# HG changeset patch # User athos # Date 1112362978 0 # Node ID 16cde3e1aa9fe934c3fc9fc143dbc0f6822749f4 # Parent 082fc511c2b9814feafd3fbaa6931d0bc480c095 Conceptions and bug fixes. diff -r 082fc511c2b9 -r 16cde3e1aa9f src/work/athos/lp/lp_base.h --- a/src/work/athos/lp/lp_base.h Fri Apr 01 13:42:31 2005 +0000 +++ b/src/work/athos/lp/lp_base.h Fri Apr 01 13:42:58 2005 +0000 @@ -105,7 +105,7 @@ public: ///\e - enum SolutionType { + enum SolutionXXXType { ///\e INFEASIBLE = 0, ///\e @@ -113,7 +113,19 @@ ///\e OPTIMAL = 2, ///\e - FEASIBLE = 3, + FEASIBLE = 3 + }; + + ///\e + enum SolutionType { + ///\e + INFEASIBLE = 0, + ///\e + UNDEFINED = 1, + ///\e + OPTIMAL = 2, + ///\e + FEASIBLE = 3 }; ///The floating point type used by the solver @@ -406,7 +418,7 @@ ///\bug Wrong interface /// - virtual SolutionType _solve() = 0; + virtual SolutionXXXType _solve() = 0; ///\e @@ -566,7 +578,7 @@ /// The upper bound of a variable (column) have to be given by an /// extended number of type Value, i.e. a finite number of type /// Value or -\ref INF. - virtual void setColLowerBound(Col c, Value value) { + void setColLowerBound(Col c, Value value) { _setColLowerBound(cols.floatingId(c.id),value); } /// Set the upper bound of a column (i.e a variable) @@ -574,7 +586,7 @@ /// The upper bound of a variable (column) have to be given by an /// extended number of type Value, i.e. a finite number of type /// Value or \ref INF. - virtual void setColUpperBound(Col c, Value value) { + void setColUpperBound(Col c, Value value) { _setColUpperBound(cols.floatingId(c.id),value); }; /// Set the lower bound of a row (i.e a constraint) @@ -582,7 +594,7 @@ /// The lower bound of a linear expression (row) have to be given by an /// extended number of type Value, i.e. a finite number of type /// Value or -\ref INF. - virtual void setRowLowerBound(Row r, Value value) { + void setRowLowerBound(Row r, Value value) { _setRowLowerBound(rows.floatingId(r.id),value); }; /// Set the upper bound of a row (i.e a constraint) @@ -590,7 +602,7 @@ /// The upper bound of a linear expression (row) have to be given by an /// extended number of type Value, i.e. a finite number of type /// Value or \ref INF. - virtual void setRowUpperBound(Row r, Value value) { + void setRowUpperBound(Row r, Value value) { _setRowUpperBound(rows.floatingId(r.id),value); }; ///Set an element of the objective function