Changeset 1313 for trunk

Timestamp:

May 19, 2008, 7:44:17 PM (13 years ago)

Author:

Peter

Message:

refs #330 for Matrix

Location:

trunk

Files:

• test/utility_test.cc (modified) (1 diff)
• yat/utility/Matrix.cc (modified) (1 diff)

trunk/test/utility_test.cc

@@ -127 +127 @@
     suite.err() << "is<double>(\"1.23.2\") should return false\n";
   if (!suite.add(!utility::is<int>("1.23")))
-    suite.err() << "is<int>(\"1.23\") should return true\n";
+    suite.err() << "is<int>(\"1.23\") should return false\n";
+  if (!suite.add(!utility::is<int>("")))
+    suite.err() << "is<int>(\"\") should return false\n";
 
   {

trunk/yat/utility/Matrix.cc

@@ -98 +98 @@
           break;
         
-        if(utility::is_double(element)) {
-          v.push_back(atof(element.c_str()));
-        }
-        else if (!element.size() || utility::is_nan(element)) {
+        if (!element.size())
           v.push_back(std::numeric_limits<double>::quiet_NaN());
-        }
         else {
-          std::stringstream ss("Warning: '");
-          ss << element << "' is not accepted as a matrix element.";
-          throw IO_error(ss.str());
+          try {
+            v.push_back(convert<double>(element));
+          }
+          catch (std::runtime_error& e) {
+            std::stringstream ss(e.what());
+            ss << "\nMatrix.cc: " << element 
+               << " is not accepted as a matrix element\n";
+            throw IO_error(ss.str());
+          }
         }
       }