Changeset 1526

Timestamp:

Sep 24, 2008, 2:42:52 PM (15 years ago)

Author:

Peter

Message:

refs #444. same as in [1525] but for DataLookupWeighted1D.

Location:

trunk/yat/classifier

Files:

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

trunk/yat/classifier/DataLookupWeighted1D.cc

@@ -69 +69 @@
   {
     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);
+      return matrix_->begin_column(index_);
+    return matrix_->begin_row(index_);
   }
 
@@ -84 +83 @@
   {
     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);
+      return matrix_->end_column(index_);
+    return matrix_->end_row(index_);
   }
 

trunk/yat/classifier/DataLookupWeighted1D.h

@@ -48 +48 @@
   public:
     /// 'Read Only' iterator
-    typedef utility::StrideIterator<
-    utility::Container2DIterator<const MatrixLookupWeighted, 
-                                 const std::pair<double, double>, void, 
-                                 const std::pair<double, double>,
-             utility::IteratorPolicyWeighted<const MatrixLookupWeighted,
-                                             const double,
-                                             const double> > >
-    const_iterator;
+    typedef MatrixLookupWeighted::const_row_iterator const_iterator;
 
     ///