LEMON/LEMON-official Changeset - r1092:2eebc8f7dca5

Repositories » LEMON » LEMON-official

Changeset - r1092:2eebc8f7dca5

« 1063:0dba9b

1102:17e36e »
1095:9a7168 »
1094:140fac »
1093:472b78 »

r1092:2eebc8f7dca5

Tue, 01 Nov 2011 08:24:30

[Not Reviewed]

0 comments (0 inline)

retvari@tmit.bme.hu
retvari@tmit.bme.hu

Fix LpBase::Constr two-side limit bug (#430)

0 2 0

default

2 files changed with 12 insertions and 4 deletions:

lemon/lp_base.h

test/lp_test.cc

↑ Collapse diff ↑

lemon/lp_base.h

Show inline comments

@@ -1606,3 +1606,3 @@
 		                                   const LpBase::Expr &f) {
-		    return LpBase::Constr(0, f - e, LpBase::INF);
+		    return LpBase::Constr(0, f - e, LpBase::NaN);
+		  }
@@ -1624,3 +1624,3 @@
 		                                   const LpBase::Value &f) {
-		    return LpBase::Constr(- LpBase::INF, e, f);
+		    return LpBase::Constr(LpBase::NaN, e, f);
+		  }
@@ -1633,3 +1633,3 @@
 		                                   const LpBase::Expr &f) {
-		    return LpBase::Constr(0, e - f, LpBase::INF);
+		    return LpBase::Constr(0, e - f, LpBase::NaN);
+		  }
@@ -1653,3 +1653,3 @@
 		                                   const LpBase::Value &f) {
-		    return LpBase::Constr(f, e, LpBase::INF);
+		    return LpBase::Constr(f, e, LpBase::NaN);
+		  }

test/lp_test.cc

Show inline comments

@@ -168,2 +168,10 @@
 		    { //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;

0 comments (0 inline)

RhodeCode