Changeset 1525 for trunk/yat/classifier/DataLookup1D.cc

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.

File:

• trunk/yat/classifier/DataLookup1D.cc (modified) (2 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_);
   }