Changeset 1473:876c7b7f4dae in lemon-0.x

Timestamp:

06/10/05 14:50:43 (19 years ago)

Author:

athos

Branch:

default

Phase:

public

Convert:

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

Message:

Some tests have been developed, bugs got fixed.

Files:

• lemon/lp_cplex.cc (modified) (2 diffs)
• lemon/lp_glpk.cc (modified) (3 diffs)
• test/lp_test.cc (modified) (3 diffs)

lemon/lp_cplex.cc

@@ -392 +392 @@
       //FIXME error
     }
-
- 
+  }
+
   LpCplex::ProblemTypes LpCplex::_getProblemType()
   {
@@ -411 +411 @@
       //FIXME error
     }
-
+  }
 
   void LpCplex::_setMax()

lemon/lp_glpk.cc

@@ -22 +22 @@
 
 #include <lemon/lp_glpk.h>
-
+//#include <iostream>
 namespace lemon {
 
@@ -440 +440 @@
   LpGlpk::SolutionStatus LpGlpk::_getDualStatus()
   {
+//     std::cout<<"Itt megy: "<<lpx_get_dual_stat(lp)<<std::endl;
+//     std::cout<<"Itt a primal: "<<lpx_get_prim_stat(lp)<<std::endl;
+
     switch (lpx_get_dual_stat(lp)) {
     case LPX_D_UNDEF://Undefined (no solve has been run yet)
@@ -446 +449 @@
 //    case LPX_D_INFEAS://Infeasible 
       return INFEASIBLE;
-    case LPX_FEAS://Feasible    
-      switch (lpx_get_prim_stat(lp)) {
-      case LPX_P_NOFEAS:
+    case LPX_D_FEAS://Feasible    
+      switch (lpx_get_status(lp)) {
+      case LPX_NOFEAS:
         return INFINITE;
       case LPX_OPT:

test/lp_test.cc

@@ -1 +1 @@
 #include<lemon/lp_skeleton.h>
+#include "test_tools.h"
 
 #ifdef HAVE_CONFIG_H
@@ -171 +172 @@
 }
 
+void aTest(LpSolverBase & lp)
+{
+  typedef LpSolverBase LP;
+
+ //The following example is taken from the book by Gáspár and Temesi, page 39.
+
+  typedef LpSolverBase::Row Row;
+  typedef LpSolverBase::Col Col;
+
+
+  Col x1 = lp.addCol();
+  Col x2 = lp.addCol();
+
+
+  //Constraints
+  lp.addRow(3*x1+2*x2 >=6);  
+  lp.addRow(-1*x1+x2<=4);  
+  lp.addRow(5*x1+8*x2<=40);  
+  lp.addRow(x1-2*x2<=4);  
+  //Nonnegativity of the variables
+  lp.colLowerBound(x1, 0);
+  lp.colLowerBound(x2, 0);
+  //Objective function
+  lp.setObj(2*x1+x2);
+
+  lp.max();
+  lp.solve();
+
+
+  if (lp.primalStatus()==LpSolverBase::OPTIMAL){
+    printf("Z = %g; x1 = %g; x2 = %g\n", 
+           lp.primalValue(), 
+           lp.primal(x1), lp.primal(x2));
+  }
+  else{
+    std::cout<<"Optimal solution not found!"<<std::endl;
+  }
+
+  check(lp.primalStatus()==LpSolverBase::OPTIMAL,"Primalstatus should be OPTIMAL");
+
+  double opt=123/9;
+  check(lp.primalValue()==opt,"The optimum value is 122/9");
+
+
+}
+
+
 int main() 
 {
@@ -179 +227 @@
   LpGlpk lp_glpk;
   lpTest(lp_glpk);
+  aTest(lp_glpk);
 #endif
 
 #ifdef HAVE_CPLEX
-//  LpCplex lp_cplex;
-//  lpTest(lp_cplex);
+  LpCplex lp_cplex;
+  lpTest(lp_cplex);
 #endif