1.1 --- a/lemon/lp_base.h Fri Mar 02 17:56:22 2007 +0000
1.2 +++ b/lemon/lp_base.h Fri Mar 02 18:04:28 2007 +0000
1.3 @@ -199,20 +199,20 @@
1.4
1.5 protected:
1.6
1.7 - int _lpId(const Col& col) const {
1.8 - return cols.floatingId(id(col));
1.9 + int _lpId(const Col& c) const {
1.10 + return cols.floatingId(id(c));
1.11 }
1.12
1.13 - int _lpId(const Row& row) const {
1.14 - return rows.floatingId(id(row));
1.15 + int _lpId(const Row& r) const {
1.16 + return rows.floatingId(id(r));
1.17 }
1.18
1.19 - Col _item(int id, Col) const {
1.20 - return Col(cols.fixId(id));
1.21 + Col _item(int i, Col) const {
1.22 + return Col(cols.fixId(i));
1.23 }
1.24
1.25 - Row _item(int id, Row) const {
1.26 - return Row(rows.fixId(id));
1.27 + Row _item(int i, Row) const {
1.28 + return Row(rows.fixId(i));
1.29 }
1.30
1.31
1.32 @@ -891,10 +891,10 @@
1.33 ///\param obj is the corresponding component of the objective
1.34 ///function. It is 0 by default.
1.35 ///\return The created column.
1.36 - Col addCol(const DualExpr &e, Value obj=0) {
1.37 + Col addCol(const DualExpr &e, Value o = 0) {
1.38 Col c=addCol();
1.39 col(c,e);
1.40 - objCoeff(c,obj);
1.41 + objCoeff(c,o);
1.42 return c;
1.43 }
1.44