Changeset 1930

Timestamp:

Apr 30, 2009, 8:04:11 PM (14 years ago)

Author:

Peter

Message:

avoid copying in MatrixWeighted?(istream), i.e., avoid use of intermediate Matrix. closes #535

Location:

trunk/yat/utility

Files:

• Matrix.cc (modified) (1 diff)
• MatrixWeighted.cc (modified) (1 diff)

trunk/yat/utility/Matrix.cc

@@ -103 +103 @@
       throw utility::GSL_error("Matrix::Matrix failed to allocate memory");
 
-    // if gsl error handler disabled, out of bounds index will not
-    // abort the program.
     for (size_t i=0; i<data_matrix.size(); ++i) {
       assert(data_matrix[i].size()==columns());

trunk/yat/utility/MatrixWeighted.cc

@@ -65 +65 @@
   MatrixWeighted::MatrixWeighted(std::istream& is, char sep)
   {
-    Matrix data(is, sep);
-    copy(data);
+    if (!is.good())
+      throw utility::IO_error("MatrixWeighted: istream is not good");
+
+    // read the data file and store in stl vectors (dynamically
+    // expandable)
+    std::vector<std::vector<double> > data_matrix;
+    try {
+      load(is, data_matrix, sep, '\n', true);
+    }
+    catch (utility::IO_error& e) {
+      std::stringstream ss(e.what());
+      ss << "\nMatrixWeighted(std::istream&): invalid dimensions\n";
+      throw IO_error(ss.str());
+    }
+    catch (std::runtime_error& e) {
+      std::stringstream ss(e.what());
+      ss << "\nMatrixWeighted(std::istream&): invalid matrix element\n";
+      throw IO_error(ss.str());
+    }
+
+    unsigned int nof_rows = data_matrix.size();
+    // if stream was empty, create nothing
+    if (!nof_rows)
+      return;
+
+    unsigned int nof_columns=data_matrix[0].size();
+
+    resize(nof_rows, nof_columns);
+    for (size_t i=0; i<rows(); ++i) {
+      std::copy(data_matrix[i].begin(), data_matrix[i].end(), 
+                data_iterator(begin_row(i)));
+      binary_weight(data_matrix[i].begin(), data_matrix[i].end(), 
+                    weight_iterator(begin_row(i)));
+    }
   }