COIN-OR::LEMON - Graph Library

Changeset 461:08d495d48089 in lemon-1.2 for lemon


Ignore:
Timestamp:
01/12/09 13:26:01 (11 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Phase:
public
Message:

Remove lp_ prefix from the solver's header name

Location:
lemon
Files:
8 added
8 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • lemon/Makefile.am

    r459 r461  
    2929
    3030if HAVE_GLPK
    31 lemon_libemon_la_SOURCES += lemon/lp_glpk.cc
     31lemon_libemon_la_SOURCES += lemon/glpk.cc
    3232endif
    3333
    3434if HAVE_CPLEX
    35 lemon_libemon_la_SOURCES += lemon/lp_cplex.cc
     35lemon_libemon_la_SOURCES += lemon/cplex.cc
    3636endif
    3737
    3838if HAVE_SOPLEX
    39 lemon_libemon_la_SOURCES += lemon/lp_soplex.cc
     39lemon_libemon_la_SOURCES += lemon/soplex.cc
    4040endif
    4141
    4242if HAVE_CLP
    43 lemon_libemon_la_SOURCES += lemon/lp_clp.cc
     43lemon_libemon_la_SOURCES += lemon/clp.cc
    4444endif
    4545
     
    5151        lemon/bin_heap.h \
    5252        lemon/circulation.h \
     53        lemon/clp.h \
    5354        lemon/color.h \
    5455        lemon/concept_check.h \
    5556        lemon/counter.h \
    5657        lemon/core.h \
     58        lemon/cplex.h \
    5759        lemon/dfs.h \
    5860        lemon/dijkstra.h \
     
    6264        lemon/error.h \
    6365        lemon/full_graph.h \
     66        lemon/glpk.h \
    6467        lemon/graph_to_eps.h \
    6568        lemon/grid_graph.h \
     
    7275        lemon/lp.h \
    7376        lemon/lp_base.h \
    74         lemon/lp_clp.h \
    75         lemon/lp_cplex.h \
    76         lemon/lp_glpk.h \
    7777        lemon/lp_skeleton.h \
    78         lemon/lp_soplex.h \
    7978        lemon/list_graph.h \
    8079        lemon/maps.h \
     
    8786        lemon/random.h \
    8887        lemon/smart_graph.h \
     88        lemon/soplex.h \
    8989        lemon/suurballe.h \
    9090        lemon/time_measure.h \
  • lemon/lp.h

    r459 r461  
    2424
    2525#ifdef HAVE_GLPK
    26 #include <lemon/lp_glpk.h>
     26#include <lemon/glpk.h>
    2727#elif HAVE_CPLEX
    28 #include <lemon/lp_cplex.h>
     28#include <lemon/cplex.h>
    2929#elif HAVE_SOPLEX
    30 #include <lemon/lp_soplex.h>
     30#include <lemon/soplex.h>
    3131#elif HAVE_CLP
    32 #include <lemon/lp_clp.h>
     32#include <lemon/clp.h>
    3333#endif
    3434
     
    4444  ///\ingroup lp_group
    4545  ///
    46   ///Currently, the possible values are \c LP_GLPK, \c LP_CPLEX, \c
    47   ///LP_SOPLEX or \c LP_CLP
     46  ///Currently, the possible values are \c GLPK, \c CPLEX,
     47  ///\c SOPLEX or \c CLP
    4848#define LEMON_DEFAULT_LP SOLVER
    4949  ///The default LP solver
     
    6060  ///\ingroup lp_group
    6161  ///
    62   ///Currently, the possible values are \c MIP_GLPK or \c MIP_CPLEX
     62  ///Currently, the possible values are \c GLPK or \c CPLEX
    6363#define LEMON_DEFAULT_MIP SOLVER
    6464  ///The default MIP solver.
     
    7171#else
    7272#ifdef HAVE_GLPK
    73 # define LEMON_DEFAULT_LP LP_GLPK
     73# define LEMON_DEFAULT_LP GLPK
    7474  typedef LpGlpk Lp;
    75 # define LEMON_DEFAULT_MIP MIP_GLPK
     75# define LEMON_DEFAULT_MIP GLPK
    7676  typedef MipGlpk Mip;
    7777#elif HAVE_CPLEX
    78 # define LEMON_DEFAULT_LP LP_CPLEX
     78# define LEMON_DEFAULT_LP CPLEX
    7979  typedef LpCplex Lp;
    80 # define LEMON_DEFAULT_MIP MIP_CPLEX
     80# define LEMON_DEFAULT_MIP CPLEX
    8181  typedef MipCplex Mip;
    8282#elif HAVE_SOPLEX
    83 # define DEFAULT_LP LP_SOPLEX
     83# define DEFAULT_LP SOPLEX
    8484  typedef LpSoplex Lp;
    8585#elif HAVE_CLP
    86 # define DEFAULT_LP LP_CLP
     86# define DEFAULT_LP CLP
    8787  typedef LpClp Lp; 
    8888#endif
Note: See TracChangeset for help on using the changeset viewer.