[Lemon-commits] [lemon_svn] alpar: r1738 - hugo/trunk/src/work/athos/lp

[Lemon SVN]

Author: alpar
Date: Tue Apr  5 08:41:21 2005
New Revision: 1738

Modified:
   hugo/trunk/src/work/athos/lp/lp_base.h
   hugo/trunk/src/work/athos/lp/lp_cplex.cc
   hugo/trunk/src/work/athos/lp/lp_cplex.h
   hugo/trunk/src/work/athos/lp/lp_glpk.cc
   hugo/trunk/src/work/athos/lp/lp_glpk.h
   hugo/trunk/src/work/athos/lp/lp_solver_skeleton.cc
   hugo/trunk/src/work/athos/lp/lp_solver_skeleton.h

Log:
SolutionStatus -> SolveExitStatus
SolutionType -> SolutionStatus

Modified: hugo/trunk/src/work/athos/lp/lp_base.h
==============================================================================
--- hugo/trunk/src/work/athos/lp/lp_base.h	(original)
+++ hugo/trunk/src/work/athos/lp/lp_base.h	Tue Apr  5 08:41:21 2005
@@ -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();
     }
 

Modified: hugo/trunk/src/work/athos/lp/lp_cplex.cc
==============================================================================
--- hugo/trunk/src/work/athos/lp/lp_cplex.cc	(original)
+++ hugo/trunk/src/work/athos/lp/lp_cplex.cc	Tue Apr  5 08:41:21 2005
@@ -91,7 +91,7 @@
   {
   }
 
-  LpCplex::SolutionType LpCplex::_solve()
+  LpCplex::SolutionStatus LpCplex::_solve()
   {
     return OPTIMAL;
   }

Modified: hugo/trunk/src/work/athos/lp/lp_cplex.h
==============================================================================
--- hugo/trunk/src/work/athos/lp/lp_cplex.h	(original)
+++ hugo/trunk/src/work/athos/lp/lp_cplex.h	Tue Apr  5 08:41:21 2005
@@ -108,7 +108,7 @@
     
     ///\bug Unimplemented
     ///
-    virtual SolutionType _solve();
+    virtual SolutionStatus _solve();
     ///\e
     
     ///\bug Unimplemented

Modified: hugo/trunk/src/work/athos/lp/lp_glpk.cc
==============================================================================
--- hugo/trunk/src/work/athos/lp/lp_glpk.cc	(original)
+++ hugo/trunk/src/work/athos/lp/lp_glpk.cc	Tue Apr  5 08:41:21 2005
@@ -238,7 +238,7 @@
   }
 
 
-  LpGlpk::SolutionStatus LpGlpk::_solve()
+  LpGlpk::SolveExitStatus LpGlpk::_solve()
   {
     int i=  lpx_simplex(lp);
     switch (i) {
@@ -256,7 +256,7 @@
   }
   
  
-  LpGlpk::SolutionType LpGlpk::_getPrimalType()
+  LpGlpk::SolutionStatus LpGlpk::_getPrimalType()
   {
     int stat=  lpx_get_status(lp);
     switch (stat) {

Modified: hugo/trunk/src/work/athos/lp/lp_glpk.h
==============================================================================
--- hugo/trunk/src/work/athos/lp/lp_glpk.h	(original)
+++ hugo/trunk/src/work/athos/lp/lp_glpk.h	Tue Apr  5 08:41:21 2005
@@ -70,7 +70,7 @@
     
     ///\bug Unimplemented
     ///
-    virtual SolutionStatus _solve();
+    virtual SolveExitStatus _solve();
     ///\e
     
     ///\bug Unimplemented
@@ -80,7 +80,7 @@
     
     ///\bug Unimplemented
     ///
-    virtual SolutionType _getPrimalType();
+    virtual SolutionStatus _getPrimalType();
 
   };
 } //END OF NAMESPACE LEMON

Modified: hugo/trunk/src/work/athos/lp/lp_solver_skeleton.cc
==============================================================================
--- hugo/trunk/src/work/athos/lp/lp_solver_skeleton.cc	(original)
+++ hugo/trunk/src/work/athos/lp/lp_solver_skeleton.cc	Tue Apr  5 08:41:21 2005
@@ -65,7 +65,7 @@
   {
   }
 
-  LpSolverSkeleton::SolutionStatus LpSolverSkeleton::_solve()
+  LpSolverSkeleton::SolveExitStatus LpSolverSkeleton::_solve()
   {
     return SOLVED;
   }
@@ -75,7 +75,7 @@
     return 0;
   }
   
-  LpSolverSkeleton::SolutionType LpSolverSkeleton::_getPrimalType()
+  LpSolverSkeleton::SolutionStatus LpSolverSkeleton::_getPrimalType()
   {
     return OPTIMAL;
   }

Modified: hugo/trunk/src/work/athos/lp/lp_solver_skeleton.h
==============================================================================
--- hugo/trunk/src/work/athos/lp/lp_solver_skeleton.h	(original)
+++ hugo/trunk/src/work/athos/lp/lp_solver_skeleton.h	Tue Apr  5 08:41:21 2005
@@ -82,7 +82,7 @@
     
     ///\bug Wrong interface
     ///
-    virtual SolutionStatus _solve();
+    virtual SolveExitStatus _solve();
 
     ///\e
 
@@ -93,7 +93,7 @@
 
     ///\bug Wrong interface
     ///
-    virtual SolutionType _getPrimalType();
+    virtual SolutionStatus _getPrimalType();
 
   public:
     LpSolverSkeleton() : LpSolverBase(), col_num(0), row_num(0) {}