LEMON/LEMON-official Changeset - r587:9db62975c32b

Repositories » LEMON » LEMON-official

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

Changeset - r587:9db62975c32b

« 586:547e96

588:89e29e »

r587:9db62975c32b

Thu, 26 Feb 2009 08:39:16

[Not Reviewed]

0 comments (0 inline)

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

Fix newSolver()/cloneSolver() API in LP tools + doc improvements (#230) - More logical structure for newSolver()/cloneSolver() - Fix compilation problem with gcc-3.3 - Doc improvements

0 13 0

default

13 files changed with 118 insertions and 78 deletions:

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

test/lp_test.cc

test/mip_test.cc

↑ Collapse diff ↑

0 comments (0 inline)

@@ -58,3 +58,3 @@
-		  ClpLp* ClpLp::_newSolver() const {
+		  ClpLp* ClpLp::newSolver() const {
 		    ClpLp* newlp = new ClpLp;
@@ -63,3 +63,3 @@
-		  ClpLp* ClpLp::_cloneSolver() const {
+		  ClpLp* ClpLp::cloneSolver() const {
 		    ClpLp* copylp = new ClpLp(*this);

@@ -58,2 +58,7 @@
 		    /// \e
 		    virtual ClpLp* newSolver() const;
 		    /// \e
 		    virtual ClpLp* cloneSolver() const;
 		  protected:
@@ -68,5 +73,2 @@
 		    virtual ClpLp* _newSolver() const;
 		    virtual ClpLp* _cloneSolver() const;
 		    virtual const char* _solverName() const;

@@ -453,4 +453,4 @@
 		  CplexLp* CplexLp::_newSolver() const { return new CplexLp; }
 		  CplexLp* CplexLp::_cloneSolver() const {return new CplexLp(*this); }
 		  CplexLp* CplexLp::newSolver() const { return new CplexLp; }
 		  CplexLp* CplexLp::cloneSolver() const {return new CplexLp(*this); }
@@ -825,4 +825,4 @@
 		  CplexMip* CplexMip::_newSolver() const { return new CplexMip; }
 		  CplexMip* CplexMip::_cloneSolver() const {return new CplexMip(*this); }
 		  CplexMip* CplexMip::newSolver() const { return new CplexMip; }
 		  CplexMip* CplexMip::cloneSolver() const {return new CplexMip(*this); }

@@ -162,3 +162,3 @@
 		  ///\ingroup lp_group
-		  class CplexLp : public CplexBase, public LpSolver {
+		  class CplexLp : public LpSolver, public CplexBase {
 		  public:
@@ -173,2 +173,7 @@
 		    /// \e
 		    virtual CplexLp* cloneSolver() const;
 		    /// \e
 		    virtual CplexLp* newSolver() const;
 		  private:
@@ -188,5 +193,2 @@
 		    virtual CplexLp* _cloneSolver() const;
 		    virtual CplexLp* _newSolver() const;
 		    virtual const char* _solverName() const;
@@ -224,3 +226,3 @@
 		  ///\ingroup lp_group
-		  class CplexMip : public CplexBase, public MipSolver {
+		  class CplexMip : public MipSolver, public CplexBase {
 		  public:

@@ -536,4 +536,4 @@
 		  GlpkLp* GlpkLp::_newSolver() const { return new GlpkLp; }
 		  GlpkLp* GlpkLp::_cloneSolver() const { return new GlpkLp(*this); }
 		  GlpkLp* GlpkLp::newSolver() const { return new GlpkLp; }
 		  GlpkLp* GlpkLp::cloneSolver() const { return new GlpkLp(*this); }
@@ -942,4 +942,4 @@
 		  GlpkMip* GlpkMip::_newSolver() const { return new GlpkMip; }
 		  GlpkMip* GlpkMip::_cloneSolver() const {return new GlpkMip(*this); }
 		  GlpkMip* GlpkMip::newSolver() const { return new GlpkMip; }
 		  GlpkMip* GlpkMip::cloneSolver() const {return new GlpkMip(*this); }

RhodeCode

Login to your account

@@ -121,3 +121,3 @@
 		  ///\ingroup lp_group
-		  class GlpkLp : public GlpkBase, public LpSolver {
+		  class GlpkLp : public LpSolver, public GlpkBase {
 		  public:
@@ -129,2 +129,7 @@
 		    ///\e
 		    virtual GlpkLp* cloneSolver() const;
 		    ///\e
 		    virtual GlpkLp* newSolver() const;
 		  private:
@@ -138,5 +143,2 @@
 		    virtual GlpkLp* _cloneSolver() const;
 		    virtual GlpkLp* _newSolver() const;
 		    virtual const char* _solverName() const;
@@ -205,3 +207,3 @@
 		  ///\ingroup lp_group
-		  class GlpkMip : public GlpkBase, public MipSolver {
+		  class GlpkMip : public MipSolver, public GlpkBase {
 		  public:
@@ -213,7 +215,7 @@
 		    virtual GlpkMip* cloneSolver() const;
 		    virtual GlpkMip* newSolver() const;
 		  protected:
 		    virtual GlpkMip* _cloneSolver() const;
 		    virtual GlpkMip* _newSolver() const;
 		    virtual const char* _solverName() const;

@@ -920,4 +920,2 @@
 		    //Abstract virtual functions
 		    virtual LpBase* _newSolver() const = 0;
 		    virtual LpBase* _cloneSolver() const = 0;
@@ -989,7 +987,2 @@
 		    ///Creates a new LP problem
 		    LpBase* newSolver() {return _newSolver();}
 		    ///Makes a copy of the LP problem
 		    LpBase* cloneSolver() {return _cloneSolver();}
 		    ///Gives back the name of the solver.
@@ -1823,2 +1816,7 @@
 		    ///Allocate a new LP problem instance
 		    virtual LpSolver* newSolver() const = 0;
 		    ///Make a copy of the LP problem
 		    virtual LpSolver* cloneSolver() const = 0;
 		    ///\name Solve the LP
@@ -1937,9 +1935,4 @@
 		    LpSolver* newSolver() {return _newSolver();}
 		    LpSolver* cloneSolver() {return _cloneSolver();}
 		  protected:
 		    virtual LpSolver* _newSolver() const = 0;
 		    virtual LpSolver* _cloneSolver() const = 0;
 		  };
@@ -1977,2 +1970,7 @@
 		    ///Allocate a new MIP problem instance
 		    virtual MipSolver* newSolver() const = 0;
 		    ///Make a copy of the MIP problem
 		    virtual MipSolver* cloneSolver() const = 0;
 		    ///\name Solve the MIP
@@ -2064,11 +2062,2 @@
 		  public:
 		    MipSolver* newSolver() {return _newSolver();}
 		    MipSolver* cloneSolver() {return _cloneSolver();}
 		  protected:
 		    virtual MipSolver* _newSolver() const = 0;
 		    virtual MipSolver* _cloneSolver() const = 0;
 		  };

@@ -107,6 +107,6 @@
-		  LpSkeleton* LpSkeleton::_newSolver() const
+		  LpSkeleton* LpSkeleton::newSolver() const
 		  { return static_cast<LpSkeleton*>(0); }
-		  LpSkeleton* LpSkeleton::_cloneSolver() const
+		  LpSkeleton* LpSkeleton::cloneSolver() const
 		  { return static_cast<LpSkeleton*>(0); }
@@ -124,6 +124,6 @@
-		  MipSkeleton* MipSkeleton::_newSolver() const
+		  MipSkeleton* MipSkeleton::newSolver() const
 		  { return static_cast<MipSkeleton*>(0); }
-		  MipSkeleton* MipSkeleton::_cloneSolver() const
+		  MipSkeleton* MipSkeleton::cloneSolver() const
 		  { return static_cast<MipSkeleton*>(0); }

@@ -24,6 +24,12 @@
 		///\file
-		///\brief A skeleton file to implement LP solver interfaces
+		///\brief Skeleton file to implement LP/MIP solver interfaces
 		///
 		///The classes in this file do nothing, but they can serve as skeletons when
 		///implementing an interface to new solvers.
 		namespace lemon {
-		  ///A skeleton class to implement LP solver interfaces
+		  ///A skeleton class to implement LP/MIP solver base interface
 		  ///This class does nothing, but it can serve as a skeleton when
 		  ///implementing an interface to new solvers.
 		  class SkeletonSolverBase : public virtual LpBase {
@@ -138,10 +144,16 @@
-		  /// \brief Interface for a skeleton LP solver
+		  /// \brief Skeleton class for an LP solver interface
 		  ///
-		  /// This class implements an interface for a skeleton LP solver.
+		  ///This class does nothing, but it can serve as a skeleton when
 		  ///implementing an interface to new solvers.
 		  ///\ingroup lp_group
-		  class LpSkeleton : public SkeletonSolverBase, public LpSolver {
+		  class LpSkeleton : public LpSolver, public SkeletonSolverBase {
 		  public:
 		    LpSkeleton() : SkeletonSolverBase(), LpSolver() {}
 		    ///\e
 		    LpSkeleton() : LpSolver(), SkeletonSolverBase() {}
 		    ///\e
 		    virtual LpSkeleton* newSolver() const;
 		    ///\e
 		    virtual LpSkeleton* cloneSolver() const;
 		  protected:
@@ -175,6 +187,2 @@
 		    ///\e
 		    virtual LpSkeleton* _newSolver() const;
 		    ///\e
 		    virtual LpSkeleton* _cloneSolver() const;
 		    ///\e
 		    virtual const char* _solverName() const;
@@ -183,9 +191,15 @@
-		  /// \brief Interface for a skeleton MIP solver
+		  /// \brief Skeleton class for a MIP solver interface
 		  ///
-		  /// This class implements an interface for a skeleton MIP solver.
+		  ///This class does nothing, but it can serve as a skeleton when
 		  ///implementing an interface to new solvers.
 		  ///\ingroup lp_group
-		  class MipSkeleton : public SkeletonSolverBase, public MipSolver {
+		  class MipSkeleton : public MipSolver, public SkeletonSolverBase {
 		  public:
-		    MipSkeleton() : SkeletonSolverBase(), MipSolver() {}
+		    ///\e
 		    MipSkeleton() : MipSolver(), SkeletonSolverBase() {}
 		    ///\e
 		    virtual MipSkeleton* newSolver() const;
 		    ///\e
 		    virtual MipSkeleton* cloneSolver() const;
@@ -217,9 +231,3 @@
 		    ///\e
 		    virtual MipSkeleton* _newSolver() const;
 		    ///\e
 		    virtual MipSkeleton* _cloneSolver() const;
 		    ///\e
 		    virtual const char* _solverName() const;
 		  };

@@ -56,3 +56,3 @@
-		  SoplexLp* SoplexLp::_newSolver() const {
+		  SoplexLp* SoplexLp::newSolver() const {
 		    SoplexLp* newlp = new SoplexLp();
@@ -61,3 +61,3 @@
-		  SoplexLp* SoplexLp::_cloneSolver() const {
+		  SoplexLp* SoplexLp::cloneSolver() const {
 		    SoplexLp* newlp = new SoplexLp(*this);

@@ -75,2 +75,6 @@
 		    ~SoplexLp();
 		    /// \e
 		    virtual SoplexLp* newSolver() const;
 		    /// \e
 		    virtual SoplexLp* cloneSolver() const;
@@ -78,5 +82,2 @@
 		    virtual SoplexLp* _newSolver() const;
 		    virtual SoplexLp* _cloneSolver() const;
 		    virtual const char* _solverName() const;

@@ -199,2 +199,7 @@
 		    //Test for clone/new
 		    LP* lpnew = lp.newSolver();
 		    LP* lpclone = lp.cloneSolver();
 		    delete lpnew;
 		    delete lpclone;
@@ -249,3 +254,4 @@
 		    std::ostringstream sbuf;
-		    sbuf << "Wrong optimal value: the right optimum is " << exp_opt;
+		    sbuf << "Wrong optimal value (" << lp.primal() <<") with "
 		         << lp.solverName() <<"\n     the right optimum is " << exp_opt;
 		    check(std::abs(lp.primal()-exp_opt) < 1e-3, sbuf.str());
@@ -357,2 +363,15 @@
 		template<class LP>
 		void cloneTest()
+		{
 		  //Test for clone/new
 		  LP* lp = new LP();
 		  LP* lpnew = lp->newSolver();
 		  LP* lpclone = lp->cloneSolver();
 		  delete lp;
 		  delete lpnew;
 		  delete lpclone;
+		}
 		int main()
@@ -367,2 +386,3 @@
 		    aTest(lp_glpk2);
 		    cloneTest<GlpkLp>();
+		  }
@@ -383,2 +403,3 @@
+		  }
 		    cloneTest<CplexLp>();
 		#endif
@@ -390,2 +411,3 @@
 		    aTest(lp_soplex2);
 		    cloneTest<SoplexLp>();
+		  }
@@ -398,2 +420,3 @@
 		    aTest(lp_clp2);
 		    cloneTest<ClpLp>();
+		  }

@@ -108,2 +108,13 @@
 		template<class MIP>
 		void cloneTest()
+		{
 		  MIP* mip = new MIP();
 		  MIP* mipnew = mip->newSolver();
 		  MIP* mipclone = mip->cloneSolver();
 		  delete mip;
 		  delete mipnew;
 		  delete mipclone;
+		}
@@ -116,2 +127,3 @@
 		    aTest(mip1);
 		    cloneTest<GlpkMip>();
+		  }
@@ -131,2 +143,3 @@
+		  }
 		  cloneTest<CplexMip>();
 		#endif