Changeset 1801

Timestamp:

Feb 17, 2009, 6:48:49 PM (15 years ago)

Author:

Peter

Message:

changed template arguments to better describe requirements on passed iterators - refs #478 and #425

File:

• trunk/yat/normalizer/qQuantileNormalizer.h (modified) (6 diffs)

trunk/yat/normalizer/qQuantileNormalizer.h

@@ -89 +89 @@
        normalization.
     */
-    template<typename BidirectionalIterator>
-    qQuantileNormalizer(BidirectionalIterator first, BidirectionalIterator last,
+    template<typename ForwardIterator>
+    qQuantileNormalizer(ForwardIterator first, ForwardIterator last,
                         unsigned int Q);
 
@@ -118 +118 @@
        \brief Create the partition and perform required calculations.
     */
-    template<typename BidirectionalIterator>
-    Partitioner(BidirectionalIterator first, BidirectionalIterator last, 
+    template<typename ForwardIterator>
+    Partitioner(ForwardIterator first, ForwardIterator last, 
                 unsigned int N);
 
@@ -143 +143 @@
   private:
     // unweighted "constructor"
-    template<typename Iterator>
-    void build(Iterator first, Iterator last, unsigned int N, 
+    template<typename ForwardIterator>
+    void build(ForwardIterator first, ForwardIterator last, unsigned int N, 
                utility::unweighted_iterator_tag);
     // weighted "constructor"
-    template<typename Iterator>
-    void build(Iterator first, Iterator last, unsigned int N, 
+    template<typename ForwardIterator>
+    void build(ForwardIterator first, ForwardIterator last, unsigned int N, 
                utility::weighted_iterator_tag);
     void init(const utility::VectorBase&, unsigned int N);
@@ -176 +176 @@
   // template implementations
 
-  template<typename BidirectionalIterator>
-  qQuantileNormalizer::qQuantileNormalizer(BidirectionalIterator first, 
-                                           BidirectionalIterator last,
+  template<typename ForwardIterator>
+  qQuantileNormalizer::qQuantileNormalizer(ForwardIterator first, 
+                                           ForwardIterator last,
                                            unsigned int Q)
     : target_(Partitioner(first, last, Q))
@@ -310 +310 @@
 
 
-  template<typename BidirectionalIterator>
-  qQuantileNormalizer::Partitioner::Partitioner(BidirectionalIterator first, 
-                                                BidirectionalIterator last, 
+  template<typename ForwardIterator>
+  qQuantileNormalizer::Partitioner::Partitioner(ForwardIterator first, 
+                                                ForwardIterator last, 
                                                 unsigned int N)
     : average_(utility::Vector(N)), index_(utility::Vector(N))
   {
-    typedef typename 
-      utility::weighted_iterator_traits<BidirectionalIterator>::type tag;
-    build(first, last, N, tag());
-          
-  }
-
-
-  template<typename Iterator>
-  void qQuantileNormalizer::Partitioner::build(Iterator first, Iterator last, 
+    build(first, last, N, 
+          typename utility::weighted_iterator_traits<ForwardIterator>::type());
+  }
+
+
+  template<typename ForwardIterator>
+  void qQuantileNormalizer::Partitioner::build(ForwardIterator first, 
+                                               ForwardIterator last, 
                                                unsigned int N, 
                                                utility::unweighted_iterator_tag)
@@ -335 +334 @@
 
 
-  template<typename Iterator>
-  void qQuantileNormalizer::Partitioner::build(Iterator first, 
-                                               Iterator last, unsigned int N, 
+  template<typename ForwardIterator>
+  void qQuantileNormalizer::Partitioner::build(ForwardIterator first, 
+                                               ForwardIterator last, 
+                                               unsigned int N, 
                                                utility::weighted_iterator_tag)
   {