Changeset 482:ed54c0d13df0 in lemon for test/mip_test.cc

Timestamp:

12/02/08 22:48:28 (15 years ago)

Author:

Balazs Dezso <deba@…>

Branch:

default

Children:

483:76ec7bd57026, 547:17cabb114d52

Phase:

public

Message:

Thorough redesign of the LP/MIP interface (#44)

• Redesigned class structure
• Redesigned iterators
• Some functions in the basic interface redesigned
• More complete setting functions
• Ray retrieving functions
• Lot of improvements
• Cplex common env
• CLP macro definition to config.h.in
• Update lp.h to also use soplex and clp
• Remove default_solver_name
• New solverName() function in solvers
• Handle exceptions for MipCplex? test
• Rename tolerance parameter to epsilon
• Rename MapIt? to CoeffIt?
• Lot of documentation improvements
• Various bugfixes

File:

• test/mip_test.cc (modified) (4 diffs)

test/mip_test.cc

@@ -25 +25 @@
 
 #ifdef HAVE_CPLEX
-#include <lemon/mip_cplex.h>
+#include <lemon/lp_cplex.h>
 #endif
 
 #ifdef HAVE_GLPK
-#include <lemon/mip_glpk.h>
+#include <lemon/lp_glpk.h>
 #endif
 
@@ -35 +35 @@
 using namespace lemon;
 
-void solveAndCheck(MipSolverBase& lp, MipSolverBase::SolutionStatus stat,
+void solveAndCheck(MipSolver& mip, MipSolver::ProblemType stat,
                    double exp_opt) {
   using std::string;
 
-  lp.solve();
+  mip.solve();
   //int decimal,sign;
   std::ostringstream buf;
-  buf << "Primalstatus should be: " << int(stat)
-      <<" and it is "<<int(lp.mipStatus());
+  buf << "Type should be: " << int(stat)<<" and it is "<<int(mip.type());
 
 
   //  itoa(stat,buf1, 10);
-  check(lp.mipStatus()==stat, buf.str());
+  check(mip.type()==stat, buf.str());
 
-  if (stat ==  MipSolverBase::OPTIMAL) {
+  if (stat ==  MipSolver::OPTIMAL) {
     std::ostringstream sbuf;
     buf << "Wrong optimal value: the right optimum is " << exp_opt;
-    check(std::abs(lp.primalValue()-exp_opt) < 1e-3, sbuf.str());
+    check(std::abs(mip.solValue()-exp_opt) < 1e-3, sbuf.str());
     //+ecvt(exp_opt,2)
   }
 }
 
-void aTest(MipSolverBase& mip)
+void aTest(MipSolver& mip)
 {
  //The following example is very simple
 
 
-  typedef MipSolverBase::Row Row;
-  typedef MipSolverBase::Col Col;
+  typedef MipSolver::Row Row;
+  typedef MipSolver::Col Col;
 
 
@@ -91 +90 @@
   //over the triangle with vertices (0,0),(4/5,2/5),(0,2)
   double expected_opt=4.0/5.0;
-  solveAndCheck(mip, MipSolverBase::OPTIMAL, expected_opt);
+  solveAndCheck(mip, MipSolver::OPTIMAL, expected_opt);
 
   //Restrict x2 to integer
-  mip.colType(x2,MipSolverBase::INT);
+  mip.colType(x2,MipSolver::INTEGER);
   expected_opt=1.0/2.0;
-  solveAndCheck(mip, MipSolverBase::OPTIMAL, expected_opt);
+  solveAndCheck(mip, MipSolver::OPTIMAL, expected_opt);
 
 
   //Restrict both to integer
-  mip.colType(x1,MipSolverBase::INT);
+  mip.colType(x1,MipSolver::INTEGER);
   expected_opt=0;
-  solveAndCheck(mip, MipSolverBase::OPTIMAL, expected_opt);
+  solveAndCheck(mip, MipSolver::OPTIMAL, expected_opt);
 
 
@@ -113 +112 @@
 
 #ifdef HAVE_GLPK
-  MipGlpk mip1;
-  aTest(mip1);
+  {
+    MipGlpk mip1;
+    aTest(mip1);
+  }
 #endif
 
 #ifdef HAVE_CPLEX
-  MipCplex mip2;
-  aTest(mip2);
+  try {
+    MipCplex mip2;
+    aTest(mip2);
+  } catch (CplexEnv::LicenseError& error) {
+#ifdef LEMON_FORCE_CPLEX_CHECK
+    check(false, error.what());
+#else
+    std::cerr << error.what() << std::endl;
+    std::cerr << "Cplex license check failed, lp check skipped" << std::endl;
+#endif
+  }
 #endif