equal
deleted
inserted
replaced
679 s++; |
679 s++; |
680 } |
680 } |
681 return s; |
681 return s; |
682 } |
682 } |
683 template<class T> |
683 template<class T> |
684 typename enable_if<typename T::ValueSet::value_type::LpSolverCol, |
684 typename enable_if<typename T::MapIt::Value::LpSolverCol, |
685 int>::type |
685 int>::type |
686 addColSet(T &t,dummy<2> = 2) { |
686 addColSet(T &t,dummy<2> = 2) { |
687 ///\bug <tt>return addColSet(t.valueSet());</tt> should also work. |
|
688 int s=0; |
687 int s=0; |
689 for(typename T::ValueSet::iterator i=t.valueSet().begin(); |
688 for(typename T::MapIt i(t); i!=INVALID; ++i) |
690 i!=t.valueSet().end(); |
|
691 ++i) |
|
692 { |
689 { |
693 *i=addCol(); |
690 i.set(addCol()); |
694 s++; |
691 s++; |
695 } |
692 } |
696 return s; |
693 return s; |
697 } |
694 } |
698 #endif |
695 #endif |
785 s++; |
782 s++; |
786 } |
783 } |
787 return s; |
784 return s; |
788 } |
785 } |
789 template<class T> |
786 template<class T> |
790 typename enable_if<typename T::ValueSet::value_type::LpSolverRow, |
787 typename enable_if<typename T::MapIt::Value::LpSolverRow, |
791 int>::type |
788 int>::type |
792 addRowSet(T &t,dummy<2> = 2) { |
789 addRowSet(T &t,dummy<2> = 2) { |
793 ///\bug <tt>return addRowSet(t.valueSet());</tt> should also work. |
|
794 int s=0; |
790 int s=0; |
795 for(typename T::ValueSet::iterator i=t.valueSet().begin(); |
791 for(typename T::MapIt i(t); i!=INVALID; ++i) |
796 i!=t.valueSet().end(); |
|
797 ++i) |
|
798 { |
792 { |
799 *i=addRow(); |
793 i.set(addRow()); |
800 s++; |
794 s++; |
801 } |
795 } |
802 return s; |
796 return s; |
803 } |
797 } |
804 #endif |
798 #endif |