Changeset 857 for trunk/yat/classifier/NCC.cc

Timestamp:

Sep 7, 2007, 1:23:27 AM (16 years ago)

Author:

Peter

Message:

refs #148 in NCC

File:

• trunk/yat/classifier/NCC.cc (modified) (2 diffs)

trunk/yat/classifier/NCC.cc

@@ -91 +91 @@
     centroids_.clone(utility::matrix(data_.rows(), target_.nof_classes()));
     utility::matrix nof_in_class(data_.rows(), target_.nof_classes());
+    const MatrixLookupWeighted* weighted_data = 
+      dynamic_cast<const MatrixLookupWeighted*>(&data_);
+    bool weighted = weighted_data;
+
     for(size_t i=0; i<data_.rows(); i++) {
       for(size_t j=0; j<data_.columns(); j++) {
         centroids_(i,target_(j)) += data_(i,j);
-        try {
-          nof_in_class(i,target_(j))+=
-            dynamic_cast<const MatrixLookupWeighted&>(data_).weight(i,j);
-        }
-        catch (std::bad_cast) {
+        if (weighted)
+          nof_in_class(i,target_(j))+= weighted_data->weight(i,j);
+        else
           nof_in_class(i,target_(j))+=1.0;
-        }
       }
     }   
@@ -135 +136 @@
   {   
     prediction.clone(utility::matrix(centroids_.columns(), input.columns()));
-    try {    
-      const MatrixLookupWeighted& data=
-        dynamic_cast<const MatrixLookupWeighted&>(input);     
+    // weighted case
+    const MatrixLookupWeighted* data =
+      dynamic_cast<const MatrixLookupWeighted*>(&input);  
+    if (data) {
       for(size_t j=0; j<input.columns();j++) {     
         DataLookup1D in(input,j,false);
         utility::vector weights(in.size(),0);
         for(size_t i=0; i<in.size();i++) 
-          weights(i)=data.weight(i,j);
+          weights(i)=data->weight(i,j);
         utility::vector out;
         predict(in,weights,out);
         prediction.column(j,out);
       }
+      return;
     }
-    catch (std::bad_cast) {
-      try {
-        dynamic_cast<const MatrixLookup&>(input);
-        for(size_t j=0; j<input.columns();j++) {     
-          DataLookup1D in(input,j,false);
-          utility::vector weights(in.size(),1.0);
-          utility::vector out;
-          predict(in,weights,out);
-          prediction.column(j,out);
-        }
-      }
-      catch (std::bad_cast e) {       
-        std::cerr << "Error in NCC::predict: DataLookup2D of unexpected class. "
-                  <<  "bad_cast: " << e.what() << std::endl;
-      }
+    // non-weighted case
+    const MatrixLookup* x = dynamic_cast<const MatrixLookup*>(&input);
+    if (!x){
+      std::string str;
+      str = "Error in NCC::predict: DataLookup2D of unexpected class.";
+      throw std::runtime_error(str);
+    }
+    for(size_t j=0; j<input.columns();j++) {     
+      DataLookup1D in(input,j,false);
+      utility::vector weights(in.size(),1.0);
+      utility::vector out;
+      predict(in,weights,out);
+      prediction.column(j,out);
     }
   }