Changes from releases/2.9.7 at r2341 to releases/2.9.6 at r2341


Ignore:
Location:
releases/2.9.6
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • releases/2.9.6/Cbc

  • releases/2.9.6/Cbc/README

    r2341 r2341  
    3636
    3737## CHANGELOG
    38 
    39  * Release 2.9.7
    40 
    41    * Small bug fixes
    42    * Option to switch to line buffered output
    43 
    44  * Release 2.9.6
    45 
    46    * Small bug fixes
    47 
    48  * Release 2.9.5
    49 
    50    * Small bug fixes
    5138
    5239 * Release 2.9.4
  • releases/2.9.6/Cbc/configure

    r2341 r2341  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.59 for Cbc 2.9.7.
     3# Generated by GNU Autoconf 2.59 for Cbc 2.9.6.
    44#
    55# Report bugs to <cbc@lists.coin-or.org>.
     
    430430PACKAGE_NAME='Cbc'
    431431PACKAGE_TARNAME='cbc'
    432 PACKAGE_VERSION='2.9.7'
    433 PACKAGE_STRING='Cbc 2.9.7'
     432PACKAGE_VERSION='2.9.6'
     433PACKAGE_STRING='Cbc 2.9.6'
    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.7 to adapt to many kinds of systems.
     1008\`configure' configures Cbc 2.9.6 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.7:";;
     1074     short | recursive ) echo "Configuration of Cbc 2.9.6:";;
    10751075   esac
    10761076  cat <<\_ACEOF
     
    13131313if $ac_init_version; then
    13141314  cat <<\_ACEOF
    1315 Cbc configure 2.9.7
     1315Cbc configure 2.9.6
    13161316generated by GNU Autoconf 2.59
    13171317
     
    13331333running configure, to aid debugging if configure makes a mistake.
    13341334
    1335 It was created by Cbc $as_me 2.9.7, which was
     1335It was created by Cbc $as_me 2.9.6, which was
    13361336generated by GNU Autoconf 2.59.  Invocation command line was
    13371337
     
    18591859
    18601860# Capture libtool library version, if given.
    1861  coin_libversion=12:7:9
     1861 coin_libversion=12:6:9
    18621862
    18631863
     
    45814581# Define the identity of the package.
    45824582 PACKAGE='cbc'
    4583  VERSION='2.9.7'
     4583 VERSION='2.9.6'
    45844584
    45854585
     
    3145331453cat >&5 <<_CSEOF
    3145431454
    31455 This file was extended by Cbc $as_me 2.9.7, which was
     31455This file was extended by Cbc $as_me 2.9.6, which was
    3145631456generated by GNU Autoconf 2.59.  Invocation command line was
    3145731457
     
    3151631516cat >>$CONFIG_STATUS <<_ACEOF
    3151731517ac_cs_version="\\
    31518 Cbc config.status 2.9.7
     31518Cbc config.status 2.9.6
    3151931519configured by $0, generated by GNU Autoconf 2.59,
    3152031520  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • releases/2.9.6/Cbc/configure.ac

    r2341 r2341  
    1313AC_PREREQ(2.59)
    1414
    15 AC_INIT([Cbc],[2.9.7],[cbc@lists.coin-or.org])
     15AC_INIT([Cbc],[2.9.6],[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:7:9)
     44AC_COIN_PROJECTDIR_INIT(Cbc,12:6:9)
    4545
    4646# Check if user wants to produce debugging code
  • releases/2.9.6/Cbc/src

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • releases/2.9.6/Cbc/src/CbcHeuristicGreedy.cpp

    r2341 r2341  
    996996    const int * columnLength = matrix_.getVectorLengths();
    997997    int * sosRow = new int [numberColumns];
    998     char * sos = new char [numberRows];
    999     memset(sos,'a',numberRows);
    1000998    int nonSOS=0;
    1001999    // If bit set then use current
     
    10201018        } else if (rowUpper[iRow] < 1.0e10) {
    10211019          rhs[iRow]=rowUpper[iRow];
    1022           if (rhs[iRow]<0)
    1023             sos[iRow]=0; // can't be SOS
    10241020        } else {
    10251021          rhs[iRow]=rowLower[iRow];
    1026           if (rhs[iRow]<0)
    1027             sos[iRow]=0; // can't be SOS
    10281022        }
    10291023      }
     
    10431037            good = false;
    10441038          int iRow = row[j];
    1045           if (rhs[iRow]==-1.0 && sos[iRow] == 'a') {
     1039          if (rhs[iRow]==-1.0) {
    10461040            if (element[j] != 1.0)
    10471041              good = false;
     
    10591053        delete [] sosRow;
    10601054        delete [] rhs;
    1061         delete [] sos;
    10621055        setWhen(0); // switch off
    10631056        return 0;
     
    10991092    }
    11001093    double offset2 = 0.0;
     1094    char * sos = new char [numberRows];
    11011095    for (int iRow = 0;iRow < numberRows; iRow++) {
    1102       if (sos[iRow]=='a') {
    1103         // row is possible
    1104         sos[iRow]=0;
    1105         if (rhs[iRow]<0.0) {
    1106           sos[iRow]=1;
    1107           rhs[iRow]=1.0;
    1108         } else if (rhs[iRow] != rowUpper[iRow]) {
    1109           // G row
    1110           sos[iRow]=-1;
    1111         }
    1112         if( slackCost[iRow] == 1.0e30) {
    1113           slackCost[iRow]=0.0;
    1114         } else {
    1115           offset2 += slackCost[iRow];
    1116           sos[iRow] = 2;
    1117         }
     1096      sos[iRow]=0;
     1097      if (rhs[iRow]<0.0) {
     1098        sos[iRow]=1;
     1099        rhs[iRow]=1.0;
     1100      } else if (rhs[iRow] != rowUpper[iRow]) {
     1101        // G row
     1102        sos[iRow]=-1;
     1103      }
     1104      if( slackCost[iRow] == 1.0e30) {
     1105        slackCost[iRow]=0.0;
     1106      } else {
     1107        offset2 += slackCost[iRow];
     1108        sos[iRow] = 2;
    11181109      }
    11191110    }
  • releases/2.9.6/Cbc/src/config_cbc_default.h

    r2341 r2341  
    66
    77/* Version number of project */
    8 #define CBC_VERSION "2.9.7"
     8#define CBC_VERSION "2.9.6"
    99
    1010/* Major Version number of project */
     
    1515
    1616/* Release Version number of project */
    17 #define CBC_VERSION_RELEASE 7
     17#define CBC_VERSION_RELEASE 6
  • releases/2.9.6/README.md

    r2341 r2341  
    3636
    3737## CHANGELOG
    38 
    39  * Release 2.9.7
    40 
    41    * Small bug fixes
    42    * Option to switch to line buffered output
    43 
    44  * Release 2.9.6
    45 
    46    * Small bug fixes
    47 
    48  * Release 2.9.5
    49 
    50    * Small bug fixes
    5138
    5239 * Release 2.9.4
  • releases/2.9.6/configure

    r2341 r2341  
    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.7.
     4# Generated by GNU Autoconf 2.59 for Cbc 2.9.6.
    55#
    66# Report bugs to <cbc@lists.coin-or.org>.
     
    431431PACKAGE_NAME='Cbc'
    432432PACKAGE_TARNAME='cbc'
    433 PACKAGE_VERSION='2.9.7'
    434 PACKAGE_STRING='Cbc 2.9.7'
     433PACKAGE_VERSION='2.9.6'
     434PACKAGE_STRING='Cbc 2.9.6'
    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.7 to adapt to many kinds of systems.
     1041\`configure' configures Cbc 2.9.6 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.7:";;
     1107     short | recursive ) echo "Configuration of Cbc 2.9.6:";;
    11081108   esac
    11091109  cat <<\_ACEOF
     
    13311331if $ac_init_version; then
    13321332  cat <<\_ACEOF
    1333 Cbc configure 2.9.7
     1333Cbc configure 2.9.6
    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.7, which was
     1353It was created by Cbc $as_me 2.9.6, which was
    13541354generated by GNU Autoconf 2.59.  Invocation command line was
    13551355
     
    51215121# Define the identity of the package.
    51225122 PACKAGE='cbc'
    5123  VERSION='2.9.7'
     5123 VERSION='2.9.6'
    51245124
    51255125
     
    2353023530cat >&5 <<_CSEOF
    2353123531
    23532 This file was extended by Cbc $as_me 2.9.7, which was
     23532This file was extended by Cbc $as_me 2.9.6, which was
    2353323533generated by GNU Autoconf 2.59.  Invocation command line was
    2353423534
     
    2358823588cat >>$CONFIG_STATUS <<_ACEOF
    2358923589ac_cs_version="\\
    23590 Cbc config.status 2.9.7
     23590Cbc config.status 2.9.6
    2359123591configured by $0, generated by GNU Autoconf 2.59,
    2359223592  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • releases/2.9.6/configure.ac

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