Changeset 950

Timestamp:

Oct 9, 2007, 1:09:58 AM (14 years ago)

Author:

Peter

Message:

SVM::make_classifier is now throwing if KernelLookup? is not passed.

Location:

trunk/yat/classifier

Files:

• NBC.cc (modified) (2 diffs)
• SVM.cc (modified) (2 diffs)

trunk/yat/classifier/NBC.cc

@@ -73 +73 @@
     }
     catch (std::bad_cast) {
-      std::string str = "Error in NBC::make_classifier: DataLookup2D of unexpected class.";
+      std::string str = 
+        "Error in NBC::make_classifier: DataLookup2D of unexpected class.";
       throw std::runtime_error(str);
     }
@@ -121 +122 @@
     const MatrixLookupWeighted* w = 
       dynamic_cast<const MatrixLookupWeighted*>(&x);
-
+    
     // each row in prediction corresponds to a sample label (class)
     prediction.resize(centroids_.columns(), x.columns(), 0);

trunk/yat/classifier/SVM.cc

@@ -116 +116 @@
   {
     SVM* sc=0;
-    try {
-      const KernelLookup& kernel = dynamic_cast<const KernelLookup&>(data);
-      assert(data.rows()==data.columns());
-      assert(data.columns()==target.size());
-      sc = new SVM(kernel,target);
-
+    const KernelLookup& kernel = dynamic_cast<const KernelLookup&>(data);
+    assert(data.rows()==data.columns());
+    assert(data.columns()==target.size());
+    sc = new SVM(kernel,target);
+    
     //Copy those variables possible to modify from outside
     // Peter, in particular C
-    }
-    catch (std::bad_cast) {
-      std::cerr << "Warning: SVM::make_classifier only takes KernelLookup" 
-                << std::endl;
-    }
+  
     return sc;
   }
@@ -144 +139 @@
   void SVM::predict(const DataLookup2D& input, utility::matrix& prediction) const
   {
-    // Peter, should check success of dynamic_cast
     const KernelLookup& input_kernel = dynamic_cast<const KernelLookup&>(input);