Changeset 1587

Timestamp:

Jan 25, 2011 5:54:21 AM (3 years ago)

Author:

forrest

Message:

minor changes to heuristics and fix a memory leak

Location:

trunk/Cbc/src

Files:

• CbcHeuristic.cpp (modified) (1 diff)
• CbcHeuristicGreedy.cpp (modified) (1 diff)
• CbcHeuristicRENS.cpp (modified) (1 diff)

trunk/Cbc/src/CbcHeuristic.cpp

@@ -1175 +1175 @@
                     solver->setHintParam(OsiDoDualInResolve, true, OsiHintDo);
 #endif
+                    model.passInEventHandler(model_->getEventHandler());
                     model.branchAndBound();
 #ifdef ALWAYS_DUAL

trunk/Cbc/src/CbcHeuristicGreedy.cpp

@@ -996 +996 @@
       columnStart = matrix->getVectorStarts();
       columnLength = matrix->getVectorLengths();
-      rhs = new double [numberRows];
+      //rhs = new double [numberRows];
       const double * rowLower = solver->getRowLower();
       const double * rowUpper = solver->getRowUpper();

trunk/Cbc/src/CbcHeuristicRENS.cpp

@@ -334 +334 @@
               djTolerance = 1.0e30;
           } else if (type==10) {
-            double * saveUpper = CoinCopyOfArray(newSolver->getRowUpper(),numberRows);
+            double * saveUpper = new double [numberRows];
+            memset(saveUpper,0,numberRows*sizeof(double));
             char * mark = new char [numberColumns];
             char * nonzero = new char [numberColumns];
-            double factor=CoinMax(1.000001,fractionSmall_);
+            for (int iColumn = 0; iColumn < numberColumns; iColumn++) {
+              if (colUpper[iColumn]>colLower[iColumn]) {
+                CoinBigIndex j;
+                for (j = columnStart[iColumn];
+                     j < columnStart[iColumn] + columnLength[iColumn]; j++) {
+                  int iRow = row[j];
+                  saveUpper[iRow] += element[j];
+                }
+              }
+            }
+            double sum=0.0;
+            double sumRhs=0.0;
+            const double * rowUpper = newSolver->getRowUpper();
+            for (int i=0;i<numberRows;i++) {
+              if (bestDj[i]>=1.0e30) {
+                sum += saveUpper[i];
+                sumRhs += rowUpper[i];
+              }
+            }
+            double averagePerSet = sum/static_cast<double>(numberRows);
+            // allow this extra
+            double factor = averagePerSet*fractionSmall_*numberRows;
+            factor = 1.0+factor/sumRhs;
             fractionSmall_ = 0.5;
+            memcpy(saveUpper,rowUpper,numberRows*sizeof(double));
             // loosen up
             for (int i=0;i<numberRows;i++) {