[Lemon-commits] [lemon_svn] alpar: r1974 - in hugo/trunk: lemon test

[Lemon SVN]

Author: alpar
Date: Wed Jun 15 12:13:08 2005
New Revision: 1974

Modified:
   hugo/trunk/lemon/lp_base.h
   hugo/trunk/test/lp_test.cc

Log:
Bugfixes related to DualExpr.


Modified: hugo/trunk/lemon/lp_base.h
==============================================================================
--- hugo/trunk/lemon/lp_base.h	(original)
+++ hugo/trunk/lemon/lp_base.h	Wed Jun 15 12:13:08 2005
@@ -488,8 +488,6 @@
 	Base::insert(std::make_pair(v, 1));
       }
       ///\e
-      DualExpr(const Value &v) {}
-      ///\e
       void set(const Key &v,const Value &c) {
 	Base::insert(std::make_pair(v, c));
       }
@@ -706,10 +704,10 @@
     ///\return The created column.
     ///\bug This is a temportary function. The interface will change to
     ///a better one.
-    Col addCol(Value l,const DualExpr &e, Value obj=0) {
+    Col addCol(const DualExpr &e, Value obj=0) {
       Col c=addCol();
       setCol(c,e);
-      objCoeff(c,0);
+      objCoeff(c,obj);
       return c;
     }
 

Modified: hugo/trunk/test/lp_test.cc
==============================================================================
--- hugo/trunk/test/lp_test.cc	(original)
+++ hugo/trunk/test/lp_test.cc	Wed Jun 15 12:13:08 2005
@@ -164,7 +164,7 @@
     e/=2;
     e/=2.2;
     
-    e=((p1+p2)+(p1-p2)+(p1+12)+(12+p1)+(p1-12)+(12-p1)+
+    e=((p1+p2)+(p1-p2)+
        (p1+f)+(f+p1)+(f+g)+
        (p1-f)+(f-p1)+(f-g)+
        2.2*f+f*2.2+f/2.2+