Changeset 275

Timestamp:

Apr 14, 2005, 7:07:56 PM (18 years ago)

Author:

Peter

Message:

modified istream constructor for vector class to use the matrix constructor

Location:

trunk/src

Files:

• matrix.h (modified) (1 diff)
• vector.cc (modified) (2 diffs)

trunk/src/matrix.h

@@ -242 +242 @@
 
   ///
-  /// The output operator for the vector class.
+  /// The output operator for the matrix class.
   ///
   std::ostream& operator<< (std::ostream& s, const matrix&);

trunk/src/vector.cc

@@ -2 +2 @@
 
 #include "vector.h"
+#include "matrix.h"
 
 #include <iostream>
@@ -61 +62 @@
     : view_(NULL)
   {
-    using namespace std;
-  
-    // read the data file and store in stl vectors (dynamically expandable)
-    std::vector<std::vector<double> > data_matrix;
-    u_int nof_columns=0;
-    u_int nof_rows = 0;
-    string s;
-    for (nof_rows = 0; getline(is, s, '\n'); nof_rows++) {
-      istringstream line(s);
-      std::vector<double> v;
-      string tmp_string;
-      while (line >> tmp_string) {
-        if(!is.good()) {
-          // Jari. change to throw exception, remove unnecessary includes
-          cerr << "vector::vector(std::istream&): "
-               << "error reading data file!" << endl;
-          exit(1);
-        }
-        double t=atof(tmp_string.c_str());
-        // Here we should check that it actually was a double!!!!!
-        v.push_back(t);
-      }
-
-      // Ignoring empty lines
-      if(!v.size()){
-        nof_rows--;
-        continue;
-      }
-
-      if(nof_columns==0)
-        nof_columns=v.size();
-      else if(v.size()!=nof_columns) {
-        // Jari. change to throw exception, remove unnecessary includes
-        cerr << "vector::vector(std::istream&) data file error: "
-             << "line" << nof_rows+1 << " has " << v.size() 
-             << " columns; expected " << nof_columns
-             << " columns"
-             << endl; 
-        exit(1);
-      }
-      data_matrix.push_back(v);
-    }
-  
-    // manipulate the state of the stream to be good
-    is.clear(std::ios::goodbit);
-  
+    matrix m(is);
+    
     // convert the data to a gsl vector and check that data file is a
     // column vector or a row vector
-    if(nof_columns==1) {
-      v_ = gsl_vector_alloc ( nof_rows );
-      for(u_int i=0;i<nof_rows;i++) 
-        gsl_vector_set( v_, i, data_matrix[i][0] );
-    }
-    else if(nof_rows==1){
-      v_ = gsl_vector_alloc ( nof_columns );
-      for(u_int i=0;i<nof_columns;i++) 
-        gsl_vector_set( v_, i, data_matrix[0][i] );
+    if(m.columns()==1) {
+      v_ = gsl_vector_alloc ( m.rows() );
+      for(u_int i=0;i<m.rows();i++) 
+        gsl_vector_set( v_, i, m(i,0) );
+    }
+    else if(m.rows()==1){
+      v_ = gsl_vector_alloc ( m.columns() );
+      for(u_int i=0;i<m.columns();i++) 
+        gsl_vector_set( v_, i, m(0,i) );
     }
     else {
       // Jari. change to throw exception, remove unnecessary includes
-      cerr << "vector::vector(std::istream&) data file error: "
-           << "file has " << nof_rows << " rows and " << nof_columns 
-           << " columns; expected a row vector or a column vector"
-           << endl;
+      std::cerr << "vector::vector(std::istream&) data file error: "
+                << "file has " << m.rows() << " rows and " << m.columns() 
+                << " columns; expected a row vector or a column vector"
+                << std::endl;
       exit(1);
     }