Changeset 12 for branches

Timestamp:

Aug 6, 2002 1:55:36 PM (18 years ago)

Author:

forrest

Message:

Improve speed

Location:

branches/devel-1

Files:

• ClpSimplexDual.cpp (modified) (3 diffs)
• ClpSimplexPrimal.cpp (modified) (3 diffs)

branches/devel-1/ClpSimplexDual.cpp

@@ -257 +257 @@
   factorization_->slackValue(-1.0);
   factorization_->zeroTolerance(1.0e-13);
+  // save if sparse factorization wanted
+  int saveSparse = factorization_->sparseThreshold();
+
   if (internalFactorize(0))
     return 1; // some error
@@ -316 +319 @@
     // Say good factorization
     factorType=1;
+    if (saveSparse) {
+      // use default at present
+      factorization_->sparseThreshold(0);
+      factorization_->goSparse();
+    }
 
     // status stays at -1 while iterating, >=0 finished, -2 to invert
@@ -641 +649 @@
   // Restore any saved stuff
   perturbation_ = savePerturbation;
+  factorization_->sparseThreshold(saveSparse);
   dualBound_ = saveDualBound_;
   return problemStatus_;

branches/devel-1/ClpSimplexPrimal.cpp

@@ -257 +257 @@
   }
 
+  // save if sparse factorization wanted
+  int saveSparse = factorization_->sparseThreshold();
+
   // loop round to clean up solution if values pass
   int numberThrownOut = -1;
@@ -328 +331 @@
     // Say good factorization
     factorType=1;
+    if (saveSparse) {
+      // use default at present
+      factorization_->sparseThreshold(0);
+      factorization_->goSparse();
+    }
 
     // Say no pivot has occurred (for steepest edge and updates)
@@ -642 +650 @@
   // Restore any saved stuff
   perturbation_ = savePerturbation;
+  factorization_->sparseThreshold(saveSparse);
   infeasibilityCost_ = saveInfeasibilityCost;
   return problemStatus_;