Changeset 1146

Timestamp:

Feb 25, 2008, 10:03:48 PM (16 years ago)

Author:

Peter

Message:

DataLookup1D is now a lookup into a MatrixLookup? closes #327

Location:

trunk

Files:

• test/iterator_test.cc (modified) (1 diff)
• yat/classifier/DataLookup1D.cc (modified) (2 diffs)
• yat/classifier/DataLookup1D.h (modified) (4 diffs)
• yat/classifier/Kernel.cc (modified) (2 diffs)
• yat/classifier/Kernel_MEV.cc (modified) (1 diff)
• yat/classifier/Kernel_SEV.cc (modified) (1 diff)

trunk/test/iterator_test.cc

@@ -94 +94 @@
     ok = false;
 
+  classifier::MatrixLookup ml(m);
+  classifier::DataLookup1D dl1(ml,0,true);
+  if (dl1.begin()!=ml.begin_row(0))
+    ok = false;
+  if (dl1.end()!=ml.end_row(0))
+    ok = false;
+  classifier::DataLookup1D dl2(ml,0,false);
+  if (dl2.begin()!=ml.begin_column(0))
+    ok = false;
+  if (dl2.end()!=ml.end_column(0))
+    ok = false;
+
   if (!ok)
     *message << "iterator test failed" << std::endl;

trunk/yat/classifier/DataLookup1D.cc

@@ -25 +25 @@
 
 #include "DataLookup1D.h"
-#include "DataLookup2D.h"
 #include "MatrixLookup.h"
 
@@ -39 +38 @@
 namespace classifier {
 
-  DataLookup1D::DataLookup1D(const DataLookup2D& m, const size_t i, 
+  DataLookup1D::DataLookup1D(const MatrixLookup& m, const size_t i, 
                              const bool row_vector)
     : column_vector_(!row_vector), index_(i), matrix_(&m), owner_(false)

trunk/yat/classifier/DataLookup1D.h

@@ -27 +27 @@
 */
 
-#include "DataLookup2D.h"
+#include "MatrixLookup.h"
 #include "yat/utility/Container2DIterator.h"
 #include "yat/utility/iterator_traits.h"
@@ -51 +51 @@
     /// 'Read Only' iterator
     typedef utility::StrideIterator<
-    utility::Container2DIterator<const DataLookup2D, const double, void, 
+    utility::Container2DIterator<const MatrixLookup, const double, void, 
                                  const double> >
     const_iterator;
@@ -62 +62 @@
     /// column. @param index which row/column to look into.
     ///
-    DataLookup1D(const DataLookup2D&, const size_t index, 
+    DataLookup1D(const MatrixLookup&, const size_t index, 
                  const bool row_vector);
 
@@ -135 +135 @@
     const bool column_vector_;
     const size_t index_;
-    const DataLookup2D* matrix_;
+    const MatrixLookup* matrix_;
     const bool owner_;
     

trunk/yat/classifier/Kernel.cc

@@ -104 +104 @@
       return kf_->operator()(vec, DataLookupWeighted1D(*data_w_,i, false)); 
     else
-      return kf_->operator()(vec, DataLookup1D(*data_,i, false)); 
+      return kf_->operator()(vec,DataLookup1D(dynamic_cast<const MatrixLookup&>
+                                              (*data_),i, false)); 
   }
 
@@ -113 +114 @@
       return kf_->operator()(vec, DataLookupWeighted1D(*data_w_,i, false)); 
     else
-      return kf_->operator()(vec, DataLookup1D(*data_,i, false)); 
+      return kf_->operator()(vec, DataLookup1D(dynamic_cast<const MatrixLookup&>
+                                              (*data_),i, false)); 
   }
 

trunk/yat/classifier/Kernel_MEV.cc

@@ -72 +72 @@
                     DataLookupWeighted1D(*data_w_,column,false)); 
     else
-      return (*kf_)(DataLookup1D(*data_,row,false),
-                    DataLookup1D(*data_,column,false)); 
+      return (*kf_)(DataLookup1D(dynamic_cast<const MatrixLookup&>
+                                 (*data_),row,false),
+                    DataLookup1D(dynamic_cast<const MatrixLookup&>
+                                 (*data_),column,false)); 
   }
 

trunk/yat/classifier/Kernel_SEV.cc

@@ -70 +70 @@
       for (size_t j=i; j<kernel_matrix_.columns(); j++)
         kernel_matrix_(i,j) = kernel_matrix_(j,i) =
-          (*kf_)(DataLookup1D(*data_,i,false),DataLookup1D(*data_,j,false));
+          (*kf_)(DataLookup1D(dynamic_cast<const MatrixLookup&>(*data_),i,false),
+                 DataLookup1D(dynamic_cast<const MatrixLookup&>(*data_),j,false));
   }