r598:9d0d7e20f76d
Thu, 19 Mar 2009 08:40:34
[Not Reviewed]
0 comments (0 inline)
0
5
0
| ... | ... |
@@ -3,5 +3,5 @@ |
| 3 | 3 |
* This file is a part of LEMON, a generic C++ optimization library. |
| 4 | 4 |
* |
| 5 |
* Copyright (C) 2003- |
|
| 5 |
* Copyright (C) 2003-2009 |
|
| 6 | 6 |
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport |
| 7 | 7 |
* (Egervary Research Group on Combinatorial Optimization, EGRES). |
| ... | ... |
@@ -442,11 +442,11 @@ |
| 442 | 442 |
|
| 443 | 443 |
CplexLp::CplexLp() |
| 444 |
: LpBase(), |
|
| 444 |
: LpBase(), LpSolver(), CplexBase() {}
|
|
| 445 | 445 |
|
| 446 | 446 |
CplexLp::CplexLp(const CplexEnv& env) |
| 447 |
: LpBase(), |
|
| 447 |
: LpBase(), LpSolver(), CplexBase(env) {}
|
|
| 448 | 448 |
|
| 449 | 449 |
CplexLp::CplexLp(const CplexLp& other) |
| 450 |
: LpBase(), |
|
| 450 |
: LpBase(), LpSolver(), CplexBase(other) {}
|
|
| 451 | 451 |
|
| 452 | 452 |
CplexLp::~CplexLp() {}
|
| ... | ... |
@@ -799,5 +799,5 @@ |
| 799 | 799 |
|
| 800 | 800 |
CplexMip::CplexMip() |
| 801 |
: LpBase(), |
|
| 801 |
: LpBase(), MipSolver(), CplexBase() {
|
|
| 802 | 802 |
|
| 803 | 803 |
#if CPX_VERSION < 800 |
| ... | ... |
@@ -809,5 +809,5 @@ |
| 809 | 809 |
|
| 810 | 810 |
CplexMip::CplexMip(const CplexEnv& env) |
| 811 |
: LpBase(), |
|
| 811 |
: LpBase(), MipSolver(), CplexBase(env) {
|
|
| 812 | 812 |
|
| 813 | 813 |
#if CPX_VERSION < 800 |
| ... | ... |
@@ -820,5 +820,5 @@ |
| 820 | 820 |
|
| 821 | 821 |
CplexMip::CplexMip(const CplexMip& other) |
| 822 |
: LpBase(), |
|
| 822 |
: LpBase(), MipSolver(), CplexBase(other) {}
|
|
| 823 | 823 |
|
| 824 | 824 |
CplexMip::~CplexMip() {}
|
| ... | ... |
@@ -3,5 +3,5 @@ |
| 3 | 3 |
* This file is a part of LEMON, a generic C++ optimization library. |
| 4 | 4 |
* |
| 5 |
* Copyright (C) 2003- |
|
| 5 |
* Copyright (C) 2003-2009 |
|
| 6 | 6 |
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport |
| 7 | 7 |
* (Egervary Research Group on Combinatorial Optimization, EGRES). |
| ... | ... |
@@ -79,5 +79,5 @@ |
| 79 | 79 |
/// |
| 80 | 80 |
/// This class implements the common interface of the CPLEX LP and |
| 81 |
/// MIP solvers. |
|
| 81 |
/// MIP solvers. |
|
| 82 | 82 |
/// \ingroup lp_group |
| 83 | 83 |
class CplexBase : virtual public LpBase {
|
| ... | ... |
@@ -236,8 +236,11 @@ |
| 236 | 236 |
virtual ~CplexMip(); |
| 237 | 237 |
|
| 238 |
/// \e |
|
| 239 |
virtual CplexMip* cloneSolver() const; |
|
| 240 |
/// \e |
|
| 241 |
virtual CplexMip* newSolver() const; |
|
| 242 |
|
|
| 238 | 243 |
protected: |
| 239 | 244 |
|
| 240 |
virtual CplexMip* _cloneSolver() const; |
|
| 241 |
virtual CplexMip* _newSolver() const; |
|
| 242 | 245 |
|
| 243 | 246 |
virtual const char* _solverName() const; |
| ... | ... |
@@ -3,5 +3,5 @@ |
| 3 | 3 |
* This file is a part of LEMON, a generic C++ optimization library. |
| 4 | 4 |
* |
| 5 |
* Copyright (C) 2003- |
|
| 5 |
* Copyright (C) 2003-2009 |
|
| 6 | 6 |
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport |
| 7 | 7 |
* (Egervary Research Group on Combinatorial Optimization, EGRES). |
| ... | ... |
@@ -532,10 +532,10 @@ |
| 532 | 532 |
|
| 533 | 533 |
GlpkLp::GlpkLp() |
| 534 |
: LpBase(), |
|
| 534 |
: LpBase(), LpSolver(), GlpkBase() {
|
|
| 535 | 535 |
messageLevel(MESSAGE_NO_OUTPUT); |
| 536 | 536 |
} |
| 537 | 537 |
|
| 538 | 538 |
GlpkLp::GlpkLp(const GlpkLp& other) |
| 539 |
: LpBase(other), |
|
| 539 |
: LpBase(other), LpSolver(other), GlpkBase(other) {
|
|
| 540 | 540 |
messageLevel(MESSAGE_NO_OUTPUT); |
| 541 | 541 |
} |
| ... | ... |
@@ -831,10 +831,10 @@ |
| 831 | 831 |
|
| 832 | 832 |
GlpkMip::GlpkMip() |
| 833 |
: LpBase(), |
|
| 833 |
: LpBase(), MipSolver(), GlpkBase() {
|
|
| 834 | 834 |
messageLevel(MESSAGE_NO_OUTPUT); |
| 835 | 835 |
} |
| 836 | 836 |
|
| 837 | 837 |
GlpkMip::GlpkMip(const GlpkMip& other) |
| 838 |
: LpBase(), |
|
| 838 |
: LpBase(), MipSolver(), GlpkBase(other) {
|
|
| 839 | 839 |
messageLevel(MESSAGE_NO_OUTPUT); |
| 840 | 840 |
} |
| ... | ... |
@@ -3,5 +3,5 @@ |
| 3 | 3 |
* This file is a part of LEMON, a generic C++ optimization library. |
| 4 | 4 |
* |
| 5 |
* Copyright (C) 2003- |
|
| 5 |
* Copyright (C) 2003-2009 |
|
| 6 | 6 |
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport |
| 7 | 7 |
* (Egervary Research Group on Combinatorial Optimization, EGRES). |
| ... | ... |
@@ -366,5 +366,5 @@ |
| 366 | 366 |
{
|
| 367 | 367 |
//Test for clone/new |
| 368 |
|
|
| 368 |
|
|
| 369 | 369 |
LP* lp = new LP(); |
| 370 | 370 |
LP* lpnew = lp->newSolver(); |
| ... | ... |
@@ -394,4 +394,5 @@ |
| 394 | 394 |
lpTest(lp_cplex1); |
| 395 | 395 |
aTest(lp_cplex2); |
| 396 |
cloneTest<CplexLp>(); |
|
| 396 | 397 |
} catch (CplexEnv::LicenseError& error) {
|
| 397 | 398 |
#ifdef LEMON_FORCE_CPLEX_CHECK |
| ... | ... |
@@ -402,5 +403,4 @@ |
| 402 | 403 |
#endif |
| 403 | 404 |
} |
| 404 |
cloneTest<CplexLp>(); |
|
| 405 | 405 |
#endif |
| 406 | 406 |
| ... | ... |
@@ -3,5 +3,5 @@ |
| 3 | 3 |
* This file is a part of LEMON, a generic C++ optimization library. |
| 4 | 4 |
* |
| 5 |
* Copyright (C) 2003- |
|
| 5 |
* Copyright (C) 2003-2009 |
|
| 6 | 6 |
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport |
| 7 | 7 |
* (Egervary Research Group on Combinatorial Optimization, EGRES). |
| ... | ... |
@@ -110,5 +110,5 @@ |
| 110 | 110 |
void cloneTest() |
| 111 | 111 |
{
|
| 112 |
|
|
| 112 |
|
|
| 113 | 113 |
MIP* mip = new MIP(); |
| 114 | 114 |
MIP* mipnew = mip->newSolver(); |
| ... | ... |
@@ -134,4 +134,5 @@ |
| 134 | 134 |
CplexMip mip2; |
| 135 | 135 |
aTest(mip2); |
| 136 |
cloneTest<CplexMip>(); |
|
| 136 | 137 |
} catch (CplexEnv::LicenseError& error) {
|
| 137 | 138 |
#ifdef LEMON_FORCE_CPLEX_CHECK |
| ... | ... |
@@ -142,5 +143,4 @@ |
| 142 | 143 |
#endif |
| 143 | 144 |
} |
| 144 |
cloneTest<CplexMip>(); |
|
| 145 | 145 |
#endif |
| 146 | 146 |
|
0 comments (0 inline)