Changes in / [466:4f1431aeef42:467:a1155a9e8e09] in lemon-1.2

Files:

• .hgignore (modified) (1 diff)
• configure.ac (modified) (2 diffs)
• lemon/Makefile.am (modified) (6 diffs)
• lemon/bits/solver_bits.h (added)
• lemon/clp.cc (added)
• lemon/clp.h (added)
• lemon/config.h.in (modified) (2 diffs)
• lemon/cplex.cc (added)
• lemon/cplex.h (added)
• lemon/glpk.cc (added)
• lemon/glpk.h (added)
• lemon/lp.h (added)
• lemon/lp_base.cc (added)
• lemon/lp_base.h (added)
• lemon/lp_skeleton.cc (added)
• lemon/lp_skeleton.h (added)
• lemon/soplex.cc (added)
• lemon/soplex.h (added)
• m4/lx_check_clp.m4 (added)
• m4/lx_check_cplex.m4 (modified) (1 diff)
• m4/lx_check_glpk.m4 (modified) (2 diffs)
• m4/lx_check_soplex.m4 (modified) (1 diff)
• test/CMakeLists.txt (modified) (1 diff)
• test/Makefile.am (modified) (2 diffs)
• test/lp_test.cc (added)
• test/mip_test.cc (added)

.hgignore

@@ -27 +27 @@
 .deps/*
 demo/*.eps
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
 
 syntax: regexp

configure.ac

@@ -51 +51 @@
 
 dnl Checks for libraries.
-#LX_CHECK_GLPK
-#LX_CHECK_CPLEX
-#LX_CHECK_SOPLEX
+LX_CHECK_GLPK
+LX_CHECK_CPLEX
+LX_CHECK_SOPLEX
+LX_CHECK_CLP
+
+AM_CONDITIONAL([HAVE_LP], [test x"$lx_lp_found" = x"yes"])
+AM_CONDITIONAL([HAVE_MIP], [test x"$lx_mip_found" = x"yes"])
 
 dnl Disable/enable building the demo programs.
@@ -115 +119 @@
 echo C++ compiles flags............ : $WARNINGCXXFLAGS $CXXFLAGS
 echo
-#echo GLPK support.................. : $lx_glpk_found
-#echo CPLEX support................. : $lx_cplex_found
-#echo SOPLEX support................ : $lx_soplex_found
-#echo
+echo GLPK support.................. : $lx_glpk_found
+echo CPLEX support................. : $lx_cplex_found
+echo SOPLEX support................ : $lx_soplex_found
+echo CLP support................... : $lx_clp_found
+echo
 echo Build demo programs........... : $enable_demo
 echo Build additional tools........ : $enable_tools

lemon/Makefile.am

@@ -11 +11 @@
         lemon/base.cc \
         lemon/color.cc \
+        lemon/lp_base.cc \
+        lemon/lp_skeleton.cc \
         lemon/random.cc
 
-#lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS) $(AM_CXXFLAGS)
-#lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS) $(SOPLEX_LIBS)
+
+lemon_libemon_la_CXXFLAGS = \
+        $(GLPK_CFLAGS) \
+        $(CPLEX_CFLAGS) \
+        $(SOPLEX_CXXFLAGS) \
+        $(CLP_CXXFLAGS)
+
+lemon_libemon_la_LDFLAGS = \
+        $(GLPK_LIBS) \
+        $(CPLEX_LIBS) \
+        $(SOPLEX_LIBS) \
+        $(CLP_LIBS)
+
+if HAVE_GLPK
+lemon_libemon_la_SOURCES += lemon/glpk.cc
+endif
+
+if HAVE_CPLEX
+lemon_libemon_la_SOURCES += lemon/cplex.cc
+endif
+
+if HAVE_SOPLEX
+lemon_libemon_la_SOURCES += lemon/soplex.cc
+endif
+
+if HAVE_CLP
+lemon_libemon_la_SOURCES += lemon/clp.cc
+endif
 
 lemon_HEADERS += \
@@ -23 +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 \
@@ -34 +64 @@
         lemon/error.h \
         lemon/full_graph.h \
+        lemon/glpk.h \
         lemon/graph_to_eps.h \
         lemon/grid_graph.h \
@@ -41 +72 @@
         lemon/lgf_reader.h \
         lemon/lgf_writer.h \
+        lemon/list_graph.h \
+        lemon/lp.h \
+        lemon/lp_base.h \
+        lemon/lp_skeleton.h \
         lemon/list_graph.h \
         lemon/maps.h \
@@ -51 +86 @@
         lemon/random.h \
         lemon/smart_graph.h \
+        lemon/soplex.h \
         lemon/suurballe.h \
         lemon/time_measure.h \
@@ -67 +103 @@
         lemon/bits/map_extender.h \
         lemon/bits/path_dump.h \
+        lemon/bits/solver_bits.h \
         lemon/bits/traits.h \
         lemon/bits/variant.h \

lemon/config.h.in

@@ +1 @@
+/* Define to 1 if you have any LP solver. */
+#undef HAVE_LP
+
+/* Define to 1 if you have any MIP solver. */
+#undef HAVE_MIP
+
 /* Define to 1 if you have CPLEX. */
 #undef HAVE_CPLEX
@@ -4 +10 @@
 /* Define to 1 if you have GLPK. */
 #undef HAVE_GLPK
+
+/* Define to 1 if you have SOPLEX */
+#undef HAVE_SOPLEX
+
+/* Define to 1 if you have CLP */
+#undef HAVE_CLP

m4/lx_check_cplex.m4

@@ -63 +63 @@
     if test x"$lx_cplex_found" = x"yes"; then
       AC_DEFINE([HAVE_CPLEX], [1], [Define to 1 if you have CPLEX.])
+      lx_lp_found=yes
+      AC_DEFINE([HAVE_LP], [1], [Define to 1 if you have any LP solver.])
+      lx_mip_found=yes
+      AC_DEFINE([HAVE_MIP], [1], [Define to 1 if you have any MIP solver.])
       AC_MSG_RESULT([yes])
     else

m4/lx_check_glpk.m4

@@ -43 +43 @@
       }
 
+      #if (GLP_MAJOR_VERSION < 4) \
+         || (GLP_MAJOR_VERSION == 4 && GLP_MINOR_VERSION < 33)
+      #error Supported GLPK versions: 4.33 or above
+      #endif
+
       int main(int argc, char** argv)
       {
@@ -61 +66 @@
     if test x"$lx_glpk_found" = x"yes"; then
       AC_DEFINE([HAVE_GLPK], [1], [Define to 1 if you have GLPK.])
+      lx_lp_found=yes
+      AC_DEFINE([HAVE_LP], [1], [Define to 1 if you have any LP solver.])
+      lx_mip_found=yes
+      AC_DEFINE([HAVE_MIP], [1], [Define to 1 if you have any MIP solver.])
       AC_MSG_RESULT([yes])
     else

m4/lx_check_soplex.m4

@@ -57 +57 @@
     if test x"$lx_soplex_found" = x"yes"; then
       AC_DEFINE([HAVE_SOPLEX], [1], [Define to 1 if you have SOPLEX.])
+      lx_lp_found=yes
+      AC_DEFINE([HAVE_LP], [1], [Define to 1 if you have any LP solver.])
       AC_MSG_RESULT([yes])
     else

test/CMakeLists.txt

@@ -19 +19 @@
   heap_test
   kruskal_test
+  lp_test
+  mip_test
   maps_test
   max_matching_test

test/Makefile.am

@@ -34 +34 @@
         test/unionfind_test
 
+if HAVE_LP
+check_PROGRAMS += test/lp_test
+endif HAVE_LP
+if HAVE_MIP
+check_PROGRAMS += test/mip_test
+endif HAVE_MIP
+
 TESTS += $(check_PROGRAMS)
 XFAIL_TESTS += test/test_tools_fail$(EXEEXT)
@@ -52 +59 @@
 test_kruskal_test_SOURCES = test/kruskal_test.cc
 test_hao_orlin_test_SOURCES = test/hao_orlin_test.cc
+test_lp_test_SOURCES = test/lp_test.cc
 test_maps_test_SOURCES = test/maps_test.cc
+test_mip_test_SOURCES = test/mip_test.cc
 test_max_matching_test_SOURCES = test/max_matching_test.cc
 test_path_test_SOURCES = test/path_test.cc