Changeset 434 for trunk/lib/gslapi/matrix.cc

Timestamp:

Dec 15, 2005, 12:23:46 AM (17 years ago)

Author:

Markus Ringnér

Message:

Modified istream constructors to support both the old format and CSV files. Also support has been added for NaN:s

File:

• trunk/lib/gslapi/matrix.cc (modified) (4 diffs)

trunk/lib/gslapi/matrix.cc

@@ -5 +5 @@
 #include <c++_tools/gslapi/vector.h>
 #include <c++_tools/utility/stl_utility.h>
+#include <c++_tools/utility/utility.h>
 
 #include <cmath>
@@ -31 +32 @@
 
 
-
   // Constructor that gets data from istream
-  matrix::matrix(std::istream& is) throw (utility::IO_error,std::exception)
+  matrix::matrix(std::istream& is, char sep) 
+    throw (utility::IO_error,std::exception)
     : view_(NULL)
   {
+    // Markus to Jari, somewhere we should check that quiet_NaNs are supported
+    // std::numeric_limits<double>::has_quiet_NaN has to be true.
+    // Also in vector
+
     // read the data file and store in stl vectors (dynamically
     // expandable)
@@ -41 +46 @@
     u_int nof_columns=0;
     u_int nof_rows = 0;
-    std::vector<double> v;
-    for (nof_rows = 0; utility::read_to_double(is, v); nof_rows++) {
+    std::string line;
+    while(getline(is, line, '\n')){
       // Ignoring empty lines
-      if (!v.size()) {
-        nof_rows--;
+      if (!line.size()) {
         continue;
       }
+      nof_rows++;
+      std::vector<double> v;
+      std::string element;
+      std::stringstream ss(line);
+      bool ok=true;
+      while(ok) {
+        if(sep=='\0')
+          ok=(ss>>element);
+        else
+          ok=getline(ss, element, sep);
+        if(!ok)
+          break;
+
+        if(utility::is_double(element)) {
+          v.push_back(atof(element.c_str()));
+        }
+        else if (!element.size() || utility::is_nan(element)) {
+          v.push_back(std::numeric_limits<double>::quiet_NaN());
+        }
+        else {
+          // Jari, this should be communicated with as an exception.
+          //          std::cerr << "Warning: '" << vec_str[i] 
+          //                    << "' is not an integer." << std::endl;
+        }
+      }           
       if (!nof_columns)
         nof_columns=v.size();
       else if (v.size()!=nof_columns) {
         std::ostringstream s;
-        s << "matrix::matrix(std::istream&) data file error: "
+        s << "matrix::matrix(std::istream&, char) data file error: "
           << "line" << nof_rows+1 << " has " << v.size()
           << " columns; expected " << nof_columns << " columns.";
@@ -68 +97 @@
         gsl_matrix_set( m_, i, j, data_matrix[i][j] );
   }
-