Changeset 2151

Timestamp:

Jan 17, 2010, 6:29:47 AM (12 years ago)

Author:

Peter

Message:

make the iterator_traits class more generic and adding a test for qQuantileNormalizer

Location:

trunk

Files:

• test/iterator_test.cc (modified) (3 diffs)
• test/normalization_test.cc (modified) (1 diff)
• yat/utility/iterator_traits.h (modified) (2 diffs)

trunk/test/iterator_test.cc

@@ -63 +63 @@
 void test_pair_second_iterator(test::Suite&);
 
+void test_iterator_traits(test::Suite& suite);
 void test_stride_iterator(test::Suite& suite);
 void test_weighted_iterator(test::Suite& suite);
@@ -76 +77 @@
   suite.out() << "testing boost_util\n";
   test_boost_util(suite);
+  test_iterator_traits(suite);
   suite.out() << "testing pair_second_iterator\n";
   test_pair_second_iterator(suite);
@@ -287 +289 @@
 }
 
+
+void test_iterator_traits(test::Suite& suite)
+{
+  typedef std::vector<utility::DataWeight> WeightVector;
+  WeightVector vec(1);
+  utility::iterator_traits<WeightVector::const_iterator> traits;
+  double w = traits.weight(vec.begin());
+  suite.add(suite.equal(w, 1.0));
+}
+
+
 void test_stride_iterator(test::Suite& suite)
 {

trunk/test/normalization_test.cc

@@ -194 +194 @@
          boost::random_access_iterator_archetype<double>(),
          boost::mutable_random_access_iterator_archetype<double>());
+    using utility::DataWeight;
+    qQuantileNormalizer qqn4(boost::forward_iterator_archetype<DataWeight>(),
+                             boost::forward_iterator_archetype<DataWeight>(),
+                             100);
+    qqn4(boost::random_access_iterator_archetype<DataWeight>(), 
+         boost::random_access_iterator_archetype<DataWeight>(),
+         boost::mutable_random_access_iterator_archetype<DataWeight>());
   }
 }

trunk/yat/utility/iterator_traits.h

@@ -232 +232 @@
        \return reference to data of iterator
     */
-    data_reference data(Iter iter) const { return iter->data(); }
+    data_reference data(Iter iter) const { return (*iter).data(); }
 
     /**
        \return reference to weight of iterator
     */
-    weight_reference weight(Iter iter) const { return iter->weight(); }
+    weight_reference weight(Iter iter) const { return (*iter).weight(); }
   };
 
@@ -259 +259 @@
        \return const reference to data of iterator
     */
-    data_reference data(Iter iter) const { return iter->data(); }
+    data_reference data(Iter iter) const { return (*iter).data(); }
 
     /**
        \return const reference to weight of iterator
     */
-    weight_reference weight(Iter iter) const { return iter->weight(); }
+    weight_reference weight(Iter iter) const { return (*iter).weight(); }
   };