Changeset 2225 for trunk/Clp/src/ClpSimplexOther.cpp

Timestamp:

Aug 8, 2016 7:57:49 AM (5 years ago)

Author:

forrest

Message:

out abort

File:

• trunk/Clp/src/ClpSimplexOther.cpp (modified) (7 diffs)

trunk/Clp/src/ClpSimplexOther.cpp

@@ -53 +53 @@
 {
      rowArray_[1]->clear();
+#ifdef LONG_REGION_2
+     rowArray_[2]->clear();
+#else
      columnArray_[1]->clear();
+#endif
      // long enough for rows+columns
      assert(rowArray_[3]->capacity() >= numberRows_ + numberColumns_);
@@ -113 +117 @@
                // put row of tableau in rowArray[0] and columnArray[0]
                matrix_->transposeTimes(this, -1.0,
-                                       rowArray_[0], columnArray_[1], columnArray_[0]);
+                                       rowArray_[0], 
+#ifdef LONG_REGION_2 
+                                       rowArray_[2],
+#else 
+                                       columnArray_[1],
+#endif 
+                                       columnArray_[0]);
 #ifdef COIN_FAC_NEW
                assert (!rowArray_[0]->packedMode());
@@ -1227 +1237 @@
           }
      }
-     if (numberBasic != numberRows_) {
+     if (numberBasic != numberRows_ && 0) {
           printf("Bad basis - ranges - coding needed\n");
           assert (numberRanges);
@@ -2894 +2904 @@
           }
 
-          for (iColumn = 0; iColumn < 2; iColumn++) {
+          for (iColumn = 0; iColumn < SHORT_REGION; iColumn++) {
                columnArray_[iColumn]->clear();
           }
@@ -3335 +3345 @@
     }
     
-    for (iColumn = 0; iColumn < 2; iColumn++) {
+    for (iColumn = 0; iColumn < SHORT_REGION; iColumn++) {
       columnArray_[iColumn]->clear();
     }
@@ -4648 +4658 @@
     reinterpret_cast<ClpSimplexDual *> 
     ( this)->dualColumn(rowArray_[0],
-                        columnArray_[0], columnArray_[1],
+                        columnArray_[0], 
+#ifdef LONG_REGION_2 
+                        rowArray_[2],
+#else 
+                        columnArray_[1],
+#endif 
                         rowArray_[3], acceptablePivot, NULL);
   return bestPossiblePivot;
@@ -7728 +7743 @@
 #else
   for (int i=0;i<numberColumns_;i++)
-    columnWeights[i]=CoinDrand48();
+    columnWeights[i]=randomNumberGenerator_.randomDouble();
 #endif
 #if USE_HASH==1