LEMON/LEMON-main Changeset - r746:e4554cd6b2bf

Repositories » LEMON » LEMON-main

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

Changeset - r746:e4554cd6b2bf

« 745:68792f

747:a42f46 »

r746:e4554cd6b2bf

Sun, 04 Oct 2009 00:28:42

[Not Reviewed]

0 comments (0 inline)

deba@inf.elte.hu
deba@inf.elte.hu

Faster add row operation (#203) One virtual function call instead of more

0 13 0

default

13 files changed with 137 insertions and 4 deletions:

lemon/cbc.cc

lemon/cbc.h

lemon/clp.cc

lemon/clp.h

lemon/cplex.cc

lemon/cplex.h

lemon/glpk.cc

lemon/glpk.h

lemon/lp_base.h

lemon/lp_skeleton.cc

lemon/lp_skeleton.h

lemon/soplex.cc

lemon/soplex.h

↑ Collapse diff ↑

0 comments (0 inline)

@@ -91,12 +91,24 @@
 		  int CbcMip::_addRow() {
 		    _prob->addRow(0, 0, 0, -COIN_DBL_MAX, COIN_DBL_MAX);
 		    return _prob->numberRows() - 1;
+		  }
 		  int CbcMip::_addRow(Value l, ExprIterator b, ExprIterator e, Value u) {
 		    std::vector<int> indexes;
 		    std::vector<Value> values;
 		    for(ExprIterator it = b; it != e; ++it) {
 		      indexes.push_back(it->first);
 		      values.push_back(it->second);
+		    }
 		    _prob->addRow(values.size(), &indexes.front(), &values.front(), l, u);
 		    return _prob->numberRows() - 1;
+		  }
 		  void CbcMip::_eraseCol(int i) {
 		    _prob->deleteColumn(i);
+		  }
 		  void CbcMip::_eraseRow(int i) {

@@ -59,12 +59,13 @@
 		  protected:
 		    virtual const char* _solverName() const;
 		    virtual int _addCol();
 		    virtual int _addRow();
 		    virtual int _addRow(Value l, ExprIterator b, ExprIterator e, Value u);
 		    virtual void _eraseCol(int i);
 		    virtual void _eraseRow(int i);
 		    virtual void _eraseColId(int i);
 		    virtual void _eraseRowId(int i);

@@ -75,12 +75,25 @@
 		  int ClpLp::_addRow() {
 		    _prob->addRow(0, 0, 0, -COIN_DBL_MAX, COIN_DBL_MAX);
 		    return _prob->numberRows() - 1;
+		  }
 		  int ClpLp::_addRow(Value l, ExprIterator b, ExprIterator e, Value u) {
 		    std::vector<int> indexes;
 		    std::vector<Value> values;
 		    for(ExprIterator it = b; it != e; ++it) {
 		      indexes.push_back(it->first);
 		      values.push_back(it->second);
+		    }
 		    _prob->addRow(values.size(), &indexes.front(), &values.front(), l, u);
 		    return _prob->numberRows() - 1;
+		  }
 		  void ClpLp::_eraseCol(int c) {
 		    _col_names_ref.erase(_prob->getColumnName(c));
 		    _prob->deleteColumns(1, &c);
+		  }

@@ -72,12 +72,13 @@
 		  protected:
 		    virtual const char* _solverName() const;
 		    virtual int _addCol();
 		    virtual int _addRow();
 		    virtual int _addRow(Value l, ExprIterator b, ExprIterator e, Value u);
 		    virtual void _eraseCol(int i);
 		    virtual void _eraseRow(int i);
 		    virtual void _eraseColId(int i);
 		    virtual void _eraseRowId(int i);

@@ -108,12 +108,45 @@
 		    const double ub = INF;
 		    const char s = 'L';
 		    CPXnewrows(cplexEnv(), _prob, 1, &ub, &s, 0, 0);
 		    return i;
+		  }
 		  int CplexBase::_addRow(Value lb, ExprIterator b,
 		                         ExprIterator e, Value ub) {
 		    int i = CPXgetnumrows(cplexEnv(), _prob);
 		    if (lb == -INF) {
 		      const char s = 'L';
 		      CPXnewrows(cplexEnv(), _prob, 1, &ub, &s, 0, 0);
 		    } else if (ub == INF) {
 		      const char s = 'G';
 		      CPXnewrows(cplexEnv(), _prob, 1, &lb, &s, 0, 0);
 		    } else if (lb == ub){
 		      const char s = 'E';
 		      CPXnewrows(cplexEnv(), _prob, 1, &lb, &s, 0, 0);
 		    } else {
 		      const char s = 'R';
 		      double len = ub - lb;
 		      CPXnewrows(cplexEnv(), _prob, 1, &lb, &s, &len, 0);
+		    }
 		    std::vector<int> indices;
 		    std::vector<int> rowlist;
 		    std::vector<Value> values;
 		    for(ExprIterator it=b; it!=e; ++it) {
 		      indices.push_back(it->first);
 		      values.push_back(it->second);
 		      rowlist.push_back(i);
+		    }
 		    CPXchgcoeflist(cplexEnv(), _prob, values.size(),
 		                   &rowlist.front(), &indices.front(), &values.front());
 		    return i;
+		  }
 		  void CplexBase::_eraseCol(int i) {
 		    CPXdelcols(cplexEnv(), _prob, i, i);
+		  }
 		  void CplexBase::_eraseRow(int i) {

RhodeCode

Login to your account

@@ -56,12 +56,48 @@
 		  int GlpkBase::_addRow() {
 		    int i = glp_add_rows(lp, 1);
 		    glp_set_row_bnds(lp, i, GLP_FR, 0.0, 0.0);
 		    return i;
+		  }
 		  int GlpkBase::_addRow(Value lo, ExprIterator b,
 		                        ExprIterator e, Value up) {
 		    int i = glp_add_rows(lp, 1);
 		    if (lo == -INF) {
 		      if (up == INF) {
 		        glp_set_row_bnds(lp, i, GLP_FR, lo, up);
 		      } else {
 		        glp_set_row_bnds(lp, i, GLP_UP, lo, up);
+		      }
 		    } else {
 		      if (up == INF) {
 		        glp_set_row_bnds(lp, i, GLP_LO, lo, up);
 		      } else if (lo != up) {
 		        glp_set_row_bnds(lp, i, GLP_DB, lo, up);
 		      } else {
 		        glp_set_row_bnds(lp, i, GLP_FX, lo, up);
+		      }
+		    }
 		    std::vector<int> indexes;
 		    std::vector<Value> values;
 		    indexes.push_back(0);
 		    values.push_back(0);
 		    for(ExprIterator it = b; it != e; ++it) {
 		      indexes.push_back(it->first);
 		      values.push_back(it->second);
+		    }
 		    glp_set_mat_row(lp, i, values.size() - 1,
 		                    &indexes.front(), &values.front());
 		    return i;
+		  }
 		  void GlpkBase::_eraseCol(int i) {
 		    int ca[2];
 		    ca[1] = i;
 		    glp_del_cols(lp, 1, ca);
+		  }

@@ -940,12 +940,20 @@
 		    virtual void _eraseColId(int col) { cols.eraseIndex(col); }
 		    virtual void _eraseRowId(int row) { rows.eraseIndex(row); }
 		    virtual int _addCol() = 0;
 		    virtual int _addRow() = 0;
 		    virtual int _addRow(Value l, ExprIterator b, ExprIterator e, Value u) {
 		      int row = _addRow();
 		      _setRowCoeffs(row, b, e);
 		      _setRowLowerBound(row, l);
 		      _setRowUpperBound(row, u);
 		      return row;
+		    }
 		    virtual void _eraseCol(int col) = 0;
 		    virtual void _eraseRow(int row) = 0;
 		    virtual void _getColName(int col, std::string& name) const = 0;
 		    virtual void _setColName(int col, const std::string& name) = 0;
 		    virtual int _colByName(const std::string& name) const = 0;
@@ -1204,24 +1212,30 @@
 		    ///\param l is the lower bound (-\ref INF means no bound)
 		    ///\param e is a linear expression (see \ref Expr)
 		    ///\param u is the upper bound (\ref INF means no bound)
 		    ///\return The created row.
 		    Row addRow(Value l,const Expr &e, Value u) {
 		      Row r=addRow();
 		      row(r,l,e,u);
 		      Row r;
 		      e.simplify();
 		      r._id = _addRowId(_addRow(l - *e, ExprIterator(e.comps.begin(), cols),
 		                                ExprIterator(e.comps.end(), cols), u - *e));
 		      return r;
+		    }
 		    ///Add a new row (i.e a new constraint) to the LP
 		    ///\param c is a linear expression (see \ref Constr)
 		    ///\return The created row.
 		    Row addRow(const Constr &c) {
 		      Row r=addRow();
 		      row(r,c);
 		      Row r;
 		      c.expr().simplify();
 		      r._id = _addRowId(_addRow(c.lowerBounded()?c.lowerBound():-INF,
 		                                ExprIterator(c.expr().comps.begin(), cols),
 		                                ExprIterator(c.expr().comps.end(), cols),
 		                                c.upperBounded()?c.upperBound():INF));
 		      return r;
+		    }
 		    ///Erase a column (i.e a variable) from the LP
 		    ///\param c is the column to be deleted
 		    void erase(Col c) {

@@ -29,12 +29,17 @@
 		  int SkeletonSolverBase::_addRow()
+		  {
 		    return ++row_num;
+		  }
 		  int SkeletonSolverBase::_addRow(Value, ExprIterator, ExprIterator, Value)
+		  {
 		    return ++row_num;
+		  }
 		  void SkeletonSolverBase::_eraseCol(int) {}
 		  void SkeletonSolverBase::_eraseRow(int) {}
 		  void SkeletonSolverBase::_getColName(int, std::string &) const {}
 		  void SkeletonSolverBase::_setColName(int, const std::string &) {}
 		  int SkeletonSolverBase::_colByName(const std::string&) const { return -1; }

@@ -88,12 +88,25 @@
 		    _row_names.push_back(std::string());
 		    return soplex->nRows() - 1;
+		  }
 		  int SoplexLp::_addRow(Value l, ExprIterator b, ExprIterator e, Value u) {
 		    soplex::DSVector v;
 		    for (ExprIterator it = b; it != e; ++it) {
 		      v.add(it->first, it->second);
+		    }
 		    soplex::LPRow r(l, v, u);
 		    soplex->addRow(r);
 		    _row_names.push_back(std::string());
 		    return soplex->nRows() - 1;
+		  }
 		  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;