Changeset 1810:474d093466a5 in lemon-0.x for lemon/lp_base.h

Timestamp:

11/16/05 19:58:10 (18 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2355

Message:

Modified iterators on graph maps
Other iterators for not graph maps

File:

• lemon/lp_base.h (modified) (2 diffs)

lemon/lp_base.h

@@ -682 +682 @@
     }
     template<class T>
-    typename enable_if<typename T::ValueSet::value_type::LpSolverCol,
+    typename enable_if<typename T::MapIt::Value::LpSolverCol,
                        int>::type
     addColSet(T &t,dummy<2> = 2) { 
-      ///\bug <tt>return addColSet(t.valueSet());</tt> should also work.
       int s=0;
-      for(typename T::ValueSet::iterator i=t.valueSet().begin();
-          i!=t.valueSet().end();
-          ++i)
+      for(typename T::MapIt i(t); i!=INVALID; ++i)
         {
-          *i=addCol();
+          i.set(addCol());
           s++;
         }
@@ -788 +785 @@
     }
     template<class T>
-    typename enable_if<typename T::ValueSet::value_type::LpSolverRow,
+    typename enable_if<typename T::MapIt::Value::LpSolverRow,
                        int>::type
     addRowSet(T &t,dummy<2> = 2) { 
-      ///\bug <tt>return addRowSet(t.valueSet());</tt> should also work.
       int s=0;
-      for(typename T::ValueSet::iterator i=t.valueSet().begin();
-          i!=t.valueSet().end();
-          ++i)
+      for(typename T::MapIt i(t); i!=INVALID; ++i)
         {
-          *i=addRow();
+          i.set(addRow());
           s++;
         }