Changeset 936 for trunk/yat/classifier

Timestamp:

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

Author:

Peter

Message:

reimplementing yat_assert as a throwing function

Location:

trunk/yat/classifier

Files:

• IGP.h (modified) (2 diffs)
• KNN.h (modified) (2 diffs)
• NCC.h (modified) (4 diffs)

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(),