1.1 --- a/src/work/athos/lp/lp_base.h Tue Apr 05 06:19:24 2005 +0000
1.2 +++ b/src/work/athos/lp/lp_base.h Tue Apr 05 06:41:21 2005 +0000
1.3 @@ -105,7 +105,7 @@
1.4 public:
1.5
1.6 ///\e
1.7 - enum SolutionStatus {
1.8 + enum SolveExitStatus {
1.9 ///\e
1.10 SOLVED = 0,
1.11 ///\e
1.12 @@ -113,7 +113,7 @@
1.13 };
1.14
1.15 ///\e
1.16 - enum SolutionType {
1.17 + enum SolutionStatus {
1.18 ///Feasible solution has'n been found (but may exist).
1.19
1.20 ///\todo NOTFOUND might be a better name.
1.21 @@ -390,9 +390,9 @@
1.22 virtual void _setRowLowerBound(int i, Value value) = 0;
1.23 virtual void _setRowUpperBound(int i, Value value) = 0;
1.24 virtual void _setObjCoeff(int i, Value obj_coef) = 0;
1.25 - virtual SolutionStatus _solve() = 0;
1.26 + virtual SolveExitStatus _solve() = 0;
1.27 virtual Value _getPrimal(int i) = 0;
1.28 - virtual SolutionType _getPrimalType() = 0;
1.29 + virtual SolutionStatus _getPrimalType() = 0;
1.30
1.31
1.32 void clearObj() {}
1.33 @@ -614,7 +614,7 @@
1.34 ///@{
1.35
1.36 ///\e
1.37 - SolutionStatus solve() { return _solve(); }
1.38 + SolveExitStatus solve() { return _solve(); }
1.39
1.40 ///@}
1.41
1.42 @@ -623,7 +623,7 @@
1.43 ///@{
1.44
1.45 ///\e
1.46 - SolutionType primalType() {
1.47 + SolutionStatus primalType() {
1.48 return _getPrimalType();
1.49 }
1.50