diff -r 3f90ae31200a -r 9bcc455da4f5 src/work/athos/lp/lp_base.h --- a/src/work/athos/lp/lp_base.h Tue Apr 05 06:19:24 2005 +0000 +++ b/src/work/athos/lp/lp_base.h Tue Apr 05 06:41:21 2005 +0000 @@ -105,7 +105,7 @@ public: ///\e - enum SolutionStatus { + enum SolveExitStatus { ///\e SOLVED = 0, ///\e @@ -113,7 +113,7 @@ }; ///\e - enum SolutionType { + enum SolutionStatus { ///Feasible solution has'n been found (but may exist). ///\todo NOTFOUND might be a better name. @@ -390,9 +390,9 @@ virtual void _setRowLowerBound(int i, Value value) = 0; virtual void _setRowUpperBound(int i, Value value) = 0; virtual void _setObjCoeff(int i, Value obj_coef) = 0; - virtual SolutionStatus _solve() = 0; + virtual SolveExitStatus _solve() = 0; virtual Value _getPrimal(int i) = 0; - virtual SolutionType _getPrimalType() = 0; + virtual SolutionStatus _getPrimalType() = 0; void clearObj() {} @@ -614,7 +614,7 @@ ///@{ ///\e - SolutionStatus solve() { return _solve(); } + SolveExitStatus solve() { return _solve(); } ///@} @@ -623,7 +623,7 @@ ///@{ ///\e - SolutionType primalType() { + SolutionStatus primalType() { return _getPrimalType(); }