Changeset 936

Timestamp:

Oct 6, 2007, 1:02:08 AM (16 years ago)

Author:

Peter

Message:

reimplementing yat_assert as a throwing function

Location:

trunk/yat

Files:

• classifier/IGP.h (modified) (2 diffs)
• classifier/KNN.h (modified) (2 diffs)
• classifier/NCC.h (modified) (4 diffs)
• statistics/AveragerPairWeighted.h (modified) (2 diffs)
• statistics/utility.h (modified) (2 diffs)
• utility/Iterator.h (modified) (3 diffs)
• utility/IteratorWeighted.h (modified) (4 diffs)
• utility/yat_assert.h (modified) (1 diff)

trunk/yat/classifier/IGP.h

@@ -34 +34 @@
 #include <cmath>
 #include <limits>
+#include <stdexcept>
 
 namespace theplu {
@@ -82 +83 @@
     : matrix_(data), target_(target)
   {   
-    yat_assert(target_.size()==matrix_.columns());
+    utility::yat_assert<std::runtime_error>(target_.size()==matrix_.columns());
     
     // Calculate IGP for each class

trunk/yat/classifier/KNN.h

@@ -14 +14 @@
 #include <cmath>
 #include <map>
+#include <stdexcept>
 
 namespace theplu {
@@ -129 +130 @@
         for(size_t j=0; j<input.columns(); j++) {
           classifier::DataLookupWeighted1D test(*weighted_input,j,false);
-          yat_assert(training.size()==test.size());
-          (*distances)(i,j)=statistics::vector_distance(training.begin(),training.end(),test.begin(),typename statistics::vector_distance_traits<Distance>::distance());
-          yat_assert(!std::isnan((*distances)(i,j)));
+          utility::yat_assert<std::runtime_error>(training.size()==test.size());
+          (*distances)(i,j) =
+            statistics::vector_distance(training.begin(),training.end(),
+                                        test.begin(), typename statistics::vector_distance_traits<Distance>::distance());
+          utility::yat_assert<std::runtime_error>(!std::isnan((*distances)(i,j)));
         }
       }

trunk/yat/classifier/NCC.h

@@ -50 +50 @@
 #include <map>
 #include <cmath>
-
+#include <stdexcept>
 
 namespace theplu {
@@ -234 +234 @@
         for(size_t k=0; k<centroids_->columns();k++) {
           DataLookup1D centroid(unweighted_centroids,k,false);            
-          yat_assert(in.size()==centroid.size());
+          utility::yat_assert<std::runtime_error>(in.size()==centroid.size());
           prediction(k,j)=statistics::
             vector_distance(in.begin(),in.end(),centroid.begin(),
@@ -252 +252 @@
           for(size_t k=0; k<centroids_->columns();k++) {
             DataLookupWeighted1D centroid(weighted_centroids,k,false);
-            yat_assert(in.size()==centroid.size());
+            utility::yat_assert<std::runtime_error>(in.size()==centroid.size());
             prediction(k,j)=statistics::
               vector_distance(in.begin(),in.end(),centroid.begin(),
@@ -267 +267 @@
           for(size_t k=0; k<centroids_->columns();k++) {
             DataLookupWeighted1D centroid(weighted_centroids,k,false);
-            yat_assert(in.size()==centroid.size());
+            utility::yat_assert<std::runtime_error>(in.size()==centroid.size());
             prediction(k,j)=statistics::
               vector_distance(in.begin(),in.end(),centroid.begin(),

trunk/yat/statistics/AveragerPairWeighted.h

@@ -33 +33 @@
 
 #include <cmath>
+#include <stdexcept>
 
 namespace theplu{
@@ -200 +201 @@
   {
     for (size_t i=0; i<x.size(); ++i){ 
-      yat_assert(!std::isnan(x[i]));
+      utility::yat_assert<std::runtime_error>(!std::isnan(x[i]));
       add(x[i],y[i],wx[i],wy[i]);
     }

trunk/yat/statistics/utility.h

@@ -35 +35 @@
 #include <algorithm>
 #include <cmath>
+#include <stdexcept>
 #include <vector>
 
@@ -161 +162 @@
   double percentile(T first, T last, double p, bool sorted=false)
   {
-    yat_assert(first<last && "range is invalid");
-    yat_assert(p>=0);
-    yat_assert(p<=100);
+    utility::yat_assert<std::range_error>(first<last);
+    utility::yat_assert<std::runtime_error>(p>=0, "percentage is negative");
+    utility::yat_assert<std::runtime_error>(p<=100, 
+                                            "percentage is larger than 100");
     if (sorted){
       if (p>=100)

trunk/yat/utility/Iterator.h

@@ -29 +29 @@
 #include <iterator>
 #include <stddef.h>
+#include <stdexcept>
 
 namespace theplu {
@@ -65 +66 @@
      */
     return_type operator*(void) const 
-    { yat_assert(index_<container_->size());
+    { yat_assert<std::out_of_range>(index_<container_->size());
       return container_->operator()(index_); }
 
@@ -72 +73 @@
      */
     return_type operator[](difference_type n) const 
-    { yat_assert(index_+n < container_->size());
+    { yat_assert<std::out_of_range>(index_+n < container_->size());
       return container_->operator()(index_+n); }
 

trunk/yat/utility/IteratorWeighted.h

@@ -8 +8 @@
 #include <iterator>
 #include <stddef.h>
+#include <stdexcept>
 
 namespace theplu {
@@ -45 +46 @@
     return_type operator*(void) const 
     { 
-      yat_assert(index_<container_->size());
+      yat_assert<std::out_of_range>(index_<container_->size());
       return container_->operator()(index_); 
     }
@@ -53 +54 @@
     */
     return_type data(void) const 
-    { yat_assert(index_<container_->size()); return container_->data(index_); }
+    { yat_assert<std::out_of_range>(index_<container_->size()); 
+      return container_->data(index_); }
 
     /**
@@ -59 +61 @@
     */
     return_type weight(void) const 
-    { yat_assert(index_<container_->size());return container_->weight(index_); }
+    { yat_assert<std::out_of_range>(index_<container_->size());
+      return container_->weight(index_); }
 
 

trunk/yat/utility/yat_assert.h

@@ -24 +24 @@
 */
 
-#include <cassert>
+#include <string>
+
+namespace theplu {
+namespace yat {
+namespace utility {
+
+  template<class X> inline void yat_assert(bool assertion, std::string msg="") 
 #ifdef YAT_DEBUG
-# define yat_assert(expr)   (assert(expr))
+  { if (YAT_DEBUG && !assertion) throw X(msg); }
 #else
-# define yat_assert(expr)
+  { }
 #endif
 
+}}}
+  /*
+  */
 #endif