Changeset 1082

Timestamp:

Feb 13, 2008, 1:50:45 PM (16 years ago)

Author:

Peter

Message:

working on #247

Location:

trunk/yat/utility

Files:

• Iterator.h (modified) (3 diffs)
• IteratorPolicy.h (modified) (1 diff)

trunk/yat/utility/Iterator.h

@@ -42 +42 @@
   template<typename Container, typename weighted_tag, typename value, 
            typename pointer = value*, typename reference = value&,
-           class Policy = IteratorPolicy<Container, reference> > 
+           class Policy = IteratorPolicy<Container, reference, value> > 
   class Iterator
     : public std::iterator<std::random_access_iterator_tag, value, size_t, 
@@ -51 +51 @@
 
   private:
-    typedef Iterator<Container, weighted_tag, value, pointer, reference> self;
+    typedef Iterator<Container, weighted_tag, value, pointer, reference,
+                     Policy> self;
 
   public:
@@ -68 +69 @@
     Iterator(Container& container, size_t row, size_t column)
       : container_(&container), index_(row*container.columns()+column) {}
+
+    /**
+       \return data
+    */
+    typename Policy::data_type data(void) const 
+    { yat_assert<std::out_of_range>(index_<this->size(), 
+                                    "Iterator::data"); 
+      return ip_.data(*container_, row(index_), column(index_)); 
+    }
+
+    /**
+       \return weight
+    */
+    typename Policy::weight_type weight(void) const 
+    { yat_assert<std::out_of_range>(index_<this->size(), 
+                                    "Iterator::weight"); 
+      return ip_.weight(*container_, row(index_), column(index_)); 
+    }
 
     /**

trunk/yat/utility/IteratorPolicy.h

@@ -32 +32 @@
      \brief Default policy for Iterator
   */
-  template<class Container, typename reference>
+  template<class Container, typename reference, typename weight_t>
   struct IteratorPolicy
   {
+    typedef reference data_type;
+    typedef weight_t weight_type;
+
+    data_type data(const Container& c, size_t row, size_t column) const
+    {
+      return c(row, column);
+    }
+
     reference dereference(const Container& c, size_t row, size_t column) const
     {
       return c(row, column);
     }
+
+    weight_type weight(const Container& c, size_t row, size_t column) const
+    {
+      return 1.0;
+    }
+   
   };
 }}} // of namespace utility, yat, and theplu