Changeset 1484:a3484f00a5f0 in lemon-0.x

Timestamp:

06/14/05 15:55:28 (19 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

• lp_test is made working.
• some more 'const' for those who like them..

Files:

• lemon/lp_base.h (modified) (1 diff)
• test/lp_test.cc (modified) (4 diffs)

lemon/lp_base.h

@@ -48 +48 @@
     ///\param n is a floating id
     ///\return the corresponding fix id
-    int fixId(int n) {return cross[n];}
+    int fixId(int n) const {return cross[n];}
     ///Convert a fix id to a floating one
 
     ///\param n is a fix id
     ///\return the corresponding floating id
-    int floatingId(int n) { return index[n];}
+    int floatingId(int n) const { return index[n];}
     ///Add a new floating id.
 

test/lp_test.cc

@@ -40 +40 @@
     LP::Col p1,p2,p3,p4,p5;
     LP::Constr c;
+    
+    p1=lp.addCol();
+    p2=lp.addCol();
+    p3=lp.addCol();
+    p4=lp.addCol();
+    p5=lp.addCol();
     
     e[p1]=2;
@@ -200 +206 @@
   lp.solve();
 
-
+  double opt=122.0/9.0;
+  
   if (lp.primalStatus()==LpSolverBase::OPTIMAL){
-    printf("Z = %g; x1 = %g; x2 = %g\n", 
-           lp.primalValue(), 
-           lp.primal(x1), lp.primal(x2));
+    std::cout<< "Z = "<<lp.primalValue()
+             << " (error = " << lp.primalValue()-opt
+             << "); x1 = "<<lp.primal(x1)
+             << "; x2 = "<<lp.primal(x2)
+             <<std::endl;
+    
   }
   else{
@@ -212 +222 @@
   check(lp.primalStatus()==LpSolverBase::OPTIMAL,"Primalstatus should be OPTIMAL");
 
-  double opt=123/9;
-  check(lp.primalValue()==opt,"The optimum value is 122/9");
+  check(std::abs(lp.primalValue()-opt)<1e-3,
+        "Wrong optimal value: the right optimum is 122/9 (13.555555...)");
 
 
@@ -225 +235 @@
 
 #ifdef HAVE_GLPK
-  LpGlpk lp_glpk;
-  lpTest(lp_glpk);
-  aTest(lp_glpk);
+  LpGlpk lp_glpk1,lp_glpk2;
+  lpTest(lp_glpk1);
+  aTest(lp_glpk2);
 #endif