Changeset 898 for trunk/test/iterator_test.cc

Timestamp:

Sep 26, 2007, 3:44:19 PM (16 years ago)

Author:

Markus Ringnér

Message:

A first suggestion for how to adress #250. Also removed contamination of namespace std (see #251).

File:

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

trunk/test/iterator_test.cc

@@ -24 +24 @@
 #include "yat/classifier/DataLookup1D.h"
 
+#include "yat/classifier/DataLookupWeighted1D.h"
+#include "yat/classifier/MatrixLookupWeighted.h"
 #include "yat/utility/Iterator.h"
+#include "yat/utility/IteratorWeighted.h"
+#include "yat/utility/matrix.h"
 #include "yat/utility/vector.h"
 
@@ -63 +67 @@
   std::sort(begin, end);
 
+  // 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);
+  classifier::DataLookupWeighted1D aw(mw,0,true);
+  size_t nof1=std::count(aw.begin(),aw.end(),1.0);
+  if(nof1!=2) {
+    *message << "std algoritm with IteratorWeighted failed" << std::endl;
+    ok=false;
+  }
+
   if (!ok)
     *message << "iterator test failed" << std::endl;