Changeset 3543 for trunk/test/Suite.h

Timestamp:

Dec 23, 2016, 8:04:15 AM (6 years ago)

Author:

Peter

Message:

refs #803. use boost iterator categories in normalizer::Spearman

File:

• trunk/test/Suite.h (modified) (1 diff)

trunk/test/Suite.h

@@ -732 +732 @@
 
 
-  // For convenience four classes that are typical data iterators for
-  // combinations of const/mutable and weighted/unweighted. Traversal
+  // For convenience to create data iterator. This class typedefs four
+  // classes that can be conveniently constructed in tests
+  // (const/mutable and weighted/unweighted. Traversal
   // is expected to be one of:
-  // boost::incrementable_traversal_tag
-  // boost::single_pass_traversal_tag
+  //// boost::incrementable_traversal_tag (problematic with unweighted)
+  // boost::single_pass_traversal_tag (problematic with unweighted)
   // boost::forward_traversal_tag
   // boost::bidirectional_traversal_tag
   // boost::random_access_traversal_tag
-  //
-  // Note, is problematic to construct with
-  // incrementable_traversal_tag or single_pass_traversal_tag
   template<typename Traversal>
-  class UnweightedConstDataIterator
-    : public boost::iterator_archetype<
-    double,
-    boost::iterator_archetypes::readable_iterator_t,
-    Traversal
-    >
-  {};
-
-
-  template<typename Traversal>
-  class UnweightedDataIterator
-    : public boost::iterator_archetype<
-    double,
-    boost::iterator_archetypes::readable_writable_iterator_t,
-    Traversal
-    >
-  {};
-
-  template<typename Traversal>
-  class WeightedConstDataIterator
-    : public utility::WeightedIteratorArchetype<
-    boost::iterator_archetypes::readable_iterator_t,
-    Traversal>
-  {};
-
-  template<typename Traversal>
-  class WeightedDataIterator
-    : public utility::WeightedIteratorArchetype<
-    boost::iterator_archetypes::readable_writable_iterator_t,
-    Traversal>
-  {};
-
-
+  struct DataIterator
+  {
+    typedef boost::iterator_archetype<
+      double,
+      boost::iterator_archetypes::readable_iterator_t,
+      Traversal
+      > unweighted_const_iterator;
+
+    typedef boost::iterator_archetype<
+      double,
+      boost::iterator_archetypes::readable_writable_iterator_t,
+      Traversal
+      > unweighted_iterator;
+
+
+    typedef utility::WeightedIteratorArchetype<
+      boost::iterator_archetypes::readable_iterator_t, Traversal
+      >
+    weighted_const_iterator;
+
+    typedef utility::WeightedIteratorArchetype<
+      boost::iterator_archetypes::readable_writable_iterator_t,
+      Traversal
+      >
+    weighted_iterator;
+  };
 }}}