Changeset 1361

Timestamp:

Jul 2, 2008, 11:23:56 PM (15 years ago)

Author:

Peter

Message:

fixing ticket:389 - the problem was in test code

Location:

trunk

Files:

• test/matrix_lookup_test.cc (modified) (2 diffs)
• yat/classifier/MatrixLookup.cc (modified) (2 diffs)
• yat/utility/Index.cc (modified) (2 diffs)

trunk/test/matrix_lookup_test.cc

@@ -55 +55 @@
     suite.err() << "Ok" << std::endl;
 
-  // FIXME - see ticket:389
-  //suite.add(suite.test_stream(m1));
+  suite.add(suite.test_stream(m1));
 
  
@@ -162 +161 @@
   suite.err() << "MatrixLookup::validation_data(const std::vector<size_t>,\n"
          << "                              const std::vector<size_t>)...";
-  std::vector<size_t> val(23,2);
+  std::vector<size_t> val(23,1);
   const classifier::MatrixLookup* ValData = 
     new MatrixLookup(m2, utility::Index(val), false);

trunk/yat/classifier/MatrixLookup.cc

@@ -113 +113 @@
     : data_(other.data_)
   {
+    assert(other.validate());
     if (row){
       row_index_ = utility::Index(other.row_index_, index);
@@ -123 +124 @@
     assert(validate());
   }
-  
 
 

trunk/yat/utility/Index.cc

@@ -23 +23 @@
 
 #include "Index.h"
+
+#include <cassert>
 
 namespace theplu {
@@ -57 +59 @@
     std::vector<size_t>* vec = new std::vector<size_t>;
     vec->reserve(b.size());
-    for (size_t i=0; i<b.size(); ++i)
+    for (size_t i=0; i<b.size(); ++i) {
+      assert(b[i]<a.size());
       vec->push_back(a[b[i]]);
+    }
     index_ = SmartPtr<const std::vector<size_t> >(vec);
   }