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

Timestamp:

Dec 15, 2005, 1:46:38 PM (16 years ago)

Author:

Markus Ringnér

Message:

Fixed istream parsing when separator is last on line: a trailing NaN is generated

File:

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

trunk/lib/gslapi/matrix.cc

@@ -56 +56 @@
       std::string element;
       std::stringstream ss(line);
+      
       bool ok=true;
       while(ok) {
@@ -77 +78 @@
         }
       }           
+      if(sep!='\0' && line[line.size()-1]==sep) // add NaN for final separator
+          v.push_back(std::numeric_limits<double>::quiet_NaN());
       if (!nof_columns)
         nof_columns=v.size();
@@ -82 +85 @@
         std::ostringstream s;
         s << "matrix::matrix(std::istream&, char) data file error: "
-          << "line" << nof_rows+1 << " has " << v.size()
+          << "line" << nof_rows << " has " << v.size()
           << " columns; expected " << nof_columns << " columns.";
         throw utility::IO_error(s.str());