Changeset 699 for trunk

Timestamp:

Jul 21, 2007 6:41:25 PM (14 years ago)

Author:

forrest

Message:

trying to improve performance and fix message problem in CbcSolver?

Location:

trunk/Cbc/src

Files:

• CbcBranchDynamic.cpp (modified) (4 diffs)
• CbcModel.cpp (modified) (4 diffs)
• CbcSolver.cpp (modified) (9 diffs)

trunk/Cbc/src/CbcBranchDynamic.cpp

@@ -434 +434 @@
     preferredWay=preferredWay_;
   // weight at 1.0 is max min
-#define WEIGHT_AFTER 0.9
-#define WEIGHT_BEFORE 0.3
+#define WEIGHT_AFTER 0.7
+#define WEIGHT_BEFORE 0.1
   if (fabs(value-nearest)<=integerTolerance) {
     return 0.0;
@@ -446 +446 @@
       // no solution
       returnValue = WEIGHT_BEFORE*minValue + (1.0-WEIGHT_BEFORE)*maxValue;
+      if (0) {
+        double sum;
+        int number;
+        double downCost2 = CoinMax(value-below,0.0);
+        sum = sumDownCost_;
+        number = numberTimesDown_;
+        if (number>0)
+          downCost2 *= sum / (double) number;
+        else
+          downCost2  *=  downDynamicPseudoCost_;
+        double upCost2 = CoinMax((above-value),0.0);
+        sum = sumUpCost_;
+        number = numberTimesUp_;
+        if (number>0)
+          upCost2 *= sum / (double) number;
+        else
+          upCost2  *=  upDynamicPseudoCost_;
+        double minValue2 = CoinMin(downCost2,upCost2);
+        double maxValue2 = CoinMax(downCost2,upCost2);
+        printf("%d value %g downC %g upC %g minV %g maxV %g downC2 %g upC2 %g minV2 %g maxV2 %g\n",
+               columnNumber_,value,downCost,upCost,minValue,maxValue,
+               downCost2,upCost2,minValue2,maxValue2);
+      }
     } else {
       // some solution
@@ -545 +568 @@
     preferredWay=preferredWay_;
   // weight at 1.0 is max min
-#define WEIGHT_BEFORE 0.3
   if (fabs(value-nearest)<=integerTolerance) {
     return 0.0;
@@ -1247 +1269 @@
     bestNumberDown_=INT_MAX;
   }
-  if (stateOfSearch<=1&&thisOne->model()->currentNode()->depth()>10) {
+  if (stateOfSearch<=1&&thisOne->model()->currentNode()->depth()>=8) {
 #define TRY_STUFF 1
 #ifdef TRY_STUFF

trunk/Cbc/src/CbcModel.cpp

@@ -1121 +1121 @@
       if (tree)
         tree->passInSolution(bestSolution_,heuristicValue);
-    }
-    for (i = 0;i<numberHeuristics_;i++) {
-      // delete FPump
-      CbcHeuristicFPump * pump 
-        = dynamic_cast<CbcHeuristicFPump *> (heuristic_[i]);
-      if (pump) {
-        delete pump;
-        numberHeuristics_ --;
-        for (int j=i;j<numberHeuristics_;j++)
-          heuristic_[j] = heuristic_[j+1];
+      for (i = 0;i<numberHeuristics_;i++) {
+        // delete FPump
+        CbcHeuristicFPump * pump 
+          = dynamic_cast<CbcHeuristicFPump *> (heuristic_[i]);
+        if (pump) {
+          delete pump;
+          numberHeuristics_ --;
+          for (int j=i;j<numberHeuristics_;j++)
+            heuristic_[j] = heuristic_[j+1];
+        }
       }
     }
@@ -1137 +1137 @@
   statistics_ = NULL;
   // Do on switch
-  if (doStatistics) {
+  if (doStatistics>0&&doStatistics<100) {
     maximumStatistics_=10000;
     statistics_ = new CbcStatistics * [maximumStatistics_];
@@ -2376 +2376 @@
       << maximumDepthActual_ 
       << numberDJFixed_ << CoinMessageEol ;
+  if (doStatistics==100) {
+    for (int i=0;i<numberObjects_;i++) {
+      CbcSimpleIntegerDynamicPseudoCost * obj =
+        dynamic_cast <CbcSimpleIntegerDynamicPseudoCost *>(object_[i]) ;
+      if (obj)
+        obj->print();
+    }
+  }
   if (statistics_) {
     // report in some way
@@ -6905 +6913 @@
     } else if (!obj2) {
       allDynamic=false;
+    } else {
+      // synchronize trust
+      obj2->setNumberBeforeTrust(numberBeforeTrust_);
     }
   }

trunk/Cbc/src/CbcSolver.cpp

@@ -1405 +1405 @@
   OsiClpSolverInterface * originalSolver = dynamic_cast<OsiClpSolverInterface *> (model.solver());
   assert (originalSolver);
-  CoinMessageHandler * generalMessageHandler = originalSolver->messageHandler();
+  CoinMessageHandler * generalMessageHandler = originalSolver->messageHandler()->clone();
   CoinMessages generalMessages = originalSolver->getModelPtr()->messages();
   char generalPrint[10000];
@@ -3045 +3045 @@
               OsiSolverInterface * saveSolver=NULL;
               CglPreProcess process;
+              // Say integers in sync 
+              bool integersOK=true;
               delete babModel;
               babModel = new CbcModel(model);
@@ -3195 +3197 @@
                   solver2 = process.preProcessNonDefault(*saveSolver,translate[preProcess],numberPasses,
                                                          tunePreProcess);
+                  integersOK=false; // We need to redo if CbcObjects exist
                   // Tell solver we are not in Branch and Cut
                   saveSolver->setHintParam(OsiDoInBranchAndCut,false,OsiHintDo) ;
@@ -3367 +3370 @@
                 }
                 babModel->passInPriorities( priority,false);
+                integersOK=true;
                 delete [] priority;
                 delete [] sort;
@@ -3711 +3715 @@
                   // *************************************************************
                   // CbcObjects
-                  if (preProcess&&process.numberSOS()) {
+                  if (preProcess&&(process.numberSOS()||babModel->numberObjects())) {
                     int numberSOS = process.numberSOS();
                     int numberIntegers = babModel->numberIntegers();
@@ -3721 +3725 @@
                       babModel->findIntegers(true,type);
                       numberIntegers = babModel->numberIntegers();
+                      integersOK=true;
                     }
                     OsiObject ** oldObjects = babModel->objects();
@@ -3728 +3733 @@
                     int numberOldObjects = babModel->numberObjects();
                     int numberColumns = babModel->getNumCols();
+                    if (!integersOK) {
+                      // backward pointer to new variables
+                      int * newColumn = new int[numberOriginalColumns];
+                      int i;
+                      for (i=0;i<numberOriginalColumns;i++)
+                        newColumn[i]=-1;
+                      assert (originalColumns);
+                      for (i=0;i<numberColumns;i++)
+                        newColumn[originalColumns[i]]=i;
+                      // Change column numbers etc
+                      int n=0;
+                      for (int iObj = 0;iObj<numberOldObjects;iObj++) {
+                        int iColumn = oldObjects[iObj]->columnNumber();
+                        if (iColumn<0||iColumn>=numberOriginalColumns) {
+                          oldObjects[n++]=oldObjects[iObj];
+                        } else {
+                          iColumn = newColumn[iColumn];
+                          if (iColumn>=0) {
+                            CbcSimpleInteger * obj =
+                              dynamic_cast <CbcSimpleInteger *>(oldObjects[iObj]) ;
+                            assert (obj);
+                            obj->setColumnNumber(iColumn);
+                            oldObjects[n++]=oldObjects[iObj];
+                          } else {
+                            delete oldObjects[iObj];
+                          }
+                        }
+                      }
+                      delete [] newColumn;
+                      babModel->setNumberObjects(n);
+                    }
                     for (int iObj = 0;iObj<numberOldObjects;iObj++) {
-                      oldObjects[iObj]->setPriority(numberColumns+1);
+                      if (process.numberSOS())
+                        oldObjects[iObj]->setPriority(numberColumns+1);
                       int iColumn = oldObjects[iObj]->columnNumber();
-                      assert (iColumn>=0);
-                      if (iColumn>=numberOriginalColumns)
+                      if (iColumn<0||iColumn>=numberOriginalColumns) 
                         continue;
                       if (originalColumns)
@@ -4512 +4548 @@
                 }
                 model = *babModel;
+                delete generalMessageHandler;
                 return 777;
               } else {
@@ -6263 +6300 @@
   dmalloc_shutdown();
 #endif
+  delete generalMessageHandler;
   return 0;
 }