Changeset 1482 for trunk/yat/classifier

Timestamp:

Sep 9, 2008, 3:39:43 PM (15 years ago)

Author:

Peter

Message:

refs #396
stupid implementation of constructors - copying should be avoided when
internal representation in MatrixLookupWeighted? has changed

Location:

trunk/yat/classifier

Files:

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

trunk/yat/classifier/MatrixLookupWeighted.cc

@@ -26 +26 @@
 #include "MatrixLookupWeighted.h"
 #include "MatrixLookup.h"
+#include "yat/utility/DataIterator.h"
 #include "yat/utility/Matrix.h"
-
+#include "yat/utility/MatrixWeighted.h"
+#include "yat/utility/WeightIterator.h"
+
+#include <algorithm>
 #include <cassert>
 #include <fstream>
@@ -35 +39 @@
 namespace yat {
 namespace classifier {
+
+  MatrixLookupWeighted::MatrixLookupWeighted(const utility::MatrixWeighted& m,
+                                             const utility::Index& rows,
+                                             const utility::Index& columns)
+    : column_index_(columns), row_index_(rows)
+  {
+    utility::Matrix* data = new utility::Matrix(m.rows(), m.columns());
+    utility::Matrix* weight = new utility::Matrix(m.rows(), m.columns());
+    for (size_t i=0; i<m.rows(); ++i)
+      for (size_t j=0; j<m.columns(); ++j) {
+        (*data)(i,j) = m(i,j).data();
+        (*weight)(i,j) = m(i,j).weight();
+      }
+    // smart pointers are taking ownership
+    data_ = MatrixP(data);
+    weights_ = MatrixP(weight);
+  }
+
+
+  MatrixLookupWeighted::MatrixLookupWeighted(const utility::MatrixWeighted& m)
+    : column_index_(utility::Index(m.columns())), 
+      row_index_(utility::Index(m.rows()))
+  {
+    utility::Matrix* data = new utility::Matrix(m.rows(), m.columns());
+    utility::Matrix* weight = new utility::Matrix(m.rows(), m.columns());
+    for (size_t i=0; i<m.rows(); ++i)
+      for (size_t j=0; j<m.columns(); ++j) {
+        (*data)(i,j) = m(i,j).data();
+        (*weight)(i,j) = m(i,j).weight();
+      } 
+  // smart pointers are taking ownership
+    data_ = MatrixP(data);
+    weights_ = MatrixP(weight);
+  }
+
 
   MatrixLookupWeighted::MatrixLookupWeighted(const utility::Matrix& data, 

trunk/yat/classifier/MatrixLookupWeighted.h

@@ -41 +41 @@
 
 namespace utility {
+  class Index;
   class Matrix;
+  class MatrixWeighted;
 }
 
@@ -92 +94 @@
     typedef const_iterator const_row_iterator;
 
+    /**
+       \brief Create a lookup into \a matrix.
+
+       The created lookup, mlw, will fullfil: mlw(i,j) =
+       matrix(rows(i), columns(j))
+     */
+    MatrixLookupWeighted(const utility::MatrixWeighted& matrix,
+                         const utility::Index& rows,
+                         const utility::Index& columns);
+
+    /**
+       \brief Create a lookup into entire \a matrix.
+     */
+    MatrixLookupWeighted(const utility::MatrixWeighted& matrix);
+
     ///
     /// Constructor creating a lookup into the entire \a matrix and \a