Changeset 1774 for trunk/test/normalization_test.cc

Timestamp:

Feb 5, 2009, 4:48:18 PM (12 years ago)

Author:

Peter

Message:

refs #478 - fixed bugs in test code... the test still fails though.

File:

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

trunk/test/normalization_test.cc

@@ -178 +178 @@
   // test with unweighted target and source
   std::vector<double> target;
+  target.reserve(1000);
   while (target.size()<1000)
     target.push_back(target.size());
@@ -184 +185 @@
   while (source.size()<10)
     source.push_back(source.size()*10);
-  qQN(source.begin(), source.end(), source.begin());
-  
+  std::vector<double> result(source.size());
+  
+  qQN(source.begin(), source.end(), result.begin());
+  
+  using utility::DataWeight;
   // test with unweighted target and weighted source
-  std::vector<utility::DataWeight> src_w(source.size());
+  std::vector<utility::DataWeight> src_w(source.size(), DataWeight(0, 1));
   std::copy(source.begin(), source.end(),
             utility::data_iterator(src_w.begin()));
-  std::fill(utility::weight_iterator(src_w.begin()),
-            utility::weight_iterator(src_w.end()), 1.0);
-
-  qQN(src_w.begin(), src_w.end(), src_w.begin());
+
+  std::vector<utility::DataWeight> result_w(src_w.size());
+  qQN(src_w.begin(), src_w.end(), result_w.begin());
   // FIXME: this test fails 
-  suite.xadd(suite.equal_range(source.begin(), source.end(),
-                              utility::data_iterator(src_w.begin())));
+  suite.xadd(suite.equal_range(result.begin(), result.end(),
+                              utility::data_iterator(result_w.begin())));
 }