Changeset 1147

Timestamp:

Feb 25, 2008, 10:24:40 PM (16 years ago)

Author:

Peter

Message:

fixes #294

Location:

trunk/yat/utility

Files:

• Matrix.cc (modified) (2 diffs)
• Vector.cc (modified) (2 diffs)

trunk/yat/utility/Matrix.cc

@@ -70 +70 @@
     : blas_result_(NULL)
   {
+    if (!is.good())
+      throw utility::IO_error("Matrix: istream is not good");
+
     // read the data file and store in stl vectors (dynamically
     // expandable)
@@ -123 +126 @@
     // manipulate the state of the stream to be good
     is.clear(std::ios::goodbit);
+    
+    // if stream was empty, create nothing
+    if (!nof_columns || !nof_rows)
+      return;
+
     // convert the data to a gsl matrix
     m_ = gsl_matrix_alloc ( nof_rows, nof_columns );

trunk/yat/utility/Vector.cc

@@ -74 +74 @@
     : VectorMutable()
   {
+    if (!is.good())
+      throw utility::IO_error("Vector: istream is not good");
+
     // read the data file and store in stl vectors (dynamically
     // expandable)
@@ -134 +137 @@
     // manipulate the state of the stream to be good
     is.clear(std::ios::goodbit);
+
+    if (!nof_columns || !nof_rows)
+      return;
+
     // convert the data to a gsl vector
     vec_ = gsl_vector_alloc(nof_rows*nof_columns);