Changeset 1657 for trunk/Cbc/src
 Timestamp:
 May 31, 2011 8:52:49 AM (9 years ago)
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

trunk/Cbc/src/CbcNode.cpp
r1650 r1657 2253 2253 // may just need resolve 2254 2254 model>resolve(NULL, 11, saveSolution, saveLower, saveUpper); 2255 //double newObjValue = solver>getObjSense()*solver>getObjValue();2256 //objectiveValue_ = CoinMax(objectiveValue_,newObjValue);2255 double newObjValue = solver>getObjSense()*solver>getObjValue(); 2256 objectiveValue_ = CoinMax(objectiveValue_,newObjValue); 2257 2257 if (!solver>isProvenOptimal()) { 2258 2258 // infeasible … … 2376 2376 solver>setHintParam(OsiDoDualInResolve, false, OsiHintDo) ; 2377 2377 model>resolve(NULL, 11, saveSolution, saveLower, saveUpper); 2378 //double newObjValue = solver>getObjSense()*solver>getObjValue();2379 //objectiveValue_ = CoinMax(objectiveValue_,newObjValue);2378 double newObjValue = solver>getObjSense()*solver>getObjValue(); 2379 objectiveValue_ = CoinMax(objectiveValue_,newObjValue); 2380 2380 solver>setHintParam(OsiDoDualInResolve, takeHint, strength) ; 2381 2381 if (!solver>isProvenOptimal()) { … … 2597 2597 solver>unmarkHotStart(); 2598 2598 model>resolve(NULL, 11, saveSolution, saveLower, saveUpper); 2599 //double newObjValue = solver>getObjSense()*solver>getObjValue();2600 //objectiveValue_ = CoinMax(objectiveValue_,newObjValue);2599 double newObjValue = solver>getObjSense()*solver>getObjValue(); 2600 objectiveValue_ = CoinMax(objectiveValue_,newObjValue); 2601 2601 solver>markHotStart(); 2602 2602 problemFeasible = solver>isProvenOptimal(); … … 2903 2903 model>resolve(NULL, 11, saveSolution, saveLower, saveUpper); 2904 2904 newObjectiveValue = solver>getObjSense() * solver>getObjValue(); 2905 //objectiveValue_ = CoinMax(objectiveValue_,newObjectiveValue);2905 objectiveValue_ = CoinMax(objectiveValue_,newObjectiveValue); 2906 2906 objectiveChange = CoinMax(newObjectiveValue  objectiveValue_, 0.0); 2907 2907 model>feasibleSolution(choice.numIntInfeasDown, … … 2937 2937 needHotStartUpdate = false; 2938 2938 model>resolve(NULL, 11, saveSolution, saveLower, saveUpper); 2939 //double newObjValue = solver>getObjSense()*solver>getObjValue();2940 //objectiveValue_ = CoinMax(objectiveValue_,newObjValue);2939 double newObjValue = solver>getObjSense()*solver>getObjValue(); 2940 objectiveValue_ = CoinMax(objectiveValue_,newObjValue); 2941 2941 //we may again have an integer feasible solution 2942 2942 int numberIntegerInfeasibilities; … … 2957 2957 solver>getColSolution()) ; 2958 2958 model>resolve(NULL, 11, saveSolution, saveLower, saveUpper); 2959 //double newObjValue = solver>getObjSense()*solver>getObjValue();2960 //objectiveValue_ = CoinMax(objectiveValue_,newObjValue);2959 double newObjValue = solver>getObjSense()*solver>getObjValue(); 2960 objectiveValue_ = CoinMax(objectiveValue_,newObjValue); 2961 2961 cutoff = model>getCutoff(); 2962 2962 } … … 3064 3064 model>resolve(NULL, 11, saveSolution, saveLower, saveUpper); 3065 3065 newObjectiveValue = solver>getObjSense() * solver>getObjValue(); 3066 //objectiveValue_ = CoinMax(objectiveValue_,newObjectiveValue);3066 objectiveValue_ = CoinMax(objectiveValue_,newObjectiveValue); 3067 3067 objectiveChange = CoinMax(newObjectiveValue  objectiveValue_, 0.0); 3068 3068 model>feasibleSolution(choice.numIntInfeasDown, … … 3098 3098 needHotStartUpdate = false; 3099 3099 model>resolve(NULL, 11, saveSolution, saveLower, saveUpper); 3100 //double newObjValue = solver>getObjSense()*solver>getObjValue();3101 //objectiveValue_ = CoinMax(objectiveValue_,newObjValue);3100 double newObjValue = solver>getObjSense()*solver>getObjValue(); 3101 objectiveValue_ = CoinMax(objectiveValue_,newObjValue); 3102 3102 //we may again have an integer feasible solution 3103 3103 int numberIntegerInfeasibilities; … … 3112 3112 solver>getColSolution()) ; 3113 3113 model>resolve(NULL, 11, saveSolution, saveLower, saveUpper); 3114 //double newObjValue = solver>getObjSense()*solver>getObjValue();3115 //objectiveValue_ = CoinMax(objectiveValue_,newObjValue);3114 double newObjValue = solver>getObjSense()*solver>getObjValue(); 3115 objectiveValue_ = CoinMax(objectiveValue_,newObjValue); 3116 3116 cutoff = model>getCutoff(); 3117 3117 } … … 3257 3257 solver>unmarkHotStart(); 3258 3258 model>resolve(NULL, 11, saveSolution, saveLower, saveUpper); 3259 //double newObjValue = solver>getObjSense()*solver>getObjValue();3260 //objectiveValue_ = CoinMax(objectiveValue_,newObjValue);3259 double newObjValue = solver>getObjSense()*solver>getObjValue(); 3260 objectiveValue_ = CoinMax(objectiveValue_,newObjValue); 3261 3261 solver>markHotStart(); 3262 3262 // may be infeasible (if other way stopped on iterations) … … 3299 3299 solver>unmarkHotStart(); 3300 3300 model>resolve(NULL, 11, saveSolution, saveLower, saveUpper); 3301 //double newObjValue = solver>getObjSense()*solver>getObjValue();3302 //objectiveValue_ = CoinMax(objectiveValue_,newObjValue);3301 double newObjValue = solver>getObjSense()*solver>getObjValue(); 3302 objectiveValue_ = CoinMax(objectiveValue_,newObjValue); 3303 3303 solver>markHotStart(); 3304 3304 // may be infeasible (if other way stopped on iterations) … … 3383 3383 solver>setHintParam(OsiDoInBranchAndCut, true, OsiHintDo, &easy) ; 3384 3384 model>resolve(NULL, 11, saveSolution, saveLower, saveUpper) ; 3385 //double newObjValue = solver>getObjSense()*solver>getObjValue();3386 //objectiveValue_ = CoinMax(objectiveValue_,newObjValue);3385 double newObjValue = solver>getObjSense()*solver>getObjValue(); 3386 objectiveValue_ = CoinMax(objectiveValue_,newObjValue); 3387 3387 solver>setHintParam(OsiDoInBranchAndCut, true, OsiHintDo, NULL) ; 3388 3388 feasible = solver>isProvenOptimal();
Note: See TracChangeset
for help on using the changeset viewer.