Changeset 720 for trunk

Timestamp:

Aug 3, 2007 12:07:00 PM (14 years ago)

Author:

forrest

Message:

message handling and sos to CbcSolver?

Location:

trunk/Cbc/src

Files:

• CbcBranchActual.cpp (modified) (1 diff)
• CbcBranchActual.hpp (modified) (1 diff)
• CbcModel.cpp (modified) (2 diffs)
• CbcSolver.cpp (modified) (12 diffs)
• CoinSolve.cpp (modified) (2 diffs)

trunk/Cbc/src/CbcBranchActual.cpp

@@ -352 +352 @@
   id_=identifier;
   integerValued_ = type==1;
+  if (integerValued_) {
+    // check all members integer
+    OsiSolverInterface * solver = model->solver();
+    if (solver) {
+      for (int i=0;i<numberMembers_;i++) {
+        if (!solver->isInteger(which[i]))
+          integerValued_=false;
+      }
+    } else {
+      // can't tell
+      integerValued_=false;
+    }
+  }
   if (numberMembers_) {
     members_ = new int[numberMembers_];

trunk/Cbc/src/CbcBranchActual.hpp

@@ -154 +154 @@
   /** Array of weights */
   inline const double * weights() const
+  { return weights_;}
+
+  /// Set number of members
+  inline void setNumberMembers(int n)
+  {numberMembers_ = n;}
+
+  /// Members (indices in range 0 ... numberColumns-1)
+  inline int * mutableMembers() const
+  {return members_;}
+
+  /** Array of weights */
+  inline double * mutableWeights() const
   { return weights_;}
 

trunk/Cbc/src/CbcModel.cpp

@@ -4527 +4527 @@
     OsiBranchingObject * bobj = node->modifiableBranchingObject();
     CbcBranchingObject * cbcobj = dynamic_cast<CbcBranchingObject *> (bobj);
-    if (cbcobj) {
+    if (cbcobj&&cbcobj->object()) {
       CbcObject * object = cbcobj->object();
       CbcObjectUpdateData update = object->createUpdateInformation(solver_,node,cbcobj);
@@ -6855 +6855 @@
     OsiClpSolverInterface * clpSolver 
       = dynamic_cast<OsiClpSolverInterface *> (solver_);
-    if (clpSolver&&clpSolver->numberSOS()) {
+    if (clpSolver&&(clpSolver->numberSOS()||clpSolver->numberObjects())) {
       // deal with sos
       const CoinSet * setInfo = clpSolver->setInfo();
       int numberSOS = clpSolver->numberSOS();
-      nObjects=0;
-      delete [] oldObject;
-      oldObject = new OsiObject * [numberSOS];
-      for (int i=0;i<numberSOS;i++) {
-        int type = setInfo[i].setType();
-        int n=setInfo[i].numberEntries();
-        const int * which = setInfo[i].which();
-        const double * weights = setInfo[i].weights();
-        oldObject[nObjects++] = new CbcSOS(this,n,which,weights,i,type);
+      if (numberSOS) {
+        nObjects=0;
+        delete [] oldObject;
+        oldObject = new OsiObject * [numberSOS];
+        for (int i=0;i<numberSOS;i++) {
+          int type = setInfo[i].setType();
+          int n=setInfo[i].numberEntries();
+          const int * which = setInfo[i].which();
+          const double * weights = setInfo[i].weights();
+          oldObject[nObjects++] = new CbcSOS(this,n,which,weights,i,type);
+        }
+      } else {
+        // objects - only works with SOS at present
+        int numberObjects = clpSolver->numberObjects();
+        nObjects=0;
+        delete [] oldObject;
+        oldObject = new OsiObject * [numberObjects];
+        OsiObject ** osiObjects = clpSolver->objects();
+        for (int i=0;i<numberObjects;i++) {
+          OsiSOS * obj =
+            dynamic_cast <OsiSOS *>(osiObjects[i]) ;
+          if (obj) {
+            int type = obj->setType();
+            int n=obj->numberMembers();
+            const int * which = obj->members();
+            const double * weights = obj->weights();
+            oldObject[nObjects++] = new CbcSOS(this,n,which,weights,i,type);
+          }
+        }
       }
     }

trunk/Cbc/src/CbcSolver.cpp

@@ -40 +40 @@
 #include "OsiRowCutDebugger.hpp"
 #include "OsiChooseVariable.hpp"
+//#define USER_HAS_FAKE_CLP
+//#define USER_HAS_FAKE_CBC
 //#define CLP_MALLOC_STATISTICS
 #ifdef CLP_MALLOC_STATISTICS
@@ -1409 +1411 @@
   CoinMessageHandler * generalMessageHandler = model.messageHandler();
   generalMessageHandler->setPrefix(false);
+  // Move handler across if not default
+  if (!originalSolver->defaultHandler()&&originalSolver->getModelPtr()->defaultHandler())
+    originalSolver->getModelPtr()->passInMessageHandler(originalSolver->messageHandler());
   CoinMessages generalMessages = originalSolver->getModelPtr()->messages();
   char generalPrint[10000];
@@ -1630 +1635 @@
       solver->setObjSense(info.direction);
       solver->setDblParam(OsiObjOffset,info.offset);
+      if (info.offset) {
+        sprintf(generalPrint,"Ampl objective offset is %g",
+                info.offset);
+        generalMessageHandler->message(CLP_GENERAL,generalMessages)
+          << generalPrint
+          <<CoinMessageEol;
+      }
       // Set integer variables (unless nonlinear when set)
       if (!info.nonLinear) {
@@ -1878 +1890 @@
 #endif
           if (!lpSolver->integerInformation()&&!numberSOS&&
-              !clpSolver->numberSOS())
+              !clpSolver->numberSOS()&&!model.numberObjects()&&!clpSolver->numberObjects())
             type=DUALSIMPLEX;
         }
@@ -2507 +2519 @@
                 solveOptions.setSpecialOption(4,barrierOptions);
               }
+              model2->setMaximumSeconds(model.getMaximumSeconds());
 #ifdef COIN_HAS_LINK
               OsiSolverInterface * coinSolver = model.solver();
@@ -2536 +2549 @@
               model2->initialSolve(solveOptions);
 #endif
+              {
+                // map states
+                /* clp status
+                   -1 - unknown e.g. before solve or if postSolve says not optimal
+                   0 - optimal
+                   1 - primal infeasible
+                   2 - dual infeasible
+                   3 - stopped on iterations or time
+                   4 - stopped due to errors
+                   5 - stopped by event handler (virtual int ClpEventHandler::event()) */
+                /* cbc status
+                   -1 before branchAndBound
+                   0 finished - check isProvenOptimal or isProvenInfeasible to see if solution found
+                   (or check value of best solution)
+                   1 stopped - on maxnodes, maxsols, maxtime
+                   2 difficulties so run was abandoned
+                   (5 event user programmed event occurred) */
+                /* clp secondary status of problem - may get extended
+                   0 - none
+                   1 - primal infeasible because dual limit reached OR probably primal
+                   infeasible but can't prove it (main status 4)
+                   2 - scaled problem optimal - unscaled problem has primal infeasibilities
+                   3 - scaled problem optimal - unscaled problem has dual infeasibilities
+                   4 - scaled problem optimal - unscaled problem has primal and dual infeasibilities
+                   5 - giving up in primal with flagged variables
+                   6 - failed due to empty problem check 
+                   7 - postSolve says not optimal
+                   8 - failed due to bad element check
+                   9 - status was 3 and stopped on time
+                   100 up - translation of enum from ClpEventHandler
+                */
+                /* cbc secondary status of problem
+                   -1 unset (status_ will also be -1)
+                   0 search completed with solution
+                   1 linear relaxation not feasible (or worse than cutoff)
+                   2 stopped on gap
+                   3 stopped on nodes
+                   4 stopped on time
+                   5 stopped on user event
+                   6 stopped on solutions
+                   7 linear relaxation unbounded
+                */
+                int iStatus = model2->status();
+                int iStatus2 = model2->secondaryStatus();
+                if (iStatus==0) {
+                  iStatus2=0;
+                } else if (iStatus==1) {
+                  iStatus=0;
+                  iStatus2=1; // say infeasible
+                } else if (iStatus==2) {
+                  iStatus=0;
+                  iStatus2=7; // say unbounded
+                } else if (iStatus==3) {
+                  iStatus=1;
+                  if (iStatus2==9)
+                    iStatus2=4;
+                  else
+                    iStatus2=3; // Use nodes - as closer than solutions
+                } else if (iStatus==4) {
+                  iStatus=2; // difficulties
+                  iStatus2=0; 
+                }
+                model.setProblemStatus(iStatus);
+                model.setSecondaryStatus(iStatus2);
+                // and in babModel if exists
+                if (babModel) {
+                  babModel->setProblemStatus(iStatus);
+                  babModel->setSecondaryStatus(iStatus2);
+                }
+              }
               basisHasValues=1;
               if (dualize) {
@@ -3180 +3263 @@
                     delete [] prohibited;
                   }
+                  if (model.numberObjects()) {
+                    OsiObject ** oldObjects = babModel->objects();
+                    int numberOldObjects = babModel->numberObjects();
+                    // SOS
+                    int numberColumns = saveSolver->getNumCols();
+                    char * prohibited = new char[numberColumns];
+                    memset(prohibited,0,numberColumns);
+                    for (int iObj = 0;iObj<numberOldObjects;iObj++) {
+                      CbcSOS * obj =
+                        dynamic_cast <CbcSOS *>(oldObjects[iObj]) ;
+                      if (obj) {
+                        int n=obj->numberMembers();
+                        const int * which = obj->members();
+                        for (int i=0;i<n;i++) {
+                          int iColumn = which[i];
+                          prohibited[iColumn]=1;
+                        }
+                      }
+                    }
+                    process.passInProhibited(prohibited,numberColumns);
+                    delete [] prohibited;
+                  }
                   int numberPasses = 10;
                   if (tunePreProcess>=1000000) {
@@ -3746 +3851 @@
                     int numberOldObjects = babModel->numberObjects();
                     int numberColumns = babModel->getNumCols();
+                    // 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;
                     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;
@@ -3774 +3879 @@
                         }
                       }
-                      delete [] newColumn;
                       babModel->setNumberObjects(n);
                     }
+                    int nMissing=0;
                     for (int iObj = 0;iObj<numberOldObjects;iObj++) {
                       if (process.numberSOS())
                         oldObjects[iObj]->setPriority(numberColumns+1);
                       int iColumn = oldObjects[iObj]->columnNumber();
-                      if (iColumn<0||iColumn>=numberOriginalColumns) 
+                      if (iColumn<0||iColumn>=numberOriginalColumns) {
+                        CbcSOS * obj =
+                          dynamic_cast <CbcSOS *>(oldObjects[iObj]) ;
+                        if (obj) {
+                          int n=obj->numberMembers();
+                          int * which = obj->mutableMembers();
+                          double * weights = obj->mutableWeights();
+                          int nn=0;
+                          for (i=0;i<n;i++) {
+                            int iColumn = which[i];
+                            int jColumn = newColumn[iColumn];
+                            if (jColumn>=0) { 
+                              which[nn] = jColumn;
+                              weights[nn++]=weights[i];
+                            } else {
+                              nMissing++;
+                            }
+                          }
+                          obj->setNumberMembers(nn);
+                        }
                         continue;
+                      }
                       if (originalColumns)
                         iColumn = originalColumns[iColumn];
@@ -3807 +3932 @@
                       }
                     }
+                    if (nMissing) {
+                      sprintf(generalPrint,"%d SOS variables vanished due to pre processing? - check validity?\n",nMissing);
+                      generalMessageHandler->message(CLP_GENERAL,generalMessages)
+                        << generalPrint
+                        <<CoinMessageEol;
+                    }
+                    delete [] newColumn;
                     const int * starts = process.startSOS();
                     const int * which = process.whichSOS();
@@ -3820 +3952 @@
                       objects[iSOS]->setPriority(numberColumns-n);
                     }
-                    babModel->addObjects(numberSOS,objects);
+                    if (numberSOS)
+                      babModel->addObjects(numberSOS,objects);
                     for (iSOS=0;iSOS<numberSOS;iSOS++)
                       delete objects[iSOS];
@@ -6317 +6450 @@
     model.moveInfo(*babModel);
   delete babModel;
+  model.solver()->setWarmStart(NULL);
   return 0;
 }    

trunk/Cbc/src/CoinSolve.cpp

@@ -14 +14 @@
 #include <iostream>
   // define TEST_MESSAGE_HANDLER to check works on all messages
-  //#define TEST_MESSAGE_HANDLER
+//#define TEST_MESSAGE_HANDLER
 #ifdef TEST_MESSAGE_HANDLER
 // This driver shows how to trap messages - this is just as in unitTest.cpp
@@ -211 +211 @@
   clpSolver->messageHandler()->setLogLevel(1) ;
   model.messageHandler()->setLogLevel(1);
+  // switch off some printing
+  void setCbcOrClpPrinting(bool yesNo);
+  setCbcOrClpPrinting(false);
 #endif
   int returnCode = CbcMain1 (argc, argv,model);
   if (returnCode!=777) {
+    //const CoinWarmStartBasis* debugws =
+    //dynamic_cast <const CoinWarmStartBasis*>(model.solver()->getWarmStart()) ;
+    //debugws->print() ;
+    //delete debugws ; 
     return returnCode;
   } else {