Changeset 1381:998e8def9676 in lemon-0.x

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

Files:

• demo/Makefile.am (modified) (3 diffs)
• demo/lp_demo.cc (modified) (2 diffs)
• demo/lp_maxflow_demo.cc (modified) (5 diffs)
• lemon/Makefile.am (modified) (2 diffs)
• lemon/lp_base.h (modified) (1 diff)
• lemon/lp_cplex.cc (added)
• lemon/lp_cplex.h (added)

src/demo/Makefile.am

@@ -1 +1 @@
 AM_CPPFLAGS = -I$(top_srcdir)/src
 LDADD = $(top_builddir)/src/lemon/libemon.la
+
+if HAVE_GLPK
+LP_CFLAGS = $(GLPK_CFLAGS) -DHAVE_GLPK
+LP_LIBS = $(GLPK_LIBS)
+else !HAVE_GLPK
+if HAVE_CPLEX
+LP_CFLAGS = $(CPLEX_CFLAGS) -DHAVE_CPLEX
+LP_LIBS = $(CPLEX_LIBS)
+endif HAVE_CPLEX
+endif !HAVE_GLPK
+
 
 EXTRA_DIST = sub_graph_wrapper_demo.dim
@@ -13 +24 @@
 if HAVE_GLPK
 noinst_PROGRAMS += lp_demo lp_maxflow_demo
-endif
+else !HAVE_GLPK
+if HAVE_CPLEX
+noinst_PROGRAMS += lp_demo lp_maxflow_demo
+endif HAVE_CPLEX
+endif !HAVE_GLPK
+
 
 dim_to_dot_SOURCES = dim_to_dot.cc
@@ -28 +44 @@
 
 lp_demo_SOURCES = lp_demo.cc
-lp_demo_CXXFLAGS = $(GLPK_CFLAGS)
-lp_demo_LDFLAGS = $(GLPK_LIBS)
+lp_demo_CXXFLAGS = $(LP_CFLAGS)
+lp_demo_LDFLAGS = $(LP_LIBS)
 
 lp_maxflow_demo_SOURCES = lp_maxflow_demo.cc
-lp_maxflow_demo_CXXFLAGS = $(GLPK_CFLAGS)
-lp_maxflow_demo_LDFLAGS = $(GLPK_LIBS)
+lp_maxflow_demo_CXXFLAGS = $(LP_CFLAGS)
+lp_maxflow_demo_LDFLAGS = $(LP_LIBS)

src/demo/lp_demo.cc

@@ -1 +1 @@
 #include <iostream>
+
+
+#ifdef HAVE_GLPK
 #include <lemon/lp_glpk.h>
+#elif HAVE_CPLEX
+#include <lemon/lp_cplex.h>
+#endif
+
 using namespace lemon;
+
+#ifdef HAVE_GLPK
+typedef LpGlpk LpDefault;
+#elif HAVE_CPLEX
+typedef LpCplex LpDefault;
+#endif
 
 int main()
@@ -7 +20 @@
  //The following example is taken from the documentation of the GLPK library.
  //See it in the GLPK reference manual and among the GLPK sample files (sample.c)
-  LpGlpk lp;
-  typedef LpGlpk::Row Row;
-  typedef LpGlpk::Col Col;
+  LpDefault lp;
+  typedef LpDefault::Row Row;
+  typedef LpDefault::Col Col;
 
   lp.max();

src/demo/lp_maxflow_demo.cc

@@ -1 @@
-#include<lemon/lp_glpk.h>
 #include<lemon/graph_reader.h>
 #include<lemon/list_graph.h>
 
+
+#ifdef HAVE_GLPK
+#include <lemon/lp_glpk.h>
+#elif HAVE_CPLEX
+#include <lemon/lp_cplex.h>
+#endif
+
 using namespace lemon;
+
+#ifdef HAVE_GLPK
+typedef LpGlpk LpDefault;
+#elif HAVE_CPLEX
+typedef LpCplex LpDefault;
+#endif
+
 
 template<class G,class C>
 double maxFlow(const G &g,const C &cap,typename G::Node s,typename G::Node t)
 {
-  LpGlpk lp;
+  LpDefault lp;
   
   typedef G Graph;
@@ -18 +31 @@
   typedef typename G::InEdgeIt InEdgeIt;
   
-  typename G::template EdgeMap<LpGlpk::Col> x(g);
+  typename G::template EdgeMap<LpDefault::Col> x(g);
   lp.addColSet(x);
   
@@ -27 +40 @@
 
   for(NodeIt n(g);n!=INVALID;++n) if(n!=s&&n!=t) {
-    LpGlpk::Expr ex;
+    LpDefault::Expr ex;
     for(InEdgeIt  e(g,n);e!=INVALID;++e) ex+=x[e];
     for(OutEdgeIt e(g,n);e!=INVALID;++e) ex-=x[e];
@@ -33 +46 @@
   }
   {
-    LpGlpk::Expr ex;
+    LpDefault::Expr ex;
     for(InEdgeIt  e(g,t);e!=INVALID;++e) ex+=x[e];
     for(OutEdgeIt e(g,t);e!=INVALID;++e) ex-=x[e];
@@ -40 +53 @@
   lp.max();
 
+#ifdef HAVE_GLPK
   lp.presolver(true);
-  
   lp.messageLevel(3);
+#endif
 
   lp.solve();

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();}