Changeset 2217

Timestamp:

Oct 6, 2015 12:10:41 PM (3 years ago)

Author:

forrest

Message:

fix bug in greedy heuristic

File:

• stable/2.9/Cbc/src/CbcHeuristicGreedy.cpp (modified) (5 diffs)

stable/2.9/Cbc/src/CbcHeuristicGreedy.cpp

@@ -996 +996 @@
     const int * columnLength = matrix_.getVectorLengths();
     int * sosRow = new int [numberColumns];
+    char * sos = new char [numberRows];
+    memset(sos,'a',numberRows);
     int nonSOS=0;
     // If bit set then use current
@@ -1018 +1020 @@
         } else if (rowUpper[iRow] < 1.0e10) {
           rhs[iRow]=rowUpper[iRow];
+          if (rhs[iRow]<0)
+            sos[iRow]=0; // can't be SOS
         } else {
           rhs[iRow]=rowLower[iRow];
+          if (rhs[iRow]<0)
+            sos[iRow]=0; // can't be SOS
         }
       }
@@ -1037 +1043 @@
             good = false;
           int iRow = row[j];
-          if (rhs[iRow]==-1.0) {
+          if (rhs[iRow]==-1.0 && sos[iRow] == 'a') {
             if (element[j] != 1.0)
               good = false;
@@ -1053 +1059 @@
         delete [] sosRow;
         delete [] rhs;
+        delete [] sos;
         setWhen(0); // switch off
         return 0;
@@ -1092 +1099 @@
     }
     double offset2 = 0.0;
-    char * sos = new char [numberRows];
     for (int iRow = 0;iRow < numberRows; iRow++) {
-      sos[iRow]=0;
-      if (rhs[iRow]<0.0) {
-        sos[iRow]=1;
-        rhs[iRow]=1.0;
-      } else if (rhs[iRow] != rowUpper[iRow]) {
-        // G row
-        sos[iRow]=-1;
-      }
-      if( slackCost[iRow] == 1.0e30) {
-        slackCost[iRow]=0.0;
-      } else {
-        offset2 += slackCost[iRow];
-        sos[iRow] = 2;
+      if (sos[iRow]=='a') {
+        // row is possible
+        sos[iRow]=0;
+        if (rhs[iRow]<0.0) {
+          sos[iRow]=1;
+          rhs[iRow]=1.0;
+        } else if (rhs[iRow] != rowUpper[iRow]) {
+          // G row
+          sos[iRow]=-1;
+        }
+        if( slackCost[iRow] == 1.0e30) {
+          slackCost[iRow]=0.0;
+        } else {
+          offset2 += slackCost[iRow];
+          sos[iRow] = 2;
+        }
       }
     }