# HG changeset patch
# User Alpar Juttner <alpar@cs.elte.hu>
# Date 1254766891 -7200
# Node ID 1db9f9db4f952f1e67b9d5130f39b0967d6de4c2
# Parent  f6bf0b2a7b632a5797e658c8a8d13698a243b9a1# Parent  36857046492b2612fb76db945a302bb9a87bd8d2
Merge #317

diff -r f6bf0b2a7b63 -r 1db9f9db4f95 m4/lx_check_coin.m4
--- a/m4/lx_check_coin.m4	Sat Oct 03 07:32:04 2009 +0200
+++ b/m4/lx_check_coin.m4	Mon Oct 05 20:21:31 2009 +0200
@@ -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 -r f6bf0b2a7b63 -r 1db9f9db4f95 test/mip_test.cc
--- a/test/mip_test.cc	Sat Oct 03 07:32:04 2009 +0200
+++ b/test/mip_test.cc	Mon Oct 05 20:21:31 2009 +0200
@@ -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)
   }