Changeset 1616 for trunk

Timestamp:

Nov 1, 2010 9:05:15 AM (9 years ago)

Author:

forrest

Message:

for partial skip of etas

Location:

trunk/Clp/src

Files:

• ClpFactorization.cpp (modified) (6 diffs)
• ClpFactorization.hpp (modified) (2 diffs)

trunk/Clp/src/ClpFactorization.cpp

@@ -1167 +1167 @@
      goSmallThreshold_ = rhs.goSmallThreshold_;
      int goDense = 0;
+#ifdef CLP_REUSE_ETAS
+     model_=rhs.model_;
+#endif
      if (denseIfSmaller > 0 && denseIfSmaller <= goDenseThreshold_) {
           CoinDenseFactorization * denseR =
@@ -1292 +1295 @@
 #endif
           forceB_ = rhs.forceB_;
+#ifdef CLP_REUSE_ETAS
+          model_=rhs.model_;
+#endif
           goOslThreshold_ = rhs.goOslThreshold_;
           goDenseThreshold_ = rhs.goDenseThreshold_;
@@ -1397 +1403 @@
                               int solveType, bool valuesPass)
 {
+#ifdef CLP_REUSE_ETAS
+     model_= model;
+#endif
      //if ((model->specialOptions()&16384))
      //printf("factor at %d iterations\n",model->numberIterations());
@@ -2277 +2286 @@
                } else {
                     bool tab = coinFactorizationB_->wantsTableauColumn();
-                    int numberIterations = model->numberIterations();
-                    coinFactorizationB_->setUsefulInformation(&numberIterations, 1);
+#ifdef CLP_REUSE_ETAS
+                    int tempInfo[2];
+                    tempInfo[1] = model_->sequenceOut();
+#else
+                    int tempInfo[1];
+#endif
+                    tempInfo[0] = model->numberIterations();
+                    coinFactorizationB_->setUsefulInformation(tempInfo, 1);
                     returnCode =
                          coinFactorizationB_->replaceColumn(tab ? tableauColumn : regionSparse,
@@ -2364 +2379 @@
                coinFactorizationA_->setCollectStatistics(false);
           } else {
-               returnCode = coinFactorizationB_->updateColumnFT(regionSparse,
+#ifdef CLP_REUSE_ETAS
+              int tempInfo[2];
+              tempInfo[0] = model_->numberIterations();
+              tempInfo[1] = model_->sequenceIn();
+              coinFactorizationB_->setUsefulInformation(tempInfo, 2);
+#endif
+              returnCode = coinFactorizationB_->updateColumnFT(regionSparse,
                             regionSparse2);
           }
@@ -2556 +2577 @@
                }
 #else
-returnCode = coinFactorizationB_->updateTwoColumnsFT(regionSparse1,
-             regionSparse2,
-             regionSparse3,
-             noPermuteRegion3);
+#ifdef CLP_REUSE_ETAS
+                    int tempInfo[2];
+                    tempInfo[0] = model_->numberIterations();
+                    tempInfo[1] = model_->sequenceIn();
+                    coinFactorizationB_->setUsefulInformation(tempInfo, 3);
+#endif
+                    returnCode = 
+                      coinFactorizationB_->updateTwoColumnsFT(
+                                                              regionSparse1,
+                                                              regionSparse2,
+                                                              regionSparse3,
+                                                              noPermuteRegion3);
 #endif
           }

trunk/Clp/src/ClpFactorization.hpp

@@ -18 +18 @@
 #ifdef CLP_MULTIPLE_FACTORIZATIONS
 #include "CoinDenseFactorization.hpp"
+#include "ClpSimplex.hpp"
 #endif
 #ifndef COIN_FAST_CODE
@@ -405 +406 @@
      /// Pointer to CoinOtherFactorization
      CoinOtherFactorization * coinFactorizationB_;
+#ifdef CLP_REUSE_ETAS
+     /// Pointer to model
+     ClpSimplex * model_;
+#endif
      /// If nonzero force use of 1,dense 2,small 3,osl
      int forceB_;