Changes in / [958:9a716871028e:956:4dd3dc8eb5a7] in lemon-main

Files:

• lemon/lp_base.h (modified) (4 diffs)
• test/lp_test.cc (modified) (1 diff)

lemon/lp_base.h

@@ -1619 +1619 @@
   inline LpBase::Constr operator<=(const LpBase::Expr &e,
                                    const LpBase::Expr &f) {
-    return LpBase::Constr(0, f - e, LpBase::NaN);
+    return LpBase::Constr(0, f - e, LpBase::INF);
   }
 
@@ -1637 +1637 @@
   inline LpBase::Constr operator<=(const LpBase::Expr &e,
                                    const LpBase::Value &f) {
-    return LpBase::Constr(LpBase::NaN, e, f);
+    return LpBase::Constr(- LpBase::INF, e, f);
   }
 
@@ -1646 +1646 @@
   inline LpBase::Constr operator>=(const LpBase::Expr &e,
                                    const LpBase::Expr &f) {
-    return LpBase::Constr(0, e - f, LpBase::NaN);
+    return LpBase::Constr(0, e - f, LpBase::INF);
   }
 
@@ -1666 +1666 @@
   inline LpBase::Constr operator>=(const LpBase::Expr &e,
                                    const LpBase::Value &f) {
-    return LpBase::Constr(f, e, LpBase::NaN);
+    return LpBase::Constr(f, e, LpBase::INF);
   }
 

test/lp_test.cc

@@ -167 +167 @@
     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;