Changeset 1589 for trunk/yat/classifier/MatrixLookupWeighted.cc

Timestamp:

Oct 17, 2008, 6:10:43 PM (14 years ago)

Author:

Peter

Message:

fixes #444

File:

• trunk/yat/classifier/MatrixLookupWeighted.cc (modified) (3 diffs)

trunk/yat/classifier/MatrixLookupWeighted.cc

@@ -141 +141 @@
   MatrixLookupWeighted::begin_column(size_t i) const
   {
-    return const_column_iterator(const_column_iterator::iterator_type(*this,0, 
-                                                                      i),
-                                 columns());
-  }
-
-
-  MatrixLookupWeighted::const_iterator 
+    return const_column_iterator(data_->begin_column(column_index_[i]),
+                                 row_index_.begin());
+  }
+
+
+  MatrixLookupWeighted::const_row_iterator 
   MatrixLookupWeighted::begin_row(size_t i) const
   {
-    return const_row_iterator(const_row_iterator::iterator_type(*this,i, 0), 1);
+    return const_row_iterator(data_->begin_row(row_index_[i]),
+                              column_index_.begin());
   }
 
@@ -177 +177 @@
 
 
-  MatrixLookupWeighted::const_iterator 
+  MatrixLookupWeighted::const_column_iterator 
   MatrixLookupWeighted::end_column(size_t i) const
   {
-    return const_column_iterator(const_column_iterator::iterator_type(*this, 
-                                                                      rows(),i),
-                                 columns());
+    return const_column_iterator(data_->end_column(column_index_[i]), 
+                                 row_index_.end());
   }
 
@@ -189 +188 @@
   MatrixLookupWeighted::end_row(size_t i) const
   {
-    return const_row_iterator(const_row_iterator::iterator_type(*this,i+1,0),1);
+    return const_row_iterator(data_->end_row(row_index_[i]), 
+                              column_index_.end());
   }