Changeset 553 for trunk/lib/classifier/KernelLookup.cc

Timestamp:

Mar 7, 2006, 2:53:57 PM (17 years ago)

Author:

Peter

Message:

added range check in KernelLookup? Constructor and clarified doc in EnsembleBuilder?

File:

• trunk/lib/classifier/KernelLookup.cc (modified) (2 diffs)

trunk/lib/classifier/KernelLookup.cc

@@ -29 +29 @@
     // Checking that each row index is less than kernel.rows()
     assert(row.empty() || 
-           *(std::max_element(row.begin(),row.end()))<kernel.rows());
+           *(std::max_element(row.begin(),row.end()))<kernel_->rows());
     // Checking that each column index is less than kernel.column()
     assert(column.empty() || 
-           *(std::max_element(column.begin(),column.end()))<kernel.columns());
+           *(std::max_element(column.begin(),column.end()))<kernel_->columns());
 
   }
@@ -48 +48 @@
     : DataLookup2D(kernel), kernel_(kernel.kernel_)
   {
+    // Checking that no index is out of range
+    assert(row_index_.empty() || 
+           *(max_element(row_index_.begin(), row_index_.end()))<kernel_->rows());
+    assert(column_index_.empty() || 
+           *(max_element(column_index_.begin(), column_index_.end()))<
+           kernel_->columns());
+
   }