LEMON/LEMON-official Changeset - r630:99a31b399b59

Repositories » LEMON » LEMON-official

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

Changeset - r630:99a31b399b59

« 625:a2e6b1
« 629:7a28e2

633:7c1206 »
632:65fbcf »
631:33c6b6 »

r630:99a31b399b59

Tue, 14 Apr 2009 11:40:33

[Not Reviewed]

0 comments (0 inline)

alpar (Alpar Juttner)
alpar@cs.elte.hu

Merge

0 16 0

merge default

0 files changed with 187 insertions and 198 deletions:

lemon/cbc.cc

lemon/cbc.h

lemon/clp.cc

lemon/clp.h

lemon/cplex.cc

lemon/cplex.h

lemon/glpk.cc

lemon/glpk.h

lemon/lp_base.h

lemon/lp_skeleton.cc

lemon/lp_skeleton.h

lemon/soplex.cc

lemon/soplex.h

test/lp_test.cc

test/mip_test.cc

tools/lemon-0.x-to-1.x.sh

↑ Collapse diff ↑

0 comments (0 inline)

@@ -57,2 +57,3 @@
 		    _cbc_model = 0;
 		    messageLevel(MESSAGE_NOTHING);
+		  }
@@ -61,4 +62,6 @@
 		    _prob = new CoinModel(*other._prob);
 		    _prob->setProblemName("LEMON");
 		    _osi_solver = 0;
 		    _cbc_model = 0;
 		    messageLevel(MESSAGE_NOTHING);
+		  }
@@ -272,20 +275,4 @@
 		    switch (_message_level) {
 		    case MESSAGE_NO_OUTPUT:
 		      _osi_solver->messageHandler()->setLogLevel(0);
 		      _cbc_model->setLogLevel(0);
 		      break;
 		    case MESSAGE_ERROR_MESSAGE:
 		      _osi_solver->messageHandler()->setLogLevel(1);
 		      _cbc_model->setLogLevel(1);
 		      break;
 		    case MESSAGE_NORMAL_OUTPUT:
 		      _osi_solver->messageHandler()->setLogLevel(2);
 		      _cbc_model->setLogLevel(2);
 		      break;
 		    case MESSAGE_FULL_OUTPUT:
 		      _osi_solver->messageHandler()->setLogLevel(3);
 		      _cbc_model->setLogLevel(3);
 		      break;
+		    }
 		    _osi_solver->messageHandler()->setLogLevel(_message_level);
 		    _cbc_model->setLogLevel(_message_level);
@@ -455,4 +442,20 @@
 		  void CbcMip::messageLevel(MessageLevel m) {
 		    _message_level = m;
 		  void CbcMip::_messageLevel(MessageLevel level) {
 		    switch (level) {
 		    case MESSAGE_NOTHING:
 		      _message_level = 0;
 		      break;
 		    case MESSAGE_ERROR:
 		      _message_level = 1;
 		      break;
 		    case MESSAGE_WARNING:
 		      _message_level = 1;
 		      break;
 		    case MESSAGE_NORMAL:
 		      _message_level = 2;
 		      break;
 		    case MESSAGE_VERBOSE:
 		      _message_level = 3;
 		      break;
+		    }
+		  }

@@ -117,28 +117,7 @@
-		  public:
+		    virtual void _messageLevel(MessageLevel level);
 		    void _applyMessageLevel();
 		    ///Enum for \c messageLevel() parameter
 		    enum MessageLevel {
 		      /// no output (default value)
 		      MESSAGE_NO_OUTPUT = 0,
 		      /// error messages only
 		      MESSAGE_ERROR_MESSAGE = 1,
 		      /// normal output
 		      MESSAGE_NORMAL_OUTPUT = 2,
 		      /// full output (includes informational messages)
 		      MESSAGE_FULL_OUTPUT = 3
-		    };
+		    int _message_level;
 		  private:
 		    MessageLevel _message_level;
 		  public:
 		    ///Set the verbosity of the messages
 		    ///Set the verbosity of the messages
 		    ///
 		    ///\param m is the level of the messages output by the solver routines.
 		    void messageLevel(MessageLevel m);

@@ -26,3 +26,3 @@
 		    _init_temporals();
-		    messageLevel(MESSAGE_NO_OUTPUT);
+		    messageLevel(MESSAGE_NOTHING);
+		  }
@@ -34,3 +34,3 @@
 		    _init_temporals();
-		    messageLevel(MESSAGE_NO_OUTPUT);
+		    messageLevel(MESSAGE_NOTHING);
+		  }
@@ -432,4 +432,20 @@
 		  void ClpLp::messageLevel(MessageLevel m) {
 		    _prob->setLogLevel(static_cast<int>(m));
 		  void ClpLp::_messageLevel(MessageLevel level) {
 		    switch (level) {
 		    case MESSAGE_NOTHING:
 		      _prob->setLogLevel(0);
 		      break;
 		    case MESSAGE_ERROR:
 		      _prob->setLogLevel(1);
 		      break;
 		    case MESSAGE_WARNING:
 		      _prob->setLogLevel(2);
 		      break;
 		    case MESSAGE_NORMAL:
 		      _prob->setLogLevel(3);
 		      break;
 		    case MESSAGE_VERBOSE:
 		      _prob->setLogLevel(4);
 		      break;
+		    }
+		  }

@@ -138,2 +138,4 @@
 		    virtual void _messageLevel(MessageLevel);
 		  public:
@@ -155,22 +157,2 @@
 		    ///Enum for \c messageLevel() parameter
 		    enum MessageLevel {
 		      /// no output (default value)
 		      MESSAGE_NO_OUTPUT = 0,
 		      /// print final solution
 		      MESSAGE_FINAL_SOLUTION = 1,
 		      /// print factorization
 		      MESSAGE_FACTORIZATION = 2,
 		      /// normal output
 		      MESSAGE_NORMAL_OUTPUT = 3,
 		      /// verbose output
 		      MESSAGE_VERBOSE_OUTPUT = 4
 		    };
 		    ///Set the verbosity of the messages
 		    ///Set the verbosity of the messages
 		    ///
 		    ///\param m is the level of the messages output by the solver routines.
 		    void messageLevel(MessageLevel m);
 		  };

@@ -74,2 +74,3 @@
 		    _prob = CPXcreateprob(cplexEnv(), &status, "Cplex problem");
 		    messageLevel(MESSAGE_NOTHING);
+		  }
@@ -80,2 +81,3 @@
 		    _prob = CPXcreateprob(cplexEnv(), &status, "Cplex problem");
 		    messageLevel(MESSAGE_NOTHING);
+		  }
@@ -88,2 +90,3 @@
 		    cols = cplex.cols;
 		    messageLevel(MESSAGE_NOTHING);
+		  }
@@ -440,2 +443,21 @@
 		  void CplexBase::_messageLevel(MessageLevel level) {
 		    switch (level) {
 		    case MESSAGE_NOTHING:
 		      _message_enabled = false;
 		      break;
 		    case MESSAGE_ERROR:
 		    case MESSAGE_WARNING:
 		    case MESSAGE_NORMAL:
 		    case MESSAGE_VERBOSE:
 		      _message_enabled = true;
 		      break;
+		    }
+		  }
 		  void CplexBase::_applyMessageLevel() {
 		    CPXsetintparam(cplexEnv(), CPX_PARAM_SCRIND,
 		                   _message_enabled ? CPX_ON : CPX_OFF);
+		  }
 		  // CplexLp members
@@ -509,2 +531,3 @@
 		    _clear_temporals();
 		    _applyMessageLevel();
 		    return convertStatus(CPXlpopt(cplexEnv(), _prob));
@@ -514,2 +537,3 @@
 		    _clear_temporals();
 		    _applyMessageLevel();
 		    return convertStatus(CPXprimopt(cplexEnv(), _prob));
@@ -519,2 +543,3 @@
 		    _clear_temporals();
 		    _applyMessageLevel();
 		    return convertStatus(CPXdualopt(cplexEnv(), _prob));
@@ -524,2 +549,3 @@
 		    _clear_temporals();
 		    _applyMessageLevel();
 		    return convertStatus(CPXbaropt(cplexEnv(), _prob));
@@ -602,3 +628,3 @@
-		  //7.5-os cplex statusai (Vigyazat: a 9.0-asei masok!)
+		  // Cplex 7.0 status values
 		  // This table lists the statuses, returned by the CPXgetstat()
@@ -649,3 +675,3 @@
 		  //
-		  //     Ezeket hova tegyem:
+		  // Pending return values
 		  // ??case CPX_ABORT_DUAL_INFEAS
@@ -720,3 +746,2 @@
 		    //CPXgetstat(cplexEnv(), _prob);
 		    //printf("A primal status: %d, CPX_OPTIMAL=%d \n",stat,CPX_OPTIMAL);
 		    switch (stat) {
@@ -753,3 +778,3 @@
-		  //9.0-as cplex verzio statusai
+		  // Cplex 9.0 status values
 		  // CPX_STAT_ABORT_DUAL_OBJ_LIM
@@ -866,2 +891,3 @@
 		    int status;
 		    _applyMessageLevel();
 		    status = CPXmipopt (cplexEnv(), _prob);

RhodeCode

Login to your account

@@ -146,2 +146,7 @@
 		    virtual void _messageLevel(MessageLevel level);
 		    void _applyMessageLevel();
 		    bool _message_enabled;
 		  public:
@@ -150,6 +155,16 @@
 		    const CplexEnv& env() const { return _env; }
 		    /// \brief Returns the const cpxenv pointer
 		    ///
 		    /// \note The cpxenv might be destructed with the solver.
 		    const cpxenv* cplexEnv() const { return _env.cplexEnv(); }
 		    /// \brief Returns the const cpxenv pointer
 		    ///
 		    /// \note The cpxenv might be destructed with the solver.
 		    cpxenv* cplexEnv() { return _env.cplexEnv(); }
 		    /// Returns the cplex problem object
 		    cpxlp* cplexLp() { return _prob; }
 		    /// Returns the cplex problem object
 		    const cpxlp* cplexLp() const { return _prob; }

@@ -33,2 +33,3 @@
 		    glp_create_index(lp);
 		    messageLevel(MESSAGE_NOTHING);
+		  }
@@ -41,2 +42,3 @@
 		    cols = other.cols;
 		    messageLevel(MESSAGE_NOTHING);
+		  }
@@ -528,2 +530,22 @@
 		  void GlpkBase::_messageLevel(MessageLevel level) {
 		    switch (level) {
 		    case MESSAGE_NOTHING:
 		      _message_level = GLP_MSG_OFF;
 		      break;
 		    case MESSAGE_ERROR:
 		      _message_level = GLP_MSG_ERR;
 		      break;
 		    case MESSAGE_WARNING:
 		      _message_level = GLP_MSG_ERR;
 		      break;
 		    case MESSAGE_NORMAL:
 		      _message_level = GLP_MSG_ON;
 		      break;
 		    case MESSAGE_VERBOSE:
 		      _message_level = GLP_MSG_ALL;
 		      break;
+		    }
+		  }
 		  GlpkBase::FreeEnvHelper GlpkBase::freeEnvHelper;
@@ -534,3 +556,2 @@
 		    : LpBase(), LpSolver(), GlpkBase() {
 		    messageLevel(MESSAGE_NO_OUTPUT);
 		    presolver(false);
@@ -540,3 +561,2 @@
 		    : LpBase(other), LpSolver(other), GlpkBase(other) {
 		    messageLevel(MESSAGE_NO_OUTPUT);
 		    presolver(false);
@@ -564,16 +584,3 @@
 		    switch (_message_level) {
 		    case MESSAGE_NO_OUTPUT:
 		      smcp.msg_lev = GLP_MSG_OFF;
 		      break;
 		    case MESSAGE_ERROR_MESSAGE:
 		      smcp.msg_lev = GLP_MSG_ERR;
 		      break;
 		    case MESSAGE_NORMAL_OUTPUT:
 		      smcp.msg_lev = GLP_MSG_ON;
 		      break;
 		    case MESSAGE_FULL_OUTPUT:
 		      smcp.msg_lev = GLP_MSG_ALL;
 		      break;
+		    }
 		    smcp.msg_lev = _message_level;
 		    smcp.presolve = _presolve;
@@ -606,16 +613,3 @@
 		    switch (_message_level) {
 		    case MESSAGE_NO_OUTPUT:
 		      smcp.msg_lev = GLP_MSG_OFF;
 		      break;
 		    case MESSAGE_ERROR_MESSAGE:
 		      smcp.msg_lev = GLP_MSG_ERR;
 		      break;
 		    case MESSAGE_NORMAL_OUTPUT:
 		      smcp.msg_lev = GLP_MSG_ON;
 		      break;
 		    case MESSAGE_FULL_OUTPUT:
 		      smcp.msg_lev = GLP_MSG_ALL;
 		      break;
+		    }
 		    smcp.msg_lev = _message_level;
 		    smcp.meth = GLP_DUAL;
@@ -860,6 +854,2 @@
 		  void GlpkLp::messageLevel(MessageLevel m) {
 		    _message_level = m;
+		  }
 		  // GlpkMip members
@@ -868,3 +858,2 @@
 		    : LpBase(), MipSolver(), GlpkBase() {
 		    messageLevel(MESSAGE_NO_OUTPUT);
+		  }
@@ -873,3 +862,2 @@
 		    : LpBase(), MipSolver(), GlpkBase(other) {
 		    messageLevel(MESSAGE_NO_OUTPUT);
+		  }
@@ -902,16 +890,3 @@
 		    switch (_message_level) {
 		    case MESSAGE_NO_OUTPUT:
 		      smcp.msg_lev = GLP_MSG_OFF;
 		      break;
 		    case MESSAGE_ERROR_MESSAGE:
 		      smcp.msg_lev = GLP_MSG_ERR;
 		      break;
 		    case MESSAGE_NORMAL_OUTPUT:
 		      smcp.msg_lev = GLP_MSG_ON;
 		      break;
 		    case MESSAGE_FULL_OUTPUT:
 		      smcp.msg_lev = GLP_MSG_ALL;
 		      break;
+		    }
 		    smcp.msg_lev = _message_level;
 		    smcp.meth = GLP_DUAL;
@@ -940,16 +915,3 @@
 		    switch (_message_level) {
 		    case MESSAGE_NO_OUTPUT:
 		      iocp.msg_lev = GLP_MSG_OFF;
 		      break;
 		    case MESSAGE_ERROR_MESSAGE:
 		      iocp.msg_lev = GLP_MSG_ERR;
 		      break;
 		    case MESSAGE_NORMAL_OUTPUT:
 		      iocp.msg_lev = GLP_MSG_ON;
 		      break;
 		    case MESSAGE_FULL_OUTPUT:
 		      iocp.msg_lev = GLP_MSG_ALL;
 		      break;
+		    }
 		    iocp.msg_lev = _message_level;
@@ -1004,6 +966,2 @@
 		  void GlpkMip::messageLevel(MessageLevel m) {
 		    _message_level = m;
+		  }
 		} //END OF NAMESPACE LEMON

@@ -71,2 +71,17 @@
 		    ///Enum for \c messageLevel() parameter
 		    enum MessageLevel {
 		      /// no output (default value)
 		      MESSAGE_NOTHING,
 		      /// error messages only
 		      MESSAGE_ERROR,
 		      /// warnings
 		      MESSAGE_WARNING,
 		      /// normal output
 		      MESSAGE_NORMAL,
 		      /// verbose output
 		      MESSAGE_VERBOSE
 		    };
 		    ///The floating point type used by the solver
@@ -975,2 +990,4 @@
 		    virtual void _messageLevel(MessageLevel level) = 0;
 		    //Own protected stuff
@@ -1529,2 +1546,5 @@
 		    /// Sets the message level of the solver
 		    void messageLevel(MessageLevel level) { _messageLevel(level); }
 		    ///@}

@@ -86,2 +86,4 @@
 		  void SkeletonSolverBase::_messageLevel(MessageLevel) {}
 		  LpSkeleton::SolveExitStatus LpSkeleton::_solve() { return SOLVED; }

@@ -22,2 +22,3 @@
 		#include <soplex.h>
 		#include <spxout.h>
@@ -30,2 +31,3 @@
 		    soplex = new soplex::SoPlex;
 		    messageLevel(MESSAGE_NOTHING);
+		  }
@@ -49,2 +51,3 @@
 		    messageLevel(MESSAGE_NOTHING);
+		  }
@@ -274,2 +277,4 @@
 		    _applyMessageLevel();
 		    soplex::SPxSolver::Status status = soplex->solve();
@@ -421,2 +426,26 @@
 		  void SoplexLp::_messageLevel(MessageLevel level) {
 		    switch (level) {
 		    case MESSAGE_NOTHING:
 		      _message_level = -1;
 		      break;
 		    case MESSAGE_ERROR:
 		      _message_level = soplex::SPxOut::ERROR;
 		      break;
 		    case MESSAGE_WARNING:
 		      _message_level = soplex::SPxOut::WARNING;
 		      break;
 		    case MESSAGE_NORMAL:
 		      _message_level = soplex::SPxOut::INFO2;
 		      break;
 		    case MESSAGE_VERBOSE:
 		      _message_level = soplex::SPxOut::DEBUG;
 		      break;
+		    }
+		  }
 		  void SoplexLp::_applyMessageLevel() {
 		    soplex::Param::setVerbose(_message_level);
+		  }
 		} //namespace lemon

@@ -397,8 +397,3 @@
 		  } catch (CplexEnv::LicenseError& error) {
 		#ifdef LEMON_FORCE_CPLEX_CHECK
 		    check(false, error.what());
 		#else
 		    std::cerr << error.what() << std::endl;
 		    std::cerr << "Cplex license check failed, lp check skipped" << std::endl;
 		#endif
+		  }

@@ -91,2 +91,6 @@
 		        -e "s/\<storeBoolMap\>/loggerBoolMap/g"\
 		        -e "s/\<InvertableMap\>/CrossRefMap/g"\
 		        -e "s/\<invertableMap\>/crossRefMap/g"\
 		        -e "s/\<DescriptorMap\>/RangeIdMap/g"\
 		        -e "s/\<descriptorMap\>/rangeIdMap/g"\
 		        -e "s/\<BoundingBox\>/Box/g"\