Changeset 531

Timestamp:

Mar 2, 2006, 6:35:12 PM (16 years ago)

Author:

Markus Ringnér

Message:

Note there are some problem when creating MatrixLookups? from MatrixLookups? and index vectors. Halfway on the path to finding the bugs. This means CrossSplitter? and layers of CrossSplitters? do not work properly.

Location:

trunk/lib/classifier

Files:

• DataLookup2D.cc (modified) (1 diff)
• DataLookup2D.h (modified) (2 diffs)
• EnsembleBuilder.cc (modified) (1 diff)
• EnsembleBuilder.h (modified) (1 diff)
• MatrixLookup.cc (modified) (2 diffs)

trunk/lib/classifier/DataLookup2D.cc

@@ -7 +7 @@
 namespace theplu {
 namespace classifier {
+
+
+  DataLookup2D::DataLookup2D()
+  {
+  }
 
 

trunk/lib/classifier/DataLookup2D.h

@@ -18 +18 @@
   
   public:
+    
+    ///
+    /// Default constructor.
+    ///
+    DataLookup2D(void);
+
 
     ///
@@ -93 +99 @@
     std::vector<size_t> column_index_;
     
-    ///
-    /// Default constructor.
-    ///
-    DataLookup2D() {};
-
   };  
   

trunk/lib/classifier/EnsembleBuilder.cc

@@ -39 +39 @@
   }
 
+  void  EnsembleBuilder::predict
+  (const DataLookup2D& data, 
+   std::vector<std::vector<statistics::Averager> >& result)
+  {
+    cross_splitter_.reset();
+
+    result.clear();
+    result.reserve(cross_splitter_.target().nof_classes());   
+    for(size_t i=0; i<cross_splitter_.target().nof_classes();i++)
+      result.push_back(std::vector<statistics::Averager>(data.columns()));
+    
+    size_t k=0;
+    gslapi::matrix prediction;   
+    while(cross_splitter_.more()) {
+      classifier(k++).predict(data,prediction);
+
+      for(size_t i=0; i<prediction.rows();i++) 
+        for(size_t j=0; j<prediction.columns();j++) 
+          result[i][j].add(prediction(i,j));
+
+      cross_splitter_.next();
+    }
+
+  }
+
+
+
   const std::vector<std::vector<statistics::Averager> >& 
   EnsembleBuilder::validate(void)

trunk/lib/classifier/EnsembleBuilder.h

@@ -60 +60 @@
     const std::vector<std::vector<statistics::Averager> >& validate(void);
     
+    ///
+    /// Predict a dataset using the ensemble
+    ///
+    void  predict(const DataLookup2D&, 
+                  std::vector<std::vector<statistics::Averager> > &);
 
 

trunk/lib/classifier/MatrixLookup.cc

@@ -26 +26 @@
 
 
-  MatrixLookup::MatrixLookup(const MatrixLookup& data, 
+  MatrixLookup::MatrixLookup(const MatrixLookup& ml, 
                      const std::vector<size_t>& row, 
                      const std::vector<size_t>& col)
-    : DataLookup2D(row,col), data_(data.data_)
+    : DataLookup2D(ml,row,col), data_(ml.data_)
   {
   }
@@ -44 +44 @@
 
 
-  MatrixLookup::MatrixLookup(const MatrixLookup& data, 
+  MatrixLookup::MatrixLookup(const MatrixLookup& ml, 
                      const std::vector<size_t>& index, bool row)
-    : DataLookup2D(index, row), data_(data.data_)
+    : DataLookup2D(ml,index,row), data_(ml.data_)
   {
-    if(row){
-      row_index_=index;
-      column_index_.reserve((*data_).columns());
-      for(size_t i=0;i<(*data_).columns();i++)
-        column_index_.push_back(i);
-    }
-    else{
-      column_index_=index;
-      row_index_.reserve((*data_).rows());
-      for(size_t i=0;i<(*data_).rows();i++)
-        row_index_.push_back(i);
-    }
-
   }