COIN-OR::LEMON - Graph Library

Changeset 542:fc6c7aab4b8d in lemon-1.2 for lemon/glpk.cc


Ignore:
Timestamp:
03/04/09 14:43:05 (11 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Parents:
541:89e29e22d479 (diff), 538:ba124394367a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Phase:
public
Message:

Merge

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • lemon/glpk.cc

    r538 r542  
    541541  }
    542542
    543   GlpkLp* GlpkLp::_newSolver() const { return new GlpkLp; }
    544   GlpkLp* GlpkLp::_cloneSolver() const { return new GlpkLp(*this); }
     543  GlpkLp* GlpkLp::newSolver() const { return new GlpkLp; }
     544  GlpkLp* GlpkLp::cloneSolver() const { return new GlpkLp(*this); }
    545545
    546546  const char* GlpkLp::_solverName() const { return "GlpkLp"; }
     
    947947  }
    948948
    949   GlpkMip* GlpkMip::_newSolver() const { return new GlpkMip; }
    950   GlpkMip* GlpkMip::_cloneSolver() const {return new GlpkMip(*this); }
     949  GlpkMip* GlpkMip::newSolver() const { return new GlpkMip; }
     950  GlpkMip* GlpkMip::cloneSolver() const {return new GlpkMip(*this); }
    951951
    952952  const char* GlpkMip::_solverName() const { return "GlpkMip"; }
  • lemon/glpk.cc

    r540 r542  
    522522    cols.clear();
    523523  }
     524
     525  void GlpkBase::freeEnv() {
     526    glp_free_env();
     527  }
     528
     529  GlpkBase::FreeEnvHelper GlpkBase::freeEnvHelper;
    524530
    525531  // GlpkLp members
Note: See TracChangeset for help on using the changeset viewer.