Changeset 1314 for trunk/yat

Timestamp:

May 19, 2008, 7:45:50 PM (14 years ago)

Author:

Peter

Message:

closes #330

File:

• trunk/yat/utility/Vector.cc (modified) (1 diff)

trunk/yat/utility/Vector.cc

@@ -100 +100 @@
           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 a double.";
-          throw IO_error(ss.str());
+          try {
+            v.push_back(convert<double>(element));
+          }
+          catch (std::runtime_error& e) {
+            std::stringstream ss(e.what());
+            ss << "\nVector.cc: " << element 
+               << " is not accepted as a Vector element\n";
+            throw IO_error(ss.str());
+          }
         }
       }