Merge #317
authorAlpar Juttner <alpar@cs.elte.hu>
Mon, 05 Oct 2009 20:21:54 +0200 (2009-10-05)
changeset 750b7e3662faf02
parent 747 a42f46828cc1
parent 749 36857046492b
child 751 f5f260a63a9b
child 754 2de0fc630899
child 785 9ae88e7c04a7
Merge #317
     1.1 --- a/m4/lx_check_coin.m4	Mon Oct 05 09:48:57 2009 +0200
     1.2 +++ b/m4/lx_check_coin.m4	Mon Oct 05 20:21:54 2009 +0200
     1.3 @@ -88,7 +88,7 @@
     1.4        elif test x"$with_coin" != x"yes"; then
     1.5          CBC_LDFLAGS="-L$with_coin/lib"
     1.6        fi
     1.7 -      CBC_LIBS="-lOsi -lCbc -lOsiCbc -lCbcSolver -lClp -lOsiClp -lCoinUtils -lVol -lOsiVol -lCgl -lm -llapack -lblas"
     1.8 +      CBC_LIBS="-lOsi -lCbc -lCbcSolver -lClp -lOsiClp -lCoinUtils -lVol -lOsiVol -lCgl -lm -llapack -lblas"
     1.9  
    1.10        lx_save_cxxflags="$CXXFLAGS"
    1.11        lx_save_ldflags="$LDFLAGS"
     2.1 --- a/test/mip_test.cc	Mon Oct 05 09:48:57 2009 +0200
     2.2 +++ b/test/mip_test.cc	Mon Oct 05 20:21:54 2009 +0200
     2.3 @@ -50,7 +50,8 @@
     2.4  
     2.5    if (stat ==  MipSolver::OPTIMAL) {
     2.6      std::ostringstream sbuf;
     2.7 -    buf << "Wrong optimal value: the right optimum is " << exp_opt;
     2.8 +    sbuf << "Wrong optimal value ("<< mip.solValue()
     2.9 +         <<" instead of " << exp_opt << ")";
    2.10      check(std::abs(mip.solValue()-exp_opt) < 1e-3, sbuf.str());
    2.11      //+ecvt(exp_opt,2)
    2.12    }