... | ... |
@@ -597,11 +597,11 @@ |
597 | 597 |
const Value &upperBound() const { return _ub; } |
598 | 598 |
///Is the constraint lower bounded? |
599 | 599 |
bool lowerBounded() const { |
600 |
return _lb != -INF && ! |
|
600 |
return _lb != -INF && !isNaN(_lb); |
|
601 | 601 |
} |
602 | 602 |
///Is the constraint upper bounded? |
603 | 603 |
bool upperBounded() const { |
604 |
return _ub != INF && ! |
|
604 |
return _ub != INF && !isNaN(_ub); |
|
605 | 605 |
} |
606 | 606 |
|
607 | 607 |
}; |
... | ... |
@@ -1666,7 +1666,7 @@ |
1666 | 1666 |
inline LpBase::Constr operator<=(const LpBase::Value &n, |
1667 | 1667 |
const LpBase::Constr &c) { |
1668 | 1668 |
LpBase::Constr tmp(c); |
1669 |
LEMON_ASSERT( |
|
1669 |
LEMON_ASSERT(isNaN(tmp.lowerBound()), "Wrong LP constraint"); |
|
1670 | 1670 |
tmp.lowerBound()=n; |
1671 | 1671 |
return tmp; |
1672 | 1672 |
} |
... | ... |
@@ -1678,7 +1678,7 @@ |
1678 | 1678 |
const LpBase::Value &n) |
1679 | 1679 |
{ |
1680 | 1680 |
LpBase::Constr tmp(c); |
1681 |
LEMON_ASSERT( |
|
1681 |
LEMON_ASSERT(isNaN(tmp.upperBound()), "Wrong LP constraint"); |
|
1682 | 1682 |
tmp.upperBound()=n; |
1683 | 1683 |
return tmp; |
1684 | 1684 |
} |
... | ... |
@@ -1690,7 +1690,7 @@ |
1690 | 1690 |
inline LpBase::Constr operator>=(const LpBase::Value &n, |
1691 | 1691 |
const LpBase::Constr &c) { |
1692 | 1692 |
LpBase::Constr tmp(c); |
1693 |
LEMON_ASSERT( |
|
1693 |
LEMON_ASSERT(isNaN(tmp.upperBound()), "Wrong LP constraint"); |
|
1694 | 1694 |
tmp.upperBound()=n; |
1695 | 1695 |
return tmp; |
1696 | 1696 |
} |
... | ... |
@@ -1702,7 +1702,7 @@ |
1702 | 1702 |
const LpBase::Value &n) |
1703 | 1703 |
{ |
1704 | 1704 |
LpBase::Constr tmp(c); |
1705 |
LEMON_ASSERT( |
|
1705 |
LEMON_ASSERT(isNaN(tmp.lowerBound()), "Wrong LP constraint"); |
|
1706 | 1706 |
tmp.lowerBound()=n; |
1707 | 1707 |
return tmp; |
1708 | 1708 |
} |
0 comments (0 inline)