Changes from releases/5.6.5 at r2363 to releases/5.6.6 at r2363


Ignore:
Location:
releases/5.6.6
Files:
13 edited

Legend:

Unmodified
Added
Removed
  • releases/5.6.6/Dependencies

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • releases/5.6.6/README

    r2363 r2363  
    1 SYMPHONY Version 5.6.4 README
     1SYMPHONY Version 5.6.6 README
    22=============================
    33
  • releases/5.6.6/README.md

    r2363 r2363  
    1 # SYMPHONY Version 5.6.5 README
     1# SYMPHONY Version 5.6.6 README
    22
    33Welcome to SYMPHONY. SYMPHONY is distributed under the Eclipse Public License
     
    229229## WHAT'S NEW
    230230
     231Release 5.6.6:
     232
     2331. Disabling pre-processor for multicriteria instances.
     234
    231235Release 5.6.5:
    232236
  • releases/5.6.6/SYMPHONY

  • releases/5.6.6/SYMPHONY/README

    r2363 r2363  
    1 SYMPHONY Version 5.6.5 README
     1SYMPHONY Version 5.6.6 README
    22=============================
    33
     
    243243==========
    244244
     245Release 5.6.6:
     246
     2471. Disabling pre-processor for multicriteria instances.
     248
    245249Release 5.6.5:
    246250
  • releases/5.6.6/SYMPHONY/configure

    r2363 r2363  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.59 for SYMPHONY 5.6.5.
     3# Generated by GNU Autoconf 2.59 for SYMPHONY 5.6.6.
    44#
    55# Report bugs to <symphony@list.coin-or.org>.
     
    440440PACKAGE_NAME='SYMPHONY'
    441441PACKAGE_TARNAME='symphony'
    442 PACKAGE_VERSION='5.6.5'
    443 PACKAGE_STRING='SYMPHONY 5.6.5'
     442PACKAGE_VERSION='5.6.6'
     443PACKAGE_STRING='SYMPHONY 5.6.6'
    444444PACKAGE_BUGREPORT='symphony@list.coin-or.org'
    445445
     
    10161016  # This message is too long to be a string in the A/UX 3.1 sh.
    10171017  cat <<_ACEOF
    1018 \`configure' configures SYMPHONY 5.6.5 to adapt to many kinds of systems.
     1018\`configure' configures SYMPHONY 5.6.6 to adapt to many kinds of systems.
    10191019
    10201020Usage: $0 [OPTION]... [VAR=VALUE]...
     
    10821082if test -n "$ac_init_help"; then
    10831083  case $ac_init_help in
    1084      short | recursive ) echo "Configuration of SYMPHONY 5.6.5:";;
     1084     short | recursive ) echo "Configuration of SYMPHONY 5.6.6:";;
    10851085   esac
    10861086  cat <<\_ACEOF
     
    13331333if $ac_init_version; then
    13341334  cat <<\_ACEOF
    1335 SYMPHONY configure 5.6.5
     1335SYMPHONY configure 5.6.6
    13361336generated by GNU Autoconf 2.59
    13371337
     
    13631363running configure, to aid debugging if configure makes a mistake.
    13641364
    1365 It was created by SYMPHONY $as_me 5.6.5, which was
     1365It was created by SYMPHONY $as_me 5.6.6, which was
    13661366generated by GNU Autoconf 2.59.  Invocation command line was
    13671367
     
    18891889
    18901890# Capture libtool library version, if given.
    1891  coin_libversion=9:5:6
     1891 coin_libversion=9:6:6
    18921892
    18931893
     
    46194619# Define the identity of the package.
    46204620 PACKAGE='symphony'
    4621  VERSION='5.6.5'
     4621 VERSION='5.6.6'
    46224622
    46234623
     
    2993929939cat >&5 <<_CSEOF
    2994029940
    29941 This file was extended by SYMPHONY $as_me 5.6.5, which was
     29941This file was extended by SYMPHONY $as_me 5.6.6, which was
    2994229942generated by GNU Autoconf 2.59.  Invocation command line was
    2994329943
     
    3000230002cat >>$CONFIG_STATUS <<_ACEOF
    3000330003ac_cs_version="\\
    30004 SYMPHONY config.status 5.6.5
     30004SYMPHONY config.status 5.6.6
    3000530005configured by $0, generated by GNU Autoconf 2.59,
    3000630006  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • releases/5.6.6/SYMPHONY/configure.ac

    r2363 r2363  
    2323AC_PREREQ(2.59)
    2424
    25 AC_INIT([SYMPHONY],[5.6.5],[symphony@list.coin-or.org])
     25AC_INIT([SYMPHONY],[5.6.6],[symphony@list.coin-or.org])
    2626
    2727AC_COPYRIGHT([
     
    6262# externals.  The following macro ensures that those externals are
    6363# retrieved by svn if they are not there yet.
    64 AC_COIN_PROJECTDIR_INIT(SYMPHONY,9:5:6)
     64AC_COIN_PROJECTDIR_INIT(SYMPHONY,9:6:6)
    6565
    6666# Check if user wants to produce debugging code
  • releases/5.6.6/SYMPHONY/include/config_sym_default.h

    r2363 r2363  
    66
    77/* Version number of project */
    8 #define SYMPHONY_VERSION "5.6.5"
     8#define SYMPHONY_VERSION "5.6.6"
    99
    1010/* Major Version number of project */
     
    1515
    1616/* Release Version number of project */
    17 #define SYMPHONY_VERSION_RELEASE 5
     17#define SYMPHONY_VERSION_RELEASE 6
    1818
    1919
  • releases/5.6.6/SYMPHONY/src/LP/lp_wrapper.c

    r2363 r2363  
    490490   rngval = lp_data_mip->rngval;
    491491   sense = lp_data_mip->sense;
    492    assert(bcutnum == p->mip->m);
     492   if (p->par.multi_criteria){
     493      assert(bcutnum == p->mip->m+2);
     494   }else{
     495      assert(bcutnum == p->mip->m);
     496   }
    493497   for (i = bcutnum - 1; i >= 0; i--){
    494498      row = rows + i;
  • releases/5.6.6/SYMPHONY/src/Master/master.c

    r2363 r2363  
    835835      update rootdesc and so...*/
    836836
    837    termcode = sym_presolve(env);   
     837   termcode = sym_presolve(env);
    838838
    839839   if(termcode == PREP_INFEAS || termcode == PREP_UNBOUNDED ||
     
    18181818
    18191819   sym_set_int_param(env, "multi_criteria", TRUE);
     1820   env->par.prep_par.level = 0;
    18201821   memcpy((char *)env->mip->obj1, (char *)env->mip->obj, DSIZE*env->mip->n);
    18211822   if (!env->par.lp_par.mc_find_supported_solutions){
  • releases/5.6.6/SYMPHONY/src/Master/master_prep.c

    r2363 r2363  
    3838      free_mip_desc(env->prep_mip);
    3939      FREE(env->prep_mip);
     40   }
     41
     42   if (env->par.multi_criteria){
     43      p_level = env->par.prep_par.level = 0;
    4044   }
    4145
  • releases/5.6.6/configure

    r2363 r2363  
    22# From configure.ac 0.9.
    33# Guess values for system-dependent variables and create Makefiles.
    4 # Generated by GNU Autoconf 2.59 for SYMPHONY 5.6.5.
     4# Generated by GNU Autoconf 2.59 for SYMPHONY 5.6.6.
    55#
    66# Report bugs to <https://projects.coin-or.org/svn/SYMPHONY/newticket>.
     
    441441PACKAGE_NAME='SYMPHONY'
    442442PACKAGE_TARNAME='symphony'
    443 PACKAGE_VERSION='5.6.5'
    444 PACKAGE_STRING='SYMPHONY 5.6.5'
     443PACKAGE_VERSION='5.6.6'
     444PACKAGE_STRING='SYMPHONY 5.6.6'
    445445PACKAGE_BUGREPORT='https://projects.coin-or.org/svn/SYMPHONY/newticket'
    446446
     
    10451045  # This message is too long to be a string in the A/UX 3.1 sh.
    10461046  cat <<_ACEOF
    1047 \`configure' configures SYMPHONY 5.6.5 to adapt to many kinds of systems.
     1047\`configure' configures SYMPHONY 5.6.6 to adapt to many kinds of systems.
    10481048
    10491049Usage: $0 [OPTION]... [VAR=VALUE]...
     
    11111111if test -n "$ac_init_help"; then
    11121112  case $ac_init_help in
    1113      short | recursive ) echo "Configuration of SYMPHONY 5.6.5:";;
     1113     short | recursive ) echo "Configuration of SYMPHONY 5.6.6:";;
    11141114   esac
    11151115  cat <<\_ACEOF
     
    13231323if $ac_init_version; then
    13241324  cat <<\_ACEOF
    1325 SYMPHONY configure 5.6.5
     1325SYMPHONY configure 5.6.6
    13261326generated by GNU Autoconf 2.59
    13271327
     
    13531353running configure, to aid debugging if configure makes a mistake.
    13541354
    1355 It was created by SYMPHONY $as_me 5.6.5, which was
     1355It was created by SYMPHONY $as_me 5.6.6, which was
    13561356generated by GNU Autoconf 2.59.  Invocation command line was
    13571357
     
    51215121# Define the identity of the package.
    51225122 PACKAGE='symphony'
    5123  VERSION='5.6.5'
     5123 VERSION='5.6.6'
    51245124
    51255125
     
    2284522845cat >&5 <<_CSEOF
    2284622846
    22847 This file was extended by SYMPHONY $as_me 5.6.5, which was
     22847This file was extended by SYMPHONY $as_me 5.6.6, which was
    2284822848generated by GNU Autoconf 2.59.  Invocation command line was
    2284922849
     
    2290322903cat >>$CONFIG_STATUS <<_ACEOF
    2290422904ac_cs_version="\\
    22905 SYMPHONY config.status 5.6.5
     22905SYMPHONY config.status 5.6.6
    2290622906configured by $0, generated by GNU Autoconf 2.59,
    2290722907  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • releases/5.6.6/configure.ac

    r2363 r2363  
    2323AC_PREREQ(2.59)
    2424
    25 AC_INIT([SYMPHONY],[5.6.5],[https://projects.coin-or.org/svn/SYMPHONY/newticket])
     25AC_INIT([SYMPHONY],[5.6.6],[https://projects.coin-or.org/svn/SYMPHONY/newticket])
    2626
    2727AC_COPYRIGHT([
Note: See TracChangeset for help on using the changeset viewer.