Changes from releases/2.7.2 at r1759 to releases/2.7.3 at r1759


Ignore:
Location:
releases/2.7.3
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • releases/2.7.3/Cbc

  • releases/2.7.3/Cbc/MSVisualStudio/v10/Cbc.sln

    r1759 r1759  
    9595                {F1E9E3F0-6639-4A84-8E0F-A2D5F11978FB}.Debug|Win32.ActiveCfg = Debug|Win32
    9696                {F1E9E3F0-6639-4A84-8E0F-A2D5F11978FB}.Debug|x64.ActiveCfg = Debug|x64
    97                 {F1E9E3F0-6639-4A84-8E0F-A2D5F11978FB}.Debug|x64.Build.0 = Debug|x64
    9897                {F1E9E3F0-6639-4A84-8E0F-A2D5F11978FB}.Release|Win32.ActiveCfg = Release|Win32
    9998                {F1E9E3F0-6639-4A84-8E0F-A2D5F11978FB}.Release|x64.ActiveCfg = Release|x64
    10099                {8AFDEA7E-BC40-4F31-80A8-8D05485E0A1E}.Debug|Win32.ActiveCfg = Debug|Win32
    101100                {8AFDEA7E-BC40-4F31-80A8-8D05485E0A1E}.Debug|x64.ActiveCfg = Debug|x64
    102                 {8AFDEA7E-BC40-4F31-80A8-8D05485E0A1E}.Debug|x64.Build.0 = Debug|x64
    103101                {8AFDEA7E-BC40-4F31-80A8-8D05485E0A1E}.Release|Win32.ActiveCfg = Release|Win32
    104102                {8AFDEA7E-BC40-4F31-80A8-8D05485E0A1E}.Release|x64.ActiveCfg = Release|x64
  • releases/2.7.3/Cbc/MSVisualStudio/v10/libCbcSolver/libCbcSolver.vcxproj

    r1759 r1759  
    2727  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    2828    <ConfigurationType>StaticLibrary</ConfigurationType>
    29     <CharacterSet>Unicode</CharacterSet>
     29    <CharacterSet>MultiByte</CharacterSet>
    3030    <CLRSupport>false</CLRSupport>
    31     <WholeProgramOptimization>true</WholeProgramOptimization>
     31    <WholeProgramOptimization>false</WholeProgramOptimization>
    3232  </PropertyGroup>
    3333  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     
    3838  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    3939    <ConfigurationType>StaticLibrary</ConfigurationType>
    40     <CharacterSet>Unicode</CharacterSet>
     40    <CharacterSet>MultiByte</CharacterSet>
    4141    <CLRSupport>false</CLRSupport>
    42     <WholeProgramOptimization>true</WholeProgramOptimization>
     42    <WholeProgramOptimization>false</WholeProgramOptimization>
    4343  </PropertyGroup>
    4444  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
  • releases/2.7.3/Cbc/MSVisualStudio/v10/libOsiCbc/libOsiCbc.vcxproj

    r1759 r1759  
    2727  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    2828    <ConfigurationType>StaticLibrary</ConfigurationType>
    29     <CharacterSet>Unicode</CharacterSet>
     29    <CharacterSet>MultiByte</CharacterSet>
    3030    <CLRSupport>false</CLRSupport>
    31     <WholeProgramOptimization>true</WholeProgramOptimization>
     31    <WholeProgramOptimization>false</WholeProgramOptimization>
    3232  </PropertyGroup>
    3333  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     
    3838  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    3939    <ConfigurationType>StaticLibrary</ConfigurationType>
    40     <CharacterSet>Unicode</CharacterSet>
     40    <CharacterSet>MultiByte</CharacterSet>
    4141    <CLRSupport>false</CLRSupport>
    42     <WholeProgramOptimization>true</WholeProgramOptimization>
     42    <WholeProgramOptimization>false</WholeProgramOptimization>
    4343  </PropertyGroup>
    4444  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
  • releases/2.7.3/Cbc/Makefile.am

    r1759 r1759  
    138138else
    139139if COIN_CXX_IS_CL
    140         echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libCbc.lib @CBCLIB_LIBS_INSTALLED@" > $(addlibsdir)/cbc_addlibs_cpp.txt
     140        echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libCbc.lib @CBCLIB_LIBS_INSTALLED@" > $(addlibsdir)/cbc_addlibs.txt
    141141else
    142142        echo -L@abs_lib_dir@ -lCbc @CBCLIB_LIBS_INSTALLED@ > $(addlibsdir)/cbc_addlibs.txt
  • releases/2.7.3/Cbc/Makefile.in

    r1759 r1759  
    979979@COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
    980980@COIN_HAS_PKGCONFIG_TRUE@       $(PKG_CONFIG) --libs cbc > $(addlibsdir)/cbc_addlibs.txt
    981 @COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@ echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libCbc.lib @CBCLIB_LIBS_INSTALLED@" > $(addlibsdir)/cbc_addlibs_cpp.txt
     981@COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@ echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libCbc.lib @CBCLIB_LIBS_INSTALLED@" > $(addlibsdir)/cbc_addlibs.txt
    982982@COIN_CXX_IS_CL_FALSE@@COIN_HAS_PKGCONFIG_FALSE@        echo -L@abs_lib_dir@ -lCbc @CBCLIB_LIBS_INSTALLED@ > $(addlibsdir)/cbc_addlibs.txt
    983983
  • releases/2.7.3/Cbc/configure

    r1759 r1759  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.59 for Cbc 2.7.2.
     3# Generated by GNU Autoconf 2.59 for Cbc 2.7.3.
    44#
    55# Report bugs to <cbc@lists.coin-or.org>.
     
    430430PACKAGE_NAME='Cbc'
    431431PACKAGE_TARNAME='cbc'
    432 PACKAGE_VERSION='2.7.2'
    433 PACKAGE_STRING='Cbc 2.7.2'
     432PACKAGE_VERSION='2.7.3'
     433PACKAGE_STRING='Cbc 2.7.3'
    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.7.2 to adapt to many kinds of systems.
     1008\`configure' configures Cbc 2.7.3 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.7.2:";;
     1074     short | recursive ) echo "Configuration of Cbc 2.7.3:";;
    10751075   esac
    10761076  cat <<\_ACEOF
     
    13041304if $ac_init_version; then
    13051305  cat <<\_ACEOF
    1306 Cbc configure 2.7.2
     1306Cbc configure 2.7.3
    13071307generated by GNU Autoconf 2.59
    13081308
     
    13241324running configure, to aid debugging if configure makes a mistake.
    13251325
    1326 It was created by Cbc $as_me 2.7.2, which was
     1326It was created by Cbc $as_me 2.7.3, which was
    13271327generated by GNU Autoconf 2.59.  Invocation command line was
    13281328
     
    18501850
    18511851# Capture libtool library version, if given.
    1852 coin_libversion=10:2:7
     1852coin_libversion=10:3:7
    18531853
    18541854
     
    46884688# Define the identity of the package.
    46894689 PACKAGE='cbc'
    4690  VERSION='2.7.2'
     4690 VERSION='2.7.3'
    46914691
    46924692
     
    3115231152cat >&5 <<_CSEOF
    3115331153
    31154 This file was extended by Cbc $as_me 2.7.2, which was
     31154This file was extended by Cbc $as_me 2.7.3, which was
    3115531155generated by GNU Autoconf 2.59.  Invocation command line was
    3115631156
     
    3121531215cat >>$CONFIG_STATUS <<_ACEOF
    3121631216ac_cs_version="\\
    31217 Cbc config.status 2.7.2
     31217Cbc config.status 2.7.3
    3121831218configured by $0, generated by GNU Autoconf 2.59,
    3121931219  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • releases/2.7.3/Cbc/configure.ac

    r1759 r1759  
    1313AC_PREREQ(2.59)
    1414
    15 AC_INIT([Cbc],[2.7.2],[cbc@lists.coin-or.org])
     15AC_INIT([Cbc],[2.7.3],[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,10:2:7)
     44AC_COIN_PROJECTDIR_INIT(Cbc,10:3:7)
    4545
    4646# Check if user wants to produce debugging code
  • releases/2.7.3/Cbc/src/CbcHeuristic.cpp

    r1759 r1759  
    803803                                    afterRows, afterCols, nFix, afterRows2, afterCols2);
    804804                        }
    805                         model_->messageHandler()->message(CBC_GENERAL, model_->messages())
     805                        model_->messageHandler()->message(CBC_FPUMP1, model_->messages())
    806806                        << generalPrint
    807807                        << CoinMessageEol;
  • releases/2.7.3/Cbc/src/CbcModel.hpp

    r1759 r1759  
    893893        numberIterations_ += value;
    894894    }
    895     /// Get how many Nodes it took to solve the problem.
     895    /// Get how many Nodes it took to solve the problem (including those in complete fathoming B&B inside CLP).
    896896    inline int getNodeCount() const {
    897897        return numberNodes_;
     
    900900    inline void incrementNodeCount(int value) {
    901901        numberNodes_ += value;
     902    }
     903    /// Get how many Nodes were enumerated in complete fathoming B&B inside CLP
     904    inline int getExtraNodeCount() const {
     905       return numberExtraNodes_;
    902906    }
    903907    /** Final status of problem
  • releases/2.7.3/Cbc/src/CbcSolver.cpp

    r1759 r1759  
    6161#define GLP_NOFEAS 4
    6262#define GLP_OPT 5
     63#endif
     64
     65#ifndef CBC_QUIET
     66#define CBC_QUIET 0
    6367#endif
    6468
     
    12121216        // register signal handler
    12131217        //CoinSighandler_t saveSignal=signal(SIGINT,signal_handler);
    1214 #ifndef CBC_QUIET
     1218#if CBC_QUIET < 2
    12151219        signal(SIGINT, signal_handler);
    12161220#endif
     
    16491653        }
    16501654        std::string field;
    1651 #ifndef CBC_QUIET
     1655#if CBC_QUIET == 0
    16521656        if (!noPrinting_) {
    16531657           sprintf(generalPrint,
     
    27252729                                   sprintf(generalPrint + strlen(generalPrint),
    27262730                                           "Total iterations:           0\n");
    2727 #ifndef CBC_QUIET
     2731#if CBC_QUIET == 0
    27282732                                   sprintf(generalPrint + strlen(generalPrint),
    27292733                                           "Time (CPU seconds):         %.2f\n",
     
    61856189                                            "Total iterations:               %d\n",
    61866190                                            babModel_->getIterationCount());
    6187 #ifndef CBC_QUIET
     6191#if CBC_QUIET == 0
    61886192                                    sprintf(generalPrint + strlen(generalPrint),
    61896193                                            "Time (CPU seconds):             %.2f\n",
     
    83748378        }
    83758379    }
    8376 #ifndef CBC_QUIET
     8380#if CBC_QUIET == 0
    83778381    sprintf(generalPrint ,
    83788382            "Total time (CPU seconds):       %.2f   (Wallclock seconds):       %.2f\n",
  • releases/2.7.3/Cbc/src/config_cbc_default.h

    r1759 r1759  
    66
    77/* Version number of project */
    8 #define CBC_VERSION "2.7.2"
     8#define CBC_VERSION "2.7.3"
    99
    1010/* Major Version number of project */
     
    1515
    1616/* Release Version number of project */
    17 #define CBC_VERSION_RELEASE 2
     17#define CBC_VERSION_RELEASE 3
  • releases/2.7.3/configure

    r1759 r1759  
    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.7.2.
     4# Generated by GNU Autoconf 2.59 for Cbc 2.7.3.
    55#
    66# Report bugs to <cbc@lists.coin-or.org>.
     
    431431PACKAGE_NAME='Cbc'
    432432PACKAGE_TARNAME='cbc'
    433 PACKAGE_VERSION='2.7.2'
    434 PACKAGE_STRING='Cbc 2.7.2'
     433PACKAGE_VERSION='2.7.3'
     434PACKAGE_STRING='Cbc 2.7.3'
    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.7.2 to adapt to many kinds of systems.
     1041\`configure' configures Cbc 2.7.3 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.7.2:";;
     1107     short | recursive ) echo "Configuration of Cbc 2.7.3:";;
    11081108   esac
    11091109  cat <<\_ACEOF
     
    13311331if $ac_init_version; then
    13321332  cat <<\_ACEOF
    1333 Cbc configure 2.7.2
     1333Cbc configure 2.7.3
    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.7.2, which was
     1353It was created by Cbc $as_me 2.7.3, which was
    13541354generated by GNU Autoconf 2.59.  Invocation command line was
    13551355
     
    52955295# Define the identity of the package.
    52965296 PACKAGE='cbc'
    5297  VERSION='2.7.2'
     5297 VERSION='2.7.3'
    52985298
    52995299
     
    2357723577cat >&5 <<_CSEOF
    2357823578
    23579 This file was extended by Cbc $as_me 2.7.2, which was
     23579This file was extended by Cbc $as_me 2.7.3, which was
    2358023580generated by GNU Autoconf 2.59.  Invocation command line was
    2358123581
     
    2363523635cat >>$CONFIG_STATUS <<_ACEOF
    2363623636ac_cs_version="\\
    23637 Cbc config.status 2.7.2
     23637Cbc config.status 2.7.3
    2363823638configured by $0, generated by GNU Autoconf 2.59,
    2363923639  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • releases/2.7.3/configure.ac

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