Changes from releases/2.7.4 at r1768 to releases/2.7.5 at r1768


Ignore:
Location:
releases/2.7.5
Files:
13 edited

Legend:

Unmodified
Added
Removed
  • releases/2.7.5/Cbc

  • releases/2.7.5/Cbc/MSVisualStudio/v9/cbc/cbc.vcproj

    r1768 r1768  
    7373                        <Tool
    7474                                Name="VCLinkerTool"
    75                                 AdditionalDependencies="libCbcSolver.lib libOsiClp.lib libOsi.lib libClp.lib libCoinUtils.lib"
     75                                AdditionalDependencies="libCgl.lib libCbc.lib libCbcSolver.lib libOsiClp.lib libOsi.lib libClp.lib libCoinUtils.lib"
    7676                                LinkIncremental="1"
    7777                                SuppressStartupBanner="true"
     
    160160                        <Tool
    161161                                Name="VCLinkerTool"
    162                                 AdditionalDependencies="libCbcSolver.lib libOsiClp.lib libOsi.lib libClp.lib libCoinUtils.lib"
     162                                AdditionalDependencies="libCgl.lib libCbc.lib libCbcSolver.lib libOsiClp.lib libOsi.lib libClp.lib libCoinUtils.lib"
    163163                                LinkIncremental="1"
    164164                                SuppressStartupBanner="true"
  • releases/2.7.5/Cbc/MSVisualStudio/v9/libCbc/libCbc.vcproj

    r1768 r1768  
    192192                                Optimization="0"
    193193                                AdditionalIncludeDirectories="..\..\..\..\Cbc\src\;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Cgl\src;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp"
    194                                 PreprocessorDefinitions="_DEBUG;WIN32;_LIB;USE_CBCCONFIG;COIN_NO_CLP_MESSAGE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
     194                                PreprocessorDefinitions="CBC_BUILD;_DEBUG;WIN32;_LIB;USE_CBCCONFIG;COIN_NO_CLP_MESSAGE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
    195195                                MinimalRebuild="true"
    196196                                BasicRuntimeChecks="3"
     
    266266                                InlineFunctionExpansion="1"
    267267                                AdditionalIncludeDirectories="..\..\..\..\Cbc\src\;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Cgl\src;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp"
    268                                 PreprocessorDefinitions="NDEBUG;WIN32;_LIB;USE_CBCCONFIG;COIN_NO_CLP_MESSAGE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
     268                                PreprocessorDefinitions="CBC_BUILD;NDEBUG;WIN32;_LIB;USE_CBCCONFIG;COIN_NO_CLP_MESSAGE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
    269269                                StringPooling="true"
    270270                                RuntimeLibrary="2"
  • releases/2.7.5/Cbc/MSVisualStudio/v9/libCbcSolver/libCbcSolver.vcproj

    r1768 r1768  
    170170                                Optimization="0"
    171171                                AdditionalIncludeDirectories="..\..\..\src;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglResidualCapacity"
    172                                 PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS"
     172                                PreprocessorDefinitions="CBC_BUILD;WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS"
    173173                                RuntimeLibrary="3"
    174174                                UsePrecompiledHeader="0"
     
    232232                                Name="VCCLCompilerTool"
    233233                                AdditionalIncludeDirectories="..\..\..\src\;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers"
    234                                 PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS"
     234                                PreprocessorDefinitions="CBC_BUILD;WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS"
    235235                                RuntimeLibrary="2"
    236236                                UsePrecompiledHeader="0"
  • releases/2.7.5/Cbc/configure

    r1768 r1768  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.59 for Cbc 2.7.4.
     3# Generated by GNU Autoconf 2.59 for Cbc 2.7.5.
    44#
    55# Report bugs to <cbc@lists.coin-or.org>.
     
    430430PACKAGE_NAME='Cbc'
    431431PACKAGE_TARNAME='cbc'
    432 PACKAGE_VERSION='2.7.4'
    433 PACKAGE_STRING='Cbc 2.7.4'
     432PACKAGE_VERSION='2.7.5'
     433PACKAGE_STRING='Cbc 2.7.5'
    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.4 to adapt to many kinds of systems.
     1008\`configure' configures Cbc 2.7.5 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.4:";;
     1074     short | recursive ) echo "Configuration of Cbc 2.7.5:";;
    10751075   esac
    10761076  cat <<\_ACEOF
     
    13041304if $ac_init_version; then
    13051305  cat <<\_ACEOF
    1306 Cbc configure 2.7.4
     1306Cbc configure 2.7.5
    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.4, which was
     1326It was created by Cbc $as_me 2.7.5, 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:4:7
     1852coin_libversion=10:5:7
    18531853
    18541854
     
    46884688# Define the identity of the package.
    46894689 PACKAGE='cbc'
    4690  VERSION='2.7.4'
     4690 VERSION='2.7.5'
    46914691
    46924692
     
    2922029220
    2922129221
     29222
     29223
     29224
     29225
     29226
     29227
     29228
     29229
     29230
     29231
     29232
     29233
     29234
     29235
     29236
     29237
    2922229238#check if user provided LIBS, CFLAGS, or DATA for package or disables use of package
    2922329239if test $coin_has_asl != skipping; then
     
    2923329249       ASL_PCLIBS="$withval"
    2923429250
     29251         CBCLIB_PCLIBS="$withval $CBCLIB_PCLIBS"
     29252         CBCLIB_LIBS="$withval $CBCLIB_LIBS"
     29253
     29254         CBCGENERIC_PCLIBS="$withval $CBCGENERIC_PCLIBS"
     29255         CBCGENERIC_LIBS="$withval $CBCGENERIC_LIBS"
     29256
    2923529257       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
    2923629258       if test -z "$PKG_CONFIG" ; then
    2923729259         ASL_LIBS_INSTALLED="$withval"
    29238 
     29260         CBCLIB_LIBS_INSTALLED="$withval $CBCLIB_LIBS_INSTALLED"CBCGENERIC_LIBS_INSTALLED="$withval $CBCGENERIC_LIBS_INSTALLED"
    2923929261       fi
    2924029262     fi
     
    2925329275       coin_has_asl=yes
    2925429276       ASL_CFLAGS="-I`${CYGPATH_W} $withval`"
    29255 
     29277       CBCLIB_CFLAGS="-I`${CYGPATH_W} $withval` $CBCLIB_CFLAGS"CBCGENERIC_CFLAGS="-I`${CYGPATH_W} $withval` $CBCGENERIC_CFLAGS"
    2925629278       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
    2925729279       if test -z "$PKG_CONFIG" ; then
    2925829280         ASL_CFLAGS_INSTALLED="$ASL_CFLAGS"
    29259 
     29281         CBCLIB_CFLAGS_INSTALLED="$ASL_CFLAGS $CBCLIB_CFLAGS_INSTALLED"CBCGENERIC_CFLAGS_INSTALLED="$ASL_CFLAGS $CBCGENERIC_CFLAGS_INSTALLED"
    2926029282       fi
    2926129283     fi
     
    2932129343        ASL_PCREQUIRES="coinasl"
    2932229344
    29323         # augment X_PCREQUIRES, X_CFLAGS, and X_LIBS for each build target X in
     29345        # augment X_PCREQUIRES, X_CFLAGS, and X_LIBS for each build target X in CbcLib CbcGeneric
     29346
     29347          CBCLIB_PCREQUIRES="coinasl $CBCLIB_PCREQUIRES"
     29348          CBCLIB_CFLAGS="$ASL_CFLAGS $CBCLIB_CFLAGS"
     29349          CBCLIB_LIBS="$ASL_LIBS $CBCLIB_LIBS"
     29350
     29351          CBCGENERIC_PCREQUIRES="coinasl $CBCGENERIC_PCREQUIRES"
     29352          CBCGENERIC_CFLAGS="$ASL_CFLAGS $CBCGENERIC_CFLAGS"
     29353          CBCGENERIC_LIBS="$ASL_LIBS $CBCGENERIC_LIBS"
    2932429354
    2932529355
     
    2956629596  ASL_PCREQUIRES="coinasl"
    2956729597
     29598    CBCLIB_PCREQUIRES="coinasl $CBCLIB_PCREQUIRES"
     29599    CBCLIB_CFLAGS="$ASL_CFLAGS $CBCLIB_CFLAGS"
     29600    CBCLIB_LIBS="$ASL_LIBS $CBCLIB_LIBS"
     29601    CBCLIB_CFLAGS_INSTALLED="$ASL_CFLAGS_INSTALLED $CBCLIB_CFLAGS_INSTALLED"
     29602    CBCLIB_LIBS_INSTALLED="$ASL_LIBS_INSTALLED $CBCLIB_LIBS_INSTALLED"
     29603
     29604    CBCGENERIC_PCREQUIRES="coinasl $CBCGENERIC_PCREQUIRES"
     29605    CBCGENERIC_CFLAGS="$ASL_CFLAGS $CBCGENERIC_CFLAGS"
     29606    CBCGENERIC_LIBS="$ASL_LIBS $CBCGENERIC_LIBS"
     29607    CBCGENERIC_CFLAGS_INSTALLED="$ASL_CFLAGS_INSTALLED $CBCGENERIC_CFLAGS_INSTALLED"
     29608    CBCGENERIC_LIBS_INSTALLED="$ASL_LIBS_INSTALLED $CBCGENERIC_LIBS_INSTALLED"
     29609
    2956829610
    2956929611fi
     
    2961229654     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    2961329655     ASL_DEPENDENCIES=`echo " $ASL_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     29656
     29657       CBCLIB_DEPENDENCIES=`echo " $CBCLIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     29658
     29659       CBCGENERIC_DEPENDENCIES=`echo " $CBCGENERIC_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2961429660
    2961529661  fi
     
    2964029686echo "$as_me: ASL PCREQUIRES are $ASL_PCREQUIRES" >&6;}
    2964129687    fi
     29688
     29689      { echo "$as_me:$LINENO: CbcLib CFLAGS are $CBCLIB_CFLAGS" >&5
     29690echo "$as_me: CbcLib CFLAGS are $CBCLIB_CFLAGS" >&6;}
     29691      { echo "$as_me:$LINENO: CbcLib LIBS   are $CBCLIB_LIBS" >&5
     29692echo "$as_me: CbcLib LIBS   are $CBCLIB_LIBS" >&6;}
     29693      { echo "$as_me:$LINENO: CbcLib DEPENDENCIES are $CBCLIB_DEPENDENCIES" >&5
     29694echo "$as_me: CbcLib DEPENDENCIES are $CBCLIB_DEPENDENCIES" >&6;}
     29695
     29696      { echo "$as_me:$LINENO: CbcGeneric CFLAGS are $CBCGENERIC_CFLAGS" >&5
     29697echo "$as_me: CbcGeneric CFLAGS are $CBCGENERIC_CFLAGS" >&6;}
     29698      { echo "$as_me:$LINENO: CbcGeneric LIBS   are $CBCGENERIC_LIBS" >&5
     29699echo "$as_me: CbcGeneric LIBS   are $CBCGENERIC_LIBS" >&6;}
     29700      { echo "$as_me:$LINENO: CbcGeneric DEPENDENCIES are $CBCGENERIC_DEPENDENCIES" >&5
     29701echo "$as_me: CbcGeneric DEPENDENCIES are $CBCGENERIC_DEPENDENCIES" >&6;}
    2964229702
    2964329703  fi
     
    3115231212cat >&5 <<_CSEOF
    3115331213
    31154 This file was extended by Cbc $as_me 2.7.4, which was
     31214This file was extended by Cbc $as_me 2.7.5, which was
    3115531215generated by GNU Autoconf 2.59.  Invocation command line was
    3115631216
     
    3121531275cat >>$CONFIG_STATUS <<_ACEOF
    3121631276ac_cs_version="\\
    31217 Cbc config.status 2.7.4
     31277Cbc config.status 2.7.5
    3121831278configured by $0, generated by GNU Autoconf 2.59,
    3121931279  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • releases/2.7.5/Cbc/configure.ac

    r1768 r1768  
    1313AC_PREREQ(2.59)
    1414
    15 AC_INIT([Cbc],[2.7.4],[cbc@lists.coin-or.org])
     15AC_INIT([Cbc],[2.7.5],[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:4:7)
     44AC_COIN_PROJECTDIR_INIT(Cbc,10:5:7)
    4545
    4646# Check if user wants to produce debugging code
     
    104104
    105105# Ampl Solver library
    106 AC_COIN_CHECK_PACKAGE(ASL, [coinasl])
     106AC_COIN_CHECK_PACKAGE(ASL, [coinasl], [CbcLib CbcGeneric])
    107107
    108108#############################################################################
  • releases/2.7.5/Cbc/src/CbcSolver.cpp

    r1768 r1768  
    62096209                                    return returnCode;
    62106210                                }
     6211#ifdef COIN_HAS_ASL
     6212                                if (statusUserFunction_[0]) {
     6213                                   clpSolver = dynamic_cast< OsiClpSolverInterface*> (babModel_->solver());
     6214                                   lpSolver = clpSolver->getModelPtr();
     6215                                   double value = babModel_->getObjValue()*lpSolver->getObjSense();
     6216                                   char buf[300];
     6217                                   int pos=0;
     6218                                   if (iStat==0) {
     6219                                      if (babModel_->getObjValue()<1.0e40) {
     6220                                         pos += sprintf(buf+pos,"optimal," );
     6221                                      } else {
     6222                                         // infeasible
     6223                                         iStat=1;
     6224                                         pos += sprintf(buf+pos,"infeasible,");
     6225                                      }
     6226                                   } else if (iStat==1) {
     6227                                      if (iStat2!=6)
     6228                                         iStat=3;
     6229                                      else
     6230                                         iStat=4;
     6231                                      pos += sprintf(buf+pos,"stopped on %s,",minor[iStat2].c_str());
     6232                                   } else if (iStat==2) {
     6233                                      iStat = 7;
     6234                                      pos += sprintf(buf+pos,"stopped on difficulties,");
     6235                                   } else if (iStat==5) {
     6236                                      iStat = 3;
     6237                                      pos += sprintf(buf+pos,"stopped on ctrl-c,");
     6238                                   } else {
     6239                                      pos += sprintf(buf+pos,"status unknown,");
     6240                                      iStat=6;
     6241                                   }
     6242                                   info.problemStatus=iStat;
     6243                                   info.objValue = value;
     6244                                   if (babModel_->getObjValue()<1.0e40) {
     6245                                      int precision = ampl_obj_prec();
     6246                                      if (precision>0)
     6247                                         pos += sprintf(buf+pos," objective %.*g",precision,
     6248                                                        value);
     6249                                      else
     6250                                         pos += sprintf(buf+pos," objective %g",value);
     6251                                   }
     6252                                   sprintf(buf+pos,"\n%d nodes, %d iterations, %g seconds",
     6253                                           babModel_->getNodeCount(),
     6254                                           babModel_->getIterationCount(),
     6255                                           totalTime);
     6256                                   if (bestSolution) {
     6257                                      free(info.primalSolution);
     6258                                      if (!numberKnapsack) {
     6259                                         info.primalSolution = (double *) malloc(n*sizeof(double));
     6260                                         CoinCopyN(lpSolver->primalColumnSolution(),n,info.primalSolution);
     6261                                         int numberRows = lpSolver->numberRows();
     6262                                         free(info.dualSolution);
     6263                                         info.dualSolution = (double *) malloc(numberRows*sizeof(double));
     6264                                         CoinCopyN(lpSolver->dualRowSolution(),numberRows,info.dualSolution);
     6265                                      } else {
     6266                                         // expanded knapsack
     6267                                         info.dualSolution=NULL;
     6268                                         int numberColumns = saveCoinModel.numberColumns();
     6269                                         info.primalSolution = (double *) malloc(numberColumns*sizeof(double));
     6270                                         // Fills in original solution (coinModel length)
     6271                                         afterKnapsack(saveTightenedModel,  whichColumn,  knapsackStart,
     6272                                                       knapsackRow,  numberKnapsack,
     6273                                                       lpSolver->primalColumnSolution(), info.primalSolution,1);
     6274                                      }
     6275                                   } else {
     6276                                      info.primalSolution=NULL;
     6277                                      info.dualSolution=NULL;
     6278                                   }
     6279                                   // put buffer into info
     6280                                   strcpy(info.buffer,buf);
     6281                                }
     6282#endif
    62116283                            } else {
    62126284                                std::cout << "Model strengthened - now has " << clpSolver->getNumRows()
  • releases/2.7.5/Cbc/src/CbcSolverExpandKnapsack.cpp

    r1768 r1768  
    528528
    529529
     530// Fills in original solution (coinModel length)
     531void
     532afterKnapsack(const CoinModel & coinModel2, const int * whichColumn, const int * knapsackStart,
     533              const int * knapsackRow, int numberKnapsack,
     534              const double * knapsackSolution, double * solution, int logLevel)
     535{
     536   CoinModel coinModel = coinModel2;
     537   int numberColumns = coinModel.numberColumns();
     538   int iColumn;
     539   // associate all columns to stop possible error messages
     540   for (iColumn=0;iColumn<numberColumns;iColumn++) {
     541      coinModel.associateElement(coinModel.columnName(iColumn),1.0);
     542   }
     543   CoinZeroN(solution,numberColumns);
     544   int nCol=knapsackStart[0];
     545   for (iColumn=0;iColumn<nCol;iColumn++) {
     546      int jColumn = whichColumn[iColumn];
     547      solution[jColumn]=knapsackSolution[iColumn];
     548   }
     549   int * buildRow = new int [numberColumns]; // wild overkill
     550   double * buildElement = new double [numberColumns];
     551   int iKnapsack;
     552   for (iKnapsack=0;iKnapsack<numberKnapsack;iKnapsack++) {
     553      int k=-1;
     554      double value=0.0;
     555      for (iColumn=knapsackStart[iKnapsack];iColumn<knapsackStart[iKnapsack+1];iColumn++) {
     556         if (knapsackSolution[iColumn]>1.0e-5) {
     557            if (k>=0) {
     558               printf("Two nonzero values for knapsack %d at (%d,%g) and (%d,%g)\n",iKnapsack,
     559                      k,knapsackSolution[k],iColumn,knapsackSolution[iColumn]);
     560               abort();
     561            }
     562            k=iColumn;
     563            value=floor(knapsackSolution[iColumn]+0.5);
     564            assert (fabs(value-knapsackSolution[iColumn])<1.0e-5);
     565         }
     566      }
     567      if (k>=0) {
     568         int iRow = knapsackRow[iKnapsack];
     569         int nCreate = 10000;
     570         int nel=coinModel.expandKnapsack(iRow,nCreate,NULL,NULL,buildRow,buildElement,k-knapsackStart[iKnapsack]);
     571         assert (nel);
     572         if (logLevel>0)
     573            printf("expanded column %d in knapsack %d has %d nonzero entries:\n",
     574                   k-knapsackStart[iKnapsack],iKnapsack,nel);
     575         for (int i=0;i<nel;i++) {
     576            int jColumn = buildRow[i];
     577            double value = buildElement[i];
     578            if (logLevel>0)
     579               printf("%d - original %d has value %g\n",i,jColumn,value);
     580            solution[jColumn]=value;
     581         }
     582      }
     583   }
     584   delete [] buildRow;
     585   delete [] buildElement;
     586#if 0
     587   for (iColumn=0;iColumn<numberColumns;iColumn++) {
     588      if (solution[iColumn]>1.0e-5&&coinModel.isInteger(iColumn))
     589         printf("%d %g\n",iColumn,solution[iColumn]);
     590   }
     591#endif
     592}
  • releases/2.7.5/Cbc/src/CbcSolverExpandKnapsack.hpp

    r1768 r1768  
    2020               int fixedPriority, int SOSPriority, CoinModel & tightenedModel);
    2121
     22void
     23afterKnapsack(const CoinModel & coinModel2, const int * whichColumn, const int * knapsackStart,
     24              const int * knapsackRow, int numberKnapsack,
     25              const double * knapsackSolution, double * solution, int logLevel);
     26
    2227#endif
    2328
  • releases/2.7.5/Cbc/src/Cbc_ampl.cpp

    r1768 r1768  
    3030*/
    3131
     32#include "CbcConfig.h"
     33
    3234#ifdef COIN_HAS_ASL
    3335
    34 #include "CbcConfig.h"
    3536#ifdef HAVE_UNISTD_H
    3637# include "unistd.h"
     
    144145static Option_Info Oinfo = {
    145146    const_cast<char*>("cbc"),
    146     const_cast<char*>("Cbc 1.04"),
     147    const_cast<char*>("CBC trunk"),
    147148    const_cast<char*>("cbc_options"),
    148149    keywds,
  • releases/2.7.5/Cbc/src/config_cbc_default.h

    r1768 r1768  
    66
    77/* Version number of project */
    8 #define CBC_VERSION "2.7.4"
     8#define CBC_VERSION "2.7.5"
    99
    1010/* Major Version number of project */
     
    1515
    1616/* Release Version number of project */
    17 #define CBC_VERSION_RELEASE 4
     17#define CBC_VERSION_RELEASE 5
  • releases/2.7.5/configure

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

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