Bugfixes related to DualExpr.
authoralpar
Wed, 15 Jun 2005 10:13:08 +0000
changeset 149394535d1833b5
parent 1492 0d58f0301923
child 1494 ae55ba000ebb
Bugfixes related to DualExpr.
lemon/lp_base.h
test/lp_test.cc
     1.1 --- a/lemon/lp_base.h	Wed Jun 15 10:10:59 2005 +0000
     1.2 +++ b/lemon/lp_base.h	Wed Jun 15 10:13:08 2005 +0000
     1.3 @@ -488,8 +488,6 @@
     1.4  	Base::insert(std::make_pair(v, 1));
     1.5        }
     1.6        ///\e
     1.7 -      DualExpr(const Value &v) {}
     1.8 -      ///\e
     1.9        void set(const Key &v,const Value &c) {
    1.10  	Base::insert(std::make_pair(v, c));
    1.11        }
    1.12 @@ -706,10 +704,10 @@
    1.13      ///\return The created column.
    1.14      ///\bug This is a temportary function. The interface will change to
    1.15      ///a better one.
    1.16 -    Col addCol(Value l,const DualExpr &e, Value obj=0) {
    1.17 +    Col addCol(const DualExpr &e, Value obj=0) {
    1.18        Col c=addCol();
    1.19        setCol(c,e);
    1.20 -      objCoeff(c,0);
    1.21 +      objCoeff(c,obj);
    1.22        return c;
    1.23      }
    1.24  
     2.1 --- a/test/lp_test.cc	Wed Jun 15 10:10:59 2005 +0000
     2.2 +++ b/test/lp_test.cc	Wed Jun 15 10:13:08 2005 +0000
     2.3 @@ -164,7 +164,7 @@
     2.4      e/=2;
     2.5      e/=2.2;
     2.6      
     2.7 -    e=((p1+p2)+(p1-p2)+(p1+12)+(12+p1)+(p1-12)+(12-p1)+
     2.8 +    e=((p1+p2)+(p1-p2)+
     2.9         (p1+f)+(f+p1)+(f+g)+
    2.10         (p1-f)+(f-p1)+(f-g)+
    2.11         2.2*f+f*2.2+f/2.2+