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  

     2.1 --- a/src/work/athos/lp/lp_cplex.cc	Tue Apr 05 06:19:24 2005 +0000
     2.2 +++ b/src/work/athos/lp/lp_cplex.cc	Tue Apr 05 06:41:21 2005 +0000
     2.3 @@ -91,7 +91,7 @@
     2.4    {
     2.5    }
     2.6  
     2.7 -  LpCplex::SolutionType LpCplex::_solve()
     2.8 +  LpCplex::SolutionStatus LpCplex::_solve()
     2.9    {
    2.10      return OPTIMAL;
    2.11    }

     3.1 --- a/src/work/athos/lp/lp_cplex.h	Tue Apr 05 06:19:24 2005 +0000
     3.2 +++ b/src/work/athos/lp/lp_cplex.h	Tue Apr 05 06:41:21 2005 +0000
     3.3 @@ -108,7 +108,7 @@
     3.4      
     3.5      ///\bug Unimplemented
     3.6      ///
     3.7 -    virtual SolutionType _solve();
     3.8 +    virtual SolutionStatus _solve();
     3.9      ///\e
    3.10      
    3.11      ///\bug Unimplemented

     4.1 --- a/src/work/athos/lp/lp_glpk.cc	Tue Apr 05 06:19:24 2005 +0000
     4.2 +++ b/src/work/athos/lp/lp_glpk.cc	Tue Apr 05 06:41:21 2005 +0000
     4.3 @@ -238,7 +238,7 @@
     4.4    }
     4.5  
     4.6  
     4.7 -  LpGlpk::SolutionStatus LpGlpk::_solve()
     4.8 +  LpGlpk::SolveExitStatus LpGlpk::_solve()
     4.9    {
    4.10      int i=  lpx_simplex(lp);
    4.11      switch (i) {
    4.12 @@ -256,7 +256,7 @@
    4.13    }
    4.14    
    4.15   
    4.16 -  LpGlpk::SolutionType LpGlpk::_getPrimalType()
    4.17 +  LpGlpk::SolutionStatus LpGlpk::_getPrimalType()
    4.18    {
    4.19      int stat=  lpx_get_status(lp);
    4.20      switch (stat) {

     5.1 --- a/src/work/athos/lp/lp_glpk.h	Tue Apr 05 06:19:24 2005 +0000
     5.2 +++ b/src/work/athos/lp/lp_glpk.h	Tue Apr 05 06:41:21 2005 +0000
     5.3 @@ -70,7 +70,7 @@
     5.4      
     5.5      ///\bug Unimplemented
     5.6      ///
     5.7 -    virtual SolutionStatus _solve();
     5.8 +    virtual SolveExitStatus _solve();
     5.9      ///\e
    5.10      
    5.11      ///\bug Unimplemented
    5.12 @@ -80,7 +80,7 @@
    5.13      
    5.14      ///\bug Unimplemented
    5.15      ///
    5.16 -    virtual SolutionType _getPrimalType();
    5.17 +    virtual SolutionStatus _getPrimalType();
    5.18  
    5.19    };
    5.20  } //END OF NAMESPACE LEMON

     6.1 --- a/src/work/athos/lp/lp_solver_skeleton.cc	Tue Apr 05 06:19:24 2005 +0000
     6.2 +++ b/src/work/athos/lp/lp_solver_skeleton.cc	Tue Apr 05 06:41:21 2005 +0000
     6.3 @@ -65,7 +65,7 @@
     6.4    {
     6.5    }
     6.6  
     6.7 -  LpSolverSkeleton::SolutionStatus LpSolverSkeleton::_solve()
     6.8 +  LpSolverSkeleton::SolveExitStatus LpSolverSkeleton::_solve()
     6.9    {
    6.10      return SOLVED;
    6.11    }
    6.12 @@ -75,7 +75,7 @@
    6.13      return 0;
    6.14    }
    6.15    
    6.16 -  LpSolverSkeleton::SolutionType LpSolverSkeleton::_getPrimalType()
    6.17 +  LpSolverSkeleton::SolutionStatus LpSolverSkeleton::_getPrimalType()
    6.18    {
    6.19      return OPTIMAL;
    6.20    }

     7.1 --- a/src/work/athos/lp/lp_solver_skeleton.h	Tue Apr 05 06:19:24 2005 +0000
     7.2 +++ b/src/work/athos/lp/lp_solver_skeleton.h	Tue Apr 05 06:41:21 2005 +0000
     7.3 @@ -82,7 +82,7 @@
     7.4      
     7.5      ///\bug Wrong interface
     7.6      ///
     7.7 -    virtual SolutionStatus _solve();
     7.8 +    virtual SolveExitStatus _solve();
     7.9  
    7.10      ///\e
    7.11  
    7.12 @@ -93,7 +93,7 @@
    7.13  
    7.14      ///\bug Wrong interface
    7.15      ///
    7.16 -    virtual SolutionType _getPrimalType();
    7.17 +    virtual SolutionStatus _getPrimalType();
    7.18  
    7.19    public:
    7.20      LpSolverSkeleton() : LpSolverBase(), col_num(0), row_num(0) {}