Changeset 565

Timestamp:

Mar 16, 2006, 3:19:41 PM (17 years ago)

Author:

Peter

Message:

removed default row/column in constructors (MatrixLookup? and DataLookup1D)

Location:

trunk

Files:

• lib/classifier/DataLookup1D.h (modified) (1 diff)
• lib/classifier/KernelLookup.h (modified) (2 diffs)
• lib/classifier/KernelWeighted_MEV.h (modified) (2 diffs)
• lib/classifier/KernelWeighted_SEV.h (modified) (2 diffs)
• lib/classifier/Kernel_MEV.h (modified) (1 diff)
• lib/classifier/Kernel_SEV.cc (modified) (2 diffs)
• lib/classifier/MatrixLookup.h (modified) (2 diffs)
• lib/classifier/SVM.cc (modified) (1 diff)
• test/data_lookup_1d_test.cc (modified) (1 diff)

trunk/lib/classifier/DataLookup1D.h

@@ -32 +32 @@
     ///
     DataLookup1D(const DataLookup2D&, const size_t index, 
-                 const bool row_vector=true);
+                 const bool row_vector);
 
     ///

trunk/lib/classifier/KernelLookup.h

@@ -126 +126 @@
     ///
     inline const MatrixLookup* data(void) const
-    { return new MatrixLookup(kernel_->data(),column_index_); }
+    { return new MatrixLookup(kernel_->data(),column_index_,false); }
 
 
@@ -163 +163 @@
     ///
     inline const MatrixLookup* weights(void) const
-    { return new MatrixLookup(kernel_->weights(),column_index_); }
+    { return new MatrixLookup(kernel_->weights(),column_index_, false); }
 
 

trunk/lib/classifier/KernelWeighted_MEV.h

@@ -59 +59 @@
     inline double element(const DataLookup1D& vec, const size_t i) const
     { 
-      return (*kf_)(vec, DataLookup1D(*data_,i), 
+      return (*kf_)(vec, DataLookup1D(*data_,i,false), 
                     DataLookup1D(vec.size(),1.0),
-                    DataLookup1D(*weights_,i)); 
+                    DataLookup1D(*weights_,i,false)); 
     }
 
@@ -70 +70 @@
                           const size_t i) const
     { 
-      return (*kf_)(vec, DataLookup1D(*data_,i),w,DataLookup1D(*weights_,i)); 
+      return (*kf_)(vec, DataLookup1D(*data_,i, false),
+                    w,DataLookup1D(*weights_,i, false)); 
     }
 

trunk/lib/classifier/KernelWeighted_SEV.h

@@ -62 +62 @@
     inline double element(const DataLookup1D& vec, const size_t i) const
     { 
-      return (*kf_)(vec, DataLookup1D(*data_,i), 
+      return (*kf_)(vec, DataLookup1D(*data_,i, false), 
                     DataLookup1D(vec.size(),1.0),
-                    DataLookup1D(*weights_,i)); 
+                    DataLookup1D(*weights_,i, false)); 
     }
 
@@ -73 +73 @@
                           const size_t i) const
     { 
-      return (*kf_)(vec, DataLookup1D(*data_,i),w,DataLookup1D(*weights_,i)); 
+      return (*kf_)(vec, DataLookup1D(*data_,i, false),
+                    w,DataLookup1D(*weights_,i, false)); 
     }
 

trunk/lib/classifier/Kernel_MEV.h

@@ -58 +58 @@
     ///
     inline double element(const DataLookup1D& vec, const size_t i) const
-    { return kf_->operator()(vec, DataLookup1D(*data_,i)); }
+    { return kf_->operator()(vec, DataLookup1D(*data_,i,false)); }
       
     inline double element(const DataLookup1D& vec, const DataLookup1D& w, 
                           const size_t i) const
-    {return (*kf_)(vec, DataLookup1D(*data_,i), w, DataLookup1D(w.size(),1.0));}
+    {return (*kf_)(vec, DataLookup1D(*data_,i,false), 
+                   w, DataLookup1D(w.size(),1.0));}
 
     const Kernel_MEV* selected(const std::vector<size_t>& index) const;

trunk/lib/classifier/Kernel_SEV.cc

@@ -40 +40 @@
   double Kernel_SEV::element(const DataLookup1D& vec, const size_t i) const
   { 
-    return kf_->operator()(vec, DataLookup1D(*data_,i)); 
+    return kf_->operator()(vec, DataLookup1D(*data_,i, false)); 
   }
 
@@ -46 +46 @@
                              const size_t i) const
   { 
-    return (*kf_)(vec, DataLookup1D(*data_,i), w, DataLookup1D(w.size(),1.0));
+    return (*kf_)(vec, DataLookup1D(*data_,i, false), 
+                  w, DataLookup1D(w.size(),1.0));
   }
 

trunk/lib/classifier/MatrixLookup.h

@@ -62 +62 @@
     MatrixLookup(const gslapi::matrix& matrix, 
                  const std::vector<size_t>& index, 
-                 const bool row_vectors=true);
+                 const bool row_vectors);
 
     ///
@@ -94 +94 @@
     ///
     MatrixLookup(const MatrixLookup& matrix, const std::vector<size_t>&, 
-                 const bool row_vectors=true);
+                 const bool row_vectors);
 
     ///

trunk/lib/classifier/SVM.cc

@@ -82 +82 @@
       index.push_back(ranker_->id(i));
     kernel_ = kernel.selected(index);
+    assert(kernel_->rows()==kernel.rows());
+    assert(kernel_->columns()==kernel.columns());
     owner_ = true;
-
+    
   }
 

trunk/test/data_lookup_1d_test.cc

@@ -41 +41 @@
   *error << "DataLookup1D::DataLookup1D(const MatrixLookup&\n"
          << "                           const size_t, const bool)...";
-  classifier::DataLookup1D v1(m1,1);
+  classifier::DataLookup1D v1(m1,1, true);
   if (v1.size()!=m1.columns() || v1(0)!=m1(1,0) || 
       v1(1)!=m1(1,1) ) {