Changeset 202 for branches/pre

Timestamp:

Aug 27, 2003 6:30:57 AM (18 years ago)

Author:

forrest

Message:

getting better

File:

• branches/pre/ClpSimplexPrimalQuadratic.cpp (modified) (8 diffs)

branches/pre/ClpSimplexPrimalQuadratic.cpp

@@ -507 +507 @@
   // Now do quadratic
   //ClpPrimalQuadraticDantzig dantzigP(model2,&info);
-  //ClpPrimalColumnDantzig dantzigP;
-  //model2->setPrimalColumnPivotAlgorithm(dantzigP);
+  ClpPrimalColumnDantzig dantzigP;
+  model2->setPrimalColumnPivotAlgorithm(dantzigP);
   model2->messageHandler()->setLogLevel(63);
   model2->primalQuadratic2(&info,phase);
@@ -1073 +1073 @@
           // if stable replace in basis
           int updateStatus = 0;
-          if (result<20)
+          if (result<20) {
+            double saveCheck = factorization_->getAccuracyCheck();
+            if (cleanupIteration)
+              factorization_->relaxAccuracyCheck(1.0e3*saveCheck);
             updateStatus=factorization_->replaceColumn(rowArray_[2],
                                                        pivotRow_,
                                                        alpha_);
+            factorization_->relaxAccuracyCheck(saveCheck);
+          }
           if (result>=10) {
             updateStatus = max(updateStatus,result/10);
@@ -1100 +1105 @@
             nextSequenceIn=saveSequenceInInfo;
             info->setCrucialSj(saveCrucialSjInfo);
+            if (saveCrucialSjInfo<0&&!phase)
+              nextSequenceIn=-1;
             pivotRow_=-1;
             // better to have small tolerance even if slower
@@ -1115 +1122 @@
               returnCode=-4;
               // retry on return
-              nextSequenceIn = sequenceIn_;
+              if (info->crucialSj()>=0)
+                nextSequenceIn = sequenceIn_;
               break;
             } else {
@@ -1791 +1799 @@
           double alpha=work[iSjRow2];
           printf("Sj alpha %g sol %g ratio %g\n",alpha,solution_[crucialSj2],solution_[crucialSj2]/alpha);
-          if (fabs(fabs(d1)-fabs(solution_[crucialSj2]/alpha))>1.0e-3) {
+          if (fabs(fabs(d1)-fabs(solution_[crucialSj2]/alpha))>1.0e-3*(1.0+fabs(d1))) {
             printf("bad test\n");
             if (factorization_->pivots())
@@ -1830 +1838 @@
   double upperTheta = maximumMovement;
   bool throwAway=false;
-  if (numberIterations_==931) {
+  if (numberIterations_==1750) {
     printf("Bad iteration coming up after iteration %d\n",numberIterations_);
   }
@@ -2271 +2279 @@
         valueOut_ = solution(sequenceOut_);
         theta_ = fabs(valueOut_/alpha_);
-        assert (fabs(maximumMovement-theta_)<1.0e-3*1.0+maximumMovement);
+        assert (fabs(maximumMovement-theta_)<1.0e-3*(1.0+maximumMovement));
         if (way<0.0) 
           theta_ = - theta_;
@@ -3024 +3032 @@
           // should adjust value?
           solution_[jSequence]=0.0;
-          //value=value2;
+          value=value2;
         } else {
           //if (fabs(value-value2-dj_[jSequence-start])>1.0e-3)