Changeset 461:08d495d48089 in lemon-main

Timestamp:

01/12/09 13:26:01 (16 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Phase:

public

Message:

Remove lp_ prefix from the solver's header name

Files:

• lemon/Makefile.am (modified) (5 diffs)
• lemon/clp.cc (added)
• lemon/clp.h (added)
• lemon/cplex.cc (added)
• lemon/cplex.h (added)
• lemon/glpk.cc (added)
• lemon/glpk.h (added)
• lemon/lp.h (modified) (4 diffs)
• lemon/lp_clp.cc (deleted)
• lemon/lp_clp.h (deleted)
• lemon/lp_cplex.cc (deleted)
• lemon/lp_cplex.h (deleted)
• lemon/lp_glpk.cc (deleted)
• lemon/lp_glpk.h (deleted)
• lemon/lp_soplex.cc (deleted)
• lemon/lp_soplex.h (deleted)
• lemon/soplex.cc (added)
• lemon/soplex.h (added)
• test/lp_test.cc (modified) (1 diff)
• test/mip_test.cc (modified) (1 diff)

lemon/Makefile.am

@@ -29 +29 @@
 
 if HAVE_GLPK
-lemon_libemon_la_SOURCES += lemon/lp_glpk.cc
+lemon_libemon_la_SOURCES += lemon/glpk.cc
 endif
 
 if HAVE_CPLEX
-lemon_libemon_la_SOURCES += lemon/lp_cplex.cc
+lemon_libemon_la_SOURCES += lemon/cplex.cc
 endif
 
 if HAVE_SOPLEX
-lemon_libemon_la_SOURCES += lemon/lp_soplex.cc
+lemon_libemon_la_SOURCES += lemon/soplex.cc
 endif
 
 if HAVE_CLP
-lemon_libemon_la_SOURCES += lemon/lp_clp.cc
+lemon_libemon_la_SOURCES += lemon/clp.cc
 endif
 
@@ -51 +51 @@
         lemon/bin_heap.h \
         lemon/circulation.h \
+        lemon/clp.h \
         lemon/color.h \
         lemon/concept_check.h \
         lemon/counter.h \
         lemon/core.h \
+        lemon/cplex.h \
         lemon/dfs.h \
         lemon/dijkstra.h \
@@ -62 +64 @@
         lemon/error.h \
         lemon/full_graph.h \
+        lemon/glpk.h \
         lemon/graph_to_eps.h \
         lemon/grid_graph.h \
@@ -72 +75 @@
         lemon/lp.h \
         lemon/lp_base.h \
-        lemon/lp_clp.h \
-        lemon/lp_cplex.h \
-        lemon/lp_glpk.h \
         lemon/lp_skeleton.h \
-        lemon/lp_soplex.h \
         lemon/list_graph.h \
         lemon/maps.h \
@@ -87 +86 @@
         lemon/random.h \
         lemon/smart_graph.h \
+        lemon/soplex.h \
         lemon/suurballe.h \
         lemon/time_measure.h \

lemon/lp.h

@@ -24 +24 @@
 
 #ifdef HAVE_GLPK
-#include <lemon/lp_glpk.h>
+#include <lemon/glpk.h>
 #elif HAVE_CPLEX
-#include <lemon/lp_cplex.h>
+#include <lemon/cplex.h>
 #elif HAVE_SOPLEX
-#include <lemon/lp_soplex.h>
+#include <lemon/soplex.h>
 #elif HAVE_CLP
-#include <lemon/lp_clp.h>
+#include <lemon/clp.h>
 #endif
 
@@ -44 +44 @@
   ///\ingroup lp_group
   ///
-  ///Currently, the possible values are \c LP_GLPK, \c LP_CPLEX, \c
-  ///LP_SOPLEX or \c LP_CLP
+  ///Currently, the possible values are \c GLPK, \c CPLEX,
+  ///\c SOPLEX or \c CLP
 #define LEMON_DEFAULT_LP SOLVER
   ///The default LP solver
@@ -60 +60 @@
   ///\ingroup lp_group
   ///
-  ///Currently, the possible values are \c MIP_GLPK or \c MIP_CPLEX
+  ///Currently, the possible values are \c GLPK or \c CPLEX
 #define LEMON_DEFAULT_MIP SOLVER
   ///The default MIP solver.
@@ -71 +71 @@
 #else
 #ifdef HAVE_GLPK
-# define LEMON_DEFAULT_LP LP_GLPK
+# define LEMON_DEFAULT_LP GLPK
   typedef LpGlpk Lp;
-# define LEMON_DEFAULT_MIP MIP_GLPK
+# define LEMON_DEFAULT_MIP GLPK
   typedef MipGlpk Mip;
 #elif HAVE_CPLEX
-# define LEMON_DEFAULT_LP LP_CPLEX
+# define LEMON_DEFAULT_LP CPLEX
   typedef LpCplex Lp;
-# define LEMON_DEFAULT_MIP MIP_CPLEX
+# define LEMON_DEFAULT_MIP CPLEX
   typedef MipCplex Mip;
 #elif HAVE_SOPLEX
-# define DEFAULT_LP LP_SOPLEX
+# define DEFAULT_LP SOPLEX
   typedef LpSoplex Lp;
 #elif HAVE_CLP
-# define DEFAULT_LP LP_CLP
+# define DEFAULT_LP CLP
   typedef LpClp Lp;  
 #endif

test/lp_test.cc

@@ -27 +27 @@
 
 #ifdef HAVE_GLPK
-#include <lemon/lp_glpk.h>
+#include <lemon/glpk.h>
 #endif
 
 #ifdef HAVE_CPLEX
-#include <lemon/lp_cplex.h>
+#include <lemon/cplex.h>
 #endif
 
 #ifdef HAVE_SOPLEX
-#include <lemon/lp_soplex.h>
+#include <lemon/soplex.h>
 #endif
 
 #ifdef HAVE_CLP
-#include <lemon/lp_clp.h>
+#include <lemon/clp.h>
 #endif
 

test/mip_test.cc

@@ -25 +25 @@
 
 #ifdef HAVE_CPLEX
-#include <lemon/lp_cplex.h>
+#include <lemon/cplex.h>
 #endif
 
 #ifdef HAVE_GLPK
-#include <lemon/lp_glpk.h>
+#include <lemon/glpk.h>
 #endif