Changes from releases/2.9.0 at r2498 to releases/2.9.1 at r2498
- Location:
- releases/2.9.1
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
releases/2.9.1/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. 0.3 # Generated by GNU Autoconf 2.59 for Cbc 2.9.1. 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. 0'433 PACKAGE_STRING='Cbc 2.9. 0'432 PACKAGE_VERSION='2.9.1' 433 PACKAGE_STRING='Cbc 2.9.1' 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. 0to adapt to many kinds of systems.1008 \`configure' configures Cbc 2.9.1 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. 0:";;1074 short | recursive ) echo "Configuration of Cbc 2.9.1:";; 1075 1075 esac 1076 1076 cat <<\_ACEOF … … 1309 1309 if $ac_init_version; then 1310 1310 cat <<\_ACEOF 1311 Cbc configure 2.9. 01311 Cbc configure 2.9.1 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. 0, which was1331 It was created by Cbc $as_me 2.9.1, 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: 0:91857 coin_libversion=12:1:9 1858 1858 1859 1859 … … 4577 4577 # Define the identity of the package. 4578 4578 PACKAGE='cbc' 4579 VERSION='2.9. 0'4579 VERSION='2.9.1' 4580 4580 4581 4581 … … 20488 20488 # On Cygwin and AIX, building DLLs doesn't work 20489 20489 dependency_linking=no 20490 if test x"$ enable_shared" = xyes; then20490 if test x"$coin_disable_shared" = xno; then 20491 20491 case $build in 20492 20492 *-cygwin* | *-mingw*) … … 31171 31171 cat >&5 <<_CSEOF 31172 31172 31173 This file was extended by Cbc $as_me 2.9. 0, which was31173 This file was extended by Cbc $as_me 2.9.1, 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. 031236 Cbc config.status 2.9.1 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.1/Cbc/configure.ac
r2498 r2498 13 13 AC_PREREQ(2.59) 14 14 15 AC_INIT([Cbc],[2.9. 0],[cbc@lists.coin-or.org])15 AC_INIT([Cbc],[2.9.1],[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: 0:9)44 AC_COIN_PROJECTDIR_INIT(Cbc,12:1:9) 45 45 46 46 # Check if user wants to produce debugging code -
releases/2.9.1/Cbc/src/CbcCountRowCut.cpp
r2498 r2498 709 709 newCutPtr->setRow(vector); 710 710 rowCut_[numberCuts_++]=newCutPtr; 711 printf("addedGreedyGlobalCut of size %d to %x- cuts size %d\n",712 711 //printf("addedGreedyGlobalCut of size %d to %p - cuts size %d\n", 712 // cut.row().getNumElements(),this,numberCuts_); 713 713 return 0; 714 714 } else { -
releases/2.9.1/Cbc/src/CbcHeuristic.cpp
r2498 r2498 975 975 solver2->resolve(); 976 976 CbcModel model(*solver2); 977 double startTime=model_->getDblParam(CbcModel::CbcStartSeconds); 978 model.setDblParam(CbcModel::CbcStartSeconds,startTime); 977 979 // move seed across 978 980 model.randomNumberGenerator()->setSeed(model_->randomNumberGenerator()->getSeed()); -
releases/2.9.1/Cbc/src/CbcHeuristicDive.cpp
r2498 r2498 217 217 smallObjective_=0.0; 218 218 const double * objective = model_->solver()->getObjCoefficients(); 219 for (int i = 0; i < numberIntegers; i++) { 219 int numberObjects = model_->numberObjects(); 220 for (int i = 0; i < numberObjects; i++) { 220 221 OsiObject * object = model_->modifiableObject(i); 221 222 const CbcSimpleInteger * thisOne = dynamic_cast <const CbcSimpleInteger *> (object); 222 assert (thisOne); 223 if (!thisOne) 224 continue; // Not integer 223 225 int iColumn = thisOne->columnNumber(); 224 226 smallObjective_ += objective[iColumn]; … … 232 234 if (gotPriorities || priority1>priority2) { 233 235 priority_ = new PriorityType [numberIntegers]; 234 for (int i = 0; i < number Integers; i++) {236 for (int i = 0; i < numberObjects; i++) { 235 237 OsiObject * object = model_->modifiableObject(i); 236 238 const CbcSimpleInteger * thisOne = dynamic_cast <const CbcSimpleInteger *> (object); 239 if (!thisOne) 240 continue; // Not integer 237 241 int level=thisOne->priority()-priority2; 238 242 assert (level<(1<<29)); -
releases/2.9.1/Cbc/src/config_cbc_default.h
r2498 r2498 6 6 7 7 /* Version number of project */ 8 #define CBC_VERSION "2.9. 0"8 #define CBC_VERSION "2.9.1" 9 9 10 10 /* Major Version number of project */ … … 15 15 16 16 /* Release Version number of project */ 17 #define CBC_VERSION_RELEASE 017 #define CBC_VERSION_RELEASE 1 -
releases/2.9.1/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. 0.4 # Generated by GNU Autoconf 2.59 for Cbc 2.9.1. 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. 0'434 PACKAGE_STRING='Cbc 2.9. 0'433 PACKAGE_VERSION='2.9.1' 434 PACKAGE_STRING='Cbc 2.9.1' 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. 0to adapt to many kinds of systems.1041 \`configure' configures Cbc 2.9.1 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. 0:";;1107 short | recursive ) echo "Configuration of Cbc 2.9.1:";; 1108 1108 esac 1109 1109 cat <<\_ACEOF … … 1331 1331 if $ac_init_version; then 1332 1332 cat <<\_ACEOF 1333 Cbc configure 2.9. 01333 Cbc configure 2.9.1 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. 0, which was1353 It was created by Cbc $as_me 2.9.1, 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. 0'5119 VERSION='2.9.1' 5120 5120 5121 5121 … … 20791 20791 # On Cygwin and AIX, building DLLs doesn't work 20792 20792 dependency_linking=no 20793 if test x"$ enable_shared" = xyes; then20793 if test x"$coin_disable_shared" = xno; then 20794 20794 case $build in 20795 20795 *-cygwin* | *-mingw*) … … 23460 23460 cat >&5 <<_CSEOF 23461 23461 23462 This file was extended by Cbc $as_me 2.9. 0, which was23462 This file was extended by Cbc $as_me 2.9.1, 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. 023520 Cbc config.status 2.9.1 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.1/configure.ac
r2498 r2498 13 13 AC_PREREQ(2.59) 14 14 15 AC_INIT([Cbc],[2.9. 0],[cbc@lists.coin-or.org])15 AC_INIT([Cbc],[2.9.1],[cbc@lists.coin-or.org]) 16 16 17 17 AC_COPYRIGHT([
Note: See TracChangeset
for help on using the changeset viewer.