Minor changes.
authorathos
Tue, 26 Sep 2006 12:20:22 +0000
changeset 2221c7261e981330
parent 2220 4473c872599a
child 2222 a24939ee343c
Minor changes.
lemon/lp.h
test/mip_test.cc
     1.1 --- a/lemon/lp.h	Mon Sep 25 08:51:08 2006 +0000
     1.2 +++ b/lemon/lp.h	Tue Sep 26 12:20:22 2006 +0000
     1.3 @@ -81,4 +81,4 @@
     1.4   
     1.5  } //namespace lemon
     1.6  
     1.7 -#endif //LEMON_LP_BASE_H
     1.8 +#endif //LEMON_LP_H
     2.1 --- a/test/mip_test.cc	Mon Sep 25 08:51:08 2006 +0000
     2.2 +++ b/test/mip_test.cc	Tue Sep 26 12:20:22 2006 +0000
     2.3 @@ -3,7 +3,12 @@
     2.4  
     2.5  #include <lemon/mip_cplex.h>
     2.6  #include <lemon/mip_glpk.h>
     2.7 -#include<lemon/config.h>
     2.8 +
     2.9 +#ifdef HAVE_CONFIG_H
    2.10 +#include <config.h>
    2.11 +#endif
    2.12 +
    2.13 +
    2.14  
    2.15  using namespace lemon;
    2.16  
    2.17 @@ -62,7 +67,7 @@
    2.18  
    2.19  
    2.20    //Maximization of x1
    2.21 -  //over the triangle with vertices 
    2.22 +  //over the triangle with vertices (0,0),(4/5,2/5),(0,2)
    2.23    double expected_opt=4.0/5.0;
    2.24    solveAndCheck(mip, MipSolverBase::OPTIMAL, expected_opt);
    2.25  
    2.26 @@ -90,10 +95,7 @@
    2.27    aTest(mip1);
    2.28  #endif
    2.29  
    2.30 -
    2.31 -
    2.32  #ifdef HAVE_CPLEX
    2.33 -  //std::cout<<ATTILA<<INTEGER;
    2.34    MipCplex mip2;
    2.35    aTest(mip2);
    2.36  #endif