Changeset 1769 for trunk

Timestamp:

Feb 29, 2012 3:48:21 AM (9 years ago)

Author:

forrest

Message:

changes to allow multiple solutions in standalone executable

Location:

trunk/Cbc/src

Files:

• CbcModel.cpp (modified) (1 diff)
• CbcModel.hpp (modified) (1 diff)
• CbcSolver.cpp (modified) (13 diffs)

trunk/Cbc/src/CbcModel.cpp

@@ -15058 +15058 @@
     }
 }
+// Delete a saved solution and move others up
+void 
+CbcModel::deleteSavedSolution(int which)
+{
+  if (which >0 && which <= numberSavedSolutions_) {
+    delete [] savedSolutions_[which-1];
+    // move up
+    numberSavedSolutions_--;
+    for (int j =  which-1; j <numberSavedSolutions_; j++) {
+      savedSolutions_[j] = savedSolutions_[j+1];
+    }
+    savedSolutions_[numberSavedSolutions_]=NULL;
+  }
+}
 #ifdef COIN_HAS_CLP
 void

trunk/Cbc/src/CbcModel.hpp

@@ -1306 +1306 @@
     /// Return a saved solution objective (0==best) - COIN_DBL_MAX if off end
     double savedSolutionObjective(int which) const;
+    /// Delete a saved solution and move others up
+    void deleteSavedSolution(int which);
 
     /** Current phase (so heuristics etc etc can find out).

trunk/Cbc/src/CbcSolver.cpp

@@ -294 +294 @@
     return *this;
 }
+#ifdef KEEP_POSTPROCESS
+static void putBackOtherSolutions(CbcModel * presolvedModel, CbcModel * model,
+                           CglPreProcess * preProcess)
+{
+  int numberSolutions=presolvedModel->numberSavedSolutions();
+  int numberColumns=presolvedModel->getNumCols();
+  if (numberSolutions>1) {
+    double * bestSolution = CoinCopyOfArray(presolvedModel->bestSolution(),numberColumns);
+    //double cutoff = presolvedModel->getCutoff();
+    double objectiveValue=presolvedModel->getObjValue();
+    //model->createSpaceForSavedSolutions(numberSolutions-1);
+    for (int iSolution=numberSolutions-1;iSolution>=0;iSolution--) {
+      presolvedModel->setCutoff(COIN_DBL_MAX);
+      presolvedModel->solver()->setColSolution(presolvedModel->savedSolution(iSolution));
+      //presolvedModel->savedSolutionObjective(iSolution));
+      preProcess->postProcess(*presolvedModel->solver(),false);
+      model->setBestSolution(preProcess->originalModel()->getColSolution(),model->solver()->getNumCols(),
+                             presolvedModel->savedSolutionObjective(iSolution));
+    }
+    presolvedModel->setBestObjectiveValue(objectiveValue);
+    presolvedModel->solver()->setColSolution(bestSolution);
+    //presolvedModel->setBestSolution(bestSolution,numberColumns,objectiveValue);
+  }
+}
+#endif
 
 /*
@@ -588 +613 @@
     parameters_[whichParam(CBC_PARAM_DBL_TIMELIMIT_BAB, numberParameters_, parameters_)].setDoubleValue(1.0e8);
     parameters_[whichParam(CLP_PARAM_ACTION_SOLUTION, numberParameters_, parameters_)].setStringValue(solutionFile);
+    parameters_[whichParam(CLP_PARAM_ACTION_NEXTBESTSOLUTION, numberParameters_, parameters_)].setStringValue(solutionFile);
     parameters_[whichParam(CLP_PARAM_ACTION_SAVESOL, numberParameters_, parameters_)].setStringValue(solutionSaveFile);
     parameters_[whichParam(CLP_PARAM_INT_SPRINT, numberParameters_, parameters_)].setIntValue(doSprint);
@@ -3528 +3554 @@
                             OsiSolverInterface * saveSolver = NULL;
                             CglPreProcess process;
-                            cbcPreProcessPointer = & process;
                             // Say integers in sync
                             bool integersOK = true;
@@ -3775 +3800 @@
                                         if ((model_.moreSpecialOptions()&65536)!=0)
                                           process.setOptions(2+4+8); // no cuts
+                                        cbcPreProcessPointer = & process;
                                         solver2 = process.preProcessNonDefault(*saveSolver, translate[preProcess], numberPasses,
                                                                                tunePreProcess);
@@ -3782 +3808 @@
                                     }
 #elif CBC_OTHER_SOLVER==1
+                                    cbcPreProcessPointer = & process;
                                     solver2 = process.preProcessNonDefault(*saveSolver, translate[preProcess], numberPasses,
                                                                            tunePreProcess);
@@ -5623 +5650 @@
                                     babModel_ = NULL;
                                     return returnCode;
+                                } else {
+                                  int numberSolutions = babModel_->numberSavedSolutions();
+                                  if (numberSolutions>1) {
+                                    for (int iSolution=numberSolutions-1;iSolution>=0;iSolution--) {
+                                      model_.setBestSolution(babModel_->savedSolution(iSolution),
+                                                             model_.solver()->getNumCols(),
+                                                             babModel_->savedSolutionObjective(iSolution));
+                                    }
+                                  }
                                 }
 #ifdef CLP_MALLOC_STATISTICS
@@ -5865 +5901 @@
                                     ClpSimplex * lpSolver = clpSolver->getModelPtr();
                                     lpSolver->setSpecialOptions(lpSolver->specialOptions() | IN_BRANCH_AND_BOUND); // say is Cbc (and in branch and bound)
+#endif
+#ifdef KEEP_POSTPROCESS
+                                    // put back any saved solutions
+                                    putBackOtherSolutions(babModel_,&model_,&process);
 #endif
                                     process.postProcess(*babModel_->solver());
@@ -6015 +6055 @@
                                     memcpy(bestSolution, babModel_->solver()->getColSolution(), n*sizeof(double));
                                 }
-                                if (returnMode == 1) {
+                                if (returnMode == 1&&model_.numberSavedSolutions()<2) {
                                     model_.deleteSolutions();
                                     model_.setBestSolution(bestSolution, n, babModel_->getMinimizationObjValue());
@@ -7713 +7753 @@
                     break;
                     case CLP_PARAM_ACTION_SOLUTION:
+                    case CLP_PARAM_ACTION_NEXTBESTSOLUTION:
                     case CLP_PARAM_ACTION_GMPL_SOLUTION:
                         if (goodModel) {
+                          ClpSimplex * saveLpSolver = NULL;
                             // get next field
                             field = CoinReadGetString(argc, argv);
@@ -7881 +7923 @@
                                 break;
                               }
-                                if (printMode < 5) {
+                              if (printMode < 5) {
+                                if (type == CLP_PARAM_ACTION_NEXTBESTSOLUTION) {
+                                  // save
+                                  const double * nextBestSolution = model_.savedSolution(1);
+                                  if (!nextBestSolution) {
+                                    sprintf(generalPrint, "All alternative solutions printed");
+                                    generalMessageHandler->message(CLP_GENERAL, generalMessages)
+                                      << generalPrint
+                                      << CoinMessageEol;
+                                    break;
+                                  } else {
+                                    sprintf(generalPrint, "Alternative solution - %d remaining",model_.numberSavedSolutions()-2);
+                                    generalMessageHandler->message(CLP_GENERAL, generalMessages)
+                                      << generalPrint
+                                      << CoinMessageEol;
+                                  }
+                                  saveLpSolver = lpSolver;
+                                  assert (clpSolver->getModelPtr()==saveLpSolver);
+                                  lpSolver = new ClpSimplex(*saveLpSolver);
+                                  ClpSimplex * oldSimplex = clpSolver->swapModelPtr(lpSolver);
+                                  assert (oldSimplex==saveLpSolver);
+                                  double * solution = lpSolver->primalColumnSolution();
+                                  double * lower = lpSolver->columnLower();
+                                  double * upper = lpSolver->columnUpper();
+                                  int numberColumns=lpSolver->numberColumns();
+                                  memcpy(solution,nextBestSolution,numberColumns*sizeof(double));
+                                  model_.deleteSavedSolution(1);
+                                  for (int i = 0; i < numberColumns; i++) {
+                                    if (clpSolver->isInteger(i)) {
+                                      double value=floor(solution[i]+0.5);
+                                      lower[i]=value;
+                                      upper[i]=value;
+                                    }
+                                  }
+                                  lpSolver->allSlackBasis();
+                                  lpSolver->initialSolve();
+                                }
                                     // Write solution header (suggested by Luigi Poderico)
                                     lpSolver->computeObjectiveValue(false);
@@ -8277 +8355 @@
                                         }
                                     }
+                                    if (type == CLP_PARAM_ACTION_NEXTBESTSOLUTION) {
+                                      if(saveLpSolver) {
+                                        clpSolver->swapModelPtr(saveLpSolver);
+                                        delete lpSolver;
+                                        lpSolver=saveLpSolver;
+                                        saveLpSolver=NULL;
+                                      }
+                                    }
                                 } else {
                                     // special format suitable for OsiRowCutDebugger
@@ -8612 +8698 @@
     parameters[whichParam(CBC_PARAM_DBL_TIMELIMIT_BAB, numberParameters, parameters)].setDoubleValue(1.0e8);
     parameters[whichParam(CLP_PARAM_ACTION_SOLUTION, numberParameters, parameters)].setStringValue(solutionFile);
+    parameters[whichParam(CLP_PARAM_ACTION_NEXTBESTSOLUTION, numberParameters, parameters)].setStringValue(solutionFile);
     parameters[whichParam(CLP_PARAM_ACTION_SAVESOL, numberParameters, parameters)].setStringValue(solutionSaveFile);
     parameters[whichParam(CLP_PARAM_INT_SPRINT, numberParameters, parameters)].setIntValue(doSprint);
@@ -9225 +9312 @@
   Source code changes so up to 2.0
 */
+