Changeset 538 for stable/1.1

Timestamp:

Feb 16, 2007 3:51:27 PM (14 years ago)

Author:

forrest

Message:

out messages

Location:

stable/1.1/Cbc/src

Files:

• CbcBranchActual.cpp (modified) (2 diffs)
• CbcModel.cpp (modified) (4 diffs)
• CbcNode.hpp (modified) (1 diff)
• CbcStrategy.cpp (modified) (1 diff)
• Cbc_ampl.cpp (modified) (4 diffs)

stable/1.1/Cbc/src/CbcBranchActual.cpp

@@ -233 +233 @@
   }
   if (n2<numberMembers_) {
-    printf("** SOS number of members reduced from %d to %d!\n",numberMembers_,n2);
+    //printf("** SOS number of members reduced from %d to %d!\n",numberMembers_,n2);
     numberMembers_=n2;
   }
@@ -539 +539 @@
   }
   if (n2<numberMembers_) {
-    printf("** SOS number of members reduced from %d to %d!\n",numberMembers_,n2);
+    //printf("** SOS number of members reduced from %d to %d!\n",numberMembers_,n2);
     numberMembers_=n2;
   }

stable/1.1/Cbc/src/CbcModel.cpp

@@ -941 +941 @@
       if (!feasible) anyAction = -2 ; }
       if (anyAction == -2||newNode->objectiveValue() >= cutoff)
-      { delete newNode ;
+      { 
+        if (anyAction != -2) {
+          // zap parent nodeInfo
+          newNode->nodeInfo()->nullParent();
+        }
+        delete newNode ;
         newNode = NULL ;
         feasible = false ; } } }
@@ -1031 +1036 @@
       printf("Node %x on tree\n",newNode) ;
 #     endif
+      newNode=NULL;
     } else {
       // continuous is integer
@@ -1487 +1493 @@
         if ( anyAction >=0 ) {
           assert (newNode);
-          if (newNode->objectiveValue() >= getCutoff()) 
+          if (newNode->objectiveValue() >= getCutoff()) {
             anyAction = -2; // say bad after all
+#ifdef COIN_DEVELOP
+            printf("zapping2 CbcNodeInfo %x\n",newNode->nodeInfo()->parent());
+#endif
+            // zap parent nodeInfo
+            newNode->nodeInfo()->nullParent();
+          }
         }
 /*
@@ -1598 +1610 @@
             printf("Node %x pushed on tree c\n",newNode) ;
 #           endif
+            newNode=NULL;
           }
           else

stable/1.1/Cbc/src/CbcNode.hpp

@@ -150 +150 @@
   CbcNodeInfo * parent() const
   {return parent_;};
+  /// Set parent null
+  inline void nullParent()
+  { parent_=NULL;};
 
   void addCuts(OsiCuts & cuts,int numberToBranch, int * whichGenerator);

stable/1.1/Cbc/src/CbcStrategy.cpp

@@ -353 +353 @@
         OsiClpSolverInterface * clpSolver = dynamic_cast< OsiClpSolverInterface*> (solver);
         ClpSimplex * lpSolver = clpSolver->getModelPtr();
+        lpSolver->passInMessageHandler(solver->messageHandler());
         if (lpSolver->tightenPrimalBounds()==0) {
           lpSolver->dual();

stable/1.1/Cbc/src/Cbc_ampl.cpp

@@ -24 +24 @@
 ****************************************************************/
 
-#include "getstub.h"
+#include "CbcConfig.h"
+#ifdef HAVE_UNISTD_H
+# include "unistd.h"
+#endif
+
+extern "C" {
+# include "getstub.h"
+}
+
 #include "Cbc_ampl.h"
-#include "unistd.h"
 #include <string>
 #include <cassert>
+#include "CoinSort.hpp"
 /* so decodePhrase and clpCheck can access */
 static ampl_info * saveInfo=NULL;
@@ -72 +80 @@
 }
 static void
-sos_kludge(int nsos, int *sosbeg, double *sosref)
+sos_kludge(int nsos, int *sosbeg, double *sosref,int * sosind)
 {
   // Adjust sosref if necessary to make monotonic increasing
   int i, j, k;
+  // first sort
+  for (i=0;i<nsos;i++) {
+    k = sosbeg[i];
+    int end=sosbeg[i+1];
+    CoinSort_2(sosref+k,sosref+end,sosind+k);
+  }
   double t, t1;
   for(i = j = 0; i++ < nsos; ) {
@@ -316 +330 @@
       info->sosIndices = (int *) malloc(nsosnz*sizeof(int));
       info->sosReference = (double *) malloc(nsosnz*sizeof(double));
-      sos_kludge(nsos, sosbeg, sosref);
+      sos_kludge(nsos, sosbeg, sosref,sosind);
       for (int i=0;i<nsos;i++) {
         int ichar = sostype[i];
@@ -402 +416 @@
   } else {
     /* all slack basis */
+    // leave status for output */
+#if 0
     free(info->rowStatus);
     info->rowStatus=NULL;
     free(info->columnStatus);
     info->columnStatus=NULL;
+#endif
   }
   /* add -solve - unless something there already