1.1 --- a/lemon/lp_base.h Thu Feb 26 09:39:02 2009 +0000
1.2 +++ b/lemon/lp_base.h Thu Feb 26 07:39:16 2009 +0000
1.3 @@ -918,8 +918,6 @@
1.4 protected:
1.5
1.6 //Abstract virtual functions
1.7 - virtual LpBase* _newSolver() const = 0;
1.8 - virtual LpBase* _cloneSolver() const = 0;
1.9
1.10 virtual int _addColId(int col) { return cols.addIndex(col); }
1.11 virtual int _addRowId(int row) { return rows.addIndex(row); }
1.12 @@ -987,11 +985,6 @@
1.13 /// Virtual destructor
1.14 virtual ~LpBase() {}
1.15
1.16 - ///Creates a new LP problem
1.17 - LpBase* newSolver() {return _newSolver();}
1.18 - ///Makes a copy of the LP problem
1.19 - LpBase* cloneSolver() {return _cloneSolver();}
1.20 -
1.21 ///Gives back the name of the solver.
1.22 const char* solverName() const {return _solverName();}
1.23
1.24 @@ -1821,6 +1814,11 @@
1.25
1.26 public:
1.27
1.28 + ///Allocate a new LP problem instance
1.29 + virtual LpSolver* newSolver() const = 0;
1.30 + ///Make a copy of the LP problem
1.31 + virtual LpSolver* cloneSolver() const = 0;
1.32 +
1.33 ///\name Solve the LP
1.34
1.35 ///@{
1.36 @@ -1935,13 +1933,8 @@
1.37 Value primal() const { return _getPrimalValue()+obj_const_comp;}
1.38 ///@}
1.39
1.40 - LpSolver* newSolver() {return _newSolver();}
1.41 - LpSolver* cloneSolver() {return _cloneSolver();}
1.42 -
1.43 protected:
1.44
1.45 - virtual LpSolver* _newSolver() const = 0;
1.46 - virtual LpSolver* _cloneSolver() const = 0;
1.47 };
1.48
1.49
1.50 @@ -1975,6 +1968,11 @@
1.51 UNBOUNDED = 4
1.52 };
1.53
1.54 + ///Allocate a new MIP problem instance
1.55 + virtual MipSolver* newSolver() const = 0;
1.56 + ///Make a copy of the MIP problem
1.57 + virtual MipSolver* cloneSolver() const = 0;
1.58 +
1.59 ///\name Solve the MIP
1.60
1.61 ///@{
1.62 @@ -2062,15 +2060,6 @@
1.63 virtual Value _getSol(int i) const = 0;
1.64 virtual Value _getSolValue() const = 0;
1.65
1.66 - public:
1.67 -
1.68 - MipSolver* newSolver() {return _newSolver();}
1.69 - MipSolver* cloneSolver() {return _cloneSolver();}
1.70 -
1.71 - protected:
1.72 -
1.73 - virtual MipSolver* _newSolver() const = 0;
1.74 - virtual MipSolver* _cloneSolver() const = 0;
1.75 };
1.76
1.77