Changeset 1387:37d1b20cd9ef in lemon-0.x for src

Timestamp:

04/25/05 10:19:38 (19 years ago)

Author:

Akos Ladanyi

Branch:

default

Phase:

public

Convert:

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

Message:

• include config.h instead of manually adding -DHAVE_{CPLEX,GLPK} to CXXFLAGS
• removed the checking of LpSkeleton? from lp_test.cc, because it is an abstract base class now
• removed unnecessary LDFLAGS when linking with libemon.la

Location:

src

Files:

• demo/Makefile.am (modified) (2 diffs)
• demo/lp_demo.cc (modified) (1 diff)
• demo/lp_maxflow_demo.cc (modified) (1 diff)
• test/Makefile.am (modified) (2 diffs)
• test/lp_test.cc (modified) (2 diffs)

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
@@ -44 +33 @@
 
 lp_demo_SOURCES = lp_demo.cc
-lp_demo_CXXFLAGS = $(LP_CFLAGS)
-lp_demo_LDFLAGS = $(LP_LIBS)
+lp_demo_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
 
 lp_maxflow_demo_SOURCES = lp_maxflow_demo.cc
-lp_maxflow_demo_CXXFLAGS = $(LP_CFLAGS)
-lp_maxflow_demo_LDFLAGS = $(LP_LIBS)
+lp_maxflow_demo_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)

src/demo/lp_demo.cc

@@ +1 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <iostream>
 

src/demo/lp_maxflow_demo.cc

@@ +1 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include<lemon/graph_reader.h>
 #include<lemon/list_graph.h>

src/test/Makefile.am

@@ -36 +36 @@
 if HAVE_GLPK
 check_PROGRAMS += lp_test
-endif
+else !HAVE_GLPK
+if HAVE_CPLEX
+check_PROGRAMS += lp_test
+endif HAVE_CPLEX
+endif !HAVE_GLPK
 
 TESTS = $(check_PROGRAMS)
@@ -63 +67 @@
 
 lp_test_SOURCES = lp_test.cc
-lp_test_CXXFLAGS = $(GLPK_CFLAGS)
-lp_test_LDFLAGS = $(GLPK_LIBS)
+lp_test_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)

src/test/lp_test.cc

@@ -1 @@
-#include<lemon/lp_skeleton.h>
-#include<lemon/lp_glpk.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#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
 
 void lpTest(LpSolverBase & lp)
@@ -130 +143 @@
 int main() 
 {
-  LpSkeleton lp_skel;
-  LpGlpk lp_glpk;
+  LpDefault lp;
 
-  lpTest(lp_skel);
-  lpTest(lp_glpk);
+  lpTest(lp);
 
   return 0;