Changeset 2040 for trunk/Cbc/src/CbcNode.cpp
 Timestamp:
 Jun 20, 2014 8:44:51 AM (5 years ago)
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

trunk/Cbc/src/CbcNode.cpp
r1943 r2040 2823 2823 int preferredWay; 2824 2824 double infeasibility = object>infeasibility(&usefulInfo, preferredWay); 2825 bool feasibleSolution=false; 2826 double predictedChange=0.0; 2825 2827 // may have become feasible 2826 2828 if (!infeasibility) { … … 2913 2915 */ 2914 2916 choice.possibleBranch>way(1) ; 2915 choice.possibleBranch>branch() ;2917 predictedChange = choice.possibleBranch>branch() ; 2916 2918 solver>solveFromHotStart() ; 2917 2919 bool needHotStartUpdate = false; … … 2962 2964 #endif 2963 2965 } 2966 // say infeasible if branch says so 2967 if (predictedChange==COIN_DBL_MAX) 2968 iStatus=1; 2964 2969 if (iStatus != 2 && solver>getIterationCount() > 2965 2970 realMaxHotIterations) … … 3007 3012 #endif 3008 3013 // See if integer solution 3009 if (model>feasibleSolution(choice.numIntInfeasDown, 3010 choice.numObjInfeasDown) 3014 feasibleSolution = 3015 model>feasibleSolution(choice.numIntInfeasDown, 3016 choice.numObjInfeasDown); 3017 if (feasibleSolution 3011 3018 && model>problemFeasibility()>feasible(model, 1) >= 0) { 3012 3019 if (auxiliaryInfo>solutionAddsCuts()) { … … 3099 3106 3100 3107 // repeat the whole exercise, forcing the variable up 3101 choice.possibleBranch>branch();3108 predictedChange=choice.possibleBranch>branch(); 3102 3109 solver>solveFromHotStart() ; 3103 3110 numberStrongDone++; … … 3147 3154 #endif 3148 3155 } 3156 // say infeasible if branch says so 3157 if (predictedChange==COIN_DBL_MAX) 3158 iStatus=1; 3149 3159 if (iStatus != 2 && solver>getIterationCount() > 3150 3160 realMaxHotIterations) … … 3191 3201 #endif 3192 3202 // See if integer solution 3193 if (model>feasibleSolution(choice.numIntInfeasUp, 3194 choice.numObjInfeasUp) 3203 feasibleSolution = 3204 model>feasibleSolution(choice.numIntInfeasUp, 3205 choice.numObjInfeasUp); 3206 if (feasibleSolution 3195 3207 && model>problemFeasibility()>feasible(model, 1) >= 0) { 3196 3208 #ifdef BONMIN
Note: See TracChangeset
for help on using the changeset viewer.