[Lemon-commits] Alpar Juttner: Merge #317

[Lemon HG]

details:   http://lemon.cs.elte.hu/hg/lemon/rev/b7e3662faf02
changeset: 806:b7e3662faf02
user:      Alpar Juttner <alpar [at] cs.elte.hu>
date:      Mon Oct 05 20:21:54 2009 +0200
description:
	Merge #317

diffstat:

 m4/lx_check_coin.m4 |  2 +-
 test/mip_test.cc    |  3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diffs (25 lines):

diff --git a/m4/lx_check_coin.m4 b/m4/lx_check_coin.m4
--- a/m4/lx_check_coin.m4
+++ b/m4/lx_check_coin.m4
@@ -88,7 +88,7 @@
       elif test x"$with_coin" != x"yes"; then
         CBC_LDFLAGS="-L$with_coin/lib"
       fi
-      CBC_LIBS="-lOsi -lCbc -lOsiCbc -lCbcSolver -lClp -lOsiClp -lCoinUtils -lVol -lOsiVol -lCgl -lm -llapack -lblas"
+      CBC_LIBS="-lOsi -lCbc -lCbcSolver -lClp -lOsiClp -lCoinUtils -lVol -lOsiVol -lCgl -lm -llapack -lblas"
 
       lx_save_cxxflags="$CXXFLAGS"
       lx_save_ldflags="$LDFLAGS"
diff --git a/test/mip_test.cc b/test/mip_test.cc
--- a/test/mip_test.cc
+++ b/test/mip_test.cc
@@ -50,7 +50,8 @@
 
   if (stat ==  MipSolver::OPTIMAL) {
     std::ostringstream sbuf;
-    buf << "Wrong optimal value: the right optimum is " << exp_opt;
+    sbuf << "Wrong optimal value ("<< mip.solValue()
+         <<" instead of " << exp_opt << ")";
     check(std::abs(mip.solValue()-exp_opt) < 1e-3, sbuf.str());
     //+ecvt(exp_opt,2)
   }