Changeset 540:9db62975c32b in lemon-1.2 for lemon/glpk.h

Timestamp:

02/26/09 08:39:16 (16 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Phase:

public

Message:

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

File:

• lemon/glpk.h (modified) (5 diffs)

lemon/glpk.h

@@ -120 +120 @@
   /// This class implements an interface for the GLPK LP solver.
   ///\ingroup lp_group
-  class GlpkLp : public GlpkBase, public LpSolver {
+  class GlpkLp : public LpSolver, public GlpkBase {
   public:
 
@@ -127 +127 @@
     ///\e
     GlpkLp(const GlpkLp&);
+
+    ///\e
+    virtual GlpkLp* cloneSolver() const;
+    ///\e
+    virtual GlpkLp* newSolver() const;
 
   private:
@@ -136 +141 @@
 
   protected:
-
-    virtual GlpkLp* _cloneSolver() const;
-    virtual GlpkLp* _newSolver() const;
 
     virtual const char* _solverName() const;
@@ -204 +206 @@
   /// This class implements an interface for the GLPK MIP solver.
   ///\ingroup lp_group
-  class GlpkMip : public GlpkBase, public MipSolver {
+  class GlpkMip : public MipSolver, public GlpkBase {
   public:
 
@@ -212 +214 @@
     GlpkMip(const GlpkMip&);
 
-  protected:
-
-    virtual GlpkMip* _cloneSolver() const;
-    virtual GlpkMip* _newSolver() const;
+    virtual GlpkMip* cloneSolver() const;
+    virtual GlpkMip* newSolver() const;
+
+  protected:
 
     virtual const char* _solverName() const;