Changes from releases/2.9.0 at r3045 to releases/2.9.1 at r3045


Ignore:
Location:
releases/2.9.1
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • releases/2.9.1/Cbc/configure

    r3045 r3045  
    11#! /bin/sh
    22# 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.
    44#
    55# Report bugs to <cbc@lists.coin-or.org>.
    … …  
    430430PACKAGE_NAME='Cbc'
    431431PACKAGE_TARNAME='cbc'
    432 PACKAGE_VERSION='2.9.0'
    433 PACKAGE_STRING='Cbc 2.9.0'
     432PACKAGE_VERSION='2.9.1'
     433PACKAGE_STRING='Cbc 2.9.1'
    434434PACKAGE_BUGREPORT='cbc@lists.coin-or.org'
    435435
    … …  
    10061006  # This message is too long to be a string in the A/UX 3.1 sh.
    10071007  cat <<_ACEOF
    1008 \`configure' configures Cbc 2.9.0 to adapt to many kinds of systems.
     1008\`configure' configures Cbc 2.9.1 to adapt to many kinds of systems.
    10091009
    10101010Usage: $0 [OPTION]... [VAR=VALUE]...
    … …  
    10721072if test -n "$ac_init_help"; then
    10731073  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:";;
    10751075   esac
    10761076  cat <<\_ACEOF
    … …  
    13091309if $ac_init_version; then
    13101310  cat <<\_ACEOF
    1311 Cbc configure 2.9.0
     1311Cbc configure 2.9.1
    13121312generated by GNU Autoconf 2.59
    13131313
    … …  
    13291329running configure, to aid debugging if configure makes a mistake.
    13301330
    1331 It was created by Cbc $as_me 2.9.0, which was
     1331It was created by Cbc $as_me 2.9.1, which was
    13321332generated by GNU Autoconf 2.59.  Invocation command line was
    13331333
    … …  
    18551855
    18561856# Capture libtool library version, if given.
    1857  coin_libversion=12:0:9
     1857 coin_libversion=12:1:9
    18581858
    18591859
    … …  
    45774577# Define the identity of the package.
    45784578 PACKAGE='cbc'
    4579  VERSION='2.9.0'
     4579 VERSION='2.9.1'
    45804580
    45814581
    … …  
    2048820488  # On Cygwin and AIX, building DLLs doesn't work
    2048920489  dependency_linking=no
    20490   if test x"$enable_shared" = xyes; then
     20490  if test x"$coin_disable_shared" = xno; then
    2049120491    case $build in
    2049220492      *-cygwin* | *-mingw*)
    … …  
    3117131171cat >&5 <<_CSEOF
    3117231172
    31173 This file was extended by Cbc $as_me 2.9.0, which was
     31173This file was extended by Cbc $as_me 2.9.1, which was
    3117431174generated by GNU Autoconf 2.59.  Invocation command line was
    3117531175
    … …  
    3123431234cat >>$CONFIG_STATUS <<_ACEOF
    3123531235ac_cs_version="\\
    31236 Cbc config.status 2.9.0
     31236Cbc config.status 2.9.1
    3123731237configured by $0, generated by GNU Autoconf 2.59,
    3123831238  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

  • releases/2.9.1/Cbc/configure.ac

    r3045 r3045  
    1313AC_PREREQ(2.59)
    1414
    15 AC_INIT([Cbc],[2.9.0],[cbc@lists.coin-or.org])
     15AC_INIT([Cbc],[2.9.1],[cbc@lists.coin-or.org])
    1616
    1717AC_COPYRIGHT([
    … …  
    4242# externals.  The following macro ensures that those externals are
    4343# retrieved by svn if they are not there yet.
    44 AC_COIN_PROJECTDIR_INIT(Cbc,12:0:9)
     44AC_COIN_PROJECTDIR_INIT(Cbc,12:1:9)
    4545
    4646# Check if user wants to produce debugging code

  • releases/2.9.1/Cbc/src/CbcCountRowCut.cpp

    r3045 r3045  
    709709      newCutPtr->setRow(vector);
    710710      rowCut_[numberCuts_++]=newCutPtr;
    711       printf("addedGreedyGlobalCut of size %d to %x - cuts size %d\n",
    712              cut.row().getNumElements(),this,numberCuts_);
     711      //printf("addedGreedyGlobalCut of size %d to %p - cuts size %d\n",
     712      //     cut.row().getNumElements(),this,numberCuts_);
    713713      return 0;
    714714    } else {

  • releases/2.9.1/Cbc/src/CbcHeuristic.cpp

    r3045 r3045  
    975975                solver2->resolve();
    976976                CbcModel model(*solver2);
     977                double startTime=model_->getDblParam(CbcModel::CbcStartSeconds);
     978                model.setDblParam(CbcModel::CbcStartSeconds,startTime);
    977979                // move seed across
    978980                model.randomNumberGenerator()->setSeed(model_->randomNumberGenerator()->getSeed());

  • releases/2.9.1/Cbc/src/CbcHeuristicDive.cpp

    r3045 r3045  
    217217  smallObjective_=0.0;
    218218  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++) {
    220221    OsiObject * object = model_->modifiableObject(i);
    221222    const CbcSimpleInteger * thisOne = dynamic_cast <const CbcSimpleInteger *> (object);
    222     assert (thisOne);
     223    if (!thisOne)
     224      continue; // Not integer
    223225    int iColumn = thisOne->columnNumber();
    224226    smallObjective_ += objective[iColumn];
    … …  
    232234  if (gotPriorities || priority1>priority2) {
    233235    priority_ = new PriorityType [numberIntegers];
    234     for (int i = 0; i < numberIntegers; i++) {
     236    for (int i = 0; i < numberObjects; i++) {
    235237      OsiObject * object = model_->modifiableObject(i);
    236238      const CbcSimpleInteger * thisOne = dynamic_cast <const CbcSimpleInteger *> (object);
     239      if (!thisOne)
     240        continue; // Not integer
    237241      int level=thisOne->priority()-priority2;
    238242      assert (level<(1<<29));

  • releases/2.9.1/Cbc/src/config_cbc_default.h

    r3045 r3045  
    66
    77/* Version number of project */
    8 #define CBC_VERSION "2.9.0"
     8#define CBC_VERSION "2.9.1"
    99
    1010/* Major Version number of project */
    … …  
    1515
    1616/* Release Version number of project */
    17 #define CBC_VERSION_RELEASE 0
     17#define CBC_VERSION_RELEASE 1

  • releases/2.9.1/configure

    r3045 r3045  
    22# From configure.ac 0.9.
    33# 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.
    55#
    66# Report bugs to <cbc@lists.coin-or.org>.
    … …  
    431431PACKAGE_NAME='Cbc'
    432432PACKAGE_TARNAME='cbc'
    433 PACKAGE_VERSION='2.9.0'
    434 PACKAGE_STRING='Cbc 2.9.0'
     433PACKAGE_VERSION='2.9.1'
     434PACKAGE_STRING='Cbc 2.9.1'
    435435PACKAGE_BUGREPORT='cbc@lists.coin-or.org'
    436436
    … …  
    10391039  # This message is too long to be a string in the A/UX 3.1 sh.
    10401040  cat <<_ACEOF
    1041 \`configure' configures Cbc 2.9.0 to adapt to many kinds of systems.
     1041\`configure' configures Cbc 2.9.1 to adapt to many kinds of systems.
    10421042
    10431043Usage: $0 [OPTION]... [VAR=VALUE]...
    … …  
    11051105if test -n "$ac_init_help"; then
    11061106  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:";;
    11081108   esac
    11091109  cat <<\_ACEOF
    … …  
    13311331if $ac_init_version; then
    13321332  cat <<\_ACEOF
    1333 Cbc configure 2.9.0
     1333Cbc configure 2.9.1
    13341334generated by GNU Autoconf 2.59
    13351335
    … …  
    13511351running configure, to aid debugging if configure makes a mistake.
    13521352
    1353 It was created by Cbc $as_me 2.9.0, which was
     1353It was created by Cbc $as_me 2.9.1, which was
    13541354generated by GNU Autoconf 2.59.  Invocation command line was
    13551355
    … …  
    51175117# Define the identity of the package.
    51185118 PACKAGE='cbc'
    5119  VERSION='2.9.0'
     5119 VERSION='2.9.1'
    51205120
    51215121
    … …  
    2079120791  # On Cygwin and AIX, building DLLs doesn't work
    2079220792  dependency_linking=no
    20793   if test x"$enable_shared" = xyes; then
     20793  if test x"$coin_disable_shared" = xno; then
    2079420794    case $build in
    2079520795      *-cygwin* | *-mingw*)
    … …  
    2346023460cat >&5 <<_CSEOF
    2346123461
    23462 This file was extended by Cbc $as_me 2.9.0, which was
     23462This file was extended by Cbc $as_me 2.9.1, which was
    2346323463generated by GNU Autoconf 2.59.  Invocation command line was
    2346423464
    … …  
    2351823518cat >>$CONFIG_STATUS <<_ACEOF
    2351923519ac_cs_version="\\
    23520 Cbc config.status 2.9.0
     23520Cbc config.status 2.9.1
    2352123521configured by $0, generated by GNU Autoconf 2.59,
    2352223522  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

  • releases/2.9.1/configure.ac

    r3045 r3045  
    1313AC_PREREQ(2.59)
    1414
    15 AC_INIT([Cbc],[2.9.0],[cbc@lists.coin-or.org])
     15AC_INIT([Cbc],[2.9.1],[cbc@lists.coin-or.org])
    1616
    1717AC_COPYRIGHT([
Note: See TracChangeset for help on using the changeset viewer.