Changeset 1049

Timestamp:

Feb 7, 2008, 3:50:38 PM (16 years ago)

Author:

Peter

Message:

replaced some cerr outputs with exception throws - refs #189

Location:

trunk/yat

Files:

• classifier/SVM.cc (modified) (5 diffs)
• classifier/SVM.h (modified) (1 diff)
• regression/Local.cc (modified) (2 diffs)
• statistics/PearsonCorrelation.cc (modified) (1 diff)

trunk/yat/classifier/SVM.cc

@@ -37 +37 @@
 #include <cmath>
 #include <limits>
+#include <sstream>
 #include <stdexcept>
 #include <utility>
@@ -288 +289 @@
     }
     calculate_margin();
-    trained_ = calculate_bias();
+    calculate_bias();
+    trained_ = true;
   }
 
@@ -391 +393 @@
   }
   
-  bool SVM::calculate_bias(void)
+  void SVM::calculate_bias(void)
   {
 
@@ -402 +404 @@
 
     if (!sample_.nof_sv()){
-      std::cerr << "SVM::train() error: " 
-                << "Cannot calculate bias because there is no support vector" 
-                << std::endl;
-      return false;
+      std::stringstream ss;
+      ss << "yat::classifier::SVM::train() error: " 
+         << "Cannot calculate bias because there is no support vector"; 
+      throw std::runtime_error(ss.str());
     }
 
@@ -416 +418 @@
     for (size_t i=0; i<output_.size(); i++) 
       output_(i) += bias_;
-      
-    return true;
   }
 

trunk/yat/classifier/SVM.h

@@ -208 +208 @@
     /// @return true if successful
     ///
-    bool calculate_bias(void);
+    void calculate_bias(void);
 
     ///

trunk/yat/regression/Local.cc

@@ -32 +32 @@
 #include <cassert>
 #include <iostream>
+#include <sstream>
+#include <stdexcept>
 
 namespace theplu {
@@ -53 +55 @@
   void Local::fit(const size_t step_size, const size_t nof_points)
   {
-    if (step_size==0 || nof_points<3){
-      std::cerr << "yat::regression::Local "
-                << "Parameters invalid. Fitting ignored." << std::endl;
-      return;
+    if (step_size==0){
+      std::stringstream ss;
+      ss << "yat::regression::local: step_size must be larger than zero.";
+      throw std::runtime_error(ss.str());
+    }
+    if (nof_points<3){
+      std::stringstream ss;
+      ss << "yat::regression::local: too few data points. "
+         << "At least 3 data points are needed to perform fitting.";
+      throw std::runtime_error(ss.str());
     }
 

trunk/yat/statistics/PearsonCorrelation.cc

@@ -50 +50 @@
   double PearsonCorrelation::p_value_one_sided() const
   {
-    if(nof_samples_<2){
-      std::cerr << "Warning: Only " << nof_samples_ << "samples. " 
-                << "Need at lest 3.\n";
+    if(nof_samples_<=2)
       return 1;
-    }
 
     double t = sqrt(nof_samples_ - 2)*fabs(r_) /sqrt(1-r_*r_);