Changeset 1013 for trunk/yat/classifier

Timestamp:

Feb 1, 2008, 4:34:30 PM (16 years ago)

Author:

Markus Ringnér

Message:

Adding functionality tests for NCC

Location:

trunk/yat/classifier

Files:

• NCC.h (modified) (2 diffs)
• SVM.cc (modified) (2 diffs)

trunk/yat/classifier/NCC.h

@@ -215 +215 @@
       }
     }
-    trained_=true;
-    return trained_;
+    return true;
   }
 
@@ -223 +222 @@
                               utility::matrix& prediction) const
   {   
-    utility::yat_assert<std::runtime_error>(data_.rows()==test.rows());
-    utility::yat_assert<std::runtime_error>(test.rows()==centroids_->rows());
+    utility::yat_assert<std::runtime_error>
+      (centroids_,"NCC::predict called for untrained classifier");
+    utility::yat_assert<std::runtime_error>
+      (data_.rows()==test.rows(),
+       "NCC::predict test data with incorrect number of rows");
     
     prediction.clone(utility::matrix(centroids_->columns(), test.columns()));       

trunk/yat/classifier/SVM.cc

@@ -126 +126 @@
       sc->max_epochs(max_epochs());
     }
-    catch (std::bad_cast& e) {
+    catch (std::bad_cast) {
       std::string str = 
         "Error in SVM::make_classifier: DataLookup2D of unexpected class.";
@@ -169 +169 @@
         prediction(1,i) = -prediction(0,i);
     }
-    catch (std::bad_cast& e) {
+    catch (std::bad_cast) {
       std::string str = 
         "Error in SVM::predict: DataLookup2D of unexpected class.";