Changeset 1585

Timestamp:

Oct 15, 2008, 10:39:36 PM (14 years ago)

Author:

Peter

Message:

refs #396 - fixing iterator_test

File:

• trunk/test/iterator_test.cc (modified) (2 diffs)

trunk/test/iterator_test.cc

@@ -138 +138 @@
 
   // test std algorithm on IteratorWeighted
-  utility::Matrix m(1,3,1);
-  m(0,1)=2.0;
-  utility::Matrix w(1,3,1);
-  classifier::MatrixLookupWeighted mw(m,w);
+  utility::MatrixWeighted m_w(1, 3, 1, 1);
+  m_w(0,1).data()=2.0;
+  classifier::MatrixLookupWeighted mw(m_w);
   classifier::DataLookupWeighted1D aw(mw,0,true);
   size_t nof1=std::count(aw.begin(),aw.end(),utility::DataWeight(1.0, 1.0));
@@ -195 +194 @@
   suite.add(element_data==x_weighted.begin()->data());
 
+  utility::Matrix m(mw.rows(), mw.columns());
   classifier::MatrixLookup ml(m);
   classifier::DataLookup1D dl1(ml,0,true);