Changes from releases/5.4.6 at r2071 to releases/5.4.7 at r2071


Ignore:
Location:
releases/5.4.7
Files:
28 edited

Legend:

Unmodified
Added
Removed
  • releases/5.4.7/SYMPHONY

  • releases/5.4.7/SYMPHONY/Applications/CNRP/README

    r2071 r2071  
    9292BUG REPORTS
    9393
    94 Please send bug reports to ted@lehigh.edu.
     94Please submit bug reports at https://projects.coin-or.org/SYMPHONY
  • releases/5.4.7/SYMPHONY/Applications/INSTALL

    r2071 r2071  
    1 [BSYMPHONY VRP-5.4 APPLICATION INSTALLATION
     1SYMPHONY 5.4 APPLICATION INSTALLATION
    22==========================================
    33
     
    5656   make
    5757
    58 The executable "vrp" should be successfully made here.
     58The executable "xxx" should be successfully made here.
    5959
    60604. Test the application using the sample file included with the distribution
     
    123123
    124124*******************************************************************************
    125 *            COMPILING THE SYMPHONY VRP APPLICATION (Windows)                *
     125*            BUILDING APPLICATIONS in MS Windows                              *
    126126*******************************************************************************
    127127
    128 Here is a sketch outline of how to compile the SYMPHONY VRP
    129 application in Microsoft Windows. For information on developing your own
    130 applications, please see the quick start guide below or the detailed
    131 explanation in the user's manual. Direct support is provided for compilation
    132 under MS Visual Studio 10. Compilation for other compilers should also be
    133 possible. Note that the Windows version has some limitations. Detailed timing
    134 information is not currently provided.  Support is only provided for running
    135 in sequential mode at this time.
     128Here is a sketch outline of how to compile SYMPHONY applications in Microsoft
     129Windows. For information on developing your own applications, please see the
     130quick start guide below or the detailed explanation in the user's manual.
     131Direct support is provided for compilation under MS Visual Studio 10.
     132Compilation for other compilers should also be possible. Note that the Windows
     133version has some limitations. Detailed timing information is not currently
     134provided. Support is only provided for running in sequential mode at this
     135time.
    136136
    137137First, download SYMPHONY and unpack the archive if it is required. You now
  • releases/5.4.7/SYMPHONY/Applications/MATCH/INSTALL

    r2071 r2071  
    1 SYMPHONY CNRP-5.4 APPLICATION INSTALLATION
     1SYMPHONY MATCH-5.4 APPLICATION INSTALLATION
    22==========================================
    33
  • releases/5.4.7/SYMPHONY/Applications/MATCH/README

    r2071 r2071  
    7676BUG REPORTS
    7777
    78 Please send bug reports to symphony-bugs@branchandcut.org.
     78Please submit bug reports at https://projects.coin-or.org/SYMPHONY
  • releases/5.4.7/SYMPHONY/Applications/MCKP/INSTALL

    r2071 r2071  
    1 SYMPHONY CNRP-5.4 APPLICATION INSTALLATION
     1SYMPHONY MCKP-5.4 APPLICATION INSTALLATION
    22==========================================
    33
  • releases/5.4.7/SYMPHONY/Applications/MCKP/README

    r2071 r2071  
    7474BUG REPORTS
    7575
    76 Please send bug reports to ted@lehigh.edu.
     76Please submit bug reports at https://projects.coin-or.org/SYMPHONY
  • releases/5.4.7/SYMPHONY/Applications/MPP/INSTALL

    r2071 r2071  
    1 SYMPHONY CNRP-5.4 APPLICATION INSTALLATION
     1SYMPHONY MPPP-5.4 APPLICATION INSTALLATION
    22==========================================
    33
  • releases/5.4.7/SYMPHONY/Applications/MPP/README

    r2071 r2071  
    7272BUG REPORTS
    7373
    74 Please send bug reports to symphony-bugs@branchandcut.org.
     74Please submit bug reports at https://projects.coin-or.org/SYMPHONY
  • releases/5.4.7/SYMPHONY/Applications/SPP+CUTS/INSTALL

    r2071 r2071  
    1 SYMPHONY CNRP-5.4 APPLICATION INSTALLATION
     1SYMPHONY SPP+CUTS-5.4 APPLICATION INSTALLATION
    22==========================================
    33
  • releases/5.4.7/SYMPHONY/Applications/SPP+CUTS/README

    r2071 r2071  
    7676BUG REPORTS
    7777
    78 Please send bug reports to symphony-bugs@branchandcut.org.
     78Please submit bug reports at https://projects.coin-or.org/SYMPHONY
  • releases/5.4.7/SYMPHONY/Applications/SPP/INSTALL

    r2071 r2071  
    1 SYMPHONY CNRP-5.4 APPLICATION INSTALLATION
     1SYMPHONY SPP-5.4 APPLICATION INSTALLATION
    22==========================================
    33
  • releases/5.4.7/SYMPHONY/Applications/SPP/README

    r2071 r2071  
    7777BUG REPORTS
    7878
    79 Please send bug reports to symphony-bugs@branchandcut.org.
     79Please submit bug reports at https://projects.coin-or.org/SYMPHONY
  • releases/5.4.7/SYMPHONY/Applications/USER/INSTALL

    r2071 r2071  
    1 SYMPHONY CNRP-5.4 APPLICATION INSTALLATION
     1SYMPHONY USER-5.4 APPLICATION INSTALLATION
    22==========================================
    33
  • releases/5.4.7/SYMPHONY/Applications/USER/README

    r2071 r2071  
    4141BUG REPORTS
    4242
    43 Bug reports should be sent to ted@lehigh.edu.
     43Please submit bug reports at https://projects.coin-or.org/SYMPHONY
    4444
  • releases/5.4.7/SYMPHONY/Applications/VRP/INSTALL

    r2071 r2071  
    1 SYMPHONY CNRP-5.4 APPLICATION INSTALLATION
     1SYMPHONY VRP-5.4 APPLICATION INSTALLATION
    22==========================================
    33
  • releases/5.4.7/SYMPHONY/Applications/VRP/README

    r2071 r2071  
    1515******************************************************************************
    1616
    17 Please see the INSTALL file for a guide to compile SYMPHONY CNRP application.
     17Please see the INSTALL file for a guide to compiling the SYMPHONY VRP application.
    1818
    1919*******************************************************************************
     
    7979BUG REPORTS
    8080
    81 Please send bug reports to ted@lehigh.edu.
     81Please submit bug reports at https://projects.coin-or.org/SYMPHONY
  • releases/5.4.7/SYMPHONY/Applications/VRP/src/Master/vrp_master.c

    r2071 r2071  
    1717#include <stdio.h>
    1818#include <stdlib.h>
     19#include <math.h>
    1920
    2021/* SYMPHONY include files */
  • releases/5.4.7/SYMPHONY/configure

    r2071 r2071  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.59 for SYMPHONY 5.4.6.
     3# Generated by GNU Autoconf 2.59 for SYMPHONY 5.4.7.
    44#
    55# Report bugs to <symphony@list.coin-or.org>.
     
    440440PACKAGE_NAME='SYMPHONY'
    441441PACKAGE_TARNAME='symphony'
    442 PACKAGE_VERSION='5.4.6'
    443 PACKAGE_STRING='SYMPHONY 5.4.6'
     442PACKAGE_VERSION='5.4.7'
     443PACKAGE_STRING='SYMPHONY 5.4.7'
    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.4.6 to adapt to many kinds of systems.
     1018\`configure' configures SYMPHONY 5.4.7 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.4.6:";;
     1084     short | recursive ) echo "Configuration of SYMPHONY 5.4.7:";;
    10851085   esac
    10861086  cat <<\_ACEOF
     
    13361336if $ac_init_version; then
    13371337  cat <<\_ACEOF
    1338 SYMPHONY configure 5.4.6
     1338SYMPHONY configure 5.4.7
    13391339generated by GNU Autoconf 2.59
    13401340
     
    13661366running configure, to aid debugging if configure makes a mistake.
    13671367
    1368 It was created by SYMPHONY $as_me 5.4.6, which was
     1368It was created by SYMPHONY $as_me 5.4.7, which was
    13691369generated by GNU Autoconf 2.59.  Invocation command line was
    13701370
     
    18921892
    18931893# Capture libtool library version, if given.
    1894 coin_libversion=6:6:4
     1894coin_libversion=6:7:4
    18951895
    18961896
     
    47464746# Define the identity of the package.
    47474747 PACKAGE='symphony'
    4748  VERSION='5.4.6'
     4748 VERSION='5.4.7'
    47494749
    47504750
     
    2909729097
    2909829098
     29099
     29100echo "$as_me:$LINENO: checking whether this is a VPATH configuration" >&5
     29101echo $ECHO_N "checking whether this is a VPATH configuration... $ECHO_C" >&6
     29102if test `cd $srcdir; pwd` != `pwd`; then
     29103  coin_vpath_config=yes;
     29104else
     29105  coin_vpath_config=no;
     29106fi
     29107echo "$as_me:$LINENO: result: $coin_vpath_config" >&5
     29108echo "${ECHO_T}$coin_vpath_config" >&6
     29109
     29110
     29111
     29112# Allow for newlines in the parameter
     29113if test $coin_vpath_config = yes; then
     29114  cvl_tmp="Applications/INSTALL
     29115                    Applications/CNRP/README
     29116                    Applications/CNRP/INSTALL
     29117                    Applications/CNRP/sample.cnrp
     29118                    Applications/MATCH/README
     29119                    Applications/MATCH/INSTALL
     29120                    Applications/MATCH/sample.mat
     29121                    Applications/MCKP/README
     29122                    Applications/MCKP/INSTALL
     29123                    Applications/MCKP/sample.mckp
     29124                    Applications/MPP/README
     29125                    Applications/MPP/INSTALL
     29126                    Applications/MPP/sample.mpp
     29127                    Applications/SPP/README
     29128                    Applications/SPP/INSTALL
     29129                    Applications/SPP/sample.spp
     29130                    Applications/SPP+CUTS/README
     29131                    Applications/SPP+CUTS/INSTALL
     29132                    Applications/SPP+CUTS/sample.spp
     29133                    Applications/USER/README
     29134                    Applications/USER/INSTALL
     29135                    Applications/USER/sample.mps
     29136                    Applications/VRP/README
     29137                    Applications/VRP/INSTALL
     29138                    Applications/VRP/sample.vrp"
     29139  for file in $cvl_tmp ; do
     29140    coin_vpath_link_files="$coin_vpath_link_files $file"
     29141  done
     29142fi
     29143
     29144
    2909929145# Here put the location and name of the configuration header file
    2910029146                    ac_config_headers="$ac_config_headers include/config.h include/config_sym.h"
     
    2999130037cat >&5 <<_CSEOF
    2999230038
    29993 This file was extended by SYMPHONY $as_me 5.4.6, which was
     30039This file was extended by SYMPHONY $as_me 5.4.7, which was
    2999430040generated by GNU Autoconf 2.59.  Invocation command line was
    2999530041
     
    3005430100cat >>$CONFIG_STATUS <<_ACEOF
    3005530101ac_cs_version="\\
    30056 SYMPHONY config.status 5.4.6
     30102SYMPHONY config.status 5.4.7
    3005730103configured by $0, generated by GNU Autoconf 2.59,
    3005830104  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • releases/5.4.7/SYMPHONY/configure.ac

    r2071 r2071  
    1 #===========================================================================#
     13B#===========================================================================#
    22#                                                                           #
    33# This file is part of the SYMPHONY MILP Solver Framework.                  #
     
    2323AC_PREREQ(2.59)
    2424
    25 AC_INIT([SYMPHONY],[5.4.6],[symphony@list.coin-or.org])
     25AC_INIT([SYMPHONY],[5.4.7],[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,6:6:4)
     64AC_COIN_PROJECTDIR_INIT(SYMPHONY,6:7:4)
    6565
    6666# Check if user wants to produce debugging code
     
    900900                 osi-sym-uninstalled.pc:src/OsiSym/osi-sym-uninstalled.pc.in])
    901901
     902AC_COIN_VPATH_LINK([Applications/INSTALL
     903                    Applications/CNRP/README
     904                    Applications/CNRP/INSTALL
     905                    Applications/CNRP/sample.cnrp
     906                    Applications/MATCH/README
     907                    Applications/MATCH/INSTALL
     908                    Applications/MATCH/sample.mat
     909                    Applications/MCKP/README
     910                    Applications/MCKP/INSTALL
     911                    Applications/MCKP/sample.mckp
     912                    Applications/MPP/README
     913                    Applications/MPP/INSTALL
     914                    Applications/MPP/sample.mpp
     915                    Applications/SPP/README
     916                    Applications/SPP/INSTALL
     917                    Applications/SPP/sample.spp
     918                    Applications/SPP+CUTS/README
     919                    Applications/SPP+CUTS/INSTALL
     920                    Applications/SPP+CUTS/sample.spp
     921                    Applications/USER/README
     922                    Applications/USER/INSTALL
     923                    Applications/USER/sample.mps
     924                    Applications/VRP/README
     925                    Applications/VRP/INSTALL
     926                    Applications/VRP/sample.vrp])
     927
    902928# Here put the location and name of the configuration header file
    903929AC_CONFIG_HEADER([include/config.h include/config_sym.h])
  • releases/5.4.7/SYMPHONY/include/config_sym_default.h

    r2071 r2071  
    66
    77/* Version number of project */
    8 #define SYMPHONY_VERSION "5.4.6"
     8#define SYMPHONY_VERSION "5.4.7"
    99
    1010/* Major Version number of project */
     
    1515
    1616/* Release Version number of project */
    17 #define SYMPHONY_VERSION_RELEASE 6
     17#define SYMPHONY_VERSION_RELEASE 7
    1818
    1919
  • releases/5.4.7/SYMPHONY/src/LP/lp_heuristics.c

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • releases/5.4.7/SYMPHONY/src/LP/lp_sp.c

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • releases/5.4.7/SYMPHONY/src/Master/master_prep.c

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • releases/5.4.7/SYMPHONY/src/Master/master_prep_base.c

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • releases/5.4.7/SYMPHONY/src/Master/master_prep_sr.c

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

    r2071 r2071  
    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.4.6.
     4# Generated by GNU Autoconf 2.59 for SYMPHONY 5.4.7.
    55#
    66# Report bugs to <https://projects.coin-or.org/svn/SYMPHONY/newticket>.
     
    441441PACKAGE_NAME='SYMPHONY'
    442442PACKAGE_TARNAME='symphony'
    443 PACKAGE_VERSION='5.4.6'
    444 PACKAGE_STRING='SYMPHONY 5.4.6'
     443PACKAGE_VERSION='5.4.7'
     444PACKAGE_STRING='SYMPHONY 5.4.7'
    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.4.6 to adapt to many kinds of systems.
     1047\`configure' configures SYMPHONY 5.4.7 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.4.6:";;
     1113     short | recursive ) echo "Configuration of SYMPHONY 5.4.7:";;
    11141114   esac
    11151115  cat <<\_ACEOF
     
    13261326if $ac_init_version; then
    13271327  cat <<\_ACEOF
    1328 SYMPHONY configure 5.4.6
     1328SYMPHONY configure 5.4.7
    13291329generated by GNU Autoconf 2.59
    13301330
     
    13561356running configure, to aid debugging if configure makes a mistake.
    13571357
    1358 It was created by SYMPHONY $as_me 5.4.6, which was
     1358It was created by SYMPHONY $as_me 5.4.7, which was
    13591359generated by GNU Autoconf 2.59.  Invocation command line was
    13601360
     
    53105310# Define the identity of the package.
    53115311 PACKAGE='symphony'
    5312  VERSION='5.4.6'
     5312 VERSION='5.4.7'
    53135313
    53145314
     
    2300623006cat >&5 <<_CSEOF
    2300723007
    23008 This file was extended by SYMPHONY $as_me 5.4.6, which was
     23008This file was extended by SYMPHONY $as_me 5.4.7, which was
    2300923009generated by GNU Autoconf 2.59.  Invocation command line was
    2301023010
     
    2306423064cat >>$CONFIG_STATUS <<_ACEOF
    2306523065ac_cs_version="\\
    23066 SYMPHONY config.status 5.4.6
     23066SYMPHONY config.status 5.4.7
    2306723067configured by $0, generated by GNU Autoconf 2.59,
    2306823068  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • releases/5.4.7/configure.ac

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