Changeset 1381

Timestamp:

Jul 17, 2008, 1:14:42 AM (14 years ago)

Author:

Peter

Message:

working on #363

Location:

trunk/yat/utility

Files:

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

trunk/yat/utility/MatrixWeighted.cc

@@ -27 +27 @@
 #include "MatrixWeighted.h"
 
+#include "DataIterator.h"
+#include "Matrix.h"
+#include "WeightIterator.h"
+
 #include <cassert>
 #include <vector>
@@ -41 +45 @@
 
 
+  MatrixWeighted::MatrixWeighted(size_t r, size_t c, double x, double w)
+    : vec_(std::vector<DataWeight>(r*c, DataWeight(x,w))), columns_(c)
+  {}
+
+  
+  MatrixWeighted::MatrixWeighted(const MatrixWeighted& other)
+    : vec_(other.vec_), columns_(other.columns_)
+  {}
+
+
+  MatrixWeighted::MatrixWeighted(std::istream& is, char sep)
+  {
+    Matrix data(is, sep);
+    Matrix weight;
+    nan(data, weight);
+    columns_ = data.columns();
+    resize(data.columns(), data.rows());
+    // FIXME
+    //std::copy(data.begin(), data.end(), make_data_iterator(vec_.begin()));
+    //std::copy(weight.begin(), weight.end(), make_weight_iterator(vec_.begin()));
+  }
+
+  
+  MatrixWeighted::iterator MatrixWeighted::begin(void)
+  {
+    return iterator(vec_.begin());
+  }
+
+
+  MatrixWeighted::const_iterator MatrixWeighted::begin(void) const
+  {
+    return const_iterator(vec_.begin());
+  }
+
+
+  MatrixWeighted::iterator MatrixWeighted::begin_column(size_t i)
+  {
+    return iterator(vec_.begin()+i, columns_);
+  }
+
+
+  MatrixWeighted::const_iterator MatrixWeighted::begin_column(size_t i) const
+  {
+    return const_iterator(vec_.begin()+i, columns_);
+  }
+
+
+  MatrixWeighted::iterator MatrixWeighted::begin_row(size_t i)
+  {
+    return iterator(vec_.begin()+columns_*i);
+  }
+
+
+  MatrixWeighted::const_iterator MatrixWeighted::begin_row(size_t i) const
+  {
+    return const_iterator(vec_.begin()+columns_*i);
+  }
+
+
+  size_t MatrixWeighted::columns(void) const
+  {
+    return columns_;
+  }
+
+
+  MatrixWeighted::iterator MatrixWeighted::end(void)
+  {
+    return iterator(vec_.end());
+  }
+
+
+  MatrixWeighted::const_iterator MatrixWeighted::end(void) const
+  {
+    return const_iterator(vec_.end());
+  }
+
+
+  MatrixWeighted::iterator MatrixWeighted::end_column(size_t i)
+  {
+    return iterator(vec_.begin()+i+vec_.size(), columns_);
+  }
+
+
+  MatrixWeighted::const_iterator MatrixWeighted::end_column(size_t i) const
+  {
+    return const_iterator(vec_.begin()+i+vec_.size(), columns_);
+  }
+
+
+  MatrixWeighted::iterator MatrixWeighted::end_row(size_t i)
+  {
+    return iterator(vec_.begin()+columns_*(i+1));
+  }
+
+
+  MatrixWeighted::const_iterator MatrixWeighted::end_row(size_t i) const
+  {
+    return const_iterator(vec_.begin()+columns_*(i+1));
+  }
+
+
+  void MatrixWeighted::resize(size_t rows, size_t columns)
+  {
+    columns_ = columns;
+    vec_.resize(rows*columns);
+  }
+
+  
+  size_t MatrixWeighted::rows(void) const
+  {
+    if (vec_.size())
+      return vec_.size()/columns_;
+    return 0;
+  }
+
+
+  DataWeight& MatrixWeighted::operator()(size_t row, size_t column)
+  {
+    assert(column<columns_);
+    assert(row*column < vec_.size());
+    return vec_[row*columns_ + column];
+  }
+
+
+  const DataWeight& MatrixWeighted::operator()(size_t row, size_t column) const
+  {
+    assert(column<columns_);
+    assert(row*column < vec_.size());
+    return vec_[row*columns_ + column];
+  }
+
 }}} // of namespace utility, yat and thep

trunk/yat/utility/MatrixWeighted.h

@@ -89 +89 @@
        DataWeight(\a init_value, \a init_weight)
     */
-    MatrixWeighted(const size_t& r, const size_t& c, double init_value=0,
-                 double init_weight=1.0);
+    MatrixWeighted(size_t r, size_t c, double init_value=0,
+                   double init_weight=1.0);
 
     /**
@@ -198 +198 @@
 
     /**
-       \brief Transpose the matrix.
-
-       \note This function may invalidate iterators.
-    */
-    void transpose(void);
-
-    /**
        \brief Element access operator.