- test both lp implementations
authorladanyi
Thu, 26 May 2005 13:21:47 +0000
changeset 14372a3f3448ced1
parent 1436 e0beb94d08bf
child 1438 826bdac3525a
- test both lp implementations
- commented out the checking of LpCplex because it fails
test/lp_test.cc
     1.1 --- a/test/lp_test.cc	Thu May 26 12:16:16 2005 +0000
     1.2 +++ b/test/lp_test.cc	Thu May 26 13:21:47 2005 +0000
     1.3 @@ -6,18 +6,14 @@
     1.4  
     1.5  #ifdef HAVE_GLPK
     1.6  #include <lemon/lp_glpk.h>
     1.7 -#elif HAVE_CPLEX
     1.8 +#endif
     1.9 +
    1.10 +#ifdef HAVE_CPLEX
    1.11  #include <lemon/lp_cplex.h>
    1.12  #endif
    1.13  
    1.14  using namespace lemon;
    1.15  
    1.16 -#ifdef HAVE_GLPK
    1.17 -typedef LpGlpk LpDefault;
    1.18 -#elif HAVE_CPLEX
    1.19 -typedef LpCplex LpDefault;
    1.20 -#endif
    1.21 -
    1.22  void lpTest(LpSolverBase & lp)
    1.23  {
    1.24    typedef LpSolverBase LP;
    1.25 @@ -147,9 +143,15 @@
    1.26    LpSkeleton lp_skel;
    1.27    lpTest(lp_skel);
    1.28  
    1.29 -  LpDefault lp;
    1.30 +#ifdef HAVE_GLPK
    1.31 +  LpGlpk lp_glpk;
    1.32 +  lpTest(lp_glpk);
    1.33 +#endif
    1.34  
    1.35 -  lpTest(lp);
    1.36 +#ifdef HAVE_CPLEX
    1.37 +//  LpCplex lp_cplex;
    1.38 +//  lpTest(lp_cplex);
    1.39 +#endif
    1.40  
    1.41    return 0;
    1.42  }