Changeset 1839 for trunk/Cbc/src/CbcHeuristic.cpp
 Timestamp:
 Jan 16, 2013 1:41:25 PM (7 years ago)
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

trunk/Cbc/src/CbcHeuristic.cpp
r1836 r1839 913 913 solver2>resolve(); 914 914 CbcModel model(*solver2); 915 // move seed across 916 model.randomNumberGenerator()>setSeed(model_>randomNumberGenerator()>getSeed()); 915 917 if (numberNodes >= 0) { 916 918 // normal … … 923 925 model.setFastNodeDepth(1); 924 926 model.setCutoff(signedCutoff); 927 model.setStrongStrategy(0); 925 928 // Don't do if original fraction > 1.0 and too large 926 929 if (fractionSmall_>1.0 && fractionSmall_ < 1000000.0) { … … 945 948 if ((saveModelOptions&2048) == 0) 946 949 model.setMoreSpecialOptions(model_>moreSpecialOptions()); 950 // off conflict analysis 951 model.setMoreSpecialOptions(model.moreSpecialOptions()&~4194304); 952 947 953 // Lightweight 948 954 CbcStrategyDefaultSubTree strategy(model_, 1, 5, 1, 0); … … 958 964 // going for full search and copy across more stuff 959 965 model.gutsOfCopy(*model_, 2); 966 assert (!model_>heuristicModel()); 967 model_>setHeuristicModel(&model); 960 968 for (int i = 0; i < model.numberCutGenerators(); i++) { 961 969 CbcCutGenerator * generator = model.cutGenerator(i); … … 996 1004 CglStored cuts = process.cuts(); 997 1005 model.addCutGenerator(&cuts, 1, "Stored from first"); 1006 model.cutGenerator(model.numberCutGenerators()1)>setGlobalCuts(true); 998 1007 } 999 1008 } … … 1209 1218 model_>setSpecialOptions(saveOptions1048576); 1210 1219 model.branchAndBound(); 1220 model_>setHeuristicModel(NULL); 1211 1221 model_>setSpecialOptions(saveOptions); 1212 1222 #ifdef ALWAYS_DUAL
Note: See TracChangeset
for help on using the changeset viewer.