Changeset 458:7afc121e0689 in lemon-main

Timestamp:

12/02/08 21:40:33 (16 years ago)

Author:

Balazs Dezso <deba@…>

Branch:

default

Phase:

public

Message:

Port LP and MIP solvers from SVN -r3509 (#44)

Files:

• configure.ac (modified) (2 diffs)
• lemon/CMakeLists.txt (modified) (1 diff)
• lemon/Makefile.am (modified) (3 diffs)
• lemon/bits/lp_id.h (added)
• lemon/config.h.in (modified) (1 diff)
• lemon/lp.h (added)
• lemon/lp_base.cc (added)
• lemon/lp_base.h (added)
• lemon/lp_cplex.cc (added)
• lemon/lp_cplex.h (added)
• lemon/lp_glpk.cc (added)
• lemon/lp_glpk.h (added)
• lemon/lp_skeleton.cc (added)
• lemon/lp_skeleton.h (added)
• lemon/lp_soplex.cc (added)
• lemon/lp_soplex.h (added)
• lemon/mip_cplex.cc (added)
• lemon/mip_cplex.h (added)
• lemon/mip_glpk.cc (added)
• lemon/mip_glpk.h (added)
• test/CMakeLists.txt (modified) (1 diff)
• test/Makefile.am (modified) (2 diffs)
• test/lp_test.cc (added)
• test/mip_test.cc (added)

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
 
 AM_CONDITIONAL([HAVE_LP], [test x"$lx_lp_found" = x"yes"])
@@ -118 +118 @@
 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
 echo Build demo programs........... : $enable_demo
 echo Build additional tools........ : $enable_tools

lemon/CMakeLists.txt

@@ -5 +5 @@
   base.cc
   color.cc
+  lp_base.cc
+  lp_skeleton.cc
+  lp_utils.cc
   random.cc)
 

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)
+
+lemon_libemon_la_LDFLAGS = \
+        $(GLPK_LIBS) \
+        $(CPLEX_LIBS) \
+        $(SOPLEX_LIBS)
+
+if HAVE_GLPK
+lemon_libemon_la_SOURCES += lemon/lp_glpk.cc lemon/mip_glpk.cc
+endif
+
+if HAVE_CPLEX
+lemon_libemon_la_SOURCES += lemon/lp_cplex.cc lemon/mip_cplex.cc
+endif
+
+if HAVE_SOPLEX
+lemon_libemon_la_SOURCES += lemon/lp_soplex.cc
+endif
 
 lemon_HEADERS += \
@@ -42 +64 @@
         lemon/lgf_writer.h \
         lemon/list_graph.h \
+        lemon/lp.h \
+        lemon/lp_base.h \
+        lemon/lp_cplex.h \
+        lemon/lp_glpk.h \
+        lemon/lp_skeleton.h \
+        lemon/lp_soplex.h \
+        lemon/mip_cplex.h \
+        lemon/mip_glpk.h \
         lemon/maps.h \
         lemon/math.h \
@@ -65 +95 @@
         lemon/bits/graph_adaptor_extender.h \
         lemon/bits/graph_extender.h \
+        lemon/bits/lp_id.h \
         lemon/bits/map_extender.h \
         lemon/bits/path_dump.h \

lemon/config.h.in

@@ -10 +10 @@
 /* Define to 1 if you have GLPK. */
 #undef HAVE_GLPK
+
+/* Define to 1 if you have SOPLEX */
+#undef HAVE_SOPLEX

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