Changeset 609 for trunk

Timestamp:

Aug 30, 2006, 10:49:45 AM (17 years ago)

Author:

Markus Ringnér

Message:

Fixes #98

Location:

trunk

Files:

• c++_tools/utility/utility.cc (modified) (4 diffs)
• test/Makefile.am (modified) (2 diffs)
• test/utility_test.cc (added)

trunk/c++_tools/utility/utility.cc

@@ -38 +38 @@
     std::stringstream ss(s);
     double a;
-    return (ss>>a);
+    ss>>a;
+    if(ss.fail()) 
+      return false;
+    // Check that nothing is left on stream
+    std::string b;
+    ss >> b;
+    return (b.size() ? false : true);
   }
   
@@ -45 +51 @@
     std::stringstream ss(s);
     float a;
-    return (ss>>a);
+    ss>>a;
+    if(ss.fail()) 
+      return false;
+    // Check that nothing is left on stream
+    std::string b;
+    ss >> b;
+    return (b.size() ? false : true);
   }
 
@@ -52 +64 @@
     std::stringstream ss(s);
     int a;
-    return (ss>>a);
+    ss >> a;
+    if(ss.fail()) 
+      return false;
+    // Check that nothing is left on stream
+    std::string b;
+    ss >> b;
+    return (b.size() ? false : true);
   }
 
@@ -61 +79 @@
     ss >> s2; // to trim surrounding whitespaces
     to_lower(s2);
+    // Check that nothing is left on stream
+    std::string s3;
+    ss >> s3;
+    if(s3.size())
+      return false;
     std::string nan("nan");
     return (nan==s2);

trunk/test/Makefile.am

@@ -33 +33 @@
   ncc_test nni_test pca_test regression_test rnd_test score_test \
   statistics_test stl_utility_test svd_test svm_test target_test \
-  vector_test
+  utility_test vector_test
 
 check_PROGRAMS = $(TESTS)
@@ -67 +67 @@
 svm_test_SOURCES = svm_test.cc
 target_test_SOURCES = target_test.cc
+utility_test_SOURCES = utility_test.cc
 vector_test_SOURCES = vector_test.cc