Changeset 1088 for trunk/yat/classifier

Timestamp:

Feb 14, 2008, 3:26:19 PM (16 years ago)

Author:

Peter

Message:

Closes #247. Removed IteratorWeighted? iterators over weighted container instead can use Iterator with a special Policy.

Location:

trunk/yat/classifier

Files:

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

trunk/yat/classifier/DataLookup2D.cc

@@ -123 +123 @@
 
 
+  double DataLookup2D::data(size_t i, size_t j) const
+  {
+    return (*this)(i,j);
+  }
+
+
   size_t DataLookup2D::rows(void) const
   {
     return row_index_.size();
+  }
+
+
+  double DataLookup2D::weight(size_t i, size_t j) const
+  {
+    return 1.0;
   }
 

trunk/yat/classifier/DataLookup2D.h

@@ -110 +110 @@
     size_t columns(void) const;
 
+    
+    /**
+       \return data
+    */
+    virtual double data(size_t i, size_t j) const;
+    
     ///
     /// @return number of rows
@@ -139 +145 @@
                     const std::vector<size_t>& val) const=0; 
 
+    /**
+       \return data
+    */
+    virtual double weight(size_t i, size_t j) const;
+    
     ///
     /// Is lookup weighted?

trunk/yat/classifier/DataLookupWeighted1D.cc

@@ -69 +69 @@
   DataLookupWeighted1D::const_iterator DataLookupWeighted1D::begin(void) const
   {
-    return DataLookupWeighted1D::const_iterator(*this, 0);
+    if (column_vector_)
+      return const_iterator(const_iterator::iterator_type(*matrix_, 0, index_), 
+                            matrix_->columns());
+    return const_iterator(const_iterator::iterator_type(*matrix_, index_, 0),1);
   }
 
@@ -81 +84 @@
   DataLookupWeighted1D::const_iterator DataLookupWeighted1D::end(void) const
   {
-    return DataLookupWeighted1D::const_iterator(*this, size());
+    if (column_vector_)
+      return const_iterator(const_iterator::iterator_type(*matrix_, 
+                                                          matrix_->rows(),
+                                                          index_), 
+                            matrix_->columns());
+    return const_iterator(const_iterator::iterator_type(*matrix_,index_+1,0),1);
   }
 

trunk/yat/classifier/DataLookupWeighted1D.h

@@ -26 +26 @@
 */
 
-#include "yat/utility/IteratorWeighted.h"
+#include "DataLookup2D.h"
+#include "yat/utility/Iterator.h"
+#include "yat/utility/IteratorPolicy.h"
+#include "yat/utility/StrideIterator.h"
 
 #include <iostream>
+#include <utility>
 #include <vector>
 
@@ -46 +50 @@
   
   public:
-    
-    /// 'Read Only' Iterator
-    typedef utility::IteratorWeighted<const double, const classifier::DataLookupWeighted1D> 
+    /// 'Read Only' iterator
+    typedef utility::StrideIterator<
+    utility::Iterator<const DataLookup2D, const std::pair<double, double>, 
+                      void, const std::pair<double, double>,
+                      utility::IteratorPolicyWeighted<const DataLookup2D,
+                                                      const double,
+                                                      const double> > >
     const_iterator;
 

trunk/yat/classifier/EnsembleBuilder.h

@@ -27 +27 @@
 */
 
-#include "FeatureSelector.h";
+#include "FeatureSelector.h"
 #include "Sampler.h"
 #include "SubsetGenerator.h"