Changeset 1581

Timestamp:

Oct 15, 2008, 5:24:48 PM (13 years ago)

Author:

Peter

Message:

refs #396 - fixing in KernelLookup?

Location:

trunk/yat/classifier

Files:

• KernelLookup.cc (modified) (9 diffs)
• MatrixLookupWeighted.cc (modified) (1 diff)
• MatrixLookupWeighted.h (modified) (4 diffs)

trunk/yat/classifier/KernelLookup.cc

@@ -25 +25 @@
 #include "MatrixLookupWeighted.h"
 #include "yat/utility/Matrix.h"
+#include "yat/utility/MatrixWeighted.h"
 
 #include <cassert>
@@ -240 +241 @@
     // kernel_ holds MatrixLookupWeighted, hence new Kernel also
     // should hold a MatrixLookupweighted.
-    utility::Matrix* data_all = 
-      new utility::Matrix(data.rows(), rows()+data.columns());
-    utility::Matrix* weight_all = 
-      new utility::Matrix(data.rows(), rows()+data.columns(), 1.0);
+    utility::MatrixWeighted* x_all = 
+      new utility::MatrixWeighted(data.rows(), rows()+data.columns());
     const MatrixLookupWeighted& kernel_data = kernel_->data_weighted();
 
@@ -250 +249 @@
       // first some columns from data in kernel_
       for (size_t j=0; j<row_index_.size(); ++j){
-        (*data_all)(i,j) = kernel_data.data(i,row_index_[j]); 
-        (*weight_all)(i,j) = kernel_data.weight(i,row_index_[j]);
+        (*x_all)(i,j) = kernel_data(i,row_index_[j]); 
       }
 
       // last columns are equal to new data
       for (size_t j=0;j<data.columns(); ++j){
-        (*data_all)(i,j+row_index_.size()) = data(i,j);
+        (*x_all)(i,j+row_index_.size()).data() = data(i,j);
       }
     }
@@ -269 +267 @@
       row_index.push_back(i);
 
-    MatrixLookupWeighted* tmp = new MatrixLookupWeighted(*data_all, 
-                                                         *weight_all, true);
+    MatrixLookupWeighted* tmp = new MatrixLookupWeighted(*x_all, true);
     const Kernel* kernel = kernel_->make_kernel(*tmp, true);
 
@@ -282 +279 @@
   KernelLookup KernelLookup::test_kernel(const MatrixLookupWeighted& data) const
   {
-    utility::Matrix* data_all = 
-      new utility::Matrix(data.rows(), rows()+data.columns());
-    utility::Matrix* weight_all = 
-      new utility::Matrix(data.rows(), rows()+data.columns(), 1.0);
+    utility::MatrixWeighted* x_all = 
+      new utility::MatrixWeighted(data.rows(), rows()+data.columns());
 
     if (weighted()){
@@ -293 +288 @@
         // first columns are equal to data in kernel_
         for (size_t j=0; j<row_index_.size(); ++j){
-          (*data_all)(i,j) = kernel_data.data(i,row_index_[j]);
-          (*weight_all)(i,j) = kernel_data.weight(i,row_index_[j]);
+          (*x_all)(i,j) = kernel_data(i,row_index_[j]);
         }
       }
@@ -303 +297 @@
         // first columns are equal to data in kernel_
         for (size_t j=0; j<row_index_.size(); ++j)
-          (*data_all)(i,j) = kernel_->data()(i,row_index_[j]);
+          (*x_all)(i,j).data() = kernel_->data()(i,row_index_[j]);
       }
     }
@@ -310 +304 @@
     for (size_t i=0; i<data.rows(); ++i){
       for (size_t j=0;j<data.columns(); ++j){
-        (*data_all)(i,j+row_index_.size()) = data.data(i,j);
-        (*weight_all)(i,j+row_index_.size()) = data.weight(i,j);
+        (*x_all)(i,j+row_index_.size()) = data(i,j);
       }
     }
@@ -320 +313 @@
       column_index.push_back(i+row_index_.size());
     const Kernel* kernel = 
-      kernel_->make_kernel(MatrixLookupWeighted(*data_all, *weight_all, true));
+      kernel_->make_kernel(MatrixLookupWeighted(*x_all, true));
     return KernelLookup(*kernel, row_index_, 
                         utility::Index(column_index), true);

trunk/yat/classifier/MatrixLookupWeighted.cc

@@ -56 +56 @@
 
 
-  MatrixLookupWeighted::MatrixLookupWeighted(const utility::MatrixWeighted& m)
+  MatrixLookupWeighted::MatrixLookupWeighted(const utility::MatrixWeighted& m,
+                                             bool owner)
     : column_index_(utility::Index(m.columns())), 
       row_index_(utility::Index(m.rows()))
   {
+    // Peter, remember to take care of ownership (but for now leave a leak)
+
     utility::Matrix* data = new utility::Matrix(m.rows(), m.columns());
     utility::Matrix* weight = new utility::Matrix(m.rows(), m.columns());

trunk/yat/classifier/MatrixLookupWeighted.h

@@ -24 +24 @@
   along with yat. If not, see <http://www.gnu.org/licenses/>.
 */
+
+#include "yat/utility/deprecate.h"
 
 #include "yat/utility/Container2DIterator.h"
@@ -114 +116 @@
        \brief Create a lookup into entire \a matrix.
      */
-    explicit MatrixLookupWeighted(const utility::MatrixWeighted& matrix);
+    explicit MatrixLookupWeighted(const utility::MatrixWeighted& matrix,
+                                  bool owner=false);
 
     ///
@@ -127 +130 @@
     MatrixLookupWeighted(const utility::Matrix& matrix, 
                          const utility::Matrix& weights,
-                         const bool owner=false);
+                         const bool owner=false);// YAT_DEPRECATE;
     
     /**
@@ -160 +163 @@
                          const utility::Matrix& weights, 
                          const utility::Index& row, 
-                         const utility::Index& column);
+                         const utility::Index& column);// YAT_DEPRECATE;
 
     ///