Changeset 1672

Timestamp:

Dec 22, 2008, 2:27:20 PM (15 years ago)

Author:

Peter

Message:

refs #470: svm_test

File:

• trunk/test/svm_test.cc (modified) (3 diffs)

trunk/test/svm_test.cc

@@ -92 +92 @@
   }
 
+  // tol defined on learning precision
   double tol=1e-6;
-  if (std::abs(classifier2.alpha()(1)-2)>tol || 
-      std::abs(classifier2.alpha()(2)-2)>tol){
+  if (!suite.equal_fix(classifier2.alpha()(1), 2.0, tol) ||
+      !suite.equal_fix(classifier2.alpha()(2), 2.0, tol) ) {
     suite.err() << "wrong alpha" << std::endl;
     suite.err() << "alpha: " << classifier2.alpha() <<  std::endl;
@@ -129 +130 @@
       
   // Comparing alpha to alpha_matlab
-  theplu::yat::utility::Vector diff_alpha(alpha);
-  diff_alpha-=alpha_matlab;
-  if (!(diff_alpha*diff_alpha<1e-10) ){
+  if (!suite.equal_range_fix(alpha.begin(), alpha.end(),
+                             alpha_matlab.begin(), 1e-6) ) {
     suite.err() << "Difference to matlab alphas too large\n";
     suite.add(false);
   }
+
 
   // Comparing output to target
@@ -142 +143 @@
     if (output(i)*target(i) < 1){
       if (target.binary(i))
-        slack += 1 - output(i);
+        slack = 1 - output(i);
       else
-        slack += 1 + output(i);
+        slack = 1 + output(i);
+      double slack_bound=2e-7;
+      if (slack > slack_bound || std::isnan(slack)){
+        suite.err() << "Slack too large. Is the bias correct?\n";
+        suite.err() << "slack: " << slack << std::endl;
+        suite.err() << "expected less than " << slack_bound << std::endl;
+        suite.add(false);
+      }
     }
-  }
-  double slack_bound=2e-7;
-  if (slack > slack_bound || std::isnan(slack)){
-    suite.err() << "Slack too large. Is the bias correct?\n";
-    suite.err() << "slack: " << slack << std::endl;
-    suite.err() << "expected less than " << slack_bound << std::endl;
-    suite.add(false);
   }