[Lemon-commits] [lemon_svn] ladanyi: r1840 - in hugo/trunk/src: demo test

[Lemon SVN]

Author: ladanyi
Date: Mon Apr 25 10:19:38 2005
New Revision: 1840

Modified:
   hugo/trunk/src/demo/Makefile.am
   hugo/trunk/src/demo/lp_demo.cc
   hugo/trunk/src/demo/lp_maxflow_demo.cc
   hugo/trunk/src/test/Makefile.am
   hugo/trunk/src/test/lp_test.cc

Log:
 - 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


Modified: hugo/trunk/src/demo/Makefile.am
==============================================================================
--- hugo/trunk/src/demo/Makefile.am	(original)
+++ hugo/trunk/src/demo/Makefile.am	Mon Apr 25 10:19:38 2005
@@ -1,17 +1,6 @@
 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
 
 noinst_PROGRAMS = \
@@ -43,9 +32,7 @@
 	tight_edge_filter_map.h
 
 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)

Modified: hugo/trunk/src/demo/lp_demo.cc
==============================================================================
--- hugo/trunk/src/demo/lp_demo.cc	(original)
+++ hugo/trunk/src/demo/lp_demo.cc	Mon Apr 25 10:19:38 2005
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <iostream>
 
 

Modified: hugo/trunk/src/demo/lp_maxflow_demo.cc
==============================================================================
--- hugo/trunk/src/demo/lp_maxflow_demo.cc	(original)
+++ hugo/trunk/src/demo/lp_maxflow_demo.cc	Mon Apr 25 10:19:38 2005
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include<lemon/graph_reader.h>
 #include<lemon/list_graph.h>
 

Modified: hugo/trunk/src/test/Makefile.am
==============================================================================
--- hugo/trunk/src/test/Makefile.am	(original)
+++ hugo/trunk/src/test/Makefile.am	Mon Apr 25 10:19:38 2005
@@ -35,7 +35,11 @@
 
 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)
 XFAIL_TESTS = test_tools_fail$(EXEEXT)
@@ -62,5 +66,4 @@
 heap_test_SOURCES = heap_test.cc
 
 lp_test_SOURCES = lp_test.cc
-lp_test_CXXFLAGS = $(GLPK_CFLAGS)
-lp_test_LDFLAGS = $(GLPK_LIBS)
+lp_test_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)

Modified: hugo/trunk/src/test/lp_test.cc
==============================================================================
--- hugo/trunk/src/test/lp_test.cc	(original)
+++ hugo/trunk/src/test/lp_test.cc	Mon Apr 25 10:19:38 2005
@@ -1,8 +1,21 @@
-#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)
 {
   typedef LpSolverBase LP;
@@ -129,11 +142,9 @@
 
 int main() 
 {
-  LpSkeleton lp_skel;
-  LpGlpk lp_glpk;
+  LpDefault lp;
 
-  lpTest(lp_skel);
-  lpTest(lp_glpk);
+  lpTest(lp);
 
   return 0;
 }