Changeset 517

Timestamp:

Feb 21, 2006, 5:35:34 PM (16 years ago)

Author:

Peter

Message:

fixed bug in DataLookup2D and created test for EnsembleBuilder?

Location:

trunk/lib/classifier

Files:

• CrossSplitter.cc (modified) (2 diffs)
• DataLookup2D.cc (modified) (3 diffs)
• KernelLookup.h (modified) (1 diff)

trunk/lib/classifier/CrossSplitter.cc

@@ -20 +20 @@
   { 
     assert(target.size()>1);
+    assert(target.size()==data.columns());
     std::vector<std::pair<size_t,size_t> > v;
     for (size_t i=0; i<target.size(); i++)
@@ -38 +39 @@
 
     for (size_t i=0; i<N; ) {
-
       // shuffle indices within class each class
       for (size_t j=0; j<target.nof_classes(); j++)

trunk/lib/classifier/DataLookup2D.cc

@@ -10 +10 @@
 
   DataLookup2D::DataLookup2D(const DataLookup2D& m,
-                         const std::vector<size_t>& row, 
-                         const std::vector<size_t>& col)
+                             const std::vector<size_t>& row, 
+                             const std::vector<size_t>& col)
   {
+    assert(row_index_.empty());
+    row_index_.reserve(row.size());
     for (size_t i=0; i<row.size(); i++) 
-      row_index_[i] = m.row_index_[row[i]];
+      row_index_.push_back(m.row_index_[row[i]]);
+    assert(column_index_.empty());
+    column_index_.reserve(col.size());
     for (size_t i=0; i<col.size(); i++) 
-      column_index_[i] = m.column_index_[col[i]];
+      column_index_.push_back(m.column_index_[col[i]]);
   }
     
@@ -26 +30 @@
   {
     if (row){
-      row_index_=index;
+      assert(row_index_.empty());
+      row_index_.reserve(index.size());
+      for (size_t i=0; i<index.size(); i++) 
+        row_index_.push_back(m.row_index_[index[i]]);
       column_index_= m.column_index_;
     }
     else{
-      column_index_=index;
+      assert(column_index_.empty());
+      column_index_.reserve(index.size());
+      for (size_t i=0; i<index.size(); i++) 
+        column_index_.push_back(m.row_index_[index[i]]);
       row_index_= m.row_index_;
     }
@@ -37 +47 @@
 
   DataLookup2D::DataLookup2D(const std::vector<size_t>& row, 
-                         const std::vector<size_t>& col)
+                             const std::vector<size_t>& col)
     : row_index_(row),column_index_(col)
   {

trunk/lib/classifier/KernelLookup.h

@@ -13 +13 @@
   class KernelFunction;
 
-  ///
-  ///   @brief View into sub Kernel
-  ///
-  class KernelLookup : public DataLookup2D 
-  {
-    
-  public:
+  ///
+  /// @brief View into sub Kernel
+  ///
+  class KernelLookup : public DataLookup2D 
+  {
+
+  public:
     
     ///