Changeset 482:ed54c0d13df0 in lemon for lemon/Makefile.am

Timestamp:

12/02/08 22:48:28 (14 years ago)

Author:

Balazs Dezso <deba@…>

Branch:

default

Children:

483:76ec7bd57026, 547:17cabb114d52

Phase:

public

Message:

Thorough redesign of the LP/MIP interface (#44)

• Redesigned class structure
• Redesigned iterators
• Some functions in the basic interface redesigned
• More complete setting functions
• Ray retrieving functions
• Lot of improvements
• Cplex common env
• CLP macro definition to config.h.in
• Update lp.h to also use soplex and clp
• Remove default_solver_name
• New solverName() function in solvers
• Handle exceptions for MipCplex? test
• Rename tolerance parameter to epsilon
• Rename MapIt? to CoeffIt?
• Lot of documentation improvements
• Various bugfixes

File:

• lemon/Makefile.am (modified) (3 diffs)

lemon/Makefile.am

@@ -19 +19 @@
         $(GLPK_CFLAGS) \
         $(CPLEX_CFLAGS) \
-        $(SOPLEX_CXXFLAGS)
+        $(SOPLEX_CXXFLAGS) \
+        $(CLP_CXXFLAGS)
 
 lemon_libemon_la_LDFLAGS = \
         $(GLPK_LIBS) \
         $(CPLEX_LIBS) \
-        $(SOPLEX_LIBS)
+        $(SOPLEX_LIBS) \
+        $(CLP_LIBS)
 
 if HAVE_GLPK
-lemon_libemon_la_SOURCES += lemon/lp_glpk.cc lemon/mip_glpk.cc
+lemon_libemon_la_SOURCES += lemon/lp_glpk.cc
 endif
 
 if HAVE_CPLEX
-lemon_libemon_la_SOURCES += lemon/lp_cplex.cc lemon/mip_cplex.cc
+lemon_libemon_la_SOURCES += lemon/lp_cplex.cc
 endif
 
 if HAVE_SOPLEX
 lemon_libemon_la_SOURCES += lemon/lp_soplex.cc
+endif
+
+if HAVE_CLP
+lemon_libemon_la_SOURCES += lemon/lp_clp.cc
 endif
 
@@ -66 +72 @@
         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/mip_cplex.h \
-        lemon/mip_glpk.h \
+        lemon/list_graph.h \
         lemon/maps.h \
         lemon/math.h \
@@ -95 +101 @@
         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/bits/solver_bits.h \
         lemon/bits/traits.h \
         lemon/bits/variant.h \