# HG changeset patch # User Alpar Juttner # Date 1320151400 -3600 # Node ID 472b7885ae4617cd1dc3ba75b02f3aaca3e09dce # Parent 2b47dbd6612c14010d2ad5b90e1546b6797c8ec3# Parent 2eebc8f7dca5ad761c939d1a7443791e85b7ec08 Merge bugfix #430 to branch 1.1 diff -r 2b47dbd6612c -r 472b7885ae46 lemon/lp_base.h --- a/lemon/lp_base.h Mon Oct 24 21:39:34 2011 +0200 +++ b/lemon/lp_base.h Tue Nov 01 13:43:20 2011 +0100 @@ -1604,7 +1604,7 @@ /// inline LpBase::Constr operator<=(const LpBase::Expr &e, const LpBase::Expr &f) { - return LpBase::Constr(0, f - e, LpBase::INF); + return LpBase::Constr(0, f - e, LpBase::NaN); } ///Create constraint @@ -1622,7 +1622,7 @@ /// inline LpBase::Constr operator<=(const LpBase::Expr &e, const LpBase::Value &f) { - return LpBase::Constr(- LpBase::INF, e, f); + return LpBase::Constr(LpBase::NaN, e, f); } ///Create constraint @@ -1631,7 +1631,7 @@ /// inline LpBase::Constr operator>=(const LpBase::Expr &e, const LpBase::Expr &f) { - return LpBase::Constr(0, e - f, LpBase::INF); + return LpBase::Constr(0, e - f, LpBase::NaN); } @@ -1651,7 +1651,7 @@ /// inline LpBase::Constr operator>=(const LpBase::Expr &e, const LpBase::Value &f) { - return LpBase::Constr(f, e, LpBase::INF); + return LpBase::Constr(f, e, LpBase::NaN); } ///Create constraint diff -r 2b47dbd6612c -r 472b7885ae46 test/lp_test.cc --- a/test/lp_test.cc Mon Oct 24 21:39:34 2011 +0200 +++ b/test/lp_test.cc Tue Nov 01 13:43:20 2011 +0100 @@ -166,6 +166,14 @@ c = ((2 >= e) >= 3); c = ((2 >= p1) >= 3); + { //Tests for #430 + LP::Col v=lp.addCol(); + LP::Constr c = v >= -3; + c = c <= 4; + LP::Constr c2; + c2 = -3 <= v <= 4; + } + e[x[3]]=2; e[x[3]]=4; e[x[3]]=1;