diff -r 7afc121e0689 -r ed54c0d13df0 lemon/lp_soplex.cc --- a/lemon/lp_soplex.cc Tue Dec 02 21:40:33 2008 +0100 +++ b/lemon/lp_soplex.cc Tue Dec 02 22:48:28 2008 +0100 @@ -16,8 +16,8 @@ * */ -#include -#include +#include +#include #include @@ -26,54 +26,53 @@ ///\brief Implementation of the LEMON-SOPLEX lp solver interface. namespace lemon { - LpSoplex::LpSoplex() : LpSolverBase() { - rows.setIdHandler(relocateIdHandler); - cols.setIdHandler(relocateIdHandler); + LpSoplex::LpSoplex() { soplex = new soplex::SoPlex; - solved = false; } LpSoplex::~LpSoplex() { delete soplex; } - LpSoplex::LpSoplex(const LpSoplex& lp) : LpSolverBase() { + LpSoplex::LpSoplex(const LpSoplex& lp) { rows = lp.rows; - rows.setIdHandler(relocateIdHandler); - cols = lp.cols; - cols.setIdHandler(relocateIdHandler); soplex = new soplex::SoPlex; (*static_cast(soplex)) = *(lp.soplex); - colNames = lp.colNames; - invColNames = lp.invColNames; + _col_names = lp._col_names; + _col_names_ref = lp._col_names_ref; - primal_value = lp.primal_value; - dual_value = lp.dual_value; + _row_names = lp._row_names; + _row_names_ref = lp._row_names_ref; } - LpSolverBase* LpSoplex::_newLp() { + void LpSoplex::_clear_temporals() { + _primal_values.clear(); + _dual_values.clear(); + } + + LpSoplex* LpSoplex::_newSolver() const { LpSoplex* newlp = new LpSoplex(); return newlp; } - LpSolverBase* LpSoplex::_copyLp() { + LpSoplex* LpSoplex::_cloneSolver() const { LpSoplex* newlp = new LpSoplex(*this); return newlp; } + const char* LpSoplex::_solverName() const { return "LpSoplex"; } + int LpSoplex::_addCol() { soplex::LPCol c; c.setLower(-soplex::infinity); c.setUpper(soplex::infinity); soplex->addCol(c); - colNames.push_back(std::string()); - primal_value.push_back(0.0); - solved = false; + _col_names.push_back(std::string()); return soplex->nCols() - 1; } @@ -84,8 +83,7 @@ r.setRhs(soplex::infinity); soplex->addRow(r); - dual_value.push_back(0.0); - solved = false; + _row_names.push_back(std::string()); return soplex->nRows() - 1; } @@ -93,56 +91,84 @@ void LpSoplex::_eraseCol(int i) { soplex->removeCol(i); - invColNames.erase(colNames[i]); - colNames[i] = colNames.back(); - invColNames[colNames.back()] = i; - colNames.pop_back(); - primal_value[i] = primal_value.back(); - primal_value.pop_back(); - solved = false; + _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) { soplex->removeRow(i); - dual_value[i] = dual_value.back(); - dual_value.pop_back(); - solved = false; + _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) { + cols.eraseIndex(i); + cols.relocateIndex(i, cols.maxIndex()); + } + void LpSoplex::_eraseRowId(int i) { + rows.eraseIndex(i); + rows.relocateIndex(i, rows.maxIndex()); } void LpSoplex::_getColName(int c, std::string &name) const { - name = colNames[c]; + name = _col_names[c]; } void LpSoplex::_setColName(int c, const std::string &name) { - invColNames.erase(colNames[c]); - colNames[c] = name; + _col_names_ref.erase(_col_names[c]); + _col_names[c] = name; if (!name.empty()) { - invColNames.insert(std::make_pair(name, c)); + _col_names_ref.insert(std::make_pair(name, c)); } } int LpSoplex::_colByName(const std::string& name) const { std::map::const_iterator it = - invColNames.find(name); - if (it != invColNames.end()) { + _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 { + name = _row_names[r]; + } - void LpSoplex::_setRowCoeffs(int i, ConstRowIterator b, ConstRowIterator e) { + void LpSoplex::_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 { + std::map::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) { for (int j = 0; j < soplex->nCols(); ++j) { soplex->changeElement(i, j, 0.0); } - for(ConstRowIterator it = b; it != e; ++it) { + for(ExprIterator it = b; it != e; ++it) { soplex->changeElement(i, it->first, it->second); } - solved = false; } - void LpSoplex::_getRowCoeffs(int i, RowIterator b) const { + void LpSoplex::_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)); @@ -150,17 +176,16 @@ } } - void LpSoplex::_setColCoeffs(int j, ConstColIterator b, ConstColIterator e) { + void LpSoplex::_setColCoeffs(int j, ExprIterator b, ExprIterator e) { for (int i = 0; i < soplex->nRows(); ++i) { soplex->changeElement(i, j, 0.0); } - for(ConstColIterator it = b; it != e; ++it) { + for(ExprIterator it = b; it != e; ++it) { soplex->changeElement(it->first, j, it->second); } - solved = false; } - void LpSoplex::_getColCoeffs(int i, ColIterator b) const { + void LpSoplex::_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)); @@ -170,7 +195,6 @@ void LpSoplex::_setCoeff(int i, int j, Value value) { soplex->changeElement(i, j, value); - solved = false; } LpSoplex::Value LpSoplex::_getCoeff(int i, int j) const { @@ -178,8 +202,8 @@ } void LpSoplex::_setColLowerBound(int i, Value value) { + LEMON_ASSERT(value != INF, "Invalid bound"); soplex->changeLower(i, value != -INF ? value : -soplex::infinity); - solved = false; } LpSoplex::Value LpSoplex::_getColLowerBound(int i) const { @@ -188,8 +212,8 @@ } void LpSoplex::_setColUpperBound(int i, Value value) { + LEMON_ASSERT(value != -INF, "Invalid bound"); soplex->changeUpper(i, value != INF ? value : soplex::infinity); - solved = false; } LpSoplex::Value LpSoplex::_getColUpperBound(int i) const { @@ -197,48 +221,63 @@ return value != soplex::infinity ? value : INF; } - void LpSoplex::_setRowBounds(int i, Value lb, Value ub) { - soplex->changeRange(i, lb != -INF ? lb : -soplex::infinity, - ub != INF ? ub : soplex::infinity); - solved = false; + void LpSoplex::_setRowLowerBound(int i, Value lb) { + LEMON_ASSERT(lb != INF, "Invalid bound"); + soplex->changeRange(i, lb != -INF ? lb : -soplex::infinity, soplex->rhs(i)); } - void LpSoplex::_getRowBounds(int i, Value &lower, Value &upper) const { - lower = soplex->lhs(i); - if (lower == -soplex::infinity) lower = -INF; - upper = soplex->rhs(i); - if (upper == -soplex::infinity) upper = INF; + + LpSoplex::Value LpSoplex::_getRowLowerBound(int i) const { + double res = soplex->lhs(i); + return res == -soplex::infinity ? -INF : res; + } + + void LpSoplex::_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 { + double res = soplex->rhs(i); + return res == soplex::infinity ? INF : res; + } + + void LpSoplex::_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 { + 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) { soplex->changeObj(i, obj_coef); - solved = false; } LpSoplex::Value LpSoplex::_getObjCoeff(int i) const { return soplex->obj(i); } - void LpSoplex::_clearObj() { - for (int i = 0; i < soplex->nCols(); ++i) { - soplex->changeObj(i, 0.0); - } - solved = false; - } + LpSoplex::SolveExitStatus LpSoplex::_solve() { - LpSoplex::SolveExitStatus LpSoplex::_solve() { + _clear_temporals(); + soplex::SPxSolver::Status status = soplex->solve(); - soplex::Vector pv(primal_value.size(), &primal_value[0]); - soplex->getPrimal(pv); - - soplex::Vector dv(dual_value.size(), &dual_value[0]); - soplex->getDual(dv); - switch (status) { case soplex::SPxSolver::OPTIMAL: case soplex::SPxSolver::INFEASIBLE: case soplex::SPxSolver::UNBOUNDED: - solved = true; return SOLVED; default: return UNSOLVED; @@ -246,28 +285,87 @@ } LpSoplex::Value LpSoplex::_getPrimal(int i) const { - return primal_value[i]; + 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 { - return dual_value[i]; + 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 { return soplex->objValue(); } - bool LpSoplex::_isBasicCol(int i) const { - return soplex->getBasisColStatus(i) == soplex::SPxSolver::BASIC; + LpSoplex::VarStatus LpSoplex::_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: + return LOWER; + case soplex::SPxSolver::FIXED: + return FIXED; + case soplex::SPxSolver::ZERO: + return FREE; + default: + LEMON_ASSERT(false, "Wrong column status"); + return VarStatus(); + } } - LpSoplex::SolutionStatus LpSoplex::_getPrimalStatus() const { - if (!solved) return UNDEFINED; + LpSoplex::VarStatus LpSoplex::_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: + return LOWER; + case soplex::SPxSolver::FIXED: + return FIXED; + case soplex::SPxSolver::ZERO: + return FREE; + default: + LEMON_ASSERT(false, "Wrong row status"); + return VarStatus(); + } + } + + LpSoplex::Value LpSoplex::_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 { + 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 { switch (soplex->status()) { case soplex::SPxSolver::OPTIMAL: return OPTIMAL; case soplex::SPxSolver::UNBOUNDED: - return INFINITE; + return UNBOUNDED; case soplex::SPxSolver::INFEASIBLE: return INFEASIBLE; default: @@ -275,42 +373,51 @@ } } - LpSoplex::SolutionStatus LpSoplex::_getDualStatus() const { - if (!solved) return UNDEFINED; + LpSoplex::ProblemType LpSoplex::_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; } } - LpSoplex::ProblemTypes LpSoplex::_getProblemType() const { - if (!solved) return UNKNOWN; - switch (soplex->status()) { - case soplex::SPxSolver::OPTIMAL: - return PRIMAL_DUAL_FEASIBLE; - case soplex::SPxSolver::UNBOUNDED: - return PRIMAL_FEASIBLE_DUAL_INFEASIBLE; - default: - return UNKNOWN; + void LpSoplex::_setSense(Sense sense) { + switch (sense) { + case MIN: + soplex->changeSense(soplex::SPxSolver::MINIMIZE); + break; + case MAX: + soplex->changeSense(soplex::SPxSolver::MAXIMIZE); } } - void LpSoplex::_setMax() { - soplex->changeSense(soplex::SPxSolver::MAXIMIZE); - solved = false; - } - void LpSoplex::_setMin() { - soplex->changeSense(soplex::SPxSolver::MINIMIZE); - solved = false; - } - bool LpSoplex::_isMax() const { - return soplex->spxSense() == soplex::SPxSolver::MAXIMIZE; + LpSoplex::Sense LpSoplex::_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(); + } } + void LpSoplex::_clear() { + soplex->clear(); + _col_names.clear(); + _col_names_ref.clear(); + _row_names.clear(); + _row_names_ref.clear(); + cols.clear(); + rows.clear(); + _clear_temporals(); + } } //namespace lemon