Changeset 799:015801ff09d1 in lemon-1.1

Timestamp:

02/22/13 16:42:56 (11 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

1.1

Parents:

797:c18ed26f016c (diff), 798:d32e4453b48c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Message:

Merge bugfix #445 to branch 1.1

Files:

• lemon/cplex.cc (modified) (1 diff)
• lemon/cplex.cc (modified) (2 diffs)

lemon/cplex.cc

@@ -41 +41 @@
     int status;
     _cnt = new int;
+    (*_cnt) = 1;
     _env = CPXopenCPLEX(&status);
     if (_env == 0) {

lemon/cplex.cc

@@ -3 +3 @@
  * This file is a part of LEMON, a generic C++ optimization library.
  *
- * Copyright (C) 2003-2009
+ * Copyright (C) 2003-2011
  * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
  * (Egervary Research Group on Combinatorial Optimization, EGRES).
@@ -456 +456 @@
 
   void CplexBase::_applyMessageLevel() {
-    CPXsetintparam(cplexEnv(), CPX_PARAM_SCRIND, 
+    CPXsetintparam(cplexEnv(), CPX_PARAM_SCRIND,
                    _message_enabled ? CPX_ON : CPX_OFF);
   }