Changeset 1589 for trunk/Cbc

Timestamp:

Jan 28, 2011 4:16:51 AM (9 years ago)

Author:

forrest

Message:

allow SOS greedy with 0-1

File:

• trunk/Cbc/src/CbcHeuristicGreedy.cpp (modified) (8 diffs)

trunk/Cbc/src/CbcHeuristicGreedy.cpp

@@ -989 +989 @@
     const CoinBigIndex * columnStart = matrix_.getVectorStarts();
     const int * columnLength = matrix_.getVectorLengths();
+    int * sosRow = new int [numberColumns];
     // If bit set then use current
     if ((algorithm_&1)!=0) {
@@ -1017 +1018 @@
         CoinBigIndex j;
         int nSOS=0;
-        if (!solver->isInteger(iColumn))
-          good = false;
+        int iSOS=-1;
         for (j = columnStart[iColumn];
              j < columnStart[iColumn] + columnLength[iColumn]; j++) {
@@ -1027 +1027 @@
             if (element[j] != 1.0)
               good = false;
+            iSOS=iRow;
             nSOS++;
           }
         }
-        if (nSOS!=1)
+        if (nSOS>1||!solver->isBinary(iColumn))
           good = false;
+        sosRow[iColumn] = iSOS;
       }
       if (!good) {
         delete [] rhs;
+        delete [] sosRow;
         setWhen(0); // switch off
         return 0;
       }
+    } else {
+      abort(); // not allowed yet
     }
     const double * solution = solver->getColSolution();
@@ -1055 +1060 @@
     // Take off cost of gub slack
     for (int iColumn = 0; iColumn < numberColumns; iColumn++) {
-      if (columnLength[iColumn] == 1) {
+      int iRow = sosRow[iColumn];
+      if (columnLength[iColumn] == 1&&iRow>=0) {
         // SOS slack
         double cost = direction*objective[iColumn];
-        int iRow = row[columnStart[iColumn]];
         assert (rhs[iRow]<0.0);
         slackCost[iRow]=CoinMin(slackCost[iRow],cost);
@@ -1155 +1160 @@
         forSort=1.0;
       // Use smallest cost if will fit
-      if (willFit && hasSlack && 
+      if (willFit /*&& hasSlack*/ && 
           value == 0.0 && columnUpper[iColumn]) {
         if (hasSlack) {
@@ -1249 +1254 @@
         }
     }
+    delete [] sosRow;
     delete [] newSolution;
     delete [] rowActivity;
@@ -1320 +1326 @@
             CoinBigIndex j;
             int nSOS=0;
-            if (!solver->isInteger(iColumn))
-              good = false;
             for (j = columnStart[iColumn];
                     j < columnStart[iColumn] + columnLength[iColumn]; j++) {
@@ -1333 +1337 @@
                 }
             }
-            if (nSOS!=1)
+            if (nSOS>1||!solver->isBinary(iColumn))
               good = false;
         }