Changeset 679

Timestamp:

Oct 11, 2006, 2:37:55 PM (17 years ago)

Author:

Markus Ringnér

Message:

Fixed some minor stuff so it compiles on eddie.thep.lu.se running g++3.2

Location:

trunk

Files:

• test/data_lookup_1d_test.cc (modified) (6 diffs)
• test/kernel_test.cc (modified) (1 diff)
• test/matrix_test.cc (modified) (2 diffs)
• yat/utility/CommandLine.h (modified) (1 diff)

trunk/test/data_lookup_1d_test.cc

@@ -26 +26 @@
 #include "yat/classifier/MatrixLookup.h"
 
+
+#include <cstdio>
 #include <fstream>
 #include <iostream>
@@ -34 +36 @@
 
 utility::matrix matrix(size_t n);
+int end_test(std::ostream*, bool);
 
 int main(const int argc,const char* argv[])
@@ -47 +50 @@
       std::cout << "lookup_test -v : for printing extra information\n";
   }
+  
 
   *error << "Testing Lookup Classes" << std::endl;
   bool ok = true;
+
+  if(!std::numeric_limits<double>::has_quiet_NaN) {
+    *error << "Error: a compiler without quiet_NaN is used!\n"
+     << "This will likely also mess up a lot of other yat tests\n"; 
+    ok=false;
+    return end_test(error,ok);
+  }
+
+
 
   *error << "Testing DataLookup1D" << std::endl;
@@ -132 +145 @@
     *error << "\nERROR\n" << std::endl;
   }
-  unlink("data/tmp_test_datalookup1D.txt");
+  std::remove("data/tmp_test_datalookup1D.txt");
   
   // Second with a vector with a missing value separated by '\t'.
@@ -152 +165 @@
            << std::endl;
   }
-  unlink("data/tmp_test_datalookup1D.txt");
+  std::remove("data/tmp_test_datalookup1D.txt");
    
-
-  if (ok)
-    *error << "Ok." << std::endl;
-  if (error!=&std::cerr)
-    delete error;
-  return (ok ? 0 : -1);
+  return end_test(error,ok);
 }
 
@@ -171 +179 @@
 }
 
+int end_test(std::ostream* error, bool ok) 
+{  
+  if (ok)
+    *error << "Ok." << std::endl;
+  if (error!=&std::cerr)
+    delete error;
+  return (ok ? 0 : -1);
+}

trunk/test/kernel_test.cc

@@ -188 +188 @@
   index[1]=2;
   index[2]=3;
-  classifier::KernelLookup kv(classifier::KernelLookup(kernel),index, index);
+  classifier::KernelLookup kv_raw(kernel);
+  classifier::KernelLookup kv(kv_raw,index, index);
   if (kv.rows()!=index.size()){
     *error << "Error: KernelLookup(kernel, index)\n" << std::endl

trunk/test/matrix_test.cc

@@ -24 +24 @@
 #include "yat/utility/matrix.h"
 
-#include <unistd.h>
+#include <cstdio>
 #include <fstream>
 #include <iostream>
@@ -76 +76 @@
   if (m3!=m2)
     ok=false;
-  unlink("data/tmp_test_matrix.txt");
+  std::remove("data/tmp_test_matrix.txt");
 
   *error << "\toperator*(double)" << std::endl;

trunk/yat/utility/CommandLine.h

@@ -27 +27 @@
 #include "Option.h"
 
+#include <cctype>
 #include <list>
 #include <map>