1.1 --- a/src/lemon/lp_base.h Thu May 05 15:34:43 2005 +0000
1.2 +++ b/src/lemon/lp_base.h Thu May 05 15:43:43 2005 +0000
1.3 @@ -431,8 +431,8 @@
1.4 Value const * values ) = 0;
1.5 virtual void _setColLowerBound(int i, Value value) = 0;
1.6 virtual void _setColUpperBound(int i, Value value) = 0;
1.7 - virtual void _setRowLowerBound(int i, Value value) = 0;
1.8 - virtual void _setRowUpperBound(int i, Value value) = 0;
1.9 +// virtual void _setRowLowerBound(int i, Value value) = 0;
1.10 +// virtual void _setRowUpperBound(int i, Value value) = 0;
1.11 virtual void _setRowBounds(int i, Value lower, Value upper) = 0;
1.12 virtual void _setObjCoeff(int i, Value obj_coef) = 0;
1.13 virtual void _clearObj()=0;
1.14 @@ -567,8 +567,9 @@
1.15 }
1.16 _setRowCoeffs(rows.floatingId(r.id),indices.size()-1,
1.17 &indices[0],&values[0]);
1.18 - _setRowLowerBound(rows.floatingId(r.id),l-e.constComp());
1.19 - _setRowUpperBound(rows.floatingId(r.id),u-e.constComp());
1.20 +// _setRowLowerBound(rows.floatingId(r.id),l-e.constComp());
1.21 +// _setRowUpperBound(rows.floatingId(r.id),u-e.constComp());
1.22 + _setRowBounds(rows.floatingId(r.id),l-e.constComp(),u-e.constComp());
1.23 }
1.24
1.25 ///Set a row (i.e a constaint) of the LP
1.26 @@ -633,23 +634,24 @@
1.27 _setColUpperBound(cols.floatingId(c.id),upper);
1.28 }
1.29
1.30 - /// Set the lower bound of a row (i.e a constraint)
1.31 +// /// Set the lower bound of a row (i.e a constraint)
1.32
1.33 - /// The lower bound of a linear expression (row) has to be given by an
1.34 - /// extended number of type Value, i.e. a finite number of type
1.35 - /// Value or -\ref INF.
1.36 - void rowLowerBound(Row r, Value value) {
1.37 - _setRowLowerBound(rows.floatingId(r.id),value);
1.38 - };
1.39 - /// Set the upper bound of a row (i.e a constraint)
1.40 +// /// The lower bound of a linear expression (row) has to be given by an
1.41 +// /// extended number of type Value, i.e. a finite number of type
1.42 +// /// Value or -\ref INF.
1.43 +// void rowLowerBound(Row r, Value value) {
1.44 +// _setRowLowerBound(rows.floatingId(r.id),value);
1.45 +// };
1.46 +// /// Set the upper bound of a row (i.e a constraint)
1.47
1.48 - /// The upper bound of a linear expression (row) has to be given by an
1.49 - /// extended number of type Value, i.e. a finite number of type
1.50 - /// Value or \ref INF.
1.51 - void rowUpperBound(Row r, Value value) {
1.52 - _setRowUpperBound(rows.floatingId(r.id),value);
1.53 - };
1.54 - /// Set the lower and the upper bounds of a row (i.e a variable)
1.55 +// /// The upper bound of a linear expression (row) has to be given by an
1.56 +// /// extended number of type Value, i.e. a finite number of type
1.57 +// /// Value or \ref INF.
1.58 +// void rowUpperBound(Row r, Value value) {
1.59 +// _setRowUpperBound(rows.floatingId(r.id),value);
1.60 +// };
1.61 +
1.62 + /// Set the lower and the upper bounds of a row (i.e a constraint)
1.63
1.64 /// The lower and the upper bounds of
1.65 /// a constraint (row) have to be given by an