LEMON/LEMON-official Changeset - r598:9d0d7e20f76d

Repositories » LEMON » LEMON-official

Summary
Changelog
Files
Switch To
- loading...
Options
- Lightweight changelog
- Search
Pull Requests

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

@@ -2,7 +2,7 @@
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
-		 * Copyright (C) 2003-2008
+		 * Copyright (C) 2003-2009
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
@@ -441,13 +441,13 @@
 		  // CplexLp members
 		  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) {}
 		  CplexLp::~CplexLp() {}
@@ -798,7 +798,7 @@
 		  // CplexMip members
 		  CplexMip::CplexMip()
-		    : LpBase(), CplexBase(), MipSolver() {
+		    : LpBase(), MipSolver(), CplexBase() {
 		#if CPX_VERSION < 800
 		    CPXchgprobtype(cplexEnv(),  _prob, CPXPROB_MIP);
@@ -808,7 +808,7 @@
+		  }
 		  CplexMip::CplexMip(const CplexEnv& env)
-		    : LpBase(), CplexBase(env), MipSolver() {
+		    : LpBase(), MipSolver(), CplexBase(env) {
 		#if CPX_VERSION < 800
 		    CPXchgprobtype(cplexEnv(),  _prob, CPXPROB_MIP);
@@ -819,7 +819,7 @@
+		  }
 		  CplexMip::CplexMip(const CplexMip& other)
-		    : LpBase(), CplexBase(other), MipSolver() {}
+		    : LpBase(), MipSolver(), CplexBase(other) {}
 		  CplexMip::~CplexMip() {}

lemon/cplex.h

Show inline comments

@@ -2,7 +2,7 @@
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
-		 * Copyright (C) 2003-2008
+		 * Copyright (C) 2003-2009
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
@@ -78,7 +78,7 @@
 		  /// \brief Base interface for the CPLEX LP and MIP solver
 		  ///
 		  /// This class implements the common interface of the CPLEX LP and
-		  /// MIP solvers.
 		  /// MIP solvers.
 		  /// \ingroup lp_group
 		  class CplexBase : virtual public LpBase {
 		  protected:
@@ -235,10 +235,13 @@
 		    /// \e
 		    virtual ~CplexMip();
 		    /// \e
 		    virtual CplexMip* cloneSolver() const;
 		    /// \e
 		    virtual CplexMip* newSolver() const;
 		  protected:
 		    virtual CplexMip* _cloneSolver() const;
 		    virtual CplexMip* _newSolver() const;
 		    virtual const char* _solverName() const;

lemon/glpk.cc

Show inline comments

@@ -2,7 +2,7 @@
 *
 * This file is a part of LEMON, a generic C++ optimization library.
 *
 * Copyright (C) 2003-2008
 * Copyright (C) 2003-2009
 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 * (Egervary Research Group on Combinatorial Optimization, EGRES).
 *
@@ -531,12 +531,12 @@
  // GlpkLp members

  GlpkLp::GlpkLp()
    : LpBase(), GlpkBase(), LpSolver() {
    : LpBase(), LpSolver(), GlpkBase() {
    messageLevel(MESSAGE_NO_OUTPUT);
  }

  GlpkLp::GlpkLp(const GlpkLp& other)
    : LpBase(other), GlpkBase(other), LpSolver(other) {
    : LpBase(other), LpSolver(other), GlpkBase(other) {
    messageLevel(MESSAGE_NO_OUTPUT);
  }

@@ -830,12 +830,12 @@
  // GlpkMip members

  GlpkMip::GlpkMip()
    : LpBase(), GlpkBase(), MipSolver() {
    : LpBase(), MipSolver(), GlpkBase() {
    messageLevel(MESSAGE_NO_OUTPUT);
  }

  GlpkMip::GlpkMip(const GlpkMip& other)
    : LpBase(), GlpkBase(other), MipSolver() {
    : LpBase(), MipSolver(), GlpkBase(other) {
    messageLevel(MESSAGE_NO_OUTPUT);
  }


test/lp_test.cc

Show inline comments

@@ -2,7 +2,7 @@
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
-		 * Copyright (C) 2003-2008
+		 * Copyright (C) 2003-2009
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
@@ -365,7 +365,7 @@
 		void cloneTest()
+		{
 		  //Test for clone/new
 		  LP* lp = new LP();
 		  LP* lpnew = lp->newSolver();
 		  LP* lpclone = lp->cloneSolver();
@@ -393,6 +393,7 @@
 		    CplexLp lp_cplex1,lp_cplex2;
 		    lpTest(lp_cplex1);
 		    aTest(lp_cplex2);
 		    cloneTest<CplexLp>();
 		  } catch (CplexEnv::LicenseError& error) {
 		#ifdef LEMON_FORCE_CPLEX_CHECK
 		    check(false, error.what());
@@ -401,7 +402,6 @@
 		    std::cerr << "Cplex license check failed, lp check skipped" << std::endl;
 		#endif
+		  }
 		    cloneTest<CplexLp>();
 		#endif
 		#ifdef HAVE_SOPLEX

test/mip_test.cc

Show inline comments

@@ -2,7 +2,7 @@
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
-		 * Copyright (C) 2003-2008
+		 * Copyright (C) 2003-2009
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
@@ -109,7 +109,7 @@
 		template<class MIP>
 		void cloneTest()
+		{
 		  MIP* mip = new MIP();
 		  MIP* mipnew = mip->newSolver();
 		  MIP* mipclone = mip->cloneSolver();
@@ -133,6 +133,7 @@
 		  try {
 		    CplexMip mip2;
 		    aTest(mip2);
 		    cloneTest<CplexMip>();
 		  } catch (CplexEnv::LicenseError& error) {
 		#ifdef LEMON_FORCE_CPLEX_CHECK
 		    check(false, error.what());
@@ -141,7 +142,6 @@
 		    std::cerr << "Cplex license check failed, lp check skipped" << std::endl;
 		#endif
+		  }
 		  cloneTest<CplexMip>();
 		#endif
 		  return 0;

0 comments (0 inline)

...	...	@@ -2,7 +2,7 @@
2	2	*
3	3	* This file is a part of LEMON, a generic C++ optimization library.
4	4	*
5		* Copyright (C) 2003-~~2008~~
	5	* Copyright (C) 2003-2009
6	6	* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
7	7	* (Egervary Research Group on Combinatorial Optimization, EGRES).
8	8	*
...	...	@@ -531,12 +531,12 @@
531	531	// GlpkLp members
532	532
533	533	GlpkLp::GlpkLp()
534		: LpBase(), ~~GlpkBase~~(), ~~LpSolver~~() {
	534	: LpBase(), LpSolver(), GlpkBase() {
535	535	messageLevel(MESSAGE_NO_OUTPUT);
536	536	}
537	537
538	538	GlpkLp::GlpkLp(const GlpkLp& other)
539		: LpBase(other), ~~GlpkBase~~(other), ~~LpSolver~~(other) {
	539	: LpBase(other), LpSolver(other), GlpkBase(other) {
540	540	messageLevel(MESSAGE_NO_OUTPUT);
541	541	}
542	542
...	...	@@ -830,12 +830,12 @@
830	830	// GlpkMip members
831	831
832	832	GlpkMip::GlpkMip()
833		: LpBase(), ~~GlpkBase~~(), ~~MipSolver~~() {
	833	: LpBase(), MipSolver(), GlpkBase() {
834	834	messageLevel(MESSAGE_NO_OUTPUT);
835	835	}
836	836
837	837	GlpkMip::GlpkMip(const GlpkMip& other)
838		: LpBase(), ~~GlpkBase~~(~~other~~), ~~MipSolver~~() {
	838	: LpBase(), MipSolver(), GlpkBase(other) {
839	839	messageLevel(MESSAGE_NO_OUTPUT);
840	840	}
841	841

RhodeCode

Login to your account