LEMON/LEMON-official Changeset - r598:9d0d7e20f76d

Repositories » LEMON » LEMON-official

Changeset - r598:9d0d7e20f76d

« 597:20e3ac

599:56a86a »

r598:9d0d7e20f76d

Thu, 19 Mar 2009 08:40:34

[Not Reviewed]

0 comments (0 inline)

deba@inf.elte.hu
deba@inf.elte.hu

Fix lp related errors and warnings (#241 and #242)

0 5 0

default

5 files changed with 25 insertions and 22 deletions:

lemon/cplex.cc

lemon/cplex.h

lemon/glpk.cc

test/lp_test.cc

test/mip_test.cc

↑ Collapse diff ↑

lemon/cplex.cc

Show inline comments

@@ -4,3 +4,3 @@
+		 *
-		 * Copyright (C) 2003-2008
+		 * Copyright (C) 2003-2009
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
@@ -443,9 +443,9 @@
 		  CplexLp::CplexLp()
-		    : LpBase(), CplexBase(), LpSolver() {}
+		    : LpBase(), LpSolver(), CplexBase() {}
 		  CplexLp::CplexLp(const CplexEnv& env)
-		    : LpBase(), CplexBase(env), LpSolver() {}
+		    : LpBase(), LpSolver(), CplexBase(env) {}
 		  CplexLp::CplexLp(const CplexLp& other)
-		    : LpBase(), CplexBase(other), LpSolver() {}
+		    : LpBase(), LpSolver(), CplexBase(other) {}
@@ -800,3 +800,3 @@
 		  CplexMip::CplexMip()
-		    : LpBase(), CplexBase(), MipSolver() {
+		    : LpBase(), MipSolver(), CplexBase() {
@@ -810,3 +810,3 @@
 		  CplexMip::CplexMip(const CplexEnv& env)
-		    : LpBase(), CplexBase(env), MipSolver() {
+		    : LpBase(), MipSolver(), CplexBase(env) {
@@ -821,3 +821,3 @@
 		  CplexMip::CplexMip(const CplexMip& other)
-		    : LpBase(), CplexBase(other), MipSolver() {}
+		    : LpBase(), MipSolver(), CplexBase(other) {}

lemon/cplex.h

Show inline comments

@@ -4,3 +4,3 @@
+		 *
-		 * Copyright (C) 2003-2008
+		 * Copyright (C) 2003-2009
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
@@ -80,3 +80,3 @@
 		  /// This class implements the common interface of the CPLEX LP and
-		  /// MIP solvers.
 		  /// MIP solvers.
 		  /// \ingroup lp_group
@@ -237,6 +237,9 @@
 		    /// \e
 		    virtual CplexMip* cloneSolver() const;
 		    /// \e
 		    virtual CplexMip* newSolver() const;
 		  protected:
 		    virtual CplexMip* _cloneSolver() const;
 		    virtual CplexMip* _newSolver() const;

lemon/glpk.cc

Show inline comments

@@ -4,3 +4,3 @@
+		 *
-		 * Copyright (C) 2003-2008
+		 * Copyright (C) 2003-2009
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
@@ -533,3 +533,3 @@
 		  GlpkLp::GlpkLp()
-		    : LpBase(), GlpkBase(), LpSolver() {
+		    : LpBase(), LpSolver(), GlpkBase() {
 		    messageLevel(MESSAGE_NO_OUTPUT);
@@ -538,3 +538,3 @@
 		  GlpkLp::GlpkLp(const GlpkLp& other)
-		    : LpBase(other), GlpkBase(other), LpSolver(other) {
+		    : LpBase(other), LpSolver(other), GlpkBase(other) {
 		    messageLevel(MESSAGE_NO_OUTPUT);
@@ -832,3 +832,3 @@
 		  GlpkMip::GlpkMip()
-		    : LpBase(), GlpkBase(), MipSolver() {
+		    : LpBase(), MipSolver(), GlpkBase() {
 		    messageLevel(MESSAGE_NO_OUTPUT);
@@ -837,3 +837,3 @@
 		  GlpkMip::GlpkMip(const GlpkMip& other)
-		    : LpBase(), GlpkBase(other), MipSolver() {
+		    : LpBase(), MipSolver(), GlpkBase(other) {
 		    messageLevel(MESSAGE_NO_OUTPUT);

test/lp_test.cc

Show inline comments

@@ -4,3 +4,3 @@
+		 *
-		 * Copyright (C) 2003-2008
+		 * Copyright (C) 2003-2009
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
@@ -367,3 +367,3 @@
 		  //Test for clone/new
 		  LP* lp = new LP();
@@ -395,2 +395,3 @@
 		    aTest(lp_cplex2);
 		    cloneTest<CplexLp>();
 		  } catch (CplexEnv::LicenseError& error) {
@@ -403,3 +404,2 @@
+		  }
 		    cloneTest<CplexLp>();
 		#endif

test/mip_test.cc

Show inline comments

@@ -4,3 +4,3 @@
+		 *
-		 * Copyright (C) 2003-2008
+		 * Copyright (C) 2003-2009
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
@@ -111,3 +111,3 @@
+		{
 		  MIP* mip = new MIP();
@@ -135,2 +135,3 @@
 		    aTest(mip2);
 		    cloneTest<CplexMip>();
 		  } catch (CplexEnv::LicenseError& error) {
@@ -143,3 +144,2 @@
+		  }
 		  cloneTest<CplexMip>();
 		#endif

0 comments (0 inline)

RhodeCode