Changes from releases/2.9.3 at r2498 to releases/2.9.2 at r2498
- Location:
- releases
- Files:
-
- 1 deleted
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
releases/2.9.2/Cbc
- Property svn:mergeinfo changed
/trunk/Cbc removed
- Property svn:mergeinfo changed
-
releases/2.9.2/Cbc/README
r2498 r2498 1 # CBC Version 2.9.2 README 1 CBC README 2 ========== 2 3 3 4 Welcome to the README for the COIN Branch and Cut Solver (CBC). CBC is … … 6 7 be redistributed freely. 7 8 8 ##DOCUMENTATION9 10 For a quick start guide, please see the INSTALL file in this distribution. A 11 (somehwat outdated) user's manual is available here:9 DOCUMENTATION 10 ============= 11 12 For a quick start guide, please see the INSTALL file in this distribution. A (somehwat outdated) user's manual is available here: 12 13 13 14 http://www.coin-or.org/Cbc … … 22 23 http://projects.coin-or.org/Cbc 23 24 24 ## SUPPORT 25 26 ### List Serve 25 WHAT'S NEW 26 ========== 27 28 Release 2.8.3: 29 30 1. Fix for handling SOS. 31 32 Release 2.8.2: 33 34 1. Fixed recognition of Glpk source in main configure. 35 36 2. Minor bugfixes in CoinUtils, Clp, and Cbc. 37 38 Release 2.8.1: 39 40 Ted, please fill this in! 41 42 Release 2.8.0: 43 44 1. Introduced new secondaryStatus 8 to indicate that solving stopped due to an iteration limit. 45 46 2. Solution pool is now accessible via the command line and the CbcMain* interface. 47 48 3. New mipstart option to read an initial feasible solution from a file. Only values for discrete 49 variables need to be provided. 50 51 4. Added Proximity Search heuristic by Fischetti and Monaci (off by default): 52 The simplest way to switch it on using stand-alone version is "-proximity on". 53 54 Proximity Search is the new "No-Neighborhood Search" 0-1 MIP refinement heuristic recently proposed by 55 Fischetti and Monaci (2012). The idea is to define a sub-MIP without additional constraints but with a 56 modified objective function intended to attract the search in the proximity of the incumbent. The approach 57 works well for 0-1 MIPs whose solution landscape is not too irregular (meaning the there is reasonable 58 probability of finding an improved solution by flipping a small number of binary variables), in particular 59 when it is applied to the first heuristic solutions found at the root node. 60 61 5. An implementation of Zero-Half-Cuts by Alberto Caprara is now available. 62 By default, these cuts are off. To use add to your command line -zerohalfCuts root (or other options) or just -zero. 63 So far, they may help only on a small subset of problems and may need some tuning. 64 65 The implementation of these cuts is described in 66 G. Andreello, A. Caprara, and M. Fischetti 67 "Embedding Cuts in a Branch and Cut Framework: a Computational Study with {0,1/2}-Cuts" 68 INFORMS Journal on Computing 19(2), 229-238, 2007 69 http://dx.doi.org/10.1287/ijoc.1050.0162 70 71 6. An alternative implementation of a reduce and split cut generator by Giacomo Nannicini is now available. 72 By default, these cuts are off. To use add to your command line -reduce2AndSplitCuts root (or other options). 73 74 The implementation of these cuts is described in 75 G. Cornuejols and G. Nannicini 76 "Practical strategies for generating rank-1 split cuts in mixed-integer linear programming" 77 Mathematical Programming Computation 3(4), 281-318, 2011 78 http://dx.doi.org/10.1007/s12532-011-0028-6 79 80 7. An alternative robust implementation of a Gomory cut generator by Giacomo Nannicini is now available. 81 By default, these cuts are off. To use add to your command line -GMI root (or other options). 82 83 The implementation of these cuts is described in 84 G. Cornuejols, F. Margot, and G. Nannicini 85 "On the safety of Gomory cut generators" 86 http://faculty.sutd.edu.sg/~nannicini/index.php?page=publications 87 88 8. To encourage the use of some of the more exotic/expensive cut generators a parameter -slowcutpasses has been added. 89 The idea is that the code does these cuts just a few times - less than the more usual cuts. The default is 10. 90 The cut generators identified by "may be slow" at present are just Lift and project and ReduceAndSplit (both versions). 91 92 9. Allow initialization of random seed by user. Pseudo-random numbers are used in Cbc and Clp. In Clp they 93 are used to break ties in degenerate problems, while in Cbc heuristics such as the Feasibility Pump use them 94 to decide whether to round up or down. So if a different pseudo-random seed is given to Clp then you may get 95 a different continuous optimum and so different cuts and heuristic solutions. This can be switched on by 96 setting randomSeed for Clp and/or randomCbcSeed for Cbc. The special value of 0 tells code to use time of day 97 for initial seed. 98 99 10. Building on this idea, Andrea Lodi, Matteo Fischetti, Michele Monaci, Domenico Salvagnin, Yuji Shinano, and Andrea Tramontani 100 suggest that this idea be improved by running at the root node with multiple copies of solver, each 101 with its own different seed and then passing in the solutions and cuts so that the main solver has a richer 102 set of solutions and possibly stronger cuts. This is switched on by setting -multipleRootPasses. These can also 103 be done in parallel. 104 105 11. Few changes to presolve for special variables and badly scaled problems (in CoinUtils). 106 107 12. New option -extraVariables <number> which switches on a trivial re-formulation that introduces extra integer variables 108 to group together variables with same cost. 109 110 13. For some problems, cut generators and general branching work better if the problem would be infeasible if the cost is too high. 111 If the new option -constraintFromCutoff is set, the objective function is added as a constraint which rhs is set to the current 112 cutoff value (objective value of best known solution). 113 114 Release 2.7.8: 115 Look at https://projects.coin-or.org/Cbc/changeset?old_path=%2Freleases%2F2.7.7&new_path=%2Freleases%2F2.7.8 to see all changes. 116 117 1. Change message when LP simplex iteration limit is hit from "Exiting on maximum nodes" 118 to "Exiting on maximum number of iterations" 119 120 2. Fix for using overlapping SOS. 121 122 3. Fixes in buildsystem. 123 124 Release 2.7.7: 125 Look at https://projects.coin-or.org/Cbc/changeset?old_path=%2Freleases%2F2.7.6&new_path=%2Freleases%2F2.7.7 to see all changes. 126 127 1. Fix to report interruption on user event if SIGINT is received by CbcSolver. 128 model->status() should now be 5 if this event happened. 129 Added method CbcModel::sayEventHappened() to make cbc stop due to an 'user event'. 130 131 2. Other minor fixes. 132 133 Release 2.7.6: 134 Look at https://projects.coin-or.org/Cbc/changeset?old_path=%2Freleases%2F2.7.5&new_path=%2Freleases%2F2.7.6 to see all changes. 135 136 1. Fixes to build system. 137 138 2. Other minor fixes. 139 140 Release 2.7.5: 141 Look at https://projects.coin-or.org/Cbc/changeset?old_path=%2Freleases%2F2.7.4&new_path=%2Freleases%2F2.7.5 to see all changes. 142 143 1. Fixes to get AMPL interface working again. 144 145 2. More fixes to MSVC++ files. 146 147 Release 2.7.4: 148 Look at https://projects.coin-or.org/Cbc/changeset?old_path=%2Freleases%2F2.7.3&new_path=%2Freleases%2F2.7.4 to see all changes. 149 150 1. Minor bugfixes. 151 152 Release 2.7.3: 153 Look at https://projects.coin-or.org/Cbc/changeset?old_path=%2Freleases%2F2.7.2&new_path=%2Freleases%2F2.7.3 to see all changes. 154 155 1. Minor bugfixes. 156 157 2. Fixes to MSVC++ files. 158 159 Release 2.7.2: 160 Look at https://projects.coin-or.org/Cbc/changeset?old_path=%2Freleases%2F2.7.1&new_path=%2Freleases%2F2.7.2 to see all changes. 161 162 1. Allow row/column names for GMPL models. 163 164 2. Added CbcModel::haveMultiThreadSupport() to indicate whether Cbc library has been compiled with multithread support. 165 166 3. Added CbcModel::waitingForMiniBranchAndBound() to indicate whether sub-MIP heuristic is currently running. 167 168 4. Cbc shell should work with readline if configured with --enable-gnu-packages. 169 170 5. Support for compressed input files (.gz, .bz2) is now enabled by default. 171 172 6. Fix problems with relative gap tolerance > 100% and further bugs. 173 174 7. Fixes for MSVC++ Version 9 files. 175 176 8. Minor fixes in buildsystem; update to BuildTools 0.7.1. 177 178 Release 2.7.1: 179 Look at https://projects.coin-or.org/Cbc/changeset?old_path=%2Freleases%2F2.7.0&new_path=%2Freleases%2F2.7.1 to see all changes. 180 181 1. Fixes to MSVC++ files 182 183 Release 2.7.0: 184 185 1. License has been changed to the EPL. 186 187 2. Support for MSVC++ version 10 added. 188 189 3. Support for BuildTools version 0.7 to incorporate recent enhancements, 190 including proper library versioning in Linux, prohibiting installation of 191 private headers, etc. 192 193 4. Updated externals to new stable versions of dependent projects. 194 195 5. Improvements to heuristics. 196 197 6. New options for cut generation. 198 199 7. Improved reporting of results. 200 201 8. Improvements to documentation. 202 203 9. Minor bug fixes. 204 205 SUPPORT 206 ======= 207 208 1. List Serve 27 209 28 210 CBC users should use the Cbc mailing list. To subscribe, go to 29 211 http://list.coin-or.org/mailman/listinfo/cbc 30 212 31 ###Bug Reports213 3. Bug Reports 32 214 33 215 Bug reports should be reported on the CBC development web site at 34 216 35 217 https://projects.coin-or.org/Cbc/newticket 36 37 ## CHANGELOG38 39 * Release 5.9.240 41 * Fix for proper installation with ```DESTDIR```42 43 * Release 5.9.144 45 * Fix for dependency linking46 * Minor bug fixes47 48 * Release 5.9.049 * Major algorithmic improvements50 51 * Release 5.8.1352 * Improved message handling53 * Miscellaneous bug fixes.54 55 * Release 5.8.1256 * Update for dependencies.57 58 * Release 5.8.1159 * Major overhaul of C interface60 * Fixes to SOS61 * Miscellaneous bug fixes62 63 * Release 5.8.1064 * More changes related to thread safety.65 * Fix bug in build system with Visual Studio compiler.66 * Miscellaneous bug fixes.67 68 * Release 5.8.969 * Attempt to make Cbc thread safe.70 * Add parallel examples.71 * Add CbcSolverUsefulInfo.72 * Bug fixes.73 74 * Release 5.8.875 76 * Added example to show how to use Cbc with installed libraries in MSVC++77 * Fixed inconsistency in addition of libCbcSolver to dependencies in78 {{{cbc_addlibs.txt}}}.79 80 * Release 5.8.781 82 * Changed so that Doxygen builds LaTex83 * Fixes for build system84 85 * Release 5.8.686 87 * Added option to explicitly link dependencies to comply with packaging88 requirements on Fedora and Debian, as well as allow building of MinGW89 DLLs.90 91 * Release 5.8.592 * Minor fixes to build system93 94 * Release 5.8.495 * Small bug fixes96 * Upgrades to build system97 98 * Release 2.8.3:99 100 * Fix for handling SOS.101 102 * Release 2.8.2:103 104 * Fixed recognition of Glpk source in main configure.105 * Minor bug fixes in CoinUtils, Clp, and Cbc.106 107 * Release 2.8.1:108 109 * Minor bug fixes110 111 * Release 2.8.0:112 113 * Introduced new secondaryStatus 8 to indicate that solving stopped due to114 an iteration limit.115 * Solution pool is now accessible via the command line and the CbcMain*116 interface.117 * New mipstart option to read an initial feasible solution from a file.118 Only values for discrete variables need to be provided.119 120 * Added Proximity Search heuristic by Fischetti and Monaci (off by121 default): The simplest way to switch it on using stand-alone version is122 ```-proximity on```.123 124 Proximity Search is the new "No-Neighborhood Search" 0-1 MIP refinement125 heuristic recently proposed by Fischetti and Monaci (2012). The idea is126 to define a sub-MIP without additional constraints but with a modified127 objective function intended to attract the search in the proximity of the128 incumbent. The approach works well for 0-1 MIPs whose solution landscape129 is not too irregular (meaning the there is reasonable probability of130 finding an improved solution by flipping a small number of binary131 variables), in particular when it is applied to the first heuristic132 solutions found at the root node.133 134 * An implementation of Zero-Half-Cuts by Alberto Caprara is now available.135 By default, these cuts are off. To use add to your command line136 -zerohalfCuts root (or other options) or just -zero. So far, they may137 help only on a small subset of problems and may need some tuning.138 139 The implementation of these cuts is described in G. Andreello, A.140 Caprara, and M. Fischetti "Embedding Cuts in a Branch and Cut Framework:141 a Computational Study with {0,1/2}-Cuts" INFORMS Journal on Computing142 19(2), 229-238, 2007 http://dx.doi.org/10.1287/ijoc.1050.0162143 144 * An alternative implementation of a reduce and split cut generator by145 Giacomo Nannicini is now available. By default, these cuts are off. To146 use add to your command line -reduce2AndSplitCuts root (or other147 options).148 149 The implementation of these cuts is described in G. Cornuejols and G.150 Nannicini "Practical strategies for generating rank-1 split cuts in151 mixed-integer linear programming" Mathematical Programming Computation152 3(4), 281-318, 2011 http://dx.doi.org/10.1007/s12532-011-0028-6153 154 * An alternative robust implementation of a Gomory cut generator by Giacomo155 Nannicini is now available. By default, these cuts are off. To use add to156 your command line -GMI root (or other options).157 158 The implementation of these cuts is described in G. Cornuejols, F.159 Margot, and G. Nannicini "On the safety of Gomory cut generators"160 http://faculty.sutd.edu.sg/~nannicini/index.php?page=publications161 162 * To encourage the use of some of the more exotic/expensive cut generators163 a parameter -slowcutpasses has been added. The idea is that the code does164 these cuts just a few times - less than the more usual cuts. The default165 is 10. The cut generators identified by "may be slow" at present are just166 Lift and project and ReduceAndSplit (both versions).167 168 * Allow initialization of random seed by user. Pseudo-random numbers are169 used in Cbc and Clp. In Clp they are used to break ties in degenerate170 problems, while in Cbc heuristics such as the Feasibility Pump use them171 to decide whether to round up or down. So if a different pseudo-random172 seed is given to Clp then you may get a different continuous optimum and173 so different cuts and heuristic solutions. This can be switched on by174 setting randomSeed for Clp and/or randomCbcSeed for Cbc. The special175 value of 0 tells code to use time of day for initial seed.176 177 * Building on this idea, Andrea Lodi, Matteo Fischetti, Michele Monaci,178 Domenico Salvagnin, Yuji Shinano, and Andrea Tramontani suggest that this179 idea be improved by running at the root node with multiple copies of180 solver, each with its own different seed and then passing in the181 solutions and cuts so that the main solver has a richer set of solutions182 and possibly stronger cuts. This is switched on by setting183 -multipleRootPasses. These can also be done in parallel.184 185 * Few changes to presolve for special variables and badly scaled problems186 (in CoinUtils).187 188 * New option -extraVariables <number> which switches on a trivial189 re-formulation that introduces extra integer variables to group together190 variables with same cost.191 192 * For some problems, cut generators and general branching work better if193 the problem would be infeasible if the cost is too high. If the new194 option -constraintFromCutoff is set, the objective function is added as a195 constraint which rhs is set to the current cutoff value (objective value196 of best known solution).197 198 * Release 2.7.8:199 200 * Change message when LP simplex iteration limit is hit from "Exiting on201 maximum nodes" to "Exiting on maximum number of iterations"202 * Fix for using overlapping SOS.203 * Fixes in buildsystem.204 205 * Release 2.7.7:206 207 * Fix to report interruption on user event if SIGINT is received by208 CbcSolver. model->status() should now be 5 if this event happened. Added209 method CbcModel::sayEventHappened() to make cbc stop due to an 'user210 event'.211 212 * Other minor fixes.213 214 * Release 2.7.6:215 216 * Fixes to build system.217 218 * Other minor fixes.219 220 * Release 2.7.5:221 222 * Fixes to get AMPL interface working again.223 224 * More fixes to MSVC++ files.225 226 * Release 2.7.4:227 228 * Minor bugfixes.229 230 * Release 2.7.3:231 232 * Minor bugfixes.233 234 * Fixes to MSVC++ files.235 236 * Release 2.7.2:237 238 * Allow row/column names for GMPL models.239 240 * Added CbcModel::haveMultiThreadSupport() to indicate whether Cbc library241 has been compiled with multithread support.242 243 * Added CbcModel::waitingForMiniBranchAndBound() to indicate whether244 sub-MIP heuristic is currently running.245 246 * Cbc shell should work with readline if configured with247 ```--enable-gnu-packages```.248 249 * Support for compressed input files (.gz, .bz2) is now enabled by default.250 251 * Fix problems with relative gap tolerance > 100% and further bugs.252 253 * Fixes for MSVC++ Version 9 files.254 255 * Minor fixes in buildsystem; update to BuildTools 0.7.1.256 257 * Release 2.7.1:258 259 * Fixes to MSVC++ files260 261 * Release 2.7.0:262 263 * License has been changed to the EPL.264 265 * Support for MSVC++ version 10 added.266 267 * Support for BuildTools version 0.7 to incorporate recent enhancements,268 including proper library versioning in Linux, prohibiting installation of269 private headers, etc.270 271 * Updated externals to new stable versions of dependent projects.272 273 * Improvements to heuristics.274 275 * New options for cut generation.276 277 * Improved reporting of results.278 279 * Improvements to documentation.280 281 * Minor bug fixes.282 283 -
releases/2.9.2/Cbc/configure
r2498 r2498 1 1 #! /bin/sh 2 2 # Guess values for system-dependent variables and create Makefiles. 3 # Generated by GNU Autoconf 2.59 for Cbc 2.9. 3.3 # Generated by GNU Autoconf 2.59 for Cbc 2.9.2. 4 4 # 5 5 # Report bugs to <cbc@lists.coin-or.org>. … … 430 430 PACKAGE_NAME='Cbc' 431 431 PACKAGE_TARNAME='cbc' 432 PACKAGE_VERSION='2.9. 3'433 PACKAGE_STRING='Cbc 2.9. 3'432 PACKAGE_VERSION='2.9.2' 433 PACKAGE_STRING='Cbc 2.9.2' 434 434 PACKAGE_BUGREPORT='cbc@lists.coin-or.org' 435 435 … … 1006 1006 # This message is too long to be a string in the A/UX 3.1 sh. 1007 1007 cat <<_ACEOF 1008 \`configure' configures Cbc 2.9. 3to adapt to many kinds of systems.1008 \`configure' configures Cbc 2.9.2 to adapt to many kinds of systems. 1009 1009 1010 1010 Usage: $0 [OPTION]... [VAR=VALUE]... … … 1072 1072 if test -n "$ac_init_help"; then 1073 1073 case $ac_init_help in 1074 short | recursive ) echo "Configuration of Cbc 2.9. 3:";;1074 short | recursive ) echo "Configuration of Cbc 2.9.2:";; 1075 1075 esac 1076 1076 cat <<\_ACEOF … … 1309 1309 if $ac_init_version; then 1310 1310 cat <<\_ACEOF 1311 Cbc configure 2.9. 31311 Cbc configure 2.9.2 1312 1312 generated by GNU Autoconf 2.59 1313 1313 … … 1329 1329 running configure, to aid debugging if configure makes a mistake. 1330 1330 1331 It was created by Cbc $as_me 2.9. 3, which was1331 It was created by Cbc $as_me 2.9.2, which was 1332 1332 generated by GNU Autoconf 2.59. Invocation command line was 1333 1333 … … 1855 1855 1856 1856 # Capture libtool library version, if given. 1857 coin_libversion=12: 3:91857 coin_libversion=12:2:9 1858 1858 1859 1859 … … 4577 4577 # Define the identity of the package. 4578 4578 PACKAGE='cbc' 4579 VERSION='2.9. 3'4579 VERSION='2.9.2' 4580 4580 4581 4581 … … 31171 31171 cat >&5 <<_CSEOF 31172 31172 31173 This file was extended by Cbc $as_me 2.9. 3, which was31173 This file was extended by Cbc $as_me 2.9.2, which was 31174 31174 generated by GNU Autoconf 2.59. Invocation command line was 31175 31175 … … 31234 31234 cat >>$CONFIG_STATUS <<_ACEOF 31235 31235 ac_cs_version="\\ 31236 Cbc config.status 2.9. 331236 Cbc config.status 2.9.2 31237 31237 configured by $0, generated by GNU Autoconf 2.59, 31238 31238 with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -
releases/2.9.2/Cbc/configure.ac
r2498 r2498 13 13 AC_PREREQ(2.59) 14 14 15 AC_INIT([Cbc],[2.9. 3],[cbc@lists.coin-or.org])15 AC_INIT([Cbc],[2.9.2],[cbc@lists.coin-or.org]) 16 16 17 17 AC_COPYRIGHT([ … … 42 42 # externals. The following macro ensures that those externals are 43 43 # retrieved by svn if they are not there yet. 44 AC_COIN_PROJECTDIR_INIT(Cbc,12: 3:9)44 AC_COIN_PROJECTDIR_INIT(Cbc,12:2:9) 45 45 46 46 # Check if user wants to produce debugging code -
releases/2.9.2/Cbc/src
- Property svn:mergeinfo changed
/trunk/Cbc/src removed
- Property svn:mergeinfo changed
-
releases/2.9.2/Cbc/src/CbcHeuristic.cpp
r2498 r2498 31 31 #include "CglProbing.hpp" 32 32 #include "OsiAuxInfo.hpp" 33 #include "OsiRowCutDebugger.hpp"34 33 #include "OsiPresolve.hpp" 35 34 #include "CbcBranchActual.hpp" … … 940 939 solver->messageHandler()->logLevel(0)!=-1000) 941 940 process.passInMessageHandler(solver->messageHandler()); 942 #ifdef CGL_DEBUG943 /*944 We're debugging. (specialOptions 1)945 */946 if ((model_->specialOptions()&1) != 0) {947 const OsiRowCutDebugger *debugger = solver->getRowCutDebugger() ;948 if (debugger) {949 process.setApplicationData(const_cast<double *>(debugger->optimalSolution()));950 }951 }952 #endif953 941 solver2 = process.preProcessNonDefault(*solver, false, 954 942 numberPasses); … … 984 972 << CoinMessageEol; 985 973 } 986 #ifdef CGL_DEBUG987 if ((model_->specialOptions()&1) != 0) {988 const OsiRowCutDebugger *debugger = solver2->getRowCutDebugger() ;989 if (debugger) {990 printf("On optimal path after preprocessing\n");991 }992 }993 #endif994 974 if (returnCode == 1) { 995 975 solver2->resolve(); … … 1066 1046 // going for full search and copy across more stuff 1067 1047 model.gutsOfCopy(*model_, 2); 1068 #ifdef CGL_DEBUG1069 if ((model_->specialOptions()&1) != 0) {1070 const OsiRowCutDebugger *debugger = model.solver()->getRowCutDebugger() ;1071 if (debugger) {1072 printf("On optimal path BB\n");1073 }1074 }1075 #endif1076 1048 assert (!model_->heuristicModel()); 1077 1049 model_->setHeuristicModel(&model); … … 1237 1209 } 1238 1210 //printf("sol %x\n",inputSolution_); 1239 #ifdef CGL_DEBUG1240 if ((model_->specialOptions()&1) != 0) {1241 const OsiRowCutDebugger *debugger = model.solver()->getRowCutDebugger() ;1242 if (debugger) {1243 printf("On optimal path CC\n");1244 }1245 }1246 #endif1247 1211 if (inputSolution_) { 1248 1212 // translate and add a serendipity heuristic … … 1365 1329 if ((model_->moreSpecialOptions()&4194304)!=0) 1366 1330 model.zapGlobalCuts(); 1367 #endif1368 #ifdef CGL_DEBUG1369 if ((model_->specialOptions()&1) != 0) {1370 const OsiRowCutDebugger *debugger = model.solver()->getRowCutDebugger() ;1371 if (debugger) {1372 printf("On optimal path DD\n");1373 }1374 }1375 1331 #endif 1376 1332 model.branchAndBound(); -
releases/2.9.2/Cbc/src/CbcModel.cpp
r2498 r2498 12363 12363 // We can switch off check 12364 12364 if ((specialOptions_&4) == 0 && (moreSpecialOptions2_&10) != 8) { 12365 // Be on safe side - unless very few integers and large 12366 bool allSlack = (specialOptions_&2) == 0 && solverCharacteristics_->warmStart(); 12367 if (numberIntegers_*4>solver_->getNumCols()||solver_->getNumCols()<10000) 12368 allSlack = true; 12369 if (allSlack) { 12365 if ((specialOptions_&2) == 0 && solverCharacteristics_->warmStart()) { 12370 12366 /* 12371 12367 Remove any existing warm start information to be sure there is no … … 12419 12415 //OsiHintStrength saveStrength; 12420 12416 //bool savePrintHint; 12421 //solver_->writeMps Native("infeas.mps", NULL, NULL, 2);12417 //solver_->writeMps("infeas"); 12422 12418 //bool gotHint = (solver_->getHintParam(OsiDoReducePrint,savePrintHint,saveStrength)); 12423 12419 //gotHint = (solver_->getHintParam(OsiDoScale,saveTakeHint,saveStrength)); … … 12648 12644 #if CBC_FEASIBILITY_INVESTIGATE==0 12649 12645 } 12650 #else12651 solver_->writeMpsNative("BFeasible.mps",NULL,NULL,2);12652 12646 #endif 12653 12647 //if (fabs(objValue-objectiveValue)>1.0e-7*fabs(objectiveValue)) { -
releases/2.9.2/Cbc/src/CbcSolver.cpp
r2498 r2498 1084 1084 CbcSolverUsefulData & parameterData) 1085 1085 { 1086 char * input = CoinStrdup(input2 ? input2 : "");1086 char * input = CoinStrdup(input2); 1087 1087 size_t length = strlen(input); 1088 bool blank = input[0] == ' 1088 bool blank = input[0] == '0'; 1089 1089 int n = blank ? 0 : 1; 1090 1090 for (size_t i = 0; i < length; i++) { … … 4245 4245 OsiClpSolverInterface * clpSolver2 = dynamic_cast< OsiClpSolverInterface*> (solver2); 4246 4246 ClpSimplex * lpSolver = clpSolver2->getModelPtr(); 4247 lpSolver->writeMps("presolved.mps", 2, 1, lpSolver->optimizationDirection());4247 lpSolver->writeMps("presolved.mps", 0, 1, lpSolver->optimizationDirection()); 4248 4248 printf("Preprocessed model (minimization) on presolved.mps\n"); 4249 4249 } … … 8216 8216 iColumn = -1; 8217 8217 int lowestPriority=-COIN_INT_MAX; 8218 bool needCard = true; 8219 while (!needCard || fgets(line, 1000, fp)) { 8220 if (!strncmp(line, "ENDATA", 6)|| 8221 !strncmp(line, "endata", 6)) 8218 while (iColumn>=0 || fgets(line, 1000, fp)) { 8219 if (!strncmp(line, "ENDATA", 6)) 8222 8220 break; 8223 8221 nLine++; 8224 if (!useMasks) 8222 if (!useMasks) 8225 8223 iColumn = -1; 8226 else8227 needCard=false;8228 8224 double up = 0.0; 8229 8225 double down = 0.0; … … 8287 8283 } 8288 8284 } 8289 if (iColumn == numberColumns) { 8285 if (iColumn == numberColumns) 8290 8286 iColumn = -1; 8291 needCard = true;8292 }8293 8287 break; 8294 8288 // number -
releases/2.9.2/Cbc/src/Makefile.am
r2498 r2498 252 252 CbcObject.hpp \ 253 253 CbcObjectUpdateData.hpp \ 254 CbcParam.hpp \255 254 CbcPartialNodeInfo.hpp \ 256 255 CbcSimpleInteger.hpp \ -
releases/2.9.2/Cbc/src/Makefile.in
r2498 r2498 708 708 CbcObject.hpp \ 709 709 CbcObjectUpdateData.hpp \ 710 CbcParam.hpp \711 710 CbcPartialNodeInfo.hpp \ 712 711 CbcSimpleInteger.hpp \ -
releases/2.9.2/Cbc/src/config_cbc_default.h
r2498 r2498 6 6 7 7 /* Version number of project */ 8 #define CBC_VERSION "2.9. 3"8 #define CBC_VERSION "2.9.2" 9 9 10 10 /* Major Version number of project */ … … 15 15 16 16 /* Release Version number of project */ 17 #define CBC_VERSION_RELEASE 317 #define CBC_VERSION_RELEASE 2 -
releases/2.9.2/configure
r2498 r2498 2 2 # From configure.ac 0.9. 3 3 # Guess values for system-dependent variables and create Makefiles. 4 # Generated by GNU Autoconf 2.59 for Cbc 2.9. 3.4 # Generated by GNU Autoconf 2.59 for Cbc 2.9.2. 5 5 # 6 6 # Report bugs to <cbc@lists.coin-or.org>. … … 431 431 PACKAGE_NAME='Cbc' 432 432 PACKAGE_TARNAME='cbc' 433 PACKAGE_VERSION='2.9. 3'434 PACKAGE_STRING='Cbc 2.9. 3'433 PACKAGE_VERSION='2.9.2' 434 PACKAGE_STRING='Cbc 2.9.2' 435 435 PACKAGE_BUGREPORT='cbc@lists.coin-or.org' 436 436 … … 1039 1039 # This message is too long to be a string in the A/UX 3.1 sh. 1040 1040 cat <<_ACEOF 1041 \`configure' configures Cbc 2.9. 3to adapt to many kinds of systems.1041 \`configure' configures Cbc 2.9.2 to adapt to many kinds of systems. 1042 1042 1043 1043 Usage: $0 [OPTION]... [VAR=VALUE]... … … 1105 1105 if test -n "$ac_init_help"; then 1106 1106 case $ac_init_help in 1107 short | recursive ) echo "Configuration of Cbc 2.9. 3:";;1107 short | recursive ) echo "Configuration of Cbc 2.9.2:";; 1108 1108 esac 1109 1109 cat <<\_ACEOF … … 1331 1331 if $ac_init_version; then 1332 1332 cat <<\_ACEOF 1333 Cbc configure 2.9. 31333 Cbc configure 2.9.2 1334 1334 generated by GNU Autoconf 2.59 1335 1335 … … 1351 1351 running configure, to aid debugging if configure makes a mistake. 1352 1352 1353 It was created by Cbc $as_me 2.9. 3, which was1353 It was created by Cbc $as_me 2.9.2, which was 1354 1354 generated by GNU Autoconf 2.59. Invocation command line was 1355 1355 … … 5117 5117 # Define the identity of the package. 5118 5118 PACKAGE='cbc' 5119 VERSION='2.9. 3'5119 VERSION='2.9.2' 5120 5120 5121 5121 … … 23460 23460 cat >&5 <<_CSEOF 23461 23461 23462 This file was extended by Cbc $as_me 2.9. 3, which was23462 This file was extended by Cbc $as_me 2.9.2, which was 23463 23463 generated by GNU Autoconf 2.59. Invocation command line was 23464 23464 … … 23518 23518 cat >>$CONFIG_STATUS <<_ACEOF 23519 23519 ac_cs_version="\\ 23520 Cbc config.status 2.9. 323520 Cbc config.status 2.9.2 23521 23521 configured by $0, generated by GNU Autoconf 2.59, 23522 23522 with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -
releases/2.9.2/configure.ac
r2498 r2498 13 13 AC_PREREQ(2.59) 14 14 15 AC_INIT([Cbc],[2.9. 3],[cbc@lists.coin-or.org])15 AC_INIT([Cbc],[2.9.2],[cbc@lists.coin-or.org]) 16 16 17 17 AC_COPYRIGHT([
Note: See TracChangeset
for help on using the changeset viewer.