Changeset 1042

Timestamp:

Feb 6, 2008, 7:32:30 PM (16 years ago)

Author:

Peter

Message:

fixes #268 - remove return value in SupervisedClassifier::train()

Location:

trunk

Files:

• test/svm_test.cc (modified) (1 diff)
• yat/classifier/KNN.h (modified) (2 diffs)
• yat/classifier/NBC.cc (modified) (2 diffs)
• yat/classifier/NBC.h (modified) (1 diff)
• yat/classifier/NCC.h (modified) (3 diffs)
• yat/classifier/SVM.cc (modified) (2 diffs)
• yat/classifier/SVM.h (modified) (1 diff)
• yat/classifier/SupervisedClassifier.h (modified) (1 diff)

trunk/test/svm_test.cc

@@ -131 +131 @@
   classifier::KernelLookup kv(kernel);
   theplu::yat::classifier::SVM svm(kv, target);
-  if (!svm.train()){
-    ok=false;
-    *error << "Training failured" << std::endl;
-  }
+  svm.train();
 
   theplu::yat::utility::vector alpha = svm.alpha();

trunk/yat/classifier/KNN.h

@@ -95 +95 @@
     /// @return true if training succedeed.
     ///
-    bool train();
+    void train();
 
     
@@ -241 +241 @@
   
   template <typename Distance>
-  bool KNN<Distance>::train()
+  void KNN<Distance>::train()
   {   
     trained_=true;
-    return trained_;
   }
 

trunk/yat/classifier/NBC.cc

@@ -82 +82 @@
 
 
-  bool NBC::train()
+  void NBC::train()
   {   
     sigma2_.resize(data_.rows(), target_.nof_classes());
@@ -133 +133 @@
     }   
     trained_=true;
-    return trained_;
   }
 

trunk/yat/classifier/NBC.h

@@ -84 +84 @@
     /// @return true if training succedeed.
     ///
-    bool train();
+    void train();
 
     

trunk/yat/classifier/NCC.h

@@ -96 +96 @@
     /// @return true if training succedeed.
     ///
-    bool train();
+    void train();
 
     
@@ -182 +182 @@
 
   template <typename Distance>
-  bool NCC<Distance>::train()
+  void NCC<Distance>::train()
   {   
     if(centroids_) 
@@ -219 +219 @@
       }
     }
-    return true;
   }
 

trunk/yat/classifier/SVM.cc

@@ -206 +206 @@
   }
 
-  bool SVM::train(void) 
+  void SVM::train(void) 
   {
     // initializing variables for optimization
@@ -289 +289 @@
     calculate_margin();
     trained_ = calculate_bias();
-    return trained_;
   }
 

trunk/yat/classifier/SVM.h

@@ -188 +188 @@
        @return true if succesful
     */
-    bool train();
+    void train();
 
        

trunk/yat/classifier/SupervisedClassifier.h

@@ -88 +88 @@
     /// Train the classifier.
     ///
-    virtual bool train()=0;
+    virtual void train()=0;