Changeset 1525

Timestamp:

Sep 24, 2008, 2:36:10 PM (15 years ago)

Author:

Peter

Message:

refs #444 - simplifying code in DataLookupD by calling underlying MatrixLookup? rather than creating iterator yourself.

Location:

trunk/yat/classifier

Files:

• DataLookup1D.cc (modified) (2 diffs)
• DataLookup1D.h (modified) (3 diffs)

trunk/yat/classifier/DataLookup1D.cc

@@ -94 +94 @@
   {
     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_);
   }
 
@@ -103 +102 @@
   {
     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/DataLookup1D.h

@@ -27 +27 @@
 
 #include "MatrixLookup.h"
-#include "yat/utility/Container2DIterator.h"
-#include "yat/utility/iterator_traits.h"
-#include "yat/utility/StrideIterator.h"
 
 #include <iostream>
@@ -48 +45 @@
   public:
     /// 'Read Only' iterator
-    typedef utility::StrideIterator<
-    utility::Container2DIterator<const MatrixLookup, const double, void, 
-                                 const double> >
-    const_iterator;
+    typedef MatrixLookup::const_row_iterator const_iterator;
 
     ///
@@ -125 +119 @@
 
   private:
+    // assignment no allowed
     const DataLookup1D& operator=(const DataLookup1D&);