COIN-OR::LEMON - Graph Library

Changeset 1303:9bcc455da4f5 in lemon-0.x


Ignore:
Timestamp:
04/05/05 08:41:21 (15 years ago)
Author:
Alpar Juttner
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1738
Message:

SolutionStatus? -> SolveExitStatus?
SolutionType? -> SolutionStatus?

Location:
src/work/athos/lp
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • src/work/athos/lp/lp_base.h

    r1295 r1303  
    106106
    107107    ///\e
    108     enum SolutionStatus {
     108    enum SolveExitStatus {
    109109      ///\e
    110110      SOLVED = 0,
     
    114114     
    115115    ///\e
    116     enum SolutionType {
     116    enum SolutionStatus {
    117117      ///Feasible solution has'n been found (but may exist).
    118118
     
    391391    virtual void _setRowUpperBound(int i, Value value) = 0;
    392392    virtual void _setObjCoeff(int i, Value obj_coef) = 0;
    393     virtual SolutionStatus _solve() = 0;
     393    virtual SolveExitStatus _solve() = 0;
    394394    virtual Value _getPrimal(int i) = 0;
    395     virtual SolutionType _getPrimalType() = 0;
     395    virtual SolutionStatus _getPrimalType() = 0;
    396396
    397397
     
    615615
    616616    ///\e
    617     SolutionStatus solve() { return _solve(); }
     617    SolveExitStatus solve() { return _solve(); }
    618618   
    619619    ///@}
     
    624624
    625625    ///\e
    626     SolutionType primalType() {
     626    SolutionStatus primalType() {
    627627      return _getPrimalType();
    628628    }
  • src/work/athos/lp/lp_cplex.cc

    r1299 r1303  
    9292  }
    9393
    94   LpCplex::SolutionType LpCplex::_solve()
     94  LpCplex::SolutionStatus LpCplex::_solve()
    9595  {
    9696    return OPTIMAL;
  • src/work/athos/lp/lp_cplex.h

    r1299 r1303  
    109109    ///\bug Unimplemented
    110110    ///
    111     virtual SolutionType _solve();
     111    virtual SolutionStatus _solve();
    112112    ///\e
    113113   
  • src/work/athos/lp/lp_glpk.cc

    r1300 r1303  
    239239
    240240
    241   LpGlpk::SolutionStatus LpGlpk::_solve()
     241  LpGlpk::SolveExitStatus LpGlpk::_solve()
    242242  {
    243243    int i=  lpx_simplex(lp);
     
    257257 
    258258 
    259   LpGlpk::SolutionType LpGlpk::_getPrimalType()
     259  LpGlpk::SolutionStatus LpGlpk::_getPrimalType()
    260260  {
    261261    int stat=  lpx_get_status(lp);
  • src/work/athos/lp/lp_glpk.h

    r1294 r1303  
    7171    ///\bug Unimplemented
    7272    ///
    73     virtual SolutionStatus _solve();
     73    virtual SolveExitStatus _solve();
    7474    ///\e
    7575   
     
    8181    ///\bug Unimplemented
    8282    ///
    83     virtual SolutionType _getPrimalType();
     83    virtual SolutionStatus _getPrimalType();
    8484
    8585  };
  • src/work/athos/lp/lp_solver_skeleton.cc

    r1294 r1303  
    6666  }
    6767
    68   LpSolverSkeleton::SolutionStatus LpSolverSkeleton::_solve()
     68  LpSolverSkeleton::SolveExitStatus LpSolverSkeleton::_solve()
    6969  {
    7070    return SOLVED;
     
    7676  }
    7777 
    78   LpSolverSkeleton::SolutionType LpSolverSkeleton::_getPrimalType()
     78  LpSolverSkeleton::SolutionStatus LpSolverSkeleton::_getPrimalType()
    7979  {
    8080    return OPTIMAL;
  • src/work/athos/lp/lp_solver_skeleton.h

    r1294 r1303  
    8383    ///\bug Wrong interface
    8484    ///
    85     virtual SolutionStatus _solve();
     85    virtual SolveExitStatus _solve();
    8686
    8787    ///\e
     
    9494    ///\bug Wrong interface
    9595    ///
    96     virtual SolutionType _getPrimalType();
     96    virtual SolutionStatus _getPrimalType();
    9797
    9898  public:
Note: See TracChangeset for help on using the changeset viewer.