r1093:472b7885ae46
Tue, 01 Nov 2011 13:43:20
[Not Reviewed]
0 comments (0 inline)
0
2
0
| ... | ... |
@@ -1595,72 +1595,72 @@ |
| 1595 | 1595 |
inline LpBase::Expr operator/(const LpBase::Expr &a, const LpBase::Value &b) {
|
| 1596 | 1596 |
LpBase::Expr tmp(a); |
| 1597 | 1597 |
tmp/=b; |
| 1598 | 1598 |
return tmp; |
| 1599 | 1599 |
} |
| 1600 | 1600 |
|
| 1601 | 1601 |
///Create constraint |
| 1602 | 1602 |
|
| 1603 | 1603 |
///\relates LpBase::Constr |
| 1604 | 1604 |
/// |
| 1605 | 1605 |
inline LpBase::Constr operator<=(const LpBase::Expr &e, |
| 1606 | 1606 |
const LpBase::Expr &f) {
|
| 1607 |
return LpBase::Constr(0, f - e, LpBase:: |
|
| 1607 |
return LpBase::Constr(0, f - e, LpBase::NaN); |
|
| 1608 | 1608 |
} |
| 1609 | 1609 |
|
| 1610 | 1610 |
///Create constraint |
| 1611 | 1611 |
|
| 1612 | 1612 |
///\relates LpBase::Constr |
| 1613 | 1613 |
/// |
| 1614 | 1614 |
inline LpBase::Constr operator<=(const LpBase::Value &e, |
| 1615 | 1615 |
const LpBase::Expr &f) {
|
| 1616 | 1616 |
return LpBase::Constr(e, f, LpBase::NaN); |
| 1617 | 1617 |
} |
| 1618 | 1618 |
|
| 1619 | 1619 |
///Create constraint |
| 1620 | 1620 |
|
| 1621 | 1621 |
///\relates LpBase::Constr |
| 1622 | 1622 |
/// |
| 1623 | 1623 |
inline LpBase::Constr operator<=(const LpBase::Expr &e, |
| 1624 | 1624 |
const LpBase::Value &f) {
|
| 1625 |
return LpBase::Constr( |
|
| 1625 |
return LpBase::Constr(LpBase::NaN, e, f); |
|
| 1626 | 1626 |
} |
| 1627 | 1627 |
|
| 1628 | 1628 |
///Create constraint |
| 1629 | 1629 |
|
| 1630 | 1630 |
///\relates LpBase::Constr |
| 1631 | 1631 |
/// |
| 1632 | 1632 |
inline LpBase::Constr operator>=(const LpBase::Expr &e, |
| 1633 | 1633 |
const LpBase::Expr &f) {
|
| 1634 |
return LpBase::Constr(0, e - f, LpBase:: |
|
| 1634 |
return LpBase::Constr(0, e - f, LpBase::NaN); |
|
| 1635 | 1635 |
} |
| 1636 | 1636 |
|
| 1637 | 1637 |
|
| 1638 | 1638 |
///Create constraint |
| 1639 | 1639 |
|
| 1640 | 1640 |
///\relates LpBase::Constr |
| 1641 | 1641 |
/// |
| 1642 | 1642 |
inline LpBase::Constr operator>=(const LpBase::Value &e, |
| 1643 | 1643 |
const LpBase::Expr &f) {
|
| 1644 | 1644 |
return LpBase::Constr(LpBase::NaN, f, e); |
| 1645 | 1645 |
} |
| 1646 | 1646 |
|
| 1647 | 1647 |
|
| 1648 | 1648 |
///Create constraint |
| 1649 | 1649 |
|
| 1650 | 1650 |
///\relates LpBase::Constr |
| 1651 | 1651 |
/// |
| 1652 | 1652 |
inline LpBase::Constr operator>=(const LpBase::Expr &e, |
| 1653 | 1653 |
const LpBase::Value &f) {
|
| 1654 |
return LpBase::Constr(f, e, LpBase:: |
|
| 1654 |
return LpBase::Constr(f, e, LpBase::NaN); |
|
| 1655 | 1655 |
} |
| 1656 | 1656 |
|
| 1657 | 1657 |
///Create constraint |
| 1658 | 1658 |
|
| 1659 | 1659 |
///\relates LpBase::Constr |
| 1660 | 1660 |
/// |
| 1661 | 1661 |
inline LpBase::Constr operator==(const LpBase::Expr &e, |
| 1662 | 1662 |
const LpBase::Value &f) {
|
| 1663 | 1663 |
return LpBase::Constr(f, e, f); |
| 1664 | 1664 |
} |
| 1665 | 1665 |
|
| 1666 | 1666 |
///Create constraint |
| ... | ... |
@@ -157,24 +157,32 @@ |
| 157 | 157 |
//c = (p1 == p2 ); |
| 158 | 158 |
c = (p1 == 2.2); |
| 159 | 159 |
c = (p1 == 2 ); |
| 160 | 160 |
c = (2.2== p2 ); |
| 161 | 161 |
c = (2 == p2 ); |
| 162 | 162 |
|
| 163 | 163 |
c = ((2 <= e) <= 3); |
| 164 | 164 |
c = ((2 <= p1) <= 3); |
| 165 | 165 |
|
| 166 | 166 |
c = ((2 >= e) >= 3); |
| 167 | 167 |
c = ((2 >= p1) >= 3); |
| 168 | 168 |
|
| 169 |
{ //Tests for #430
|
|
| 170 |
LP::Col v=lp.addCol(); |
|
| 171 |
LP::Constr c = v >= -3; |
|
| 172 |
c = c <= 4; |
|
| 173 |
LP::Constr c2; |
|
| 174 |
c2 = -3 <= v <= 4; |
|
| 175 |
} |
|
| 176 |
|
|
| 169 | 177 |
e[x[3]]=2; |
| 170 | 178 |
e[x[3]]=4; |
| 171 | 179 |
e[x[3]]=1; |
| 172 | 180 |
*e=12; |
| 173 | 181 |
|
| 174 | 182 |
lp.addRow(-LP::INF,e,23); |
| 175 | 183 |
lp.addRow(-LP::INF,3.0*(x[1]+x[2]/2)-x[3],23); |
| 176 | 184 |
lp.addRow(-LP::INF,3.0*(x[1]+x[2]*2-5*x[3]+12-x[4]/3)+2*x[4]-4,23); |
| 177 | 185 |
|
| 178 | 186 |
lp.addRow(x[1]+x[3]<=x[5]-3); |
| 179 | 187 |
lp.addRow((-7<=x[1]+x[3]-12)<=3); |
| 180 | 188 |
lp.addRow(x[1]<=x[5]); |
0 comments (0 inline)