LEMON/LEMON-official Changeset - r1094:140facbd1d7c

Repositories » LEMON » LEMON-official

Changeset - r1094:140facbd1d7c

« 1092:2eebc8
« 1090:c1a959

1099:1086d1 »

r1094:140facbd1d7c

Tue, 01 Nov 2011 13:53:06

[Not Reviewed]

0 comments (0 inline)

alpar (Alpar Juttner)
alpar@cs.elte.hu

Merge bugfix #430 to branch 1.2

0 2 0

merge 1.2

1 file changed with 12 insertions and 4 deletions:

lemon/lp_base.h

test/lp_test.cc

↑ Collapse diff ↑

lemon/lp_base.h

Show inline comments

@@ -1617,9 +1617,9 @@
 		  ///\relates LpBase::Constr
 		  ///
 		  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
@@ -1635,18 +1635,18 @@
 		  ///\relates LpBase::Constr
 		  ///
 		  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
 		  ///\relates LpBase::Constr
 		  ///
 		  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);
+		  }
 		  ///Create constraint
@@ -1664,9 +1664,9 @@
 		  ///\relates LpBase::Constr
 		  ///
 		  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

test/lp_test.cc

Show inline comments

@@ -165,8 +165,16 @@
 		    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;
 		    *e=12;

0 comments (0 inline)

RhodeCode