Changeset 851 for trunk/Clp/src/ClpSimplexDual.cpp
- Timestamp:
- Aug 24, 2006 6:16:59 AM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Clp/src/ClpSimplexDual.cpp
r822 r851 2399 2399 CoinIndexedVector * spareArray, 2400 2400 double acceptablePivot, 2401 double & upperReturn, double &bestReturn )2401 double & upperReturn, double &bestReturn,double & badFree) 2402 2402 { 2403 2403 // do first pass to get possibles … … 2415 2415 int numberRemaining=0; 2416 2416 int i; 2417 badFree=0.0; 2417 2418 for (int iSection=0;iSection<2;iSection++) { 2418 2419 … … 2450 2451 bestPossible = CoinMax(bestPossible,fabs(alpha)); 2451 2452 oldValue = reducedCost[iSequence]; 2452 // If free has to be very large - should come in via dualRow2453 if (getStatus(iSequence+addSequence)==isFree&&fabs(alpha)<1.0e-3)2454 2453 // If free has to be very large - should come in via dualRow 2454 //if (getStatus(iSequence+addSequence)==isFree&&fabs(alpha)<1.0e-3) 2455 //break; 2455 2456 if (oldValue>dualTolerance_) { 2456 2457 keep = true; … … 2458 2459 keep = true; 2459 2460 } else { 2460 if (fabs(alpha)>CoinMax(10.0*acceptablePivot,1.0e-5)) 2461 if (fabs(alpha)>CoinMax(10.0*acceptablePivot,1.0e-5)) { 2461 2462 keep = true; 2462 else2463 } else { 2463 2464 keep=false; 2465 badFree=CoinMax(badFree,fabs(alpha)); 2466 } 2464 2467 } 2465 2468 if (keep) { … … 2596 2599 upperTheta = 1.0e31; 2597 2600 double bestPossible=0.0; 2601 double badFree=0.0; 2598 2602 if (spareIntArray_[0]!=-1) { 2599 2603 numberRemaining = dualColumn0(rowArray,columnArray,spareArray, 2600 acceptablePivot,upperTheta,bestPossible );2604 acceptablePivot,upperTheta,bestPossible,badFree); 2601 2605 } else { 2602 2606 // already done … … 3107 3111 if (handler_->logLevel()>1) 3108 3112 printf("forcing re-factorization\n"); 3113 alpha_=0.0; 3114 } 3115 if (fabs(theta_*badFree)>10.0*dualTolerance_&&factorization_->pivots()) { 3116 if (handler_->logLevel()>1) 3117 printf("forcing re-factorizationon free\n"); 3109 3118 alpha_=0.0; 3110 3119 }
Note: See TracChangeset
for help on using the changeset viewer.