Changeset 1384

Timestamp:

Jul 17, 2008, 11:26:58 PM (13 years ago)

Author:

Peter

Message:

refs #396

Location:

trunk/yat/utility

Files:

• MatrixWeighted.cc (modified) (2 diffs)
• MatrixWeighted.h (modified) (3 diffs)

trunk/yat/utility/MatrixWeighted.cc

@@ -55 +55 @@
 
 
+  MatrixWeighted::MatrixWeighted(const Matrix& data)
+  {
+    copy(data);
+  }
+
+  
   MatrixWeighted::MatrixWeighted(std::istream& is, char sep)
   {
     Matrix data(is, sep);
-    Matrix weight;
-    nan(data, weight);
-    columns_ = data.columns();
-    resize(data.columns(), data.rows());
-    std::copy(data.begin(), data.end(), make_data_iterator(vec_.begin()));
-    std::copy(weight.begin(), weight.end(), make_weight_iterator(vec_.begin()));
+    copy(data);
   }
 
@@ -106 +107 @@
   {
     return columns_;
+  }
+
+
+  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.columns(), data.rows());
+    std::copy(data.begin(), data.end(), make_data_iterator(vec_.begin()));
+    std::copy(weight.begin(), weight.end(), make_weight_iterator(vec_.begin()));
   }
 

trunk/yat/utility/MatrixWeighted.h

@@ -36 +36 @@
 namespace yat {
 namespace utility {
+
+  class Matrix;
 
   ///
@@ -97 +99 @@
     MatrixWeighted(const MatrixWeighted&);
 
+    
     /**
        \brief The istream constructor.
 
-       Constructor is reading data values using corresponding
-       constructor in Matrix class. The weights are calculate dusing
+       Data is copied from \a other and weights are calculated using
        the nan function.
+    */
+    explicit MatrixWeighted(const Matrix& other);
+
+    /**
+       \brief The istream constructor.
+
+       This constructor first creates a Matrix using the istream
+       constructor, and then constructs MatrixWeighted using
+       MatrixWeighted(const Matrix&).
     */
     explicit MatrixWeighted(std::istream &, char sep='\0'); 
@@ -221 +232 @@
 
   private:
+    void copy(const Matrix&);
+    void copy(const Matrix& data, const Matrix& weight);
+
     std::vector<DataWeight> vec_;
     size_t columns_;