Changeset 1851
- Timestamp:
- Mar 22, 2012 11:21:43 AM (8 years ago)
- Location:
- trunk/Clp/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Clp/src/ClpSimplexOther.cpp
r1846 r1851 2049 2049 paramData.startingTheta=startingTheta; 2050 2050 paramData.endingTheta=endingTheta; 2051 paramData.maxTheta=COIN_DBL_MAX; 2051 2052 paramData.lowerChange = chgLower; 2052 2053 paramData.upperChange = chgUpper; … … 3020 3021 returnCode = -2; 3021 3022 } 3023 paramData.maxTheta=maxTheta; 3022 3024 bool swapped=false; 3023 3025 // Dantzig … … 3681 3683 double saveTheta=theta_; 3682 3684 theta_ = endingTheta; 3685 if (problemStatus_==2&&theta_>0.99999999*paramData.maxTheta) 3686 theta_=COIN_DBL_MAX; // we have finished 3683 3687 int status=eventHandler_->event(ClpEventHandler::theta); 3684 3688 if (status>=0&&status<10) { 3685 3689 endingTheta=theta_; 3686 theta_=saveTheta;3687 3690 problemStatus_=-1; 3688 3691 continue; … … 3692 3695 if (status<0) 3693 3696 startingTheta = useTheta; 3694 theta_=saveTheta;3695 3697 } 3698 theta_=saveTheta; 3696 3699 } 3697 3700 #else -
trunk/Clp/src/ClpSimplexOther.hpp
r1831 r1851 108 108 double startingTheta; 109 109 double endingTheta; 110 double maxTheta; 110 111 double * lowerChange; // full array of lower bound changes 111 112 int * lowerList; // list of lower bound changes
Note: See TracChangeset
for help on using the changeset viewer.