Changeset 1789 for trunk/yat/utility/MatrixWeighted.cc

Timestamp:

Feb 10, 2009, 5:11:04 PM (12 years ago)

Author:

Peter

Message:

Speeding up copying from Matrix to MatrixWeighted? using
BinaryWeight?. Moving BinaryWeight? from stl_utility.h to
utility.h. Improved docs in MatrixWeighted?.

File:

• trunk/yat/utility/MatrixWeighted.cc (modified) (3 diffs)

trunk/yat/utility/MatrixWeighted.cc

@@ -28 +28 @@
 #include "DataIterator.h"
 #include "Matrix.h"
+#include "utility.h"
 #include "WeightIterator.h"
 
@@ -112 +113 @@
   void MatrixWeighted::copy(const Matrix& data)
   {
-    Matrix weight;
-    nan(data, weight);
-    copy(data, weight);
-  }
-
-
-  void MatrixWeighted::copy(const Matrix& data, const Matrix& weight)
-  {
-    assert(data.rows()==weight.rows());
-    assert(data.columns()==weight.columns());
     columns_ = data.columns();
     resize(data.rows(), data.columns());
@@ -127 +118 @@
     assert(columns()==data.columns());
     std::copy(data.begin(), data.end(), data_iterator(vec_.begin()));
-    std::copy(weight.begin(), weight.end(), weight_iterator(vec_.begin()));
+    BinaryWeight()(data.begin(), data.end(), weight_iterator(vec_.begin()));
   }