Changeset 1538 for trunk/yat

Timestamp:

Sep 27, 2008, 6:27:55 AM (15 years ago)

Author:

Peter

Message:

refs #368 - added several tests. Left now is to add specializations for trait classes.

Location:

trunk/yat/utility

Files:

• DataWeightProxy.h (modified) (3 diffs)
• WeightedIterator.h (modified) (5 diffs)

trunk/yat/utility/DataWeightProxy.h

@@ -52 +52 @@
        \return reference to data
      */
+    //typename std::iterator_traits<DataWeight>::reference data(void) const
     double& data(void) { return *data_; }
 
@@ -72 +73 @@
        \brief assignment operator
      */
+    DataWeightProxy& operator=(const DataWeightProxy& rhs)
+    {
+      data() = rhs.data();
+      weight() = rhs.weight();
+      return *this;
+    }
+
+    /**
+       \brief assignment operator
+     */
     DataWeightProxy& operator=(const DataWeight& rhs)
     {
@@ -82 +93 @@
        \brief Conversion to DataWeight
      */
-    operator DataWeight() const { return DataWeight(data(), weight()); }
+    operator DataWeight() const 
+    { return DataWeight(this->data(), this->weight()); }
 
   private:

trunk/yat/utility/WeightedIterator.h

@@ -41 +41 @@
     : public boost::iterator_facade<
     WeightedIterator<DataIterator, WeightIterator>,
-    DataWeight,
+    DataWeightProxy<DataIterator, WeightIterator>,
     typename std::iterator_traits<DataIterator>::iterator_category,
     DataWeightProxy<DataIterator, WeightIterator> >
@@ -47 +47 @@
   {
   public:
+    /**
+       \brief DataIterator
+     */
+    typedef DataIterator data_iterator_type;
+
+    /**
+       \brief DataIterator
+     */
+    typedef WeightIterator weight_iterator_type;
+
     /**
        \brief Constructor
@@ -54 +64 @@
     {}
     
+    /**
+       \return const reference to underlying data iterator
+     */
+    const DataIterator& data_base(void) const { return d_iter_; }
+
+    /**
+       \return const reference to underlying weight iterator
+     */
+    const WeightIterator& weight_base(void) const { return w_iter_; }
 
     /**
@@ -73 +92 @@
        to const_iterator.
      */
-    /*
     template<typename D2, typename W2>
     WeightedIterator(WeightedIterator<D2, W2> other,
             typename boost::enable_if_convertible<D2,DataIterator>::type* = 0,
             typename boost::enable_if_convertible<W2,WeightIterator>::type* = 0)
-    {}
-    */
+      : d_iter_(other.data_base()), w_iter_(other.weight_base()) {}
+
 
   private:
@@ -98 +116 @@
     utility::DataWeightProxy<DataIterator, WeightIterator> 
     dereference(void) const 
-    { 
-      return DataWeightProxy<DataIterator, WeightIterator>(d_iter_, 
+    { return DataWeightProxy<DataIterator, WeightIterator>(d_iter_, 
                                                            w_iter_); 
     }