[Lemon-commits] [lemon_svn] ladanyi: r1912 - hugo/trunk/test

[Lemon SVN]

Author: ladanyi
Date: Thu May 26 15:21:47 2005
New Revision: 1912

Modified:
   hugo/trunk/test/lp_test.cc

Log:
 - test both lp implementations
 - commented out the checking of LpCplex because it fails


Modified: hugo/trunk/test/lp_test.cc
==============================================================================
--- hugo/trunk/test/lp_test.cc	(original)
+++ hugo/trunk/test/lp_test.cc	Thu May 26 15:21:47 2005
@@ -6,18 +6,14 @@
 
 #ifdef HAVE_GLPK
 #include <lemon/lp_glpk.h>
-#elif HAVE_CPLEX
+#endif
+
+#ifdef 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;
@@ -147,9 +143,15 @@
   LpSkeleton lp_skel;
   lpTest(lp_skel);
 
-  LpDefault lp;
+#ifdef HAVE_GLPK
+  LpGlpk lp_glpk;
+  lpTest(lp_glpk);
+#endif
 
-  lpTest(lp);
+#ifdef HAVE_CPLEX
+//  LpCplex lp_cplex;
+//  lpTest(lp_cplex);
+#endif
 
   return 0;
 }