Changeset 481:7afc121e0689 in lemon for lemon

Timestamp:

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

Author:

Balazs Dezso <deba@…>

Branch:

default

Phase:

public

Message:

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

Location:

lemon

Files:

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

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