LEMON/LEMON-official Changeset - r485:9b082b3fb33f

Repositories » LEMON » LEMON-official

Summary
Changelog
Files
Switch To
- loading...
Options
- Lightweight changelog
- Search
Pull Requests

Changeset - r485:9b082b3fb33f

« 484:08d495

490:a1155a »

r485:9b082b3fb33f

Mon, 12 Jan 2009 13:26:02

[Not Reviewed]

0 comments (0 inline)

alpar (Alpar Juttner)
alpar@cs.elte.hu

Rename Lp*/Mip* to *Lp/*Mip

0 11 0

default

11 files changed with 241 insertions and 241 deletions:

lemon/clp.cc

lemon/clp.h

lemon/cplex.cc

lemon/cplex.h

lemon/glpk.cc

lemon/glpk.h

lemon/lp.h

lemon/soplex.cc

lemon/soplex.h

test/lp_test.cc

test/mip_test.cc

↑ Collapse diff ↑

lemon/clp.cc

Show inline comments

@@ -18,120 +18,120 @@

#include <lemon/clp.h>
#include <coin/ClpSimplex.hpp>

namespace lemon {

  LpClp::LpClp() {
  ClpLp::ClpLp() {
    _prob = new ClpSimplex();
    _init_temporals();
    messageLevel(MESSAGE_NO_OUTPUT);
  }

  LpClp::LpClp(const LpClp& other) {
  ClpLp::ClpLp(const ClpLp& other) {
    _prob = new ClpSimplex(*other._prob);
    rows = other.rows;
    cols = other.cols;
    _init_temporals();
    messageLevel(MESSAGE_NO_OUTPUT);
  }

  LpClp::~LpClp() {
  ClpLp::~ClpLp() {
    delete _prob;
    _clear_temporals();
  }

  void LpClp::_init_temporals() {
  void ClpLp::_init_temporals() {
    _primal_ray = 0;
    _dual_ray = 0;
  }

  void LpClp::_clear_temporals() {
  void ClpLp::_clear_temporals() {
    if (_primal_ray) {
      delete[] _primal_ray;
      _primal_ray = 0;
    }
    if (_dual_ray) {
      delete[] _dual_ray;
      _dual_ray = 0;
    }
  }

  LpClp* LpClp::_newSolver() const {
    LpClp* newlp = new LpClp;
  ClpLp* ClpLp::_newSolver() const {
    ClpLp* newlp = new ClpLp;
    return newlp;
  }

  LpClp* LpClp::_cloneSolver() const {
    LpClp* copylp = new LpClp(*this);
  ClpLp* ClpLp::_cloneSolver() const {
    ClpLp* copylp = new ClpLp(*this);
    return copylp;
  }

  const char* LpClp::_solverName() const { return "LpClp"; }
  const char* ClpLp::_solverName() const { return "ClpLp"; }

  int LpClp::_addCol() {
  int ClpLp::_addCol() {
    _prob->addColumn(0, 0, 0, -COIN_DBL_MAX, COIN_DBL_MAX, 0.0);
    return _prob->numberColumns() - 1;
  }

  int LpClp::_addRow() {
  int ClpLp::_addRow() {
    _prob->addRow(0, 0, 0, -COIN_DBL_MAX, COIN_DBL_MAX);
    return _prob->numberRows() - 1;
  }


  void LpClp::_eraseCol(int c) {
  void ClpLp::_eraseCol(int c) {
    _col_names_ref.erase(_prob->getColumnName(c));
    _prob->deleteColumns(1, &c);
  }

  void LpClp::_eraseRow(int r) {
  void ClpLp::_eraseRow(int r) {
    _row_names_ref.erase(_prob->getRowName(r));
    _prob->deleteRows(1, &r);
  }

  void LpClp::_eraseColId(int i) {
  void ClpLp::_eraseColId(int i) {
    cols.eraseIndex(i);
    cols.shiftIndices(i);
  }

  void LpClp::_eraseRowId(int i) {
  void ClpLp::_eraseRowId(int i) {
    rows.eraseIndex(i);
    rows.shiftIndices(i);
  }

  void LpClp::_getColName(int c, std::string& name) const {
  void ClpLp::_getColName(int c, std::string& name) const {
    name = _prob->getColumnName(c);
  }

  void LpClp::_setColName(int c, const std::string& name) {
  void ClpLp::_setColName(int c, const std::string& name) {
    _prob->setColumnName(c, const_cast<std::string&>(name));
    _col_names_ref[name] = c;
  }

  int LpClp::_colByName(const std::string& name) const {
  int ClpLp::_colByName(const std::string& name) const {
    std::map<std::string, int>::const_iterator it = _col_names_ref.find(name);
    return it != _col_names_ref.end() ? it->second : -1;
  }

  void LpClp::_getRowName(int r, std::string& name) const {
  void ClpLp::_getRowName(int r, std::string& name) const {
    name = _prob->getRowName(r);
  }

  void LpClp::_setRowName(int r, const std::string& name) {
  void ClpLp::_setRowName(int r, const std::string& name) {
    _prob->setRowName(r, const_cast<std::string&>(name));
    _row_names_ref[name] = r;
  }

  int LpClp::_rowByName(const std::string& name) const {
  int ClpLp::_rowByName(const std::string& name) const {
    std::map<std::string, int>::const_iterator it = _row_names_ref.find(name);
    return it != _row_names_ref.end() ? it->second : -1;
  }


  void LpClp::_setRowCoeffs(int ix, ExprIterator b, ExprIterator e) {
  void ClpLp::_setRowCoeffs(int ix, ExprIterator b, ExprIterator e) {
    std::map<int, Value> coeffs;

    int n = _prob->clpMatrix()->getNumCols();

    const int* indices = _prob->clpMatrix()->getIndices();
    const double* elements = _prob->clpMatrix()->getElements();
@@ -153,13 +153,13 @@
    for (std::map<int, Value>::iterator it = coeffs.begin();
         it != coeffs.end(); ++it) {
      _prob->modifyCoefficient(ix, it->first, it->second);
    }
  }

  void LpClp::_getRowCoeffs(int ix, InsertIterator b) const {
  void ClpLp::_getRowCoeffs(int ix, InsertIterator b) const {
    int n = _prob->clpMatrix()->getNumCols();

    const int* indices = _prob->clpMatrix()->getIndices();
    const double* elements = _prob->clpMatrix()->getElements();

    for (int i = 0; i < n; ++i) {
@@ -170,13 +170,13 @@
      if (it != indices + end && *it == ix) {
        *b = std::make_pair(i, elements[it - indices]);
      }
    }
  }

  void LpClp::_setColCoeffs(int ix, ExprIterator b, ExprIterator e) {
  void ClpLp::_setColCoeffs(int ix, ExprIterator b, ExprIterator e) {
    std::map<int, Value> coeffs;

    CoinBigIndex begin = _prob->clpMatrix()->getVectorStarts()[ix];
    CoinBigIndex end = begin + _prob->clpMatrix()->getVectorLengths()[ix];

    const int* indices = _prob->clpMatrix()->getIndices();
@@ -193,30 +193,30 @@
    for (std::map<int, Value>::iterator it = coeffs.begin();
         it != coeffs.end(); ++it) {
      _prob->modifyCoefficient(it->first, ix, it->second);
    }
  }

  void LpClp::_getColCoeffs(int ix, InsertIterator b) const {
  void ClpLp::_getColCoeffs(int ix, InsertIterator b) const {
    CoinBigIndex begin = _prob->clpMatrix()->getVectorStarts()[ix];
    CoinBigIndex end = begin + _prob->clpMatrix()->getVectorLengths()[ix];

    const int* indices = _prob->clpMatrix()->getIndices();
    const double* elements = _prob->clpMatrix()->getElements();

    for (CoinBigIndex i = begin; i != end; ++i) {
      *b = std::make_pair(indices[i], elements[i]);
      ++b;
    }
  }

  void LpClp::_setCoeff(int ix, int jx, Value value) {
  void ClpLp::_setCoeff(int ix, int jx, Value value) {
    _prob->modifyCoefficient(ix, jx, value);
  }

  LpClp::Value LpClp::_getCoeff(int ix, int jx) const {
  ClpLp::Value ClpLp::_getCoeff(int ix, int jx) const {
    CoinBigIndex begin = _prob->clpMatrix()->getVectorStarts()[ix];
    CoinBigIndex end = begin + _prob->clpMatrix()->getVectorLengths()[ix];

    const int* indices = _prob->clpMatrix()->getIndices();
    const double* elements = _prob->clpMatrix()->getElements();

@@ -225,121 +225,121 @@
      return elements[it - indices];
    } else {
      return 0.0;
    }
  }

  void LpClp::_setColLowerBound(int i, Value lo) {
  void ClpLp::_setColLowerBound(int i, Value lo) {
    _prob->setColumnLower(i, lo == - INF ? - COIN_DBL_MAX : lo);
  }

  LpClp::Value LpClp::_getColLowerBound(int i) const {
  ClpLp::Value ClpLp::_getColLowerBound(int i) const {
    double val = _prob->getColLower()[i];
    return val == - COIN_DBL_MAX ? - INF : val;
  }

  void LpClp::_setColUpperBound(int i, Value up) {
  void ClpLp::_setColUpperBound(int i, Value up) {
    _prob->setColumnUpper(i, up == INF ? COIN_DBL_MAX : up);
  }

  LpClp::Value LpClp::_getColUpperBound(int i) const {
  ClpLp::Value ClpLp::_getColUpperBound(int i) const {
    double val = _prob->getColUpper()[i];
    return val == COIN_DBL_MAX ? INF : val;
  }

  void LpClp::_setRowLowerBound(int i, Value lo) {
  void ClpLp::_setRowLowerBound(int i, Value lo) {
    _prob->setRowLower(i, lo == - INF ? - COIN_DBL_MAX : lo);
  }

  LpClp::Value LpClp::_getRowLowerBound(int i) const {
  ClpLp::Value ClpLp::_getRowLowerBound(int i) const {
    double val = _prob->getRowLower()[i];
    return val == - COIN_DBL_MAX ? - INF : val;
  }

  void LpClp::_setRowUpperBound(int i, Value up) {
  void ClpLp::_setRowUpperBound(int i, Value up) {
    _prob->setRowUpper(i, up == INF ? COIN_DBL_MAX : up);
  }

  LpClp::Value LpClp::_getRowUpperBound(int i) const {
  ClpLp::Value ClpLp::_getRowUpperBound(int i) const {
    double val = _prob->getRowUpper()[i];
    return val == COIN_DBL_MAX ? INF : val;
  }

  void LpClp::_setObjCoeffs(ExprIterator b, ExprIterator e) {
  void ClpLp::_setObjCoeffs(ExprIterator b, ExprIterator e) {
    int num = _prob->clpMatrix()->getNumCols();
    for (int i = 0; i < num; ++i) {
      _prob->setObjectiveCoefficient(i, 0.0);
    }
    for (ExprIterator it = b; it != e; ++it) {
      _prob->setObjectiveCoefficient(it->first, it->second);
    }
  }

  void LpClp::_getObjCoeffs(InsertIterator b) const {
  void ClpLp::_getObjCoeffs(InsertIterator b) const {
    int num = _prob->clpMatrix()->getNumCols();
    for (int i = 0; i < num; ++i) {
      Value coef = _prob->getObjCoefficients()[i];
      if (coef != 0.0) {
        *b = std::make_pair(i, coef);
        ++b;
      }
    }
  }

  void LpClp::_setObjCoeff(int i, Value obj_coef) {
  void ClpLp::_setObjCoeff(int i, Value obj_coef) {
    _prob->setObjectiveCoefficient(i, obj_coef);
  }

  LpClp::Value LpClp::_getObjCoeff(int i) const {
  ClpLp::Value ClpLp::_getObjCoeff(int i) const {
    return _prob->getObjCoefficients()[i];
  }

  LpClp::SolveExitStatus LpClp::_solve() {
  ClpLp::SolveExitStatus ClpLp::_solve() {
    return _prob->primal() >= 0 ? SOLVED : UNSOLVED;
  }

  LpClp::SolveExitStatus LpClp::solvePrimal() {
  ClpLp::SolveExitStatus ClpLp::solvePrimal() {
    return _prob->primal() >= 0 ? SOLVED : UNSOLVED;
  }

  LpClp::SolveExitStatus LpClp::solveDual() {
  ClpLp::SolveExitStatus ClpLp::solveDual() {
    return _prob->dual() >= 0 ? SOLVED : UNSOLVED;
  }

  LpClp::SolveExitStatus LpClp::solveBarrier() {
  ClpLp::SolveExitStatus ClpLp::solveBarrier() {
    return _prob->barrier() >= 0 ? SOLVED : UNSOLVED;
  }

  LpClp::Value LpClp::_getPrimal(int i) const {
  ClpLp::Value ClpLp::_getPrimal(int i) const {
    return _prob->primalColumnSolution()[i];
  }
  LpClp::Value LpClp::_getPrimalValue() const {
  ClpLp::Value ClpLp::_getPrimalValue() const {
    return _prob->objectiveValue();
  }

  LpClp::Value LpClp::_getDual(int i) const {
  ClpLp::Value ClpLp::_getDual(int i) const {
    return _prob->dualRowSolution()[i];
  }

  LpClp::Value LpClp::_getPrimalRay(int i) const {
  ClpLp::Value ClpLp::_getPrimalRay(int i) const {
    if (!_primal_ray) {
      _primal_ray = _prob->unboundedRay();
      LEMON_ASSERT(_primal_ray != 0, "Primal ray is not provided");
    }
    return _primal_ray[i];
  }

  LpClp::Value LpClp::_getDualRay(int i) const {
  ClpLp::Value ClpLp::_getDualRay(int i) const {
    if (!_dual_ray) {
      _dual_ray = _prob->infeasibilityRay();
      LEMON_ASSERT(_dual_ray != 0, "Dual ray is not provided");
    }
    return _dual_ray[i];
  }

  LpClp::VarStatus LpClp::_getColStatus(int i) const {
  ClpLp::VarStatus ClpLp::_getColStatus(int i) const {
    switch (_prob->getColumnStatus(i)) {
    case ClpSimplex::basic:
      return BASIC;
    case ClpSimplex::isFree:
      return FREE;
    case ClpSimplex::atUpperBound:
@@ -353,13 +353,13 @@
    default:
      LEMON_ASSERT(false, "Wrong column status");
      return VarStatus();
    }
  }

  LpClp::VarStatus LpClp::_getRowStatus(int i) const {
  ClpLp::VarStatus ClpLp::_getRowStatus(int i) const {
    switch (_prob->getColumnStatus(i)) {
    case ClpSimplex::basic:
      return BASIC;
    case ClpSimplex::isFree:
      return FREE;
    case ClpSimplex::atUpperBound:
@@ -374,64 +374,64 @@
      LEMON_ASSERT(false, "Wrong row status");
      return VarStatus();
    }
  }


  LpClp::ProblemType LpClp::_getPrimalType() const {
  ClpLp::ProblemType ClpLp::_getPrimalType() const {
    if (_prob->isProvenOptimal()) {
      return OPTIMAL;
    } else if (_prob->isProvenPrimalInfeasible()) {
      return INFEASIBLE;
    } else if (_prob->isProvenDualInfeasible()) {
      return UNBOUNDED;
    } else {
      return UNDEFINED;
    }
  }

  LpClp::ProblemType LpClp::_getDualType() const {
  ClpLp::ProblemType ClpLp::_getDualType() const {
    if (_prob->isProvenOptimal()) {
      return OPTIMAL;
    } else if (_prob->isProvenDualInfeasible()) {
      return INFEASIBLE;
    } else if (_prob->isProvenPrimalInfeasible()) {
      return INFEASIBLE;
    } else {
      return UNDEFINED;
    }
  }

  void LpClp::_setSense(LpClp::Sense sense) {
  void ClpLp::_setSense(ClpLp::Sense sense) {
    switch (sense) {
    case MIN:
      _prob->setOptimizationDirection(1);
      break;
    case MAX:
      _prob->setOptimizationDirection(-1);
      break;
    }
  }

  LpClp::Sense LpClp::_getSense() const {
  ClpLp::Sense ClpLp::_getSense() const {
    double dir = _prob->optimizationDirection();
    if (dir > 0.0) {
      return MIN;
    } else {
      return MAX;
    }
  }

  void LpClp::_clear() {
  void ClpLp::_clear() {
    delete _prob;
    _prob = new ClpSimplex();
    rows.clear();
    cols.clear();
    _col_names_ref.clear();
    _clear_temporals();
  }

  void LpClp::messageLevel(MessageLevel m) {
  void ClpLp::messageLevel(MessageLevel m) {
    _prob->setLogLevel(static_cast<int>(m));
  }

} //END OF NAMESPACE LEMON

lemon/clp.h

Show inline comments

@@ -36,41 +36,41 @@
 		  /// \brief Interface for the CLP solver
 		  ///
 		  /// This class implements an interface for the Clp LP solver.  The
 		  /// Clp library is an object oriented lp solver library developed at
 		  /// the IBM. The CLP is part of the COIN-OR package and it can be
 		  /// used with Common Public License.
-		  class LpClp : public LpSolver {
+		  class ClpLp : public LpSolver {
 		  protected:
 		    ClpSimplex* _prob;
 		    std::map<std::string, int> _col_names_ref;
 		    std::map<std::string, int> _row_names_ref;
 		  public:
 		    /// \e
-		    LpClp();
+		    ClpLp();
 		    /// \e
-		    LpClp(const LpClp&);
+		    ClpLp(const ClpLp&);
 		    /// \e
-		    ~LpClp();
+		    ~ClpLp();
 		  protected:
 		    mutable double* _primal_ray;
 		    mutable double* _dual_ray;
 		    void _init_temporals();
 		    void _clear_temporals();
 		  protected:
 		    virtual LpClp* _newSolver() const;
 		    virtual LpClp* _cloneSolver() const;
 		    virtual ClpLp* _newSolver() const;
 		    virtual ClpLp* _cloneSolver() const;
 		    virtual const char* _solverName() const;
 		    virtual int _addCol();
 		    virtual int _addRow();

lemon/cplex.cc

Show inline comments

@@ -435,31 +435,31 @@
 		    int status;
 		    _prob = CPXcreateprob(cplexEnv(), &status, "Cplex problem");
 		    rows.clear();
 		    cols.clear();
+		  }
-		  // LpCplex members
+		  // CplexLp members
-		  LpCplex::LpCplex()
+		  CplexLp::CplexLp()
 		    : LpBase(), CplexBase(), LpSolver() {}
-		  LpCplex::LpCplex(const CplexEnv& env)
+		  CplexLp::CplexLp(const CplexEnv& env)
 		    : LpBase(), CplexBase(env), LpSolver() {}
-		  LpCplex::LpCplex(const LpCplex& other)
+		  CplexLp::CplexLp(const CplexLp& other)
 		    : LpBase(), CplexBase(other), LpSolver() {}
-		  LpCplex::~LpCplex() {}
+		  CplexLp::~CplexLp() {}
 		  LpCplex* LpCplex::_newSolver() const { return new LpCplex; }
 		  LpCplex* LpCplex::_cloneSolver() const {return new LpCplex(*this); }
 		  CplexLp* CplexLp::_newSolver() const { return new CplexLp; }
 		  CplexLp* CplexLp::_cloneSolver() const {return new CplexLp(*this); }
-		  const char* LpCplex::_solverName() const { return "LpCplex"; }
+		  const char* CplexLp::_solverName() const { return "CplexLp"; }
-		  void LpCplex::_clear_temporals() {
+		  void CplexLp::_clear_temporals() {
 		    _col_status.clear();
 		    _row_status.clear();
 		    _primal_ray.clear();
 		    _dual_ray.clear();
+		  }
@@ -469,13 +469,13 @@
 		  // CPLEX problem object (CPXERR_NO_PROBLEM). Exceeding a
 		  // user-specified CPLEX limit, or proving the model infeasible or
 		  // unbounded, are not considered errors. Note that a zero return
 		  // value does not necessarily mean that a solution exists. Use query
 		  // routines CPXsolninfo, CPXgetstat, and CPXsolution to obtain
 		  // further information about the status of the optimization.
-		  LpCplex::SolveExitStatus LpCplex::convertStatus(int status) {
+		  CplexLp::SolveExitStatus CplexLp::convertStatus(int status) {
 		#if CPX_VERSION >= 800
 		    if (status == 0) {
 		      switch (CPXgetstat(cplexEnv(), _prob)) {
 		      case CPX_STAT_OPTIMAL:
 		      case CPX_STAT_INFEASIBLE:
 		      case CPX_STAT_UNBOUNDED:
@@ -502,51 +502,51 @@
 		    } else {
 		      return UNSOLVED;
+		    }
 		#endif
+		  }
-		  LpCplex::SolveExitStatus LpCplex::_solve() {
+		  CplexLp::SolveExitStatus CplexLp::_solve() {
 		    _clear_temporals();
 		    return convertStatus(CPXlpopt(cplexEnv(), _prob));
+		  }
-		  LpCplex::SolveExitStatus LpCplex::solvePrimal() {
+		  CplexLp::SolveExitStatus CplexLp::solvePrimal() {
 		    _clear_temporals();
 		    return convertStatus(CPXprimopt(cplexEnv(), _prob));
+		  }
-		  LpCplex::SolveExitStatus LpCplex::solveDual() {
+		  CplexLp::SolveExitStatus CplexLp::solveDual() {
 		    _clear_temporals();
 		    return convertStatus(CPXdualopt(cplexEnv(), _prob));
+		  }
-		  LpCplex::SolveExitStatus LpCplex::solveBarrier() {
+		  CplexLp::SolveExitStatus CplexLp::solveBarrier() {
 		    _clear_temporals();
 		    return convertStatus(CPXbaropt(cplexEnv(), _prob));
+		  }
-		  LpCplex::Value LpCplex::_getPrimal(int i) const {
+		  CplexLp::Value CplexLp::_getPrimal(int i) const {
 		    Value x;
 		    CPXgetx(cplexEnv(), _prob, &x, i, i);
 		    return x;
+		  }
-		  LpCplex::Value LpCplex::_getDual(int i) const {
+		  CplexLp::Value CplexLp::_getDual(int i) const {
 		    Value y;
 		    CPXgetpi(cplexEnv(), _prob, &y, i, i);
 		    return y;
+		  }
-		  LpCplex::Value LpCplex::_getPrimalValue() const {
+		  CplexLp::Value CplexLp::_getPrimalValue() const {
 		    Value objval;
 		    CPXgetobjval(cplexEnv(), _prob, &objval);
 		    return objval;
+		  }
-		  LpCplex::VarStatus LpCplex::_getColStatus(int i) const {
+		  CplexLp::VarStatus CplexLp::_getColStatus(int i) const {
 		    if (_col_status.empty()) {
 		      _col_status.resize(CPXgetnumcols(cplexEnv(), _prob));
 		      CPXgetbase(cplexEnv(), _prob, &_col_status.front(), 0);
+		    }
 		    switch (_col_status[i]) {
 		    case CPX_BASIC:
@@ -556,17 +556,17 @@
 		    case CPX_AT_LOWER:
 		      return LOWER;
 		    case CPX_AT_UPPER:
 		      return UPPER;
 		    default:
 		      LEMON_ASSERT(false, "Wrong column status");
-		      return LpCplex::VarStatus();
+		      return CplexLp::VarStatus();
+		    }
+		  }
-		  LpCplex::VarStatus LpCplex::_getRowStatus(int i) const {
+		  CplexLp::VarStatus CplexLp::_getRowStatus(int i) const {
 		    if (_row_status.empty()) {
 		      _row_status.resize(CPXgetnumrows(cplexEnv(), _prob));
 		      CPXgetbase(cplexEnv(), _prob, 0, &_row_status.front());
+		    }
 		    switch (_row_status[i]) {
 		    case CPX_BASIC:
@@ -578,25 +578,25 @@
 		        return s != 'L' ? LOWER : UPPER;
+		      }
 		    case CPX_AT_UPPER:
 		      return UPPER;
 		    default:
 		      LEMON_ASSERT(false, "Wrong row status");
-		      return LpCplex::VarStatus();
+		      return CplexLp::VarStatus();
+		    }
+		  }
-		  LpCplex::Value LpCplex::_getPrimalRay(int i) const {
+		  CplexLp::Value CplexLp::_getPrimalRay(int i) const {
 		    if (_primal_ray.empty()) {
 		      _primal_ray.resize(CPXgetnumcols(cplexEnv(), _prob));
 		      CPXgetray(cplexEnv(), _prob, &_primal_ray.front());
+		    }
 		    return _primal_ray[i];
+		  }
-		  LpCplex::Value LpCplex::_getDualRay(int i) const {
+		  CplexLp::Value CplexLp::_getDualRay(int i) const {
 		    if (_dual_ray.empty()) {
+		    }
 		    return _dual_ray[i];
+		  }
@@ -683,13 +683,13 @@
+		    }
+		  }
 		#else
 		  void statusSwitch(CPXENVptr,int&){}
 		#endif
-		  LpCplex::ProblemType LpCplex::_getPrimalType() const {
+		  CplexLp::ProblemType CplexLp::_getPrimalType() const {
 		    // Unboundedness not treated well: the following is from cplex 9.0 doc
 		    // About Unboundedness
 		    // The treatment of models that are unbounded involves a few
 		    // subtleties. Specifically, a declaration of unboundedness means that
 		    // ILOG CPLEX has determined that the model has an unbounded
@@ -765,13 +765,13 @@
 		  // CPX_STAT_OPTIMAL
 		  // CPX_STAT_OPTIMAL_FACE_UNBOUNDED
 		  // CPX_STAT_OPTIMAL_INFEAS
 		  // CPX_STAT_OPTIMAL_RELAXED
 		  // CPX_STAT_UNBOUNDED
-		  LpCplex::ProblemType LpCplex::_getDualType() const {
+		  CplexLp::ProblemType CplexLp::_getDualType() const {
 		    int stat = CPXgetstat(cplexEnv(), _prob);
 		#if CPX_VERSION >= 800
 		    switch (stat) {
 		    case CPX_STAT_OPTIMAL:
 		      return OPTIMAL;
 		    case CPX_STAT_UNBOUNDED:
@@ -792,46 +792,46 @@
 		      return UNDEFINED; //Everything else comes here
 		      //FIXME error
+		    }
 		#endif
+		  }
-		  // MipCplex members
+		  // CplexMip members
-		  MipCplex::MipCplex()
+		  CplexMip::CplexMip()
 		    : LpBase(), CplexBase(), MipSolver() {
 		#if CPX_VERSION < 800
 		    CPXchgprobtype(cplexEnv(),  _prob, CPXPROB_MIP);
 		#else
 		    CPXchgprobtype(cplexEnv(),  _prob, CPXPROB_MILP);
 		#endif
+		  }
-		  MipCplex::MipCplex(const CplexEnv& env)
+		  CplexMip::CplexMip(const CplexEnv& env)
 		    : LpBase(), CplexBase(env), MipSolver() {
 		#if CPX_VERSION < 800
 		    CPXchgprobtype(cplexEnv(),  _prob, CPXPROB_MIP);
 		#else
 		    CPXchgprobtype(cplexEnv(),  _prob, CPXPROB_MILP);
 		#endif
+		  }
-		  MipCplex::MipCplex(const MipCplex& other)
+		  CplexMip::CplexMip(const CplexMip& other)
 		    : LpBase(), CplexBase(other), MipSolver() {}
-		  MipCplex::~MipCplex() {}
+		  CplexMip::~CplexMip() {}
 		  MipCplex* MipCplex::_newSolver() const { return new MipCplex; }
 		  MipCplex* MipCplex::_cloneSolver() const {return new MipCplex(*this); }
 		  CplexMip* CplexMip::_newSolver() const { return new CplexMip; }
 		  CplexMip* CplexMip::_cloneSolver() const {return new CplexMip(*this); }
-		  const char* MipCplex::_solverName() const { return "MipCplex"; }
+		  const char* CplexMip::_solverName() const { return "CplexMip"; }
-		  void MipCplex::_setColType(int i, MipCplex::ColTypes col_type) {
+		  void CplexMip::_setColType(int i, CplexMip::ColTypes col_type) {
 		    // Note If a variable is to be changed to binary, a call to CPXchgbds
 		    // should also be made to change the bounds to 0 and 1.
 		    switch (col_type){
 		    case INTEGER: {
@@ -844,13 +844,13 @@
 		    } break;
 		    default:
 		      break;
+		    }
+		  }
-		  MipCplex::ColTypes MipCplex::_getColType(int i) const {
+		  CplexMip::ColTypes CplexMip::_getColType(int i) const {
 		    char t;
 		    CPXgetctype (cplexEnv(), _prob, &t, i, i);
 		    switch (t) {
 		    case 'I':
 		      return INTEGER;
 		    case 'C':
@@ -859,24 +859,24 @@
 		      LEMON_ASSERT(false, "Invalid column type");
 		      return ColTypes();
+		    }
+		  }
-		  MipCplex::SolveExitStatus MipCplex::_solve() {
+		  CplexMip::SolveExitStatus CplexMip::_solve() {
 		    int status;
 		    status = CPXmipopt (cplexEnv(), _prob);
 		    if (status==0)
 		      return SOLVED;
 		    else
 		      return UNSOLVED;
+		  }
-		  MipCplex::ProblemType MipCplex::_getType() const {
+		  CplexMip::ProblemType CplexMip::_getType() const {
 		    int stat = CPXgetstat(cplexEnv(), _prob);
 		    //Fortunately, MIP statuses did not change for cplex 8.0
 		    switch (stat) {
 		    case CPXMIP_OPTIMAL:
@@ -906,19 +906,19 @@
 		    // unbounded. Note that ILOG CPLEX has not necessarily concluded that
 		    // a feasible solution exists. Users can call the routine CPXsolninfo
 		    // to determine whether ILOG CPLEX has also concluded that the model
 		    // has a feasible solution.
+		  }
-		  MipCplex::Value MipCplex::_getSol(int i) const {
+		  CplexMip::Value CplexMip::_getSol(int i) const {
 		    Value x;
 		    CPXgetmipx(cplexEnv(), _prob, &x, i, i);
 		    return x;
+		  }
-		  MipCplex::Value MipCplex::_getSolValue() const {
+		  CplexMip::Value CplexMip::_getSolValue() const {
 		    Value objval;
 		    CPXgetmipobjval(cplexEnv(), _prob, &objval);
 		    return objval;
+		  }
 		} //namespace lemon

lemon/cplex.h

Show inline comments

@@ -157,22 +157,22 @@
 		  };
 		  /// \brief Interface for the CPLEX LP solver
 		  ///
 		  /// This class implements an interface for the CPLEX LP solver.
 		  ///\ingroup lp_group
-		  class LpCplex : public CplexBase, public LpSolver {
+		  class CplexLp : public CplexBase, public LpSolver {
 		  public:
 		    /// \e
-		    LpCplex();
+		    CplexLp();
 		    /// \e
-		    LpCplex(const CplexEnv&);
+		    CplexLp(const CplexEnv&);
 		    /// \e
-		    LpCplex(const LpCplex&);
+		    CplexLp(const CplexLp&);
 		    /// \e
-		    virtual ~LpCplex();
+		    virtual ~CplexLp();
 		  private:
 		    // these values cannot retrieved element by element
 		    mutable std::vector<int> _col_status;
 		    mutable std::vector<int> _row_status;
@@ -183,14 +183,14 @@
 		    void _clear_temporals();
 		    SolveExitStatus convertStatus(int status);
 		  protected:
 		    virtual LpCplex* _cloneSolver() const;
 		    virtual LpCplex* _newSolver() const;
 		    virtual CplexLp* _cloneSolver() const;
 		    virtual CplexLp* _newSolver() const;
 		    virtual const char* _solverName() const;
 		    virtual SolveExitStatus _solve();
 		    virtual Value _getPrimal(int i) const;
 		    virtual Value _getDual(int i) const;
@@ -219,27 +219,27 @@
 		  };
 		  /// \brief Interface for the CPLEX MIP solver
 		  ///
 		  /// This class implements an interface for the CPLEX MIP solver.
 		  ///\ingroup lp_group
-		  class MipCplex : public CplexBase, public MipSolver {
+		  class CplexMip : public CplexBase, public MipSolver {
 		  public:
 		    /// \e
-		    MipCplex();
+		    CplexMip();
 		    /// \e
-		    MipCplex(const CplexEnv&);
+		    CplexMip(const CplexEnv&);
 		    /// \e
-		    MipCplex(const MipCplex&);
+		    CplexMip(const CplexMip&);
 		    /// \e
-		    virtual ~MipCplex();
+		    virtual ~CplexMip();
 		  protected:
 		    virtual MipCplex* _cloneSolver() const;
 		    virtual MipCplex* _newSolver() const;
 		    virtual CplexMip* _cloneSolver() const;
 		    virtual CplexMip* _newSolver() const;
 		    virtual const char* _solverName() const;
 		    virtual ColTypes _getColType(int col) const;
 		    virtual void _setColType(int col, ColTypes col_type);

lemon/glpk.cc

Show inline comments

@@ -519,39 +519,39 @@
 		  void GlpkBase::_clear() {
 		    glp_erase_prob(lp);
 		    rows.clear();
 		    cols.clear();
+		  }
-		  // LpGlpk members
+		  // GlpkLp members
-		  LpGlpk::LpGlpk()
+		  GlpkLp::GlpkLp()
 		    : LpBase(), GlpkBase(), LpSolver() {
 		    messageLevel(MESSAGE_NO_OUTPUT);
+		  }
-		  LpGlpk::LpGlpk(const LpGlpk& other)
+		  GlpkLp::GlpkLp(const GlpkLp& other)
 		    : LpBase(other), GlpkBase(other), LpSolver(other) {
 		    messageLevel(MESSAGE_NO_OUTPUT);
+		  }
 		  LpGlpk* LpGlpk::_newSolver() const { return new LpGlpk; }
 		  LpGlpk* LpGlpk::_cloneSolver() const { return new LpGlpk(*this); }
 		  GlpkLp* GlpkLp::_newSolver() const { return new GlpkLp; }
 		  GlpkLp* GlpkLp::_cloneSolver() const { return new GlpkLp(*this); }
-		  const char* LpGlpk::_solverName() const { return "LpGlpk"; }
+		  const char* GlpkLp::_solverName() const { return "GlpkLp"; }
-		  void LpGlpk::_clear_temporals() {
+		  void GlpkLp::_clear_temporals() {
 		    _primal_ray.clear();
 		    _dual_ray.clear();
+		  }
-		  LpGlpk::SolveExitStatus LpGlpk::_solve() {
+		  GlpkLp::SolveExitStatus GlpkLp::_solve() {
 		    return solvePrimal();
+		  }
-		  LpGlpk::SolveExitStatus LpGlpk::solvePrimal() {
+		  GlpkLp::SolveExitStatus GlpkLp::solvePrimal() {
 		    _clear_temporals();
 		    glp_smcp smcp;
 		    glp_init_smcp(&smcp);
 		    switch (_message_level) {
@@ -570,13 +570,13 @@
+		    }
 		    if (glp_simplex(lp, &smcp) != 0) return UNSOLVED;
 		    return SOLVED;
+		  }
-		  LpGlpk::SolveExitStatus LpGlpk::solveDual() {
+		  GlpkLp::SolveExitStatus GlpkLp::solveDual() {
 		    _clear_temporals();
 		    glp_smcp smcp;
 		    glp_init_smcp(&smcp);
 		    switch (_message_level) {
@@ -596,25 +596,25 @@
 		    smcp.meth = GLP_DUAL;
 		    if (glp_simplex(lp, &smcp) != 0) return UNSOLVED;
 		    return SOLVED;
+		  }
-		  LpGlpk::Value LpGlpk::_getPrimal(int i) const {
+		  GlpkLp::Value GlpkLp::_getPrimal(int i) const {
 		    return glp_get_col_prim(lp, i);
+		  }
-		  LpGlpk::Value LpGlpk::_getDual(int i) const {
+		  GlpkLp::Value GlpkLp::_getDual(int i) const {
 		    return glp_get_row_dual(lp, i);
+		  }
-		  LpGlpk::Value LpGlpk::_getPrimalValue() const {
+		  GlpkLp::Value GlpkLp::_getPrimalValue() const {
 		    return glp_get_obj_val(lp);
+		  }
-		  LpGlpk::VarStatus LpGlpk::_getColStatus(int i) const {
+		  GlpkLp::VarStatus GlpkLp::_getColStatus(int i) const {
 		    switch (glp_get_col_stat(lp, i)) {
 		    case GLP_BS:
 		      return BASIC;
 		    case GLP_UP:
 		      return UPPER;
 		    case GLP_LO:
@@ -622,17 +622,17 @@
 		    case GLP_NF:
 		      return FREE;
 		    case GLP_NS:
 		      return FIXED;
 		    default:
 		      LEMON_ASSERT(false, "Wrong column status");
-		      return LpGlpk::VarStatus();
+		      return GlpkLp::VarStatus();
+		    }
+		  }
-		  LpGlpk::VarStatus LpGlpk::_getRowStatus(int i) const {
+		  GlpkLp::VarStatus GlpkLp::_getRowStatus(int i) const {
 		    switch (glp_get_row_stat(lp, i)) {
 		    case GLP_BS:
 		      return BASIC;
 		    case GLP_UP:
 		      return UPPER;
 		    case GLP_LO:
@@ -640,17 +640,17 @@
 		    case GLP_NF:
 		      return FREE;
 		    case GLP_NS:
 		      return FIXED;
 		    default:
 		      LEMON_ASSERT(false, "Wrong row status");
-		      return LpGlpk::VarStatus();
+		      return GlpkLp::VarStatus();
+		    }
+		  }
-		  LpGlpk::Value LpGlpk::_getPrimalRay(int i) const {
+		  GlpkLp::Value GlpkLp::_getPrimalRay(int i) const {
 		    if (_primal_ray.empty()) {
 		      int row_num = glp_get_num_rows(lp);
 		      int col_num = glp_get_num_cols(lp);
 		      _primal_ray.resize(col_num + 1, 0.0);
@@ -696,13 +696,13 @@
+		        }
+		      }
+		    }
 		    return _primal_ray[i];
+		  }
-		  LpGlpk::Value LpGlpk::_getDualRay(int i) const {
+		  GlpkLp::Value GlpkLp::_getDualRay(int i) const {
 		    if (_dual_ray.empty()) {
 		      int row_num = glp_get_num_rows(lp);
 		      _dual_ray.resize(row_num + 1, 0.0);
 		      int index = glp_get_unbnd_ray(lp);
@@ -768,13 +768,13 @@
+		        }
+		      }
+		    }
 		    return _dual_ray[i];
+		  }
-		  LpGlpk::ProblemType LpGlpk::_getPrimalType() const {
+		  GlpkLp::ProblemType GlpkLp::_getPrimalType() const {
 		    if (glp_get_status(lp) == GLP_OPT)
 		      return OPTIMAL;
 		    switch (glp_get_prim_stat(lp)) {
 		    case GLP_UNDEF:
 		      return UNDEFINED;
 		    case GLP_FEAS:
@@ -785,17 +785,17 @@
 		        return UNDEFINED;
+		      }
 		    case GLP_NOFEAS:
 		      return INFEASIBLE;
 		    default:
 		      LEMON_ASSERT(false, "Wrong primal type");
-		      return  LpGlpk::ProblemType();
+		      return  GlpkLp::ProblemType();
+		    }
+		  }
-		  LpGlpk::ProblemType LpGlpk::_getDualType() const {
+		  GlpkLp::ProblemType GlpkLp::_getDualType() const {
 		    if (glp_get_status(lp) == GLP_OPT)
 		      return OPTIMAL;
 		    switch (glp_get_dual_stat(lp)) {
 		    case GLP_UNDEF:
 		      return UNDEFINED;
 		    case GLP_FEAS:
@@ -806,59 +806,59 @@
 		        return UNDEFINED;
+		      }
 		    case GLP_NOFEAS:
 		      return INFEASIBLE;
 		    default:
 		      LEMON_ASSERT(false, "Wrong primal type");
-		      return  LpGlpk::ProblemType();
+		      return  GlpkLp::ProblemType();
+		    }
+		  }
-		  void LpGlpk::presolver(bool b) {
+		  void GlpkLp::presolver(bool b) {
 		    lpx_set_int_parm(lp, LPX_K_PRESOL, b ? 1 : 0);
+		  }
-		  void LpGlpk::messageLevel(MessageLevel m) {
+		  void GlpkLp::messageLevel(MessageLevel m) {
 		    _message_level = m;
+		  }
-		  // MipGlpk members
+		  // GlpkMip members
-		  MipGlpk::MipGlpk()
+		  GlpkMip::GlpkMip()
 		    : LpBase(), GlpkBase(), MipSolver() {
 		    messageLevel(MESSAGE_NO_OUTPUT);
+		  }
-		  MipGlpk::MipGlpk(const MipGlpk& other)
+		  GlpkMip::GlpkMip(const GlpkMip& other)
 		    : LpBase(), GlpkBase(other), MipSolver() {
 		    messageLevel(MESSAGE_NO_OUTPUT);
+		  }
-		  void MipGlpk::_setColType(int i, MipGlpk::ColTypes col_type) {
+		  void GlpkMip::_setColType(int i, GlpkMip::ColTypes col_type) {
 		    switch (col_type) {
 		    case INTEGER:
 		      glp_set_col_kind(lp, i, GLP_IV);
 		      break;
 		    case REAL:
 		      glp_set_col_kind(lp, i, GLP_CV);
 		      break;
+		    }
+		  }
-		  MipGlpk::ColTypes MipGlpk::_getColType(int i) const {
+		  GlpkMip::ColTypes GlpkMip::_getColType(int i) const {
 		    switch (glp_get_col_kind(lp, i)) {
 		    case GLP_IV:
 		    case GLP_BV:
 		      return INTEGER;
 		    default:
 		      return REAL;
+		    }
+		  }
-		  MipGlpk::SolveExitStatus MipGlpk::_solve() {
+		  GlpkMip::SolveExitStatus GlpkMip::_solve() {
 		    glp_smcp smcp;
 		    glp_init_smcp(&smcp);
 		    switch (_message_level) {
 		    case MESSAGE_NO_OUTPUT:
 		      smcp.msg_lev = GLP_MSG_OFF;
@@ -898,13 +898,13 @@
 		    if (glp_intopt(lp, &iocp) != 0) return UNSOLVED;
 		    return SOLVED;
+		  }
-		  MipGlpk::ProblemType MipGlpk::_getType() const {
+		  GlpkMip::ProblemType GlpkMip::_getType() const {
 		    switch (glp_get_status(lp)) {
 		    case GLP_OPT:
 		      switch (glp_mip_status(lp)) {
 		      case GLP_UNDEF:
 		        return UNDEFINED;
 		      case GLP_NOFEAS:
@@ -912,41 +912,41 @@
 		      case GLP_FEAS:
 		        return FEASIBLE;
 		      case GLP_OPT:
 		        return OPTIMAL;
 		      default:
 		        LEMON_ASSERT(false, "Wrong problem type.");
-		        return MipGlpk::ProblemType();
+		        return GlpkMip::ProblemType();
+		      }
 		    case GLP_NOFEAS:
 		      return INFEASIBLE;
 		    case GLP_INFEAS:
 		    case GLP_FEAS:
 		      if (glp_get_dual_stat(lp) == GLP_NOFEAS) {
 		        return UNBOUNDED;
 		      } else {
 		        return UNDEFINED;
+		      }
 		    default:
 		      LEMON_ASSERT(false, "Wrong problem type.");
-		      return MipGlpk::ProblemType();
+		      return GlpkMip::ProblemType();
+		    }
+		  }
-		  MipGlpk::Value MipGlpk::_getSol(int i) const {
+		  GlpkMip::Value GlpkMip::_getSol(int i) const {
 		    return glp_mip_col_val(lp, i);
+		  }
-		  MipGlpk::Value MipGlpk::_getSolValue() const {
+		  GlpkMip::Value GlpkMip::_getSolValue() const {
 		    return glp_mip_obj_val(lp);
+		  }
 		  MipGlpk* MipGlpk::_newSolver() const { return new MipGlpk; }
 		  MipGlpk* MipGlpk::_cloneSolver() const {return new MipGlpk(*this); }
 		  GlpkMip* GlpkMip::_newSolver() const { return new GlpkMip; }
 		  GlpkMip* GlpkMip::_cloneSolver() const {return new GlpkMip(*this); }
-		  const char* MipGlpk::_solverName() const { return "MipGlpk"; }
+		  const char* GlpkMip::_solverName() const { return "GlpkMip"; }
-		  void MipGlpk::messageLevel(MessageLevel m) {
+		  void GlpkMip::messageLevel(MessageLevel m) {
 		    _message_level = m;
+		  }
 		} //END OF NAMESPACE LEMON

lemon/glpk.h

Show inline comments

@@ -116,31 +116,31 @@
 		  };
 		  /// \brief Interface for the GLPK LP solver
 		  ///
 		  /// This class implements an interface for the GLPK LP solver.
 		  ///\ingroup lp_group
-		  class LpGlpk : public GlpkBase, public LpSolver {
+		  class GlpkLp : public GlpkBase, public LpSolver {
 		  public:
 		    ///\e
-		    LpGlpk();
+		    GlpkLp();
 		    ///\e
-		    LpGlpk(const LpGlpk&);
+		    GlpkLp(const GlpkLp&);
 		  private:
 		    mutable std::vector<double> _primal_ray;
 		    mutable std::vector<double> _dual_ray;
 		    void _clear_temporals();
 		  protected:
 		    virtual LpGlpk* _cloneSolver() const;
 		    virtual LpGlpk* _newSolver() const;
 		    virtual GlpkLp* _cloneSolver() const;
 		    virtual GlpkLp* _newSolver() const;
 		    virtual const char* _solverName() const;
 		    virtual SolveExitStatus _solve();
 		    virtual Value _getPrimal(int i) const;
 		    virtual Value _getDual(int i) const;
@@ -200,24 +200,24 @@
 		  };
 		  /// \brief Interface for the GLPK MIP solver
 		  ///
 		  /// This class implements an interface for the GLPK MIP solver.
 		  ///\ingroup lp_group
-		  class MipGlpk : public GlpkBase, public MipSolver {
+		  class GlpkMip : public GlpkBase, public MipSolver {
 		  public:
 		    ///\e
-		    MipGlpk();
+		    GlpkMip();
 		    ///\e
-		    MipGlpk(const MipGlpk&);
+		    GlpkMip(const GlpkMip&);
 		  protected:
 		    virtual MipGlpk* _cloneSolver() const;
 		    virtual MipGlpk* _newSolver() const;
 		    virtual GlpkMip* _cloneSolver() const;
 		    virtual GlpkMip* _newSolver() const;
 		    virtual const char* _solverName() const;
 		    virtual ColTypes _getColType(int col) const;
 		    virtual void _setColType(int col, ColTypes col_type);

lemon/lp.h

Show inline comments

@@ -48,14 +48,14 @@
 		#define LEMON_DEFAULT_LP SOLVER
 		  ///The default LP solver
 		  ///The default LP solver.
 		  ///\ingroup lp_group
 		  ///
 		  ///Currently, it is either \c LpGlpk, \c LpCplex, \c LpSoplex or \c LpClp
 		  typedef LpGlpk Lp;
 		  ///Currently, it is either \c GlpkLp, \c CplexLp, \c SoplexLp or \c ClpLp
 		  typedef GlpkLp Lp;
 		  ///The default MIP solver identifier
 		  ///The default MIP solver identifier.
 		  ///\ingroup lp_group
 		  ///
@@ -63,31 +63,31 @@
 		#define LEMON_DEFAULT_MIP SOLVER
 		  ///The default MIP solver.
 		  ///The default MIP solver.
 		  ///\ingroup lp_group
 		  ///
 		  ///Currently, it is either \c MipGlpk or \c MipCplex
 		  typedef MipGlpk Mip;
 		  ///Currently, it is either \c GlpkMip or \c CplexMip
 		  typedef GlpkMip Mip;
 		#else
 		#ifdef HAVE_GLPK
 		# define LEMON_DEFAULT_LP GLPK
-		  typedef LpGlpk Lp;
+		  typedef GlpkLp Lp;
 		# define LEMON_DEFAULT_MIP GLPK
-		  typedef MipGlpk Mip;
+		  typedef GlpkMip Mip;
 		#elif HAVE_CPLEX
 		# define LEMON_DEFAULT_LP CPLEX
-		  typedef LpCplex Lp;
+		  typedef CplexLp Lp;
 		# define LEMON_DEFAULT_MIP CPLEX
-		  typedef MipCplex Mip;
+		  typedef CplexMip Mip;
 		#elif HAVE_SOPLEX
 		# define DEFAULT_LP SOPLEX
-		  typedef LpSoplex Lp;
+		  typedef SoplexLp Lp;
 		#elif HAVE_CLP
 		# define DEFAULT_LP CLP
-		  typedef LpClp Lp;
+		  typedef ClpLp Lp;
 		#endif
 		#endif
 		} //namespace lemon
 		#endif //LEMON_LP_H

lemon/soplex.cc

Show inline comments

@@ -23,21 +23,21 @@
 		///\file
 		///\brief Implementation of the LEMON-SOPLEX lp solver interface.
 		namespace lemon {
-		  LpSoplex::LpSoplex() {
+		  SoplexLp::SoplexLp() {
 		    soplex = new soplex::SoPlex;
+		  }
-		  LpSoplex::~LpSoplex() {
+		  SoplexLp::~SoplexLp() {
 		    delete soplex;
+		  }
-		  LpSoplex::LpSoplex(const LpSoplex& lp) {
+		  SoplexLp::SoplexLp(const SoplexLp& lp) {
 		    rows = lp.rows;
 		    cols = lp.cols;
 		    soplex = new soplex::SoPlex;
 		    (*static_cast<soplex::SPxLP*>(soplex)) = *(lp.soplex);
@@ -46,232 +46,232 @@
 		    _row_names = lp._row_names;
 		    _row_names_ref = lp._row_names_ref;
+		  }
-		  void LpSoplex::_clear_temporals() {
+		  void SoplexLp::_clear_temporals() {
 		    _primal_values.clear();
 		    _dual_values.clear();
+		  }
 		  LpSoplex* LpSoplex::_newSolver() const {
 		    LpSoplex* newlp = new LpSoplex();
 		  SoplexLp* SoplexLp::_newSolver() const {
 		    SoplexLp* newlp = new SoplexLp();
 		    return newlp;
+		  }
 		  LpSoplex* LpSoplex::_cloneSolver() const {
 		    LpSoplex* newlp = new LpSoplex(*this);
 		  SoplexLp* SoplexLp::_cloneSolver() const {
 		    SoplexLp* newlp = new SoplexLp(*this);
 		    return newlp;
+		  }
-		  const char* LpSoplex::_solverName() const { return "LpSoplex"; }
+		  const char* SoplexLp::_solverName() const { return "SoplexLp"; }
-		  int LpSoplex::_addCol() {
+		  int SoplexLp::_addCol() {
 		    soplex::LPCol c;
 		    c.setLower(-soplex::infinity);
 		    c.setUpper(soplex::infinity);
 		    soplex->addCol(c);
 		    _col_names.push_back(std::string());
 		    return soplex->nCols() - 1;
+		  }
-		  int LpSoplex::_addRow() {
+		  int SoplexLp::_addRow() {
 		    soplex::LPRow r;
 		    r.setLhs(-soplex::infinity);
 		    r.setRhs(soplex::infinity);
 		    soplex->addRow(r);
 		    _row_names.push_back(std::string());
 		    return soplex->nRows() - 1;
+		  }
-		  void LpSoplex::_eraseCol(int i) {
+		  void SoplexLp::_eraseCol(int i) {
 		    soplex->removeCol(i);
 		    _col_names_ref.erase(_col_names[i]);
 		    _col_names[i] = _col_names.back();
 		    _col_names_ref[_col_names.back()] = i;
 		    _col_names.pop_back();
+		  }
-		  void LpSoplex::_eraseRow(int i) {
+		  void SoplexLp::_eraseRow(int i) {
 		    soplex->removeRow(i);
 		    _row_names_ref.erase(_row_names[i]);
 		    _row_names[i] = _row_names.back();
 		    _row_names_ref[_row_names.back()] = i;
 		    _row_names.pop_back();
+		  }
-		  void LpSoplex::_eraseColId(int i) {
+		  void SoplexLp::_eraseColId(int i) {
 		    cols.eraseIndex(i);
 		    cols.relocateIndex(i, cols.maxIndex());
+		  }
-		  void LpSoplex::_eraseRowId(int i) {
+		  void SoplexLp::_eraseRowId(int i) {
 		    rows.eraseIndex(i);
 		    rows.relocateIndex(i, rows.maxIndex());
+		  }
-		  void LpSoplex::_getColName(int c, std::string &name) const {
+		  void SoplexLp::_getColName(int c, std::string &name) const {
 		    name = _col_names[c];
+		  }
-		  void LpSoplex::_setColName(int c, const std::string &name) {
+		  void SoplexLp::_setColName(int c, const std::string &name) {
 		    _col_names_ref.erase(_col_names[c]);
 		    _col_names[c] = name;
 		    if (!name.empty()) {
 		      _col_names_ref.insert(std::make_pair(name, c));
+		    }
+		  }
-		  int LpSoplex::_colByName(const std::string& name) const {
+		  int SoplexLp::_colByName(const std::string& name) const {
 		    std::map<std::string, int>::const_iterator it =
 		      _col_names_ref.find(name);
 		    if (it != _col_names_ref.end()) {
 		      return it->second;
 		    } else {
 		      return -1;
+		    }
+		  }
-		  void LpSoplex::_getRowName(int r, std::string &name) const {
+		  void SoplexLp::_getRowName(int r, std::string &name) const {
 		    name = _row_names[r];
+		  }
-		  void LpSoplex::_setRowName(int r, const std::string &name) {
+		  void SoplexLp::_setRowName(int r, const std::string &name) {
 		    _row_names_ref.erase(_row_names[r]);
 		    _row_names[r] = name;
 		    if (!name.empty()) {
 		      _row_names_ref.insert(std::make_pair(name, r));
+		    }
+		  }
-		  int LpSoplex::_rowByName(const std::string& name) const {
+		  int SoplexLp::_rowByName(const std::string& name) const {
 		    std::map<std::string, int>::const_iterator it =
 		      _row_names_ref.find(name);
 		    if (it != _row_names_ref.end()) {
 		      return it->second;
 		    } else {
 		      return -1;
+		    }
+		  }
-		  void LpSoplex::_setRowCoeffs(int i, ExprIterator b, ExprIterator e) {
+		  void SoplexLp::_setRowCoeffs(int i, ExprIterator b, ExprIterator e) {
 		    for (int j = 0; j < soplex->nCols(); ++j) {
 		      soplex->changeElement(i, j, 0.0);
+		    }
 		    for(ExprIterator it = b; it != e; ++it) {
 		      soplex->changeElement(i, it->first, it->second);
+		    }
+		  }
-		  void LpSoplex::_getRowCoeffs(int i, InsertIterator b) const {
+		  void SoplexLp::_getRowCoeffs(int i, InsertIterator b) const {
 		    const soplex::SVector& vec = soplex->rowVector(i);
 		    for (int k = 0; k < vec.size(); ++k) {
 		      *b = std::make_pair(vec.index(k), vec.value(k));
 		      ++b;
+		    }
+		  }
-		  void LpSoplex::_setColCoeffs(int j, ExprIterator b, ExprIterator e) {
+		  void SoplexLp::_setColCoeffs(int j, ExprIterator b, ExprIterator e) {
 		    for (int i = 0; i < soplex->nRows(); ++i) {
 		      soplex->changeElement(i, j, 0.0);
+		    }
 		    for(ExprIterator it = b; it != e; ++it) {
 		      soplex->changeElement(it->first, j, it->second);
+		    }
+		  }
-		  void LpSoplex::_getColCoeffs(int i, InsertIterator b) const {
+		  void SoplexLp::_getColCoeffs(int i, InsertIterator b) const {
 		    const soplex::SVector& vec = soplex->colVector(i);
 		    for (int k = 0; k < vec.size(); ++k) {
 		      *b = std::make_pair(vec.index(k), vec.value(k));
 		      ++b;
+		    }
+		  }
-		  void LpSoplex::_setCoeff(int i, int j, Value value) {
+		  void SoplexLp::_setCoeff(int i, int j, Value value) {
 		    soplex->changeElement(i, j, value);
+		  }
-		  LpSoplex::Value LpSoplex::_getCoeff(int i, int j) const {
+		  SoplexLp::Value SoplexLp::_getCoeff(int i, int j) const {
 		    return soplex->rowVector(i)[j];
+		  }
-		  void LpSoplex::_setColLowerBound(int i, Value value) {
+		  void SoplexLp::_setColLowerBound(int i, Value value) {
 		    LEMON_ASSERT(value != INF, "Invalid bound");
 		    soplex->changeLower(i, value != -INF ? value : -soplex::infinity);
+		  }
-		  LpSoplex::Value LpSoplex::_getColLowerBound(int i) const {
+		  SoplexLp::Value SoplexLp::_getColLowerBound(int i) const {
 		    double value = soplex->lower(i);
 		    return value != -soplex::infinity ? value : -INF;
+		  }
-		  void LpSoplex::_setColUpperBound(int i, Value value) {
+		  void SoplexLp::_setColUpperBound(int i, Value value) {
 		    LEMON_ASSERT(value != -INF, "Invalid bound");
 		    soplex->changeUpper(i, value != INF ? value : soplex::infinity);
+		  }
-		  LpSoplex::Value LpSoplex::_getColUpperBound(int i) const {
+		  SoplexLp::Value SoplexLp::_getColUpperBound(int i) const {
 		    double value = soplex->upper(i);
 		    return value != soplex::infinity ? value : INF;
+		  }
-		  void LpSoplex::_setRowLowerBound(int i, Value lb) {
+		  void SoplexLp::_setRowLowerBound(int i, Value lb) {
 		    LEMON_ASSERT(lb != INF, "Invalid bound");
 		    soplex->changeRange(i, lb != -INF ? lb : -soplex::infinity, soplex->rhs(i));
+		  }
-		  LpSoplex::Value LpSoplex::_getRowLowerBound(int i) const {
+		  SoplexLp::Value SoplexLp::_getRowLowerBound(int i) const {
 		    double res = soplex->lhs(i);
 		    return res == -soplex::infinity ? -INF : res;
+		  }
-		  void LpSoplex::_setRowUpperBound(int i, Value ub) {
+		  void SoplexLp::_setRowUpperBound(int i, Value ub) {
 		    LEMON_ASSERT(ub != -INF, "Invalid bound");
 		    soplex->changeRange(i, soplex->lhs(i), ub != INF ? ub : soplex::infinity);
+		  }
-		  LpSoplex::Value LpSoplex::_getRowUpperBound(int i) const {
+		  SoplexLp::Value SoplexLp::_getRowUpperBound(int i) const {
 		    double res = soplex->rhs(i);
 		    return res == soplex::infinity ? INF : res;
+		  }
-		  void LpSoplex::_setObjCoeffs(ExprIterator b, ExprIterator e) {
+		  void SoplexLp::_setObjCoeffs(ExprIterator b, ExprIterator e) {
 		    for (int j = 0; j < soplex->nCols(); ++j) {
 		      soplex->changeObj(j, 0.0);
+		    }
 		    for (ExprIterator it = b; it != e; ++it) {
 		      soplex->changeObj(it->first, it->second);
+		    }
+		  }
-		  void LpSoplex::_getObjCoeffs(InsertIterator b) const {
+		  void SoplexLp::_getObjCoeffs(InsertIterator b) const {
 		    for (int j = 0; j < soplex->nCols(); ++j) {
 		      Value coef = soplex->obj(j);
 		      if (coef != 0.0) {
 		        *b = std::make_pair(j, coef);
 		        ++b;
+		      }
+		    }
+		  }
-		  void LpSoplex::_setObjCoeff(int i, Value obj_coef) {
+		  void SoplexLp::_setObjCoeff(int i, Value obj_coef) {
 		    soplex->changeObj(i, obj_coef);
+		  }
-		  LpSoplex::Value LpSoplex::_getObjCoeff(int i) const {
+		  SoplexLp::Value SoplexLp::_getObjCoeff(int i) const {
 		    return soplex->obj(i);
+		  }
-		  LpSoplex::SolveExitStatus LpSoplex::_solve() {
+		  SoplexLp::SolveExitStatus SoplexLp::_solve() {
 		    _clear_temporals();
 		    soplex::SPxSolver::Status status = soplex->solve();
 		    switch (status) {
@@ -281,35 +281,35 @@
 		      return SOLVED;
 		    default:
 		      return UNSOLVED;
+		    }
+		  }
-		  LpSoplex::Value LpSoplex::_getPrimal(int i) const {
+		  SoplexLp::Value SoplexLp::_getPrimal(int i) const {
 		    if (_primal_values.empty()) {
 		      _primal_values.resize(soplex->nCols());
 		      soplex::Vector pv(_primal_values.size(), &_primal_values.front());
 		      soplex->getPrimal(pv);
+		    }
 		    return _primal_values[i];
+		  }
-		  LpSoplex::Value LpSoplex::_getDual(int i) const {
+		  SoplexLp::Value SoplexLp::_getDual(int i) const {
 		    if (_dual_values.empty()) {
 		      _dual_values.resize(soplex->nRows());
 		      soplex::Vector dv(_dual_values.size(), &_dual_values.front());
 		      soplex->getDual(dv);
+		    }
 		    return _dual_values[i];
+		  }
-		  LpSoplex::Value LpSoplex::_getPrimalValue() const {
+		  SoplexLp::Value SoplexLp::_getPrimalValue() const {
 		    return soplex->objValue();
+		  }
-		  LpSoplex::VarStatus LpSoplex::_getColStatus(int i) const {
+		  SoplexLp::VarStatus SoplexLp::_getColStatus(int i) const {
 		    switch (soplex->getBasisColStatus(i)) {
 		    case soplex::SPxSolver::BASIC:
 		      return BASIC;
 		    case soplex::SPxSolver::ON_UPPER:
 		      return UPPER;
 		    case soplex::SPxSolver::ON_LOWER:
@@ -321,13 +321,13 @@
 		    default:
 		      LEMON_ASSERT(false, "Wrong column status");
 		      return VarStatus();
+		    }
+		  }
-		  LpSoplex::VarStatus LpSoplex::_getRowStatus(int i) const {
+		  SoplexLp::VarStatus SoplexLp::_getRowStatus(int i) const {
 		    switch (soplex->getBasisRowStatus(i)) {
 		    case soplex::SPxSolver::BASIC:
 		      return BASIC;
 		    case soplex::SPxSolver::ON_UPPER:
 		      return UPPER;
 		    case soplex::SPxSolver::ON_LOWER:
@@ -339,79 +339,79 @@
 		    default:
 		      LEMON_ASSERT(false, "Wrong row status");
 		      return VarStatus();
+		    }
+		  }
-		  LpSoplex::Value LpSoplex::_getPrimalRay(int i) const {
+		  SoplexLp::Value SoplexLp::_getPrimalRay(int i) const {
 		    if (_primal_ray.empty()) {
 		      _primal_ray.resize(soplex->nCols());
 		      soplex::Vector pv(_primal_ray.size(), &_primal_ray.front());
 		      soplex->getDualfarkas(pv);
+		    }
 		    return _primal_ray[i];
+		  }
-		  LpSoplex::Value LpSoplex::_getDualRay(int i) const {
+		  SoplexLp::Value SoplexLp::_getDualRay(int i) const {
 		    if (_dual_ray.empty()) {
 		      _dual_ray.resize(soplex->nRows());
 		      soplex::Vector dv(_dual_ray.size(), &_dual_ray.front());
 		      soplex->getDualfarkas(dv);
+		    }
 		    return _dual_ray[i];
+		  }
-		  LpSoplex::ProblemType LpSoplex::_getPrimalType() const {
+		  SoplexLp::ProblemType SoplexLp::_getPrimalType() const {
 		    switch (soplex->status()) {
 		    case soplex::SPxSolver::OPTIMAL:
 		      return OPTIMAL;
 		    case soplex::SPxSolver::UNBOUNDED:
 		      return UNBOUNDED;
 		    case soplex::SPxSolver::INFEASIBLE:
 		      return INFEASIBLE;
 		    default:
 		      return UNDEFINED;
+		    }
+		  }
-		  LpSoplex::ProblemType LpSoplex::_getDualType() const {
+		  SoplexLp::ProblemType SoplexLp::_getDualType() const {
 		    switch (soplex->status()) {
 		    case soplex::SPxSolver::OPTIMAL:
 		      return OPTIMAL;
 		    case soplex::SPxSolver::UNBOUNDED:
 		      return UNBOUNDED;
 		    case soplex::SPxSolver::INFEASIBLE:
 		      return INFEASIBLE;
 		    default:
 		      return UNDEFINED;
+		    }
+		  }
-		  void LpSoplex::_setSense(Sense sense) {
+		  void SoplexLp::_setSense(Sense sense) {
 		    switch (sense) {
 		    case MIN:
 		      soplex->changeSense(soplex::SPxSolver::MINIMIZE);
 		      break;
 		    case MAX:
 		      soplex->changeSense(soplex::SPxSolver::MAXIMIZE);
+		    }
+		  }
-		  LpSoplex::Sense LpSoplex::_getSense() const {
+		  SoplexLp::Sense SoplexLp::_getSense() const {
 		    switch (soplex->spxSense()) {
 		    case soplex::SPxSolver::MAXIMIZE:
 		      return MAX;
 		    case soplex::SPxSolver::MINIMIZE:
 		      return MIN;
 		    default:
 		      LEMON_ASSERT(false, "Wrong sense.");
-		      return LpSoplex::Sense();
+		      return SoplexLp::Sense();
+		    }
+		  }
-		  void LpSoplex::_clear() {
+		  void SoplexLp::_clear() {
 		    soplex->clear();
 		    _col_names.clear();
 		    _col_names_ref.clear();
 		    _row_names.clear();
 		    _row_names_ref.clear();
 		    cols.clear();

lemon/soplex.h

Show inline comments

@@ -40,13 +40,13 @@
 		  ///
 		  /// This class implements an interface for the SoPlex LP solver.
 		  /// The SoPlex library is an object oriented lp solver library
 		  /// developed at the Konrad-Zuse-Zentrum f�r Informationstechnik
 		  /// Berlin (ZIB). You can find detailed information about it at the
 		  /// <tt>http://soplex.zib.de</tt> address.
-		  class LpSoplex : public LpSolver {
+		  class SoplexLp : public LpSolver {
 		  private:
 		    soplex::SoPlex* soplex;
 		    std::vector<std::string> _col_names;
 		    std::map<std::string, int> _col_names_ref;
@@ -65,22 +65,22 @@
 		    void _clear_temporals();
 		  public:
 		    /// \e
-		    LpSoplex();
+		    SoplexLp();
 		    /// \e
-		    LpSoplex(const LpSoplex&);
+		    SoplexLp(const SoplexLp&);
 		    /// \e
-		    ~LpSoplex();
+		    ~SoplexLp();
 		  protected:
 		    virtual LpSoplex* _newSolver() const;
 		    virtual LpSoplex* _cloneSolver() const;
 		    virtual SoplexLp* _newSolver() const;
 		    virtual SoplexLp* _cloneSolver() const;
 		    virtual const char* _solverName() const;
 		    virtual int _addCol();
 		    virtual int _addRow();

test/lp_test.cc

Show inline comments

@@ -359,21 +359,21 @@
+		{
 		  LpSkeleton lp_skel;
 		  lpTest(lp_skel);
 		#ifdef HAVE_GLPK
+		  {
-		    LpGlpk lp_glpk1,lp_glpk2;
+		    GlpkLp lp_glpk1,lp_glpk2;
 		    lpTest(lp_glpk1);
 		    aTest(lp_glpk2);
+		  }
 		#endif
 		#ifdef HAVE_CPLEX
 		  try {
-		    LpCplex lp_cplex1,lp_cplex2;
+		    CplexLp lp_cplex1,lp_cplex2;
 		    lpTest(lp_cplex1);
 		    aTest(lp_cplex2);
 		  } catch (CplexEnv::LicenseError& error) {
 		#ifdef LEMON_FORCE_CPLEX_CHECK
 		    check(false, error.what());
 		#else
@@ -382,21 +382,21 @@
 		#endif
+		  }
 		#endif
 		#ifdef HAVE_SOPLEX
+		  {
-		    LpSoplex lp_soplex1,lp_soplex2;
+		    SoplexLp lp_soplex1,lp_soplex2;
 		    lpTest(lp_soplex1);
 		    aTest(lp_soplex2);
+		  }
 		#endif
 		#ifdef HAVE_CLP
+		  {
-		    LpClp lp_clp1,lp_clp2;
+		    ClpLp lp_clp1,lp_clp2;
 		    lpTest(lp_clp1);
 		    aTest(lp_clp2);
+		  }
 		#endif
 		  return 0;

test/mip_test.cc

Show inline comments

@@ -109,20 +109,20 @@
 		int main()
+		{
 		#ifdef HAVE_GLPK
+		  {
-		    MipGlpk mip1;
+		    GlpkMip mip1;
 		    aTest(mip1);
+		  }
 		#endif
 		#ifdef HAVE_CPLEX
 		  try {
-		    MipCplex mip2;
+		    CplexMip mip2;
 		    aTest(mip2);
 		  } catch (CplexEnv::LicenseError& error) {
 		#ifdef LEMON_FORCE_CPLEX_CHECK
 		    check(false, error.what());
 		#else
 		    std::cerr << error.what() << std::endl;

0 comments (0 inline)

RhodeCode

Login to your account

...	...	@@ -18,120 +18,120 @@
18	18
19	19	#include <lemon/clp.h>
20	20	#include <coin/ClpSimplex.hpp>
21	21
22	22	namespace lemon {
23	23
24		~~LpClp~~::~~LpClp~~() {
	24	ClpLp::ClpLp() {
25	25	_prob = new ClpSimplex();
26	26	_init_temporals();
27	27	messageLevel(MESSAGE_NO_OUTPUT);
28	28	}
29	29
30		~~LpClp~~::~~LpClp~~(const ~~LpClp~~& other) {
	30	ClpLp::ClpLp(const ClpLp& other) {
31	31	_prob = new ClpSimplex(*other._prob);
32	32	rows = other.rows;
33	33	cols = other.cols;
34	34	_init_temporals();
35	35	messageLevel(MESSAGE_NO_OUTPUT);
36	36	}
37	37
38		~~LpClp~~::~~~LpClp~~() {
	38	ClpLp::~ClpLp() {
39	39	delete _prob;
40	40	_clear_temporals();
41	41	}
42	42
43		void ~~LpClp~~::_init_temporals() {
	43	void ClpLp::_init_temporals() {
44	44	_primal_ray = 0;
45	45	_dual_ray = 0;
46	46	}
47	47
48		void ~~LpClp~~::_clear_temporals() {
	48	void ClpLp::_clear_temporals() {
49	49	if (_primal_ray) {
50	50	delete[] _primal_ray;
51	51	_primal_ray = 0;
52	52	}
53	53	if (_dual_ray) {
54	54	delete[] _dual_ray;
55	55	_dual_ray = 0;
56	56	}
57	57	}
58	58
59		LpClp* LpClp::_newSolver() const {
60		LpClp* newlp = new LpClp;
	59	ClpLp* ClpLp::_newSolver() const {
	60	ClpLp* newlp = new ClpLp;
61	61	return newlp;
62	62	}
63	63
64		LpClp* LpClp::_cloneSolver() const {
65		LpClp* copylp = new LpClp(*this);
	64	ClpLp* ClpLp::_cloneSolver() const {
	65	ClpLp* copylp = new ClpLp(*this);
66	66	return copylp;
67	67	}
68	68
69		const char* ~~LpClp~~::_solverName() const { return "~~LpClp~~"; }
	69	const char* ClpLp::_solverName() const { return "ClpLp"; }
70	70
71		int ~~LpClp~~::_addCol() {
	71	int ClpLp::_addCol() {
72	72	_prob->addColumn(0, 0, 0, -COIN_DBL_MAX, COIN_DBL_MAX, 0.0);
73	73	return _prob->numberColumns() - 1;
74	74	}
75	75
76		int ~~LpClp~~::_addRow() {
	76	int ClpLp::_addRow() {
77	77	_prob->addRow(0, 0, 0, -COIN_DBL_MAX, COIN_DBL_MAX);
78	78	return _prob->numberRows() - 1;
79	79	}
80	80
81	81
82		void ~~LpClp~~::_eraseCol(int c) {
	82	void ClpLp::_eraseCol(int c) {
83	83	_col_names_ref.erase(_prob->getColumnName(c));
84	84	_prob->deleteColumns(1, &c);
85	85	}
86	86
87		void ~~LpClp~~::_eraseRow(int r) {
	87	void ClpLp::_eraseRow(int r) {
88	88	_row_names_ref.erase(_prob->getRowName(r));
89	89	_prob->deleteRows(1, &r);
90	90	}
91	91
92		void ~~LpClp~~::_eraseColId(int i) {
	92	void ClpLp::_eraseColId(int i) {
93	93	cols.eraseIndex(i);
94	94	cols.shiftIndices(i);
95	95	}
96	96
97		void ~~LpClp~~::_eraseRowId(int i) {
	97	void ClpLp::_eraseRowId(int i) {
98	98	rows.eraseIndex(i);
99	99	rows.shiftIndices(i);
100	100	}
101	101
102		void ~~LpClp~~::_getColName(int c, std::string& name) const {
	102	void ClpLp::_getColName(int c, std::string& name) const {
103	103	name = _prob->getColumnName(c);
104	104	}
105	105
106		void ~~LpClp~~::_setColName(int c, const std::string& name) {
	106	void ClpLp::_setColName(int c, const std::string& name) {
107	107	_prob->setColumnName(c, const_cast<std::string&>(name));
108	108	_col_names_ref[name] = c;
109	109	}
110	110
111		int ~~LpClp~~::_colByName(const std::string& name) const {
	111	int ClpLp::_colByName(const std::string& name) const {
112	112	std::map<std::string, int>::const_iterator it = _col_names_ref.find(name);
113	113	return it != _col_names_ref.end() ? it->second : -1;
114	114	}
115	115
116		void ~~LpClp~~::_getRowName(int r, std::string& name) const {
	116	void ClpLp::_getRowName(int r, std::string& name) const {
117	117	name = _prob->getRowName(r);
118	118	}
119	119
120		void ~~LpClp~~::_setRowName(int r, const std::string& name) {
	120	void ClpLp::_setRowName(int r, const std::string& name) {
121	121	_prob->setRowName(r, const_cast<std::string&>(name));
122	122	_row_names_ref[name] = r;
123	123	}
124	124
125		int ~~LpClp~~::_rowByName(const std::string& name) const {
	125	int ClpLp::_rowByName(const std::string& name) const {
126	126	std::map<std::string, int>::const_iterator it = _row_names_ref.find(name);
127	127	return it != _row_names_ref.end() ? it->second : -1;
128	128	}
129	129
130	130
131		void ~~LpClp~~::_setRowCoeffs(int ix, ExprIterator b, ExprIterator e) {
	131	void ClpLp::_setRowCoeffs(int ix, ExprIterator b, ExprIterator e) {
132	132	std::map<int, Value> coeffs;
133	133
134	134	int n = _prob->clpMatrix()->getNumCols();
135	135
136	136	const int* indices = _prob->clpMatrix()->getIndices();
137	137	const double* elements = _prob->clpMatrix()->getElements();
...	...	@@ -153,13 +153,13 @@
153	153	for (std::map<int, Value>::iterator it = coeffs.begin();
154	154	it != coeffs.end(); ++it) {
155	155	_prob->modifyCoefficient(ix, it->first, it->second);
156	156	}
157	157	}
158	158
159		void ~~LpClp~~::_getRowCoeffs(int ix, InsertIterator b) const {
	159	void ClpLp::_getRowCoeffs(int ix, InsertIterator b) const {
160	160	int n = _prob->clpMatrix()->getNumCols();
161	161
162	162	const int* indices = _prob->clpMatrix()->getIndices();
163	163	const double* elements = _prob->clpMatrix()->getElements();
164	164
165	165	for (int i = 0; i < n; ++i) {
...	...	@@ -170,13 +170,13 @@
170	170	if (it != indices + end && *it == ix) {
171	171	*b = std::make_pair(i, elements[it - indices]);
172	172	}
173	173	}
174	174	}
175	175
176		void ~~LpClp~~::_setColCoeffs(int ix, ExprIterator b, ExprIterator e) {
	176	void ClpLp::_setColCoeffs(int ix, ExprIterator b, ExprIterator e) {
177	177	std::map<int, Value> coeffs;
178	178
179	179	CoinBigIndex begin = _prob->clpMatrix()->getVectorStarts()[ix];
180	180	CoinBigIndex end = begin + _prob->clpMatrix()->getVectorLengths()[ix];
181	181
182	182	const int* indices = _prob->clpMatrix()->getIndices();
...	...	@@ -193,30 +193,30 @@
193	193	for (std::map<int, Value>::iterator it = coeffs.begin();
194	194	it != coeffs.end(); ++it) {
195	195	_prob->modifyCoefficient(it->first, ix, it->second);
196	196	}
197	197	}
198	198
199		void ~~LpClp~~::_getColCoeffs(int ix, InsertIterator b) const {
	199	void ClpLp::_getColCoeffs(int ix, InsertIterator b) const {
200	200	CoinBigIndex begin = _prob->clpMatrix()->getVectorStarts()[ix];
201	201	CoinBigIndex end = begin + _prob->clpMatrix()->getVectorLengths()[ix];
202	202
203	203	const int* indices = _prob->clpMatrix()->getIndices();
204	204	const double* elements = _prob->clpMatrix()->getElements();
205	205
206	206	for (CoinBigIndex i = begin; i != end; ++i) {
207	207	*b = std::make_pair(indices[i], elements[i]);
208	208	++b;
209	209	}
210	210	}
211	211
212		void ~~LpClp~~::_setCoeff(int ix, int jx, Value value) {
	212	void ClpLp::_setCoeff(int ix, int jx, Value value) {
213	213	_prob->modifyCoefficient(ix, jx, value);
214	214	}
215	215
216		~~LpClp~~::Value ~~LpClp~~::_getCoeff(int ix, int jx) const {
	216	ClpLp::Value ClpLp::_getCoeff(int ix, int jx) const {
217	217	CoinBigIndex begin = _prob->clpMatrix()->getVectorStarts()[ix];
218	218	CoinBigIndex end = begin + _prob->clpMatrix()->getVectorLengths()[ix];
219	219
220	220	const int* indices = _prob->clpMatrix()->getIndices();
221	221	const double* elements = _prob->clpMatrix()->getElements();
222	222
...	...	@@ -225,121 +225,121 @@
225	225	return elements[it - indices];
226	226	} else {
227	227	return 0.0;
228	228	}
229	229	}
230	230
231		void ~~LpClp~~::_setColLowerBound(int i, Value lo) {
	231	void ClpLp::_setColLowerBound(int i, Value lo) {
232	232	_prob->setColumnLower(i, lo == - INF ? - COIN_DBL_MAX : lo);
233	233	}
234	234
235		~~LpClp~~::Value ~~LpClp~~::_getColLowerBound(int i) const {
	235	ClpLp::Value ClpLp::_getColLowerBound(int i) const {
236	236	double val = _prob->getColLower()[i];
237	237	return val == - COIN_DBL_MAX ? - INF : val;
238	238	}
239	239
240		void ~~LpClp~~::_setColUpperBound(int i, Value up) {
	240	void ClpLp::_setColUpperBound(int i, Value up) {
241	241	_prob->setColumnUpper(i, up == INF ? COIN_DBL_MAX : up);
242	242	}
243	243
244		~~LpClp~~::Value ~~LpClp~~::_getColUpperBound(int i) const {
	244	ClpLp::Value ClpLp::_getColUpperBound(int i) const {
245	245	double val = _prob->getColUpper()[i];
246	246	return val == COIN_DBL_MAX ? INF : val;
247	247	}
248	248
249		void ~~LpClp~~::_setRowLowerBound(int i, Value lo) {
	249	void ClpLp::_setRowLowerBound(int i, Value lo) {
250	250	_prob->setRowLower(i, lo == - INF ? - COIN_DBL_MAX : lo);
251	251	}
252	252
253		~~LpClp~~::Value ~~LpClp~~::_getRowLowerBound(int i) const {
	253	ClpLp::Value ClpLp::_getRowLowerBound(int i) const {
254	254	double val = _prob->getRowLower()[i];
255	255	return val == - COIN_DBL_MAX ? - INF : val;
256	256	}
257	257
258		void ~~LpClp~~::_setRowUpperBound(int i, Value up) {
	258	void ClpLp::_setRowUpperBound(int i, Value up) {
259	259	_prob->setRowUpper(i, up == INF ? COIN_DBL_MAX : up);
260	260	}
261	261
262		~~LpClp~~::Value ~~LpClp~~::_getRowUpperBound(int i) const {
	262	ClpLp::Value ClpLp::_getRowUpperBound(int i) const {
263	263	double val = _prob->getRowUpper()[i];
264	264	return val == COIN_DBL_MAX ? INF : val;
265	265	}
266	266
267		void ~~LpClp~~::_setObjCoeffs(ExprIterator b, ExprIterator e) {
	267	void ClpLp::_setObjCoeffs(ExprIterator b, ExprIterator e) {
268	268	int num = _prob->clpMatrix()->getNumCols();
269	269	for (int i = 0; i < num; ++i) {
270	270	_prob->setObjectiveCoefficient(i, 0.0);
271	271	}
272	272	for (ExprIterator it = b; it != e; ++it) {
273	273	_prob->setObjectiveCoefficient(it->first, it->second);
274	274	}
275	275	}
276	276
277		void ~~LpClp~~::_getObjCoeffs(InsertIterator b) const {
	277	void ClpLp::_getObjCoeffs(InsertIterator b) const {
278	278	int num = _prob->clpMatrix()->getNumCols();
279	279	for (int i = 0; i < num; ++i) {
280	280	Value coef = _prob->getObjCoefficients()[i];
281	281	if (coef != 0.0) {
282	282	*b = std::make_pair(i, coef);
283	283	++b;
284	284	}
285	285	}
286	286	}
287	287
288		void ~~LpClp~~::_setObjCoeff(int i, Value obj_coef) {
	288	void ClpLp::_setObjCoeff(int i, Value obj_coef) {
289	289	_prob->setObjectiveCoefficient(i, obj_coef);
290	290	}
291	291
292		~~LpClp~~::Value ~~LpClp~~::_getObjCoeff(int i) const {
	292	ClpLp::Value ClpLp::_getObjCoeff(int i) const {
293	293	return _prob->getObjCoefficients()[i];
294	294	}
295	295
296		~~LpClp~~::SolveExitStatus ~~LpClp~~::_solve() {
	296	ClpLp::SolveExitStatus ClpLp::_solve() {
297	297	return _prob->primal() >= 0 ? SOLVED : UNSOLVED;
298	298	}
299	299
300		~~LpClp~~::SolveExitStatus ~~LpClp~~::solvePrimal() {
	300	ClpLp::SolveExitStatus ClpLp::solvePrimal() {
301	301	return _prob->primal() >= 0 ? SOLVED : UNSOLVED;
302	302	}
303	303
304		~~LpClp~~::SolveExitStatus ~~LpClp~~::solveDual() {
	304	ClpLp::SolveExitStatus ClpLp::solveDual() {
305	305	return _prob->dual() >= 0 ? SOLVED : UNSOLVED;
306	306	}
307	307
308		~~LpClp~~::SolveExitStatus ~~LpClp~~::solveBarrier() {
	308	ClpLp::SolveExitStatus ClpLp::solveBarrier() {
309	309	return _prob->barrier() >= 0 ? SOLVED : UNSOLVED;
310	310	}
311	311
312		~~LpClp~~::Value ~~LpClp~~::_getPrimal(int i) const {
	312	ClpLp::Value ClpLp::_getPrimal(int i) const {
313	313	return _prob->primalColumnSolution()[i];
314	314	}
315		~~LpClp~~::Value ~~LpClp~~::_getPrimalValue() const {
	315	ClpLp::Value ClpLp::_getPrimalValue() const {
316	316	return _prob->objectiveValue();
317	317	}
318	318
319		~~LpClp~~::Value ~~LpClp~~::_getDual(int i) const {
	319	ClpLp::Value ClpLp::_getDual(int i) const {
320	320	return _prob->dualRowSolution()[i];
321	321	}
322	322
323		~~LpClp~~::Value ~~LpClp~~::_getPrimalRay(int i) const {
	323	ClpLp::Value ClpLp::_getPrimalRay(int i) const {
324	324	if (!_primal_ray) {
325	325	_primal_ray = _prob->unboundedRay();
326	326	LEMON_ASSERT(_primal_ray != 0, "Primal ray is not provided");
327	327	}
328	328	return _primal_ray[i];
329	329	}
330	330
331		~~LpClp~~::Value ~~LpClp~~::_getDualRay(int i) const {
	331	ClpLp::Value ClpLp::_getDualRay(int i) const {
332	332	if (!_dual_ray) {
333	333	_dual_ray = _prob->infeasibilityRay();
334	334	LEMON_ASSERT(_dual_ray != 0, "Dual ray is not provided");
335	335	}
336	336	return _dual_ray[i];
337	337	}
338	338
339		~~LpClp~~::VarStatus ~~LpClp~~::_getColStatus(int i) const {
	339	ClpLp::VarStatus ClpLp::_getColStatus(int i) const {
340	340	switch (_prob->getColumnStatus(i)) {
341	341	case ClpSimplex::basic:
342	342	return BASIC;
343	343	case ClpSimplex::isFree:
344	344	return FREE;
345	345	case ClpSimplex::atUpperBound:
...	...	@@ -353,13 +353,13 @@
353	353	default:
354	354	LEMON_ASSERT(false, "Wrong column status");
355	355	return VarStatus();
356	356	}
357	357	}
358	358
359		~~LpClp~~::VarStatus ~~LpClp~~::_getRowStatus(int i) const {
	359	ClpLp::VarStatus ClpLp::_getRowStatus(int i) const {
360	360	switch (_prob->getColumnStatus(i)) {
361	361	case ClpSimplex::basic:
362	362	return BASIC;
363	363	case ClpSimplex::isFree:
364	364	return FREE;
365	365	case ClpSimplex::atUpperBound:
...	...	@@ -374,64 +374,64 @@
374	374	LEMON_ASSERT(false, "Wrong row status");
375	375	return VarStatus();
376	376	}
377	377	}
378	378
379	379
380		~~LpClp~~::ProblemType ~~LpClp~~::_getPrimalType() const {
	380	ClpLp::ProblemType ClpLp::_getPrimalType() const {
381	381	if (_prob->isProvenOptimal()) {
382	382	return OPTIMAL;
383	383	} else if (_prob->isProvenPrimalInfeasible()) {
384	384	return INFEASIBLE;
385	385	} else if (_prob->isProvenDualInfeasible()) {
386	386	return UNBOUNDED;
387	387	} else {
388	388	return UNDEFINED;
389	389	}
390	390	}
391	391
392		~~LpClp~~::ProblemType ~~LpClp~~::_getDualType() const {
	392	ClpLp::ProblemType ClpLp::_getDualType() const {
393	393	if (_prob->isProvenOptimal()) {
394	394	return OPTIMAL;
395	395	} else if (_prob->isProvenDualInfeasible()) {
396	396	return INFEASIBLE;
397	397	} else if (_prob->isProvenPrimalInfeasible()) {
398	398	return INFEASIBLE;
399	399	} else {
400	400	return UNDEFINED;
401	401	}
402	402	}
403	403
404		void ~~LpClp~~::_setSense(~~LpClp~~::Sense sense) {
	404	void ClpLp::_setSense(ClpLp::Sense sense) {
405	405	switch (sense) {
406	406	case MIN:
407	407	_prob->setOptimizationDirection(1);
408	408	break;
409	409	case MAX:
410	410	_prob->setOptimizationDirection(-1);
411	411	break;
412	412	}
413	413	}
414	414
415		~~LpClp~~::Sense ~~LpClp~~::_getSense() const {
	415	ClpLp::Sense ClpLp::_getSense() const {
416	416	double dir = _prob->optimizationDirection();
417	417	if (dir > 0.0) {
418	418	return MIN;
419	419	} else {
420	420	return MAX;
421	421	}
422	422	}
423	423
424		void ~~LpClp~~::_clear() {
	424	void ClpLp::_clear() {
425	425	delete _prob;
426	426	_prob = new ClpSimplex();
427	427	rows.clear();
428	428	cols.clear();
429	429	_col_names_ref.clear();
430	430	_clear_temporals();
431	431	}
432	432
433		void ~~LpClp~~::messageLevel(MessageLevel m) {
	433	void ClpLp::messageLevel(MessageLevel m) {
434	434	_prob->setLogLevel(static_cast<int>(m));
435	435	}
436	436
437	437	} //END OF NAMESPACE LEMON