Changeset 1738

Timestamp:

Jun 12, 2011 10:27:55 AM (8 years ago)

Author:

forrest

Message:

minor fixes

Location:

trunk/Clp/src

Files:

• CbcOrClpParam.cpp (modified) (1 diff)
• ClpSimplex.cpp (modified) (2 diffs)
• ClpSimplexOther.cpp (modified) (1 diff)
• ClpSimplexPrimal.cpp (modified) (1 diff)

trunk/Clp/src/CbcOrClpParam.cpp

@@ -3242 +3242 @@
      parameters[numberParameters++] =
           CbcOrClpParam("trust!PseudoCosts", "Number of branches before we trust pseudocosts",
-                        -3, 2000000, CBC_PARAM_INT_NUMBERBEFORE);
+                        -3, 2000000000, CBC_PARAM_INT_NUMBERBEFORE);
      parameters[numberParameters-1].setLonghelp
      (

trunk/Clp/src/ClpSimplex.cpp

@@ -10613 +10613 @@
                }
 #endif
+               double objectiveValue=0.0;
+               if (node->sequence() < 0) {
+                 objectiveValue = doubleCheck();
+                 node->gutsOfConstructor(this, info, 1, depth);
+               }
                if (node->sequence() < 0) {
                     // solution
-                    double objectiveValue = doubleCheck();
+                    //double objectiveValue = doubleCheck();
                     if (objectiveValue < bestObjective) {
 #ifdef COIN_DEVELOP
@@ -10628 +10633 @@
                           << CoinMessageEol;
 #endif
-                         ClpNode node2(this, info, depth);
-                         assert (node2.sequence() < 0);
                          // later then lower_ not columnLower_ (and total?)
                          delete [] bestLower;

trunk/Clp/src/ClpSimplexOther.cpp

@@ -120 +120 @@
                     }
                     scale2 = 1.0 / sqrt(scale2);
-                    valueIncrease[i] = scale2;
+                    //valueIncrease[i] = scale2;
                     if (sequenceIncrease >= 0) {
                          double djValue = dj_[sequenceIncrease];

trunk/Clp/src/ClpSimplexPrimal.cpp

@@ -1418 +1418 @@
                // carry on
                problemStatus_ = -1;
-               if(type == 3 && problemStatus_ != -5) {
+               if(type == 3 && !ifValuesPass) {
                     //bool unflagged =
                     unflag();