Changeset 328

Timestamp:

May 31, 2005, 1:04:20 AM (16 years ago)

Author:

Jari Häkkinen

Message:

Changed vector(istream&) implementation, i.e. removed matrix dependency.

Location:

trunk

Files:

• lib/gslapi/vector.cc (modified) (2 diffs)
• test/data/vector1.data (added)
• test/data/vector2.data (added)
• test/data/vector3.data (added)
• test/data/vector4.data (added)
• test/vector_test.cc (modified) (2 diffs)

trunk/lib/gslapi/vector.cc

@@ -2 +2 @@
 
 #include <c++_tools/gslapi/vector.h>
-#include <c++_tools/gslapi/matrix.h>
+#include <c++_tools/utility/stl_utility.h>
 
 #include <iostream>
-#include <sstream>
-#include <string>
 #include <vector>
 #include <utility>
-
-
-
 
 
@@ -62 +57 @@
     : view_(NULL)
   {
-    matrix m(is);
-    
-    // convert the data to a gsl vector and check that data file is a
-    // column vector or a row vector
-    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) );
+    // 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;
+    std::vector<double> v;
+    for (nof_rows = 0; utility::read_to_double(is, v); nof_rows++) {
+      // Ignoring empty lines
+      if (!v.size()) {
+        nof_rows--;
+        continue;
+      }
+      if (!nof_columns)
+        nof_columns=v.size();
+      else if ((nof_rows>1) && (nof_columns>1)) {
+        std::cerr << "vector::vector(std::istream&) data file error:\n"
+                  << "file has " << nof_rows << " rows and " << nof_columns
+                  << " columns; expected a row vector or a column vector."
+                  << std::endl;
+        exit(1);
+      }
+      else if(v.size()!=nof_columns) {
+        std::cerr << "vector::vector(std::istream&) data file error: "
+                  << "line" << nof_rows+1 << " has " << v.size() 
+                  << " columns; expected " << nof_columns << " columns"
+                  << std::endl;
+        exit(1);
+      }
+      data_matrix.push_back(v);
     }
-    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
-      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);
-    }
+
+    // manipulate the state of the stream to be good
+    is.clear(std::ios::goodbit);
+    // convert the data to a gsl vector
+    v_ = gsl_vector_alloc(nof_rows*nof_columns);
+    size_t n=0;
+    for (size_t i=0; i<nof_rows; i++)
+      for (size_t j=0; j<nof_columns; j++) 
+        gsl_vector_set( v_, n++, data_matrix[i][j] );
   }
 

trunk/test/vector_test.cc

@@ -1 +1 @@
 // $Id$
 
+#include <c++_tools/utility/FileIO.h>
 #include <c++_tools/gslapi/vector.h>
 #include <c++_tools/gslapi/utility.h>
 
+#include <fstream>
+
 using namespace theplu;
+
+void check_file_access(std::string& str)
+{
+  if (utility::FileIO().access_rights(str,"r")) {
+    std::cerr << "test_nni: Cannot access file " << str << std::endl;
+    exit(-1);
+  }
+}
 
 int main(const int argc,const char* argv[])
@@ -57 +68 @@
     ok=false;
 
+  // checking that reading vectors from file works
+  std::string data1("data/vector1.data");
+  std::string data2("data/vector2.data");
+  std::string data3("data/vector3.data");
+  std::string data4("data/vector4.data");
+  check_file_access(data1);
+  check_file_access(data2);
+  check_file_access(data3);
+  check_file_access(data4);
+  std::ifstream data_stream1(data1.c_str());
+  std::ifstream data_stream2(data2.c_str());
+  std::ifstream data_stream3(data3.c_str());
+  std::ifstream data_stream4(data4.c_str());
+  vec=gslapi::vector(data_stream1);
+  if (vec.size()!=9)
+    ok=false;
+  vec=gslapi::vector(data_stream2);
+  if (vec.size()!=9)
+    ok=false;
+  vec=gslapi::vector(data_stream3);
+  if (vec.size()!=12)
+    ok=false;
+  vec=gslapi::vector(data_stream4);
+  if (vec.size()!=12)
+    ok=false;
+
+  std::cout << "ok: " << ok << std::endl;
+
   if (ok) 
     return 0;