Changeset 1937

Timestamp:

Apr 9, 2013 6:32:15 AM (6 years ago)

Author:

forrest

Message:

fixes so sprint will work on unsuitable problems and testGub have no memory leaks

Location:

trunk/Clp/examples

Files:

• sprint.cpp (modified) (1 diff)
• sprint2.cpp (modified) (2 diffs)
• testGub.cpp (modified) (3 diffs)

trunk/Clp/examples/sprint.cpp

@@ -121 +121 @@
      int smallNumberColumns = CoinMin(3 * numberRows, numberColumns);
      smallNumberColumns = CoinMax(smallNumberColumns, 3000);
+     // To stop seg faults on unsuitable problems
+     smallNumberColumns = CoinMin(smallNumberColumns,numberColumns);
      // We will be using all rows
      int * whichRows = new int [numberRows];

trunk/Clp/examples/sprint2.cpp

@@ -72 +72 @@
      // Just take this number of columns in small problem
      int smallNumberColumns = 3 * numberRows;
+     // To stop seg faults on unsuitable problems
+     smallNumberColumns = CoinMin(smallNumberColumns,numberColumns);
      // And we want number of rows to be this
      int smallNumberRows = numberRows / 4;
@@ -101 +103 @@
                double ratio = ((double) smallNumberRows) / ((double) model2->numberRows());
                smallNumberColumns = (int)(smallNumberColumns * ratio);
+               // deal with pathological case
+               smallNumberColumns = CoinMax(smallNumberColumns,0);
           }
           delete model2;

trunk/Clp/examples/testGub.cpp

@@ -245 +245 @@
                          start2, row2, element2, cost2,
                          lowerColumn2, upperColumn2);
-               model2.replaceMatrix(newMatrix);
+               model2.replaceMatrix(newMatrix,true);
                newMatrix->switchOffCheck();
                newMatrix->setRefreshFrequency(1000);
@@ -275 +275 @@
                                 lowerColumn2, upperColumn2,
                                 oldMatrix->gubRowStatus(), oldMatrix->dynamicStatus());
-               model3.replaceMatrix(newMatrix);
+               model3.replaceMatrix(newMatrix,true);
                // and ordinary status (but only NON gub rows)
                memcpy(model3.statusArray(), model2.statusArray(),
@@ -293 +293 @@
                                        oldMatrix->gubRowStatus(), oldMatrix->dynamicStatus(),
                                        oldMatrix->numberGubColumns(), oldMatrix->idGen());
-               model3.replaceMatrix(newMatrix);
+               model3.replaceMatrix(newMatrix,true);
                // and ordinary status (but only NON gub rows)
                memcpy(model3.statusArray(), model2.statusArray(),