Changes in lemon/lp_skeleton.h [541:89e29e22d479:459:ed54c0d13df0] in lemon-1.2

File:

• lemon/lp_skeleton.h (modified) (3 diffs)

lemon/lp_skeleton.h

@@ -17 +17 @@
  */
 
-#ifndef LEMON_LP_SKELETON_H
-#define LEMON_LP_SKELETON_H
+#ifndef LEMON_LP_SKELETON
+#define LEMON_LP_SKELETON
 
 #include <lemon/lp_base.h>
 
 ///\file
-///\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.
+///\brief A skeleton file to implement LP solver interfaces
 namespace lemon {
 
-  ///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.
+  ///A skeleton class to implement LP solver interfaces
   class SkeletonSolverBase : public virtual LpBase {
     int col_num,row_num;
@@ -143 +137 @@
   };
 
-  /// \brief Skeleton class for an LP solver interface
+  /// \brief Interface for a skeleton LP solver
   ///
-  ///This class does nothing, but it can serve as a skeleton when
-  ///implementing an interface to new solvers.
-
+  /// This class implements an interface for a skeleton LP solver.
   ///\ingroup lp_group
-  class LpSkeleton : public LpSolver, public SkeletonSolverBase {
+  class LpSkeleton : public SkeletonSolverBase, public LpSolver {
   public:
-    ///\e
-    LpSkeleton() : LpSolver(), SkeletonSolverBase() {}
-    ///\e
-    virtual LpSkeleton* newSolver() const;
-    ///\e
-    virtual LpSkeleton* cloneSolver() const;
+    LpSkeleton() : SkeletonSolverBase(), LpSolver() {}
+
   protected:
 
@@ -186 +174 @@
 
     ///\e
+    virtual LpSkeleton* _newSolver() const;
+    ///\e
+    virtual LpSkeleton* _cloneSolver() const;
+    ///\e
     virtual const char* _solverName() const;
 
   };
 
-  /// \brief Skeleton class for a MIP solver interface
+  /// \brief Interface for a skeleton MIP solver
   ///
-  ///This class does nothing, but it can serve as a skeleton when
-  ///implementing an interface to new solvers.
+  /// This class implements an interface for a skeleton MIP solver.
   ///\ingroup lp_group
-  class MipSkeleton : public MipSolver, public SkeletonSolverBase {
+  class MipSkeleton : public SkeletonSolverBase, public MipSolver {
   public:
-    ///\e
-    MipSkeleton() : MipSolver(), SkeletonSolverBase() {}
-    ///\e
-    virtual MipSkeleton* newSolver() const;
-    ///\e
-    virtual MipSkeleton* cloneSolver() const;
+    MipSkeleton() : SkeletonSolverBase(), MipSolver() {}
 
   protected:
     ///\e
+
+    ///\bug Wrong interface
+    ///
     virtual SolveExitStatus _solve();
 
     ///\e
+
+    ///\bug Wrong interface
+    ///
     virtual Value _getSol(int i) const;
 
     ///\e
+
+    ///\bug Wrong interface
+    ///
     virtual Value _getSolValue() const;
 
     ///\e
+
+    ///\bug Wrong interface
+    ///
     virtual ProblemType _getType() const;
 
     ///\e
+    virtual MipSkeleton* _newSolver() const;
+
+    ///\e
+    virtual MipSkeleton* _cloneSolver() const;
+    ///\e
     virtual const char* _solverName() const;
+
   };
 
 } //namespace lemon
 
-#endif
+#endif // LEMON_LP_SKELETON