Changeset 1381:998e8def9676 in lemon-0.x for src/lemon

Timestamp:

04/22/05 19:47:01 (19 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1834

Message:

• lp_cplex.h, lp_cplex.cc added
• lp_demo.cc and lp_maxflow_demo.cc uses GLPK is it is found CPLEX otherwise

Location:

src/lemon

Files:

• Makefile.am (modified) (2 diffs)
• lp_base.h (modified) (1 diff)
• lp_cplex.cc (added)
• lp_cplex.h (added)

src/lemon/Makefile.am

@@ -14 +14 @@
 libemon_la_CXXFLAGS = $(GLPK_CFLAGS)
 libemon_la_LDFLAGS = $(GLPK_LIBS)
+endif
+
+if HAVE_CPLEX
+libemon_la_SOURCES += lp_cplex.cc
+libemon_la_CXXFLAGS = $(CPLEX_CFLAGS)
+libemon_la_LDFLAGS = $(CPLEX_LIBS)
 endif
 
@@ -33 +39 @@
         list_graph.h \
         lp_base.h \
+        lp_cplex.h \
         lp_glpk.h \
         lp_skeleton.h \

src/lemon/lp_base.h

@@ -465 +465 @@
     ///Creates a new LP problem
     LpSolverBase &newLp() {return _newLp();}
-    ///Make a copy of the LP problem
+    ///Makes a copy of the LP problem
     LpSolverBase &copyLp() {return _copyLp();}