1.1 --- a/demo/lp_demo.cc	Mon Aug 01 20:20:43 2005 +0000
     1.2 +++ b/demo/lp_demo.cc	Mon Aug 01 21:16:08 2005 +0000
     1.3 @@ -24,40 +24,21 @@
     1.4  /// example). For the detailed documentation of the LEMON LP solver
     1.5  /// interface read \ref lemon::LpSolverBase "this".
     1.6  
     1.7 -#ifdef HAVE_CONFIG_H
     1.8 -#include <config.h>
     1.9 -#endif
    1.10 +#include <lemon/lp.h>
    1.11  
    1.12  #include <iostream>
    1.13  
    1.14 -
    1.15 -#ifdef HAVE_GLPK
    1.16 -#include <lemon/lp_glpk.h>
    1.17 -#elif HAVE_CPLEX
    1.18 -#include <lemon/lp_cplex.h>
    1.19 -#endif
    1.20 -
    1.21  using namespace lemon;
    1.22  
    1.23 -
    1.24 -
    1.25 -#ifdef HAVE_GLPK
    1.26 -typedef LpGlpk LpDefault;
    1.27 -const char default_solver_name[]="GLPK";
    1.28 -#elif HAVE_CPLEX
    1.29 -typedef LpCplex LpDefault;
    1.30 -const char default_solver_name[]="CPLEX";
    1.31 -#endif
    1.32 -
    1.33  int main()
    1.34  {     
    1.35   //The following example is taken from the documentation of the GLPK library.
    1.36   //See it in the GLPK reference manual and among the GLPK sample files (sample.c)
    1.37  
    1.38    //A default solver is taken
    1.39 -  LpDefault lp;
    1.40 -  typedef LpDefault::Row Row;
    1.41 -  typedef LpDefault::Col Col;
    1.42 +  Lp lp;
    1.43 +  typedef Lp::Row Row;
    1.44 +  typedef Lp::Col Col;
    1.45    
    1.46  
    1.47    std::cout<<"A program demonstrating the LEMON LP solver interface"<<std::endl;