diff -Nru coinor-symphony-5.6.16+repack1/Applications/MCKP/mckp_main.c coinor-symphony-5.6.17+dfsg/Applications/MCKP/mckp_main.c --- coinor-symphony-5.6.16+repack1/Applications/MCKP/mckp_main.c 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/Applications/MCKP/mckp_main.c 2019-02-24 04:51:19.000000000 +0000 @@ -4,7 +4,7 @@ /* SYMPHONY MILP Solver Framework. This application is a solver for */ /* the Vehicle Routing Problem and the Traveling Salesman Problem. */ /* */ -/* (c) Copyright 2006-2015 Lehigh University. All Rights Reserved. */ +/* (c) Copyright 2006-2019 Lehigh University. All Rights Reserved. */ /* */ /* This application was developed by Ted Ralphs (ted@lehigh.edu) */ /* */ diff -Nru coinor-symphony-5.6.16+repack1/Applications/VRP/src/Master/vrp_io.c coinor-symphony-5.6.17+dfsg/Applications/VRP/src/Master/vrp_io.c --- coinor-symphony-5.6.16+repack1/Applications/VRP/src/Master/vrp_io.c 2011-02-10 00:46:19.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/Applications/VRP/src/Master/vrp_io.c 2019-02-24 04:51:19.000000000 +0000 @@ -402,7 +402,7 @@ deg = (int)(dist->coordx[node-1]); min = dist->coordx[node-1] - deg; dist->coordx[node-1] = MY_PI * (deg + 5.0*min/3.0 ) / 180.0; - deg = floor(dist->coordy[node-1]); + deg = (int)(dist->coordy[node-1]); min = dist->coordy[node-1] - deg; dist->coordy[node-1] = MY_PI * (deg + 5.0*min/3.0 ) / 180.0; } diff -Nru coinor-symphony-5.6.16+repack1/configure coinor-symphony-5.6.17+dfsg/configure --- coinor-symphony-5.6.16+repack1/configure 2017-01-16 21:18:15.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/configure 2019-02-24 15:00:41.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for SYMPHONY 5.6.16. +# Generated by GNU Autoconf 2.59 for SYMPHONY 5.6.17. # # Report bugs to . # @@ -16,7 +16,7 @@ # /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ # /* Laci Ladanyi (ladanyi@us.ibm.com). */ # /* */ -# /* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +# /* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ # /* */ # /* This software is licensed under the Eclipse Public License. Please see */ # /* accompanying file for terms. */ @@ -439,8 +439,8 @@ # Identity of this package. PACKAGE_NAME='SYMPHONY' PACKAGE_TARNAME='symphony' -PACKAGE_VERSION='5.6.16' -PACKAGE_STRING='SYMPHONY 5.6.16' +PACKAGE_VERSION='5.6.17' +PACKAGE_STRING='SYMPHONY 5.6.17' PACKAGE_BUGREPORT='symphony@list.coin-or.org' ac_unique_file="include/symphony.h" @@ -1015,7 +1015,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures SYMPHONY 5.6.16 to adapt to many kinds of systems. +\`configure' configures SYMPHONY 5.6.17 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1081,7 +1081,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of SYMPHONY 5.6.16:";; + short | recursive ) echo "Configuration of SYMPHONY 5.6.17:";; esac cat <<\_ACEOF @@ -1335,7 +1335,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -SYMPHONY configure 5.6.16 +SYMPHONY configure 5.6.17 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1350,7 +1350,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ @@ -1365,7 +1365,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by SYMPHONY $as_me 5.6.16, which was +It was created by SYMPHONY $as_me 5.6.17, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1891,7 +1891,7 @@ # Capture libtool library version, if given. - coin_libversion=9:16:6 + coin_libversion=9:17:6 @@ -2920,13 +2920,6 @@ coin_add_cflags="-pipe" coin_dbg_cflags="-g -O0" coin_warn_cflags="-Wimplicit -Wparentheses -Wsequence-point -Wreturn-type -Wcast-qual -Wall -Wno-unknown-pragmas -Wno-long-long" - case $build in - *-darwin*) - ;; - *) - coin_warn_cflags="-pedantic-errors $coin_warn_cflags" - ;; - esac esac fi if test -z "$coin_opt_cflags"; then @@ -3789,13 +3782,6 @@ coin_add_cxxflags="-pipe" coin_dbg_cxxflags="-g -O0" coin_warn_cxxflags="-Wparentheses -Wreturn-type -Wcast-qual -Wall -Wpointer-arith -Wwrite-strings -Wconversion -Wno-unknown-pragmas -Wno-long-long" - case $build in - *-darwin*) - ;; - *) - coin_warn_cxxflags="-pedantic-errors $coin_warn_cxxflags" - ;; - esac esac fi @@ -4620,7 +4606,7 @@ # Define the identity of the package. PACKAGE='symphony' - VERSION='5.6.16' + VERSION='5.6.17' cat >>confdefs.h <<_ACEOF @@ -5916,7 +5902,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5919 "configure"' > conftest.$ac_ext + echo '#line 5905 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7050,7 +7036,7 @@ # Provide some information about the compiler. -echo "$as_me:7053:" \ +echo "$as_me:7039:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -8117,11 +8103,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8120: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8106: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8124: \$? = $ac_status" >&5 + echo "$as_me:8110: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8385,11 +8371,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8388: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8374: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8392: \$? = $ac_status" >&5 + echo "$as_me:8378: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8489,11 +8475,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8492: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8478: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8496: \$? = $ac_status" >&5 + echo "$as_me:8482: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10834,7 +10820,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:13267: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13285: \$? = $ac_status" >&5 + echo "$as_me:13271: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13382,11 +13368,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13385: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13371: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13389: \$? = $ac_status" >&5 + echo "$as_me:13375: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14952,11 +14938,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14955: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14941: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14959: \$? = $ac_status" >&5 + echo "$as_me:14945: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15056,11 +15042,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15059: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15045: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15063: \$? = $ac_status" >&5 + echo "$as_me:15049: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17263,11 +17249,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17266: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17252: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17270: \$? = $ac_status" >&5 + echo "$as_me:17256: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17531,11 +17517,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17534: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17520: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17538: \$? = $ac_status" >&5 + echo "$as_me:17524: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17635,11 +17621,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17638: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17624: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17642: \$? = $ac_status" >&5 + echo "$as_me:17628: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -29970,7 +29956,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by SYMPHONY $as_me 5.6.16, which was +This file was extended by SYMPHONY $as_me 5.6.17, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -30033,7 +30019,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -SYMPHONY config.status 5.6.16 +SYMPHONY config.status 5.6.17 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -Nru coinor-symphony-5.6.16+repack1/configure.ac coinor-symphony-5.6.17+dfsg/configure.ac --- coinor-symphony-5.6.16+repack1/configure.ac 2017-01-16 21:18:15.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/configure.ac 2019-02-24 15:00:41.000000000 +0000 @@ -7,7 +7,7 @@ # # # The author of this file is Menal Guzelsoy # # # -# (c) Copyright 2006-2015 Lehigh University. All Rights Reserved. # +# (c) Copyright 2006-2019 Lehigh University. All Rights Reserved. # # # # This software is licensed under the Eclipse Public License. Please see # # accompanying file for terms. # @@ -22,7 +22,7 @@ AC_PREREQ(2.59) -AC_INIT([SYMPHONY],[5.6.16],[symphony@list.coin-or.org]) +AC_INIT([SYMPHONY],[5.6.17],[symphony@list.coin-or.org]) AC_COPYRIGHT([ /*===========================================================================*/ @@ -32,7 +32,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ @@ -61,7 +61,7 @@ # the source root directory contains definition of where to find those # externals. The following macro ensures that those externals are # retrieved by svn if they are not there yet. -AC_COIN_PROJECTDIR_INIT(SYMPHONY,9:16:6) +AC_COIN_PROJECTDIR_INIT(SYMPHONY,9:17:6) # Check if user wants to produce debugging code AC_COIN_DEBUG_COMPILE(SYMPHONY) diff -Nru coinor-symphony-5.6.16+repack1/debian/changelog coinor-symphony-5.6.17+dfsg/debian/changelog --- coinor-symphony-5.6.16+repack1/debian/changelog 2020-12-28 23:21:06.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/debian/changelog 2021-10-16 12:41:17.000000000 +0000 @@ -1,3 +1,14 @@ +coinor-symphony (5.6.17+dfsg-1) unstable; urgency=medium + + * New upstream version + Closes: #984022 + * Move package back to Debian Science since it is required by some GNU R + packages + * cme fix dpkg-control + * Add salsa-ci file + + -- Andreas Tille Sat, 16 Oct 2021 14:41:17 +0200 + coinor-symphony (5.6.16+repack1-3) unstable; urgency=medium * QA upload. diff -Nru coinor-symphony-5.6.16+repack1/debian/control coinor-symphony-5.6.17+dfsg/debian/control --- coinor-symphony-5.6.16+repack1/debian/control 2020-12-28 22:24:01.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/debian/control 2021-10-16 12:41:17.000000000 +0000 @@ -1,12 +1,13 @@ Source: coinor-symphony -Maintainer: Debian QA Group +Maintainer: Debian Science Team +Uploaders: Andreas Tille Section: science Priority: optional Build-Depends: chrpath, - coinor-libcgl-dev (>= 0.59.10), - coinor-libclp-dev (>= 1.16.11), - coinor-libcoinutils-dev (>= 2.10.14), - coinor-libosi-dev (>= 0.107.9), + coinor-libcgl-dev, + coinor-libclp-dev, + coinor-libcoinutils-dev, + coinor-libosi-dev, debhelper-compat (= 10), doxygen-latex, graphviz, @@ -15,11 +16,11 @@ liblapack-dev, pkg-config, zlib1g-dev -Standards-Version: 4.5.1 -Rules-Requires-Root: no -Vcs-Browser: https://salsa.debian.org/debian/coinor-symphony -Vcs-Git: https://salsa.debian.org/debian/coinor-symphony.git +Standards-Version: 4.6.0 +Vcs-Browser: https://salsa.debian.org/science-team/coinor-symphony +Vcs-Git: https://salsa.debian.org/science-team/coinor-symphony.git Homepage: https://projects.coin-or.org/SYMPHONY +Rules-Requires-Root: no Package: coinor-symphony Architecture: any @@ -41,6 +42,7 @@ Package: coinor-libsymphony3 Architecture: any +Multi-Arch: same Depends: ${misc:Depends}, ${shlibs:Depends} Description: COIN-OR solver for mixed-integer linear programs (shared libraries) @@ -57,12 +59,13 @@ Package: coinor-libsymphony-dev Architecture: any +Multi-Arch: same Section: libdevel Depends: coinor-libsymphony3 (= ${binary:Version}), - coinor-libcgl-dev (>= 0.59.9), - coinor-libclp-dev (>= 1.16.10), - coinor-libcoinutils-dev (>= 2.10.13), - coinor-libosi-dev (>= 0.107.8), + coinor-libcgl-dev, + coinor-libclp-dev, + coinor-libcoinutils-dev, + coinor-libosi-dev, ${misc:Depends}, ${shlibs:Depends} Description: COIN-OR solver for mixed-integer linear programs (developer files) @@ -79,6 +82,7 @@ Package: coinor-libsymphony-doc Architecture: all +Multi-Arch: foreign Section: doc Depends: ${misc:Depends} Recommends: coinor-libsymphony-dev diff -Nru coinor-symphony-5.6.16+repack1/debian/rules coinor-symphony-5.6.17+dfsg/debian/rules --- coinor-symphony-5.6.16+repack1/debian/rules 2020-12-28 22:24:01.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/debian/rules 2021-10-16 12:41:17.000000000 +0000 @@ -5,6 +5,10 @@ # Ensure texlive respects SOURCE_DATE_EPOCH export FORCE_SOURCE_DATE=1 +# FIXME: upstream has created configure with autoconf that does not know --runstatedir=/run +# unfortunately recreating configure depends from some macros that are not provided +# so cheating for the moment, disable autoreconf and stick to debhelper 10 + %: dh $@ --without autoreconf diff -Nru coinor-symphony-5.6.16+repack1/debian/salsa-ci.yml coinor-symphony-5.6.17+dfsg/debian/salsa-ci.yml --- coinor-symphony-5.6.16+repack1/debian/salsa-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/debian/salsa-ci.yml 2021-10-16 12:41:17.000000000 +0000 @@ -0,0 +1,4 @@ +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml diff -Nru coinor-symphony-5.6.16+repack1/debian/watch coinor-symphony-5.6.17+dfsg/debian/watch --- coinor-symphony-5.6.16+repack1/debian/watch 2020-12-28 22:12:18.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/debian/watch 2021-10-16 12:41:17.000000000 +0000 @@ -1,3 +1,3 @@ -version=3 -opts=repacksuffix=+repack1,uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/,dversionmangle=s/\+(debian|dfsg|ds|deb|-dfsg)\d*$// \ +version=4 +opts=repacksuffix=+dfsg,uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/,dversionmangle=auto \ https://www.coin-or.org/download/pkgsource/SYMPHONY/SYMPHONY-(\d\S*).(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) diff -Nru coinor-symphony-5.6.16+repack1/Doc/man-design.tex coinor-symphony-5.6.17+dfsg/Doc/man-design.tex --- coinor-symphony-5.6.16+repack1/Doc/man-design.tex 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/Doc/man-design.tex 2019-02-24 04:51:19.000000000 +0000 @@ -446,7 +446,8 @@ \begin{figure} \centering -\psfig{figure=pbandc.eps} +%\psfig{figure=pbandc.eps} +\includegraphics{pbandc} \caption{Schematic overview of the branch, cut, and price algorithm} \label{overview} \end{figure} @@ -844,7 +845,8 @@ \begin{figure} \centering -\psfig{figure=lploop.eps,width=4.80in} +%\psfig{figure=lploop.eps,width=4.80in} +\includegraphics[width=4.8in]{lploop} \caption{Overview of the node processing loop} \label{LP-loop} \end{figure} diff -Nru coinor-symphony-5.6.16+repack1/Doc/man-start.tex coinor-symphony-5.6.17+dfsg/Doc/man-start.tex --- coinor-symphony-5.6.16+repack1/Doc/man-start.tex 2016-02-20 01:12:00.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/Doc/man-start.tex 2019-02-24 04:51:19.000000000 +0000 @@ -17,26 +17,25 @@ \section{Installing the Binary Distribution} -For the users who only need the generic MILP solver or the SYMPHONY callable -library to be used in their custom applications, there are binary -distributions released for different compilers and platforms. Each -distribution consists of an executable and libraries built from the source -code of SYMPHONY version \VER. It is important to note, however, that the -pre-compiled binaries are missing some very useful functionality because of -the fact that we are unable to distribute code linked to libraries licensed -under the GNU General Public License (GPL). There are also a number of other -potentially useful configurations (such as the parallel version) that we do not -distribute in binary form. Building from source should be easy in most -environments and will give you more flexibility. See +For the users who only need to use SYMPHONY as ablack-box solver solver or +only need the SYMPHONY callable library in order to develop a custom +application, there are binary distributions released for different compilers +and platforms. Each distribution consists of an executable and libraries built +from the source code of SYMPHONY version \VER. It is important to note, +however, that the pre-compiled binaries are missing some very useful +functionality because of the fact that we are unable to distribute code linked +to libraries licensed under the GNU General Public License (GPL). There are +also a number of other potentially useful configurations (such as the parallel +version) that we do not distribute in binary form. Building from source should +be easy in most environments and will give you more flexibility. See Section~\ref{building_from_source} for more information on additional functionality available when building from source. -You can obtain the SYMPHONY binary distribution by visiting +Binaries for most platforms are available for download from \begin{center} - \url{https://www.coin-or.org/download/binary/SYMPHONY} +\url{https://bintray.com/coin-or/download/SYMPHONY} \end{center} -The binaries are currently available for Linux and Windows. These binaries are -built with the following default options: +These binaries are built with the following default options: \begin{itemize} \item The associated LP solver is the COIN LP solver (CLP). \item Cut generation is done with COIN's Cut Generation Library (CGL). @@ -49,36 +48,46 @@ \subsection{Installation in Unix-like environments} \label{building-unix} -\begin{itemize} -\item Unpack the distribution with +The installation consists of unpacking the distribution into an appropriate +installation directory, such as \code{/usr/local/symphony}. +%\begin{itemize} +%\item +Unpack the distribution with {\color{Brown} \begin{verbatim} - tar xzvf symphony-\VER-XXX-bin.tgz + tar xzvf SYMPHONY-x.y.z-XXX*.tgz \end{verbatim} } -where \code{XXX} indicates the platform and the version of -compiler used to build the distribution. -Switch into the root directory of the unpacked distribution. +where \code{x.y.z} is the version of SYMPHONY and \code{XXX} indicates the +platform and the version of compiler used to build the distribution. Switch +into the root directory of the unpacked distribution. -\item First, test the executable by going to the \code{bin} directory and -typing +%\item +Test the executable by going to the \code{bin} directory and typing {\color{Brown} \begin{verbatim} - ./symphony -F ../examples/sample.mps + ./symphony \end{verbatim} } -\item To test the callable library, the distribution +This will start up the solver in interactive mode. Type \code{help} +or \code{?} to see a list of available commands or see Chapter +\ref{API-overview} for instructions on using the interactive solver. + +%\item +To test the callable library, the distribution includes sample files in \code{examples} directory: \\ \\ \code{milp.c}: This sample code is an implementation of a basic MILP solver using SYMPHONY's C callable functions with user defined input (see -Section -\ref{callable_library}). To test the code, go to the \code{examples} directory -and type +Section \ref{callable_library}). To test the code, go to the +\code{examples} directory and type {\color{Brown} \begin{verbatim} make milp milp - \end{verbatim}} +\end{verbatim} +} +You may need to customize some paths in the Makefile and to set the +environment variable \code{LD\_LIBRARY\_PATH}. \code{milpOsi.c}: This sample code is an implementation of a basic MILP solver using SYMPHONY's C++ callable functions (through OsiSym interface) with user defined input (see Section \ref{OSI}). To test the code, @@ -87,8 +96,9 @@ \begin{verbatim} make milpOsi milpOsi - \end{verbatim}} -\end{itemize} +\end{verbatim} +} +%\end{itemize} If everything is working properly, the libraries, executables and header files can be installed in appropriate system directories if desired. This must be @@ -97,28 +107,25 @@ \subsection{Installation for Use With Microsoft Visual C++} -These instructions are for use with Microsoft Visual Studio 8. The procedure -for other version of Visual Studio should be similar. Download and unpack the -archive \code{symphony-\VER-win32-msvc6.zip} -\begin{itemize} +Download and unpack the archive \code{symphony-x.y.z-win32-msvcXX.zip} in an +appropriate installation directory, such as \code{C:\bs Program Files (x86)\bs + SYMPHONY}. -\item First, test the executable by opening Windows Explorer and double-click -on {\color{Brown}\texttt{symphony.exe}} in the {\color{Brown}\texttt{bin}} +Test the executable by opening Windows Explorer and double-click +on \code{symphony.exe} in the \code{bin} directory in the folder in which the distribution was unpacked. This should open a Window in which the interactive solver will appear. Type \code{help} or \code{?} to see a list of available commands or see Chapter \ref{API-overview} for instructions on using the interactive solver. -\item To test the callable library, the distribution includes sample codes +To test the callable library, the distribution includes sample codes along with associated project files in the \code{examples} directory. \\ \\ \code{milp.c}: This sample code is an implementation of a basic MILP solver using SYMPHONY's C callable functions with user defined input (see Section \ref{callable_library}). To build and test the code, open the SYMPHONY -MSVC++ solution file and build the project {\color{Brown}\texttt{milp}}, as +MSVC++ solution file and build the project \code{milp}, as described below in the next section. -\end{itemize} - % Applications???? %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -126,11 +133,13 @@ \section{Building From Source} \label{building_from_source} -SYMPHONY can now use the COIN-OR build system and the GNU autotools to -automate the build process. The build process should therefore be identical in -all Unix-like environments. It is even possible to use this system to build -COIN in Windows using the Microsoft Visual C++ compiler if you have MinGW -(\url{http://www.mingw.org}) installed (you need the GNU \code{make} command). +SYMPHONY uses the COIN-OR build system and the GNU autotools to automate the +build process. The build process should therefore be similar in all +Unix-like environments. It is even possible to use this system to build SYMPHONY +in Windows using the Microsoft Visual C++ compiler if you have MSys2 +(\url{https://msys2.github.io/}), CYGWIN (\url{http://cygwin.org/}), or the +Windows Subsystem for Linux +(\url{https://docs.microsoft.com/en-us/windows/wsl/install-win10}) installed. The instructions below will lead you through the steps required to compile SYMPHONY as a generic MILP solver. This process will create (1) a generic callable library that allows SYMPHONY to be called from a C or C++ code and @@ -146,9 +155,9 @@ \subsubsection{The LP Engine} SYMPHONY requires the use of a third-party callable library to solve the LP relaxations once they are formulated. The LP solver is called through Open Solver Interface, also available from -\htmladdnormallink{COIN}{https://projects.coin-or.org/Osi} +\htmladdnormallink{COIN}{https://github.com/coin-or/Osi} \begin{latexonly} -(\texttt{https://projects.coin-or.org/Osi}) +(\texttt{https://github.com/coin-or/Osi}) \end{latexonly}. The list of solvers with OSI interfaces currently numbers eight and includes both commercial and open source alternatives. By default, SYMPHONY now uses @@ -177,72 +186,293 @@ \subsection{Building in Unix-like environments} \label{getting_started_unix} -\subsubsection{Downloading} +\subsubsection{Building the Standard Configuration} + +\paragraph{Building on Linux.} + +Most Linux distributions come with all the required tools installed. To obtain +the source code, the first step is to get the installer that will then +fetch the source for SYMPHONY and all its dependencies. *You do not need to +clone SYMPHONY first, just do the following!* Open a terminal and execute + +{\color{Brown} +\begin{verbatim} +git clone https://www.github.com/coin-or/COIN-OR-OptimizationSuite +\end{verbatim} +} + +Next, to check out source code for and build all the necessary projects +(including dependencies), execute the script in the \code{COIN-OR-OptimizationSuite} +subdirectory. To execute the script, do + +{\color{Brown} +\begin{verbatim} +cd COIN-OR-OptimizationSuite +chmod u+x coin.install.sh +./coin.install.sh +\end{verbatim} +} + +(Note: The \code{chmod} command is only needed if the execute permission is not +automatically set by git on cloning). Once you run the script, +you will be prompted interactively to select a project to fetch and build. The +rest should happen automagically. Alternatively, the following command-line +incantation will execute the procedure non-interactively. + +{\color{Brown} +\begin{verbatim} +./coin.install.sh fetch build --no-prompt --main-proj=SYMPHONY +\end{verbatim} +} + +The install script invokes a separate \code{configure} script that is +auto-generated using the GNU autotools. This script takes a wide range of +additional options and these options can be specified on the commnd-line when +running \code{coin.install.sh}. For example, to build with debugging symbols, +do + +{\color{Brown} +\begin{verbatim} +./coin.install.sh fetch build --no-prompt --main-proj=SYMPHONY --enable-debug +\end{verbatim} +} + +To get help with additional options available in running the script, do -You can obtain the SYMPHONY source code either via the subversion repository, -or via the mirror on github using git, or in the form of archived releases. -The recommended method in Unix is to use subversion because it makes it easier -to obtain updates. In a Unix-like environment (such as Linux or CYGWIN), the -following command may be used to obtain SYMPHONY from source using SVN in most -cases: {\color{Brown} \begin{verbatim} - svn checkout https://projects.coin-or.org/svn/SYMPHONY/stable/5.6 SYMPHONY-5.6 +./coin/install.sh --help \end{verbatim} } -To obtain via git from github, you can do + +The above procedures will build all required dependencies and SYMPHONY itself. +Afterwards, the binaries will be installed in the directory \code{Mibs/build/bin} +and the libraries in the directory \code{SYMPHONY/build/lib}. If you wish to install in +a different directory, such as \code{/usr/local}, then run the command + {\color{Brown} \begin{verbatim} -git clone --branch=stable/5.6 https://github.com/coin-or/SYMPHONY/ SYMPHONY-5.6 +./coin.install.sh install --no-prompt --main-proj=SYMPHONY --prefix=/path/to/install/dir \end{verbatim} } -Alternatively, you can get point releases of the source code as a compressed -file by visiting + +After installation, you will also need to add \code{/path/to/install/dir/bin} to your +\code{PATH} variable in your \code{.bashrc} and also add \code{/path/to/install/dir/lib} +to your \code{LD\_LIBRARY\_PATH} if you want to link to COIN libraries. + +\paragraph{Building on Windows.} + +By far, the easiest way to build on Windows is with the GNU autotools and the +GCC compilers. The first step is to install either +\begin{itemize} +\item Msys2 (\url{https://msys2.github.io/}) +\item CYGWIN (\url{http://cygwin.org/}) +\item Windows Subsystem for Linux (\url{https://docs.microsoft.com/en-us/windows/wsl/install-win10}) +\end{itemize} +If you don't already have CYGWIN installed and don't want to fool around with +WSL (which is a great option if you already know your way around Unix), it is +recommended to use MSys2, since it provides a minimal toolset that is easy to +install. To get MSys2, either download the installer from +\url{https://msys2.github.io/} or download and unzip MSys2 base from \begin{center} - \url{https://www.coin-or.org/download/source/SYMPHONY} + \url{http://kent.dl.sourceforge.net/project/msys2/Base/x86\_64/msys2-base-x86\_64-20150512.tar.xz} \end{center} -The latest version of the source code is \VER, so you should download the file -{\color{Brown}\texttt{SYMPHONY-\VER.tgz}} and unpack the distribution with +(this is an out-of-date version, there may be a better place to get an archive +version). + +Following any of the above steps, you should have the \code{bash} command +(with Msys2, be sure to run \code{msys2\_shell.bat} +or manually add \code{msys64\bs usr \bs bin}, \code{msys64\bs mingw32\bs bin}, and +\code{msys64\bs mingw64\bs bin} to your Windows path). + +Once you have bash installed and in your \code{PATH}, open a Windows terminal and +type + {\color{Brown} \begin{verbatim} - tar -xzf SYMPHONY-\VER.tgz +bash +pacman -S make wget tar patch dos2unix diffutils git svn \end{verbatim} -} -This will create a subdirectory called \code{SYMPHONY-\VER} containing -the distribution. +} -\subsubsection{Configuring}\label{configuring} +To obtain the source code, the first step is to get the installer that will then +fetch the source for SYMPHONY and all its dependencies. *You do not need to +clone SYMPHONY first, just do the following!* Open a terminal and execute -First, switch into the root of the SYMPHONY source checkout. -If you obtained SYMPHONY via git, the the next step is to fetch the -externals, as follows (this is unnecessary with SVN). {\color{Brown} \begin{verbatim} -git clone --branch=stable/5.6 https://github.com/coin-or-tools/BuildTools/ -BuildTools/get.dependencies fetch +git clone https://www.github.com/coin-or/COIN-OR-OptimizationSuite \end{verbatim} -} -Next, you will run a configuration script that will allow the -compilation process to be customized for your environment. to perform this -step, switch into the root directory of the distribution and type +} + +Next, to check out source code for and build all the necessary projects +(including dependencies), execute the script in the \code{COIN-OR-OptimizationSuite} +subdirectory. To execute the script, do + {\color{Brown} \begin{verbatim} - ./configure +cd COIN-OR-OptimizationSuite +chmod u+x coi.install.sh +./coin.install.sh \end{verbatim} -} -This will set up the default configuration files. If you want to override -the default settings, you can either run the configuration script with -command-line options or else modify the options in the file -{\color{Brown}\texttt{share/config.site}}. A complete list of options with -brief explanations can be seen both in the file -{\color{Brown}\texttt{share/config.site}} and by typing +} + +(Note: The \code{chmod} command is only needed if the execute permission is not +automatically set by git on cloning). Once you run the script, +you will be prompted interactively to select a project to fetch and build. the +rest should happen automagically. Alternatively, the following command-line +incantation will execute the procedure non-interactively. + +{\color{Brown} +\begin{verbatim} +./coin.install.sh fetch build --no-prompt --main-proj=SYMPHONY +\end{verbatim} +} +The install script invokes a separate \code{configure} script that is +auto-generated using the GNU autotools. This script takes a wide range of +additional options and these options can be specified on the commnd-line when +running \code{coin.install.sh}. For example, to build with debugging symbols, +do + +{\color{Brown} +\begin{verbatim} +./coin.install.sh fetch build --no-prompt --main-proj=SYMPHONY --enable-debug +\end{verbatim} +} + +To get help with additional options available in running the script, do + +{\color{Brown} +\begin{verbatim} +./coin/install.sh --help +\end{verbatim} +} + +To use the resulting binaries and/or libraries, you will need to add the +full path of the directory \code{build\bs bin} to your Windows executable +search \code{PATH}, or, alternatively, copy the conents of the build directory to +\code{C:\bs Program Files (x86)\bs SYMPHONY} and add the directory \code{C:\bs + Program Files (x86)\bs SYMPHONY\bs bin} +to your Windows executable search \code{PATH}. You may also consider adding +\code{C:\bs Program Files (x86)\bs SYMPHONY\bs lib} to the \code{LIB} path and +\code{C:\bs Program Files (x86)\bs SYMPHONY\bs include} to the \code{INCLUDE} path. + +It is possible to use almost the exact same commands to build with the Visual +Studio compilers. Before doing any of the above commands in the Windows +terminal, first run the \code{vcvarsall.bat} script for your version of Visual +Studio. Note that you will also need a compatible Fortran compiler if you want +to build any projects requiring Fortran (\code{ifort} is recommended, but not +free). Then follow all the steps above, but replace the \code{build} command +with + +{\color{Brown} +\begin{verbatim} +./coin.install.sh fetch build --no-prompt --main-proj=SYMPHONY --enable-msvc +\end{verbatim} +} + +\paragraph{Building on OS X.} + +OS X is a Unix-based OS and ships with many of the basic components needed to +build COIN-OR, but it's missing some things. For examples, the latest versions +of OS X come with the \code{clang} compiler but no Fortran compiler. You may also +be missing the \code{wget} utility and \code{subversion} and \code{git} clients (needed for +obtaining source code). The easiest way to get these missing utilitites is to +install Homebrew (see http://brew.sh). After installation, open a terminal and +do + +{\color{Brown} +\begin{verbatim} +brew install gcc wget svn git +\end{verbatim} +} + +To obtain the source code, the first step is to get the installer that will then +fetch the source for SYMPHONY and all its dependencies. *You do not need to +clone SYMPHONY first, just do the following!* Open a terminal and execute + +{\color{Brown} +\begin{verbatim} +git clone https://www.github.com/coin-or/COIN-OR-OptimizationSuite +\end{verbatim} +} + +Next, to check out source code for and build all the necessary projects +(including dependencies), execute the script in the \code{COIN-OR-OptimizationSuite} +subdirectory. To execute the script, do + +{\color{Brown} +\begin{verbatim} +cd COIN-OR-OptimizationSuite +chmod u+x coi.install.sh +./coin.install.sh +\end{verbatim} +} + +(Note: The \code{chmod} command is only needed if the execute permission is not +automatically set by git on cloning). Once you run the script, +you will be prompted interactively to select a project to fetch and build. the +rest should happen automagically. Alternatively, the following command-line +incantation will execute the procedure non-interactively. + +{\color{Brown} +\begin{verbatim} +./coin.install.sh fetch build --no-prompt --main-proj=SYMPHONY +\end{verbatim} +} + +With this setup, \code{clang} will be used for compiling C++ by default and +\code{gfortran} will be used for Fortran. Since \code{clang} uses the GNU standard +library, \code{gfortran} is compatible. + +If you want to use the \code{gcc} compiler provided by Homebrew, then replace the +\code{build} command above with + {\color{Brown} \begin{verbatim} - ./configure --help=recursive +./coin.install.sh build --no-prompt --main-proj=SYMPHONY CC=gcc-5 CXX=g++-5 \end{verbatim} } -See Figure \ref{conf_opts} for a list of options the user may want to set. +The install script invokes a separate \code{configure} script that is +auto-generated using the GNU autotools. This script takes a wide range of +additional options and these options can be specified on the commnd-line when +running \code{coin.install.sh}. For example, to build with debugging symbols, +do + +{\color{Brown} +\begin{verbatim} +./coin.install.sh fetch build --no-prompt --main-proj=SYMPHONY --enable-debug +\end{verbatim} +} + +To get help with additional options available in running the script, do + +{\color{Brown} +\begin{verbatim} +./coin/install.sh --help +\end{verbatim} +} + +If you wish to install in a different directory, such as \code{/usr/local}, then run +the command + +{\color{Brown} +\begin{verbatim} +./coin.install.sh install --no-prompt --main-proj=SYMPHONY --prefix=/path/to/install/dir +\end{verbatim} +} + +After installation, you will also need to add \code{/path/to/install/dir/bin} to your +\code{PATH} variable in your \code{.bashrc} and also add \code{/path/to/install/dir/lib} +to your \code{DYLD\_LIBRARY\_PATH} if you want to link to COIN libraries. + +\subsubsection{Advanced Configuration Options} + +The \code{coin.install.sh} script supports many advnaced configuration +options. See Figure~\ref{conf_opts} for a list of some of the options the user +may want to set. + \begin{figure}[htb] \begin{tabular}{ll} \hline @@ -289,12 +519,11 @@ \caption{A list of useful configuration options \label{conf_opts}} \end{figure} -In order to enable or disable an option, either modify the file -\code{share/config.site} or add the option as an argument to configuration -script. For instance, running +In order to enable or disable an option, add the option as an argument to the +\code{coin.install.sh} script. For instance, running {\color{Brown} \begin{verbatim} - ./configure --enable-debug +./coin.install.sh fetch build --no-prompt --main-proj=SYMPHONY --enable-debug \end{verbatim} } will compile the source files with the debugging flag. @@ -304,52 +533,17 @@ compiler \code{cl} with GNU autotools in the CYGWIN environment configure with {\color{Brown} \begin{verbatim} - ./configure --enable-doscompile=msvc + ./coin.install.sh fetch build --no-prompt --main-proj=SYMPHONY --enable-doscompile=msvc \end{verbatim} } -\subsubsection{Building}\label{building} - -After configuring, the code can be built by typing the commands -{\color{Brown} -\begin{verbatim} - make - make install -\end{verbatim} -} This will first create the required libraries and executables and then will -install them. By default, the library {\color{Brown}\texttt{libSym}} and the -executable {\color{Brown}\texttt{symphony}} will be installed to the -{\color{Brown}\texttt{lib/}} and {\color{Brown}\texttt{bin/}} directories. To -install in another directory, use the option -{\color{Brown}\texttt{--prefix=DIR}} to the {\color{Brown}\texttt{configure}} -command. - -After compilation, the SYMPHONY library, together with the header files in the -subdirectory {\color{Brown}\texttt{include/}}, can then be used to call -SYMPHONY from any C/C++ code. The API for this is described in -Chapter~\ref{API-overview}. The executable can also be used for solving -generic MILP problems in MPS and GMPL format. In order to read GMPL files, you -will need to have GLPK (\url{http://www.gnu.org/software/glpk/}) installed. To -install it automatically, run the \texttt{get.Glpk} script in the -\texttt{ThirdParty/Glpk} directory. After that, configure with the additional -argument \texttt{--with-gmpl} and Glpk should be built and -linked automatically, enabling the ability to read GMPL files. - -For a more powerful modeling interface, FlopC++ can also be used to obtain a -capability similar to ILOG's Concert technology for building math programming -models (see SYMPHONY/Examples/FLOPC++). - -To test SYMPHONY after building, type -{\color{Brown} -\begin{verbatim} - make test -\end{verbatim} -} to execute an automated unit test. To test out the optimizer manually. a +To test out the optimizer manually. a sample MPS file called \code{sample.mps} and a sample GMPL/AMPL file called -{\color{Brown}\texttt{sample.mod}} together with its data file -{\color{Brown}\texttt{sample.dat}} are included with the distribution. You can +\code{sample.mod} together with its data file +\code{sample.dat} are included with the distribution. You can use either the command-line or the interactive optimizer. To solve the sample -MPS model, type {\color{Brown} +MPS model, type +{\color{Brown} \begin{verbatim} bin/symphony -F SYMPHONY/Datasets/sample.mps \end{verbatim} @@ -389,7 +583,7 @@ enable or disable OpenMP support with configure options by doing, e.g., {\color{Brown} \begin{verbatim} - ./configure --enable-openmp + ./coin.install.sh fetch build --no-prompt --main-proj=SYMPHONY --enable-openmp \end{verbatim} } In the Microsoft Visual Studio, enable OpenMP @@ -400,7 +594,8 @@ After configuring, follow the earlier instructions for building and testing. To invoke SYMPHONY from the command-line with multiple threads, specify the number of \emph{additional} worker threads with the \code{-p} option, i.e., -invoking SYMPHONY with {\color{Brown} +invoking SYMPHONY with +{\color{Brown} \begin{verbatim} bin/symphony -p 2 -F SYMPHONY/Datasets/sample.mps \end{verbatim} @@ -412,7 +607,8 @@ worker thread (\code{-p 1}). Starting in version 5.6.0, the number of threads used is automatically set equal to the number of available cores if no option is specified. For a fully sequential run with just one thread, invoke -SYMPHONY with {\color{Brown} +SYMPHONY with +{\color{Brown} \begin{verbatim} bin/symphony -p 2 -F SYMPHONY/Datasets/sample.mps \end{verbatim} @@ -444,9 +640,10 @@ %\paragraph{Configuring.} To configure for a parallel build with the default parallel configuration, -invoke the configuration script as follows: {\color{Brown} +invoke the configuration script as follows: +{\color{Brown} \begin{verbatim} - ./configure --with-pvm + ./coin.install.sh fetch build --no-prompt --main-proj=SYMPHONY --with-pvm \end{verbatim} } Note that there are a number of different parallel configurations (see @@ -505,7 +702,8 @@ on the command line and then typing \code{quit}. As above, invoke SYMPHONY using the sample MPS file called \code{sample.mps} included with the distribution. To specify the file name, use the \code{-F} command-line option, -i.e., in the root directory, type {\color{Brown} +i.e., in the root directory, type +{\color{Brown} \begin{verbatim} bin/symphony_m_EXT -F SYMPHONY/Datasets/sample.mps \end{verbatim} @@ -530,9 +728,10 @@ In order to compile SYMPHONY's applications in Unix-like environments, you must first compile a version of the callable library with hooks for the -callback functions. {\color{Brown} +callback functions. +{\color{Brown} \begin{verbatim} - ./configure --with-application + ./coin.install.sh fetch build --no-prompt --main-proj=SYMPHONY --with-application make make install \end{verbatim} @@ -630,8 +829,8 @@ \ref{callable_library}. \item Test the executable by opening Windows Explorer and double-clicking -on {\color{Brown}\texttt{symphony.exe}} in the -{\color{Brown}\texttt{Debug\bs}} subdirectory. This should open a Window in +on \code{symphony.exe} in the +\code{Debug\bs} subdirectory. This should open a Window in which the interactive solver will appear. Type \code{help} or \code{?} to see a list of available commands or see Chapter \ref{API-overview} for instructions on using the interactive solver. @@ -654,7 +853,7 @@ {\color{Brown} \begin{verbatim} - ./configure --enable-doscompile=msvc + ./coin.install.sh fetch build --no-prompt --main-proj=SYMPHONY --enable-doscompile=msvc \end{verbatim}} \subsubsection{Building SYMPHONY Applications} @@ -744,7 +943,7 @@ {\color{Brown} \begin{verbatim} - ./configure --enable-doscompile=msvc + ./coin.install.sh fetch build --no-prompt --main-proj=SYMPHONY --enable-doscompile=msvc \end{verbatim}} Afterwards, you can build the individual applications using the ``make'' diff -Nru coinor-symphony-5.6.16+repack1/Doc/man.tex coinor-symphony-5.6.17+dfsg/Doc/man.tex --- coinor-symphony-5.6.16+repack1/Doc/man.tex 2017-01-10 14:25:40.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/Doc/man.tex 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ % SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and % % Laci Ladanyi (ladanyi@us.ibm.com). % % % -% (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. % +% (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. % % % % SYMPHONY is licensed under the Eclipse Public License. Please see % % accompanying file for terms. % @@ -14,6 +14,11 @@ \documentclass[twoside,11pt]{book} +\usepackage[colorlinks]{hyperref} +\hypersetup{ + linkcolor=blue, +} + \oddsidemargin 0in \evensidemargin 0in \topmargin 0in @@ -96,7 +101,7 @@ \def\LPP{{LP Parameters}} \def\CP{{Cut Pool Parameters}} \def\CGP{{Cut Generator Parameters}} -\def\VER{{5.6.15}} +\def\VER{{5.6.17}} \lstloadlanguages{C++} \newcommand{\be}{\begin{enumerate}} @@ -139,11 +144,6 @@ \newcommand{\ptt}[1]{{\tt {\color{BrickRed} #1}}} \newcommand{\bs}{{$\backslash$}} -\usepackage[latex2html,dvipdfm,colorlinks]{hyperref} -\hypersetup{ - linkcolor=blue, -} - %\htmladdtonavigation{\htmladdnormallink % {\htmladdimg{contents_motif.gif}}{man.html}} @@ -243,7 +243,7 @@ \begin{rawhtml}

\end{rawhtml} \begin{center} -{\copyright 2000-2015 Ted Ralphs} +{\copyright 2000-2019 Ted Ralphs} \end{center} \begin{rawhtml}

\end{rawhtml} @@ -266,20 +266,21 @@ \end{rawhtml} \begin{rawhtml}

\end{rawhtml} -First and foremost, many thanks are due to Laci Lad\'anyi who worked with me -on the development of a very early precursor of SYMPHONY called COMPSys many -years ago now and who taught me much of what I then knew about programming. -Thanks are due also to Marta Es\"o, who wrote an early draft of this manual -for what was then COMPSys. This release would not have been possible without -the help of both Menal G\"uzelsoy, who has been instrumental in the -development of SYMPHONY since version 4.0, and Ashutosh Mahajan, who has +Many thanks are due to Laci Lad\'anyi who worked with me on the development of +a very early precursor of SYMPHONY called COMPSys many years ago now and who +taught me much of what I then knew about programming. Thanks are due also to +Marta Es\"o, who wrote an early draft of this manual for what was then +COMPSys. Since those early days, many of my Ph.D students have worked on +SYMPHONY and made substantial contributions. Menal G\"uzelsoy was instrumental +in the development of SYMPHONY since version 4.0 and Ashutosh Mahajan, who has worked on SYMPHONY since version 5.0. In particular, Ashutosh and Menal did all of the work that went into improving SYMPHONY for release 5.2. I would also like to thank Matthew Galati and Ondrej Medek, who contributed to the -development of SYMPHONY over the years. Finally, my sincere appreciation goes -to Leslie Trotter, William Cook, Cornell University, Rice University, Lehigh -University, the National Science Foundation, and the state of Texas, all of -whom have supported the development of SYMPHONY. +development of SYMPHONY over the years, as well as Anahita Hassanzadeh and +Suresh Bolusani. Finally, my sincere appreciation goes to Leslie Trotter, +William Cook, Cornell University, Rice University, Lehigh University, the +National Science Foundation, and the state of Texas, all of whom have +supported the development of SYMPHONY over the past almost three decades. \begin{rawhtml}

\end{rawhtml} @@ -362,7 +363,7 @@ \phantomsection \addcontentsline{toc}{chapter}{Bibliography} \bibliographystyle{plain} -\bibliography{/home/menal/PAPERS/BIB/bib} +\bibliography{/mnt/c/Users/tkral/Documents/Ref/BibFiles/SYMPHONY/bib} %\input{biblio} diff -Nru coinor-symphony-5.6.16+repack1/Examples/milp2.c coinor-symphony-5.6.17+dfsg/Examples/milp2.c --- coinor-symphony-5.6.16+repack1/Examples/milp2.c 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/Examples/milp2.c 2019-02-24 04:51:19.000000000 +0000 @@ -7,7 +7,7 @@ /* */ /* The author of this file is Menal Guzelsoy */ /* */ -/* (c) Copyright 2005-2015 Lehigh University. All Rights Reserved. */ +/* (c) Copyright 2005-2019 Lehigh University. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/Examples/milp.c coinor-symphony-5.6.17+dfsg/Examples/milp.c --- coinor-symphony-5.6.16+repack1/Examples/milp.c 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/Examples/milp.c 2019-02-24 04:51:19.000000000 +0000 @@ -7,7 +7,7 @@ /* */ /* The author of this file is Menal Guzelsoy */ /* */ -/* (c) Copyright 2005-2015 Lehigh University. All Rights Reserved. */ +/* (c) Copyright 2005-2019 Lehigh University. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/Examples/milpOsi2.c coinor-symphony-5.6.17+dfsg/Examples/milpOsi2.c --- coinor-symphony-5.6.16+repack1/Examples/milpOsi2.c 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/Examples/milpOsi2.c 2019-02-24 04:51:19.000000000 +0000 @@ -7,7 +7,7 @@ /* */ /* The author of this file is Menal Guzelsoy */ /* */ -/* (c) Copyright 2005-2015 Lehigh University. All Rights Reserved. */ +/* (c) Copyright 2005-2019 Lehigh University. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/Examples/milpOsi.c coinor-symphony-5.6.17+dfsg/Examples/milpOsi.c --- coinor-symphony-5.6.16+repack1/Examples/milpOsi.c 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/Examples/milpOsi.c 2019-02-24 04:51:19.000000000 +0000 @@ -7,7 +7,7 @@ /* */ /* The author of this file is Menal Guzelsoy */ /* */ -/* (c) Copyright 2005-2015 Lehigh University. All Rights Reserved. */ +/* (c) Copyright 2005-2019 Lehigh University. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/Examples/sensitivity.c coinor-symphony-5.6.17+dfsg/Examples/sensitivity.c --- coinor-symphony-5.6.16+repack1/Examples/sensitivity.c 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/Examples/sensitivity.c 2019-02-24 04:51:19.000000000 +0000 @@ -7,7 +7,7 @@ /* */ /* The author of this file is Menal Guzelsoy */ /* */ -/* (c) Copyright 2005-2015 Lehigh University. All Rights Reserved. */ +/* (c) Copyright 2005-2019 Lehigh University. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/Examples/warm_start1.c coinor-symphony-5.6.17+dfsg/Examples/warm_start1.c --- coinor-symphony-5.6.16+repack1/Examples/warm_start1.c 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/Examples/warm_start1.c 2019-02-24 04:51:19.000000000 +0000 @@ -7,7 +7,7 @@ /* */ /* The author of this file is Menal Guzelsoy */ /* */ -/* (c) Copyright 2005-2015 Lehigh University. All Rights Reserved. */ +/* (c) Copyright 2005-2019 Lehigh University. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/Examples/warm_start2.c coinor-symphony-5.6.17+dfsg/Examples/warm_start2.c --- coinor-symphony-5.6.16+repack1/Examples/warm_start2.c 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/Examples/warm_start2.c 2019-02-24 04:51:19.000000000 +0000 @@ -7,7 +7,7 @@ /* */ /* The author of this file is Menal Guzelsoy */ /* */ -/* (c) Copyright 2005-2015 Lehigh University. All Rights Reserved. */ +/* (c) Copyright 2005-2019 Lehigh University. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/Examples/warm_start3.c coinor-symphony-5.6.17+dfsg/Examples/warm_start3.c --- coinor-symphony-5.6.16+repack1/Examples/warm_start3.c 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/Examples/warm_start3.c 2019-02-24 04:51:19.000000000 +0000 @@ -7,7 +7,7 @@ /* */ /* The author of this file is Menal Guzelsoy */ /* */ -/* (c) Copyright 2005-2015 Lehigh University. All Rights Reserved. */ +/* (c) Copyright 2005-2019 Lehigh University. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/include/config_sym_default.h coinor-symphony-5.6.17+dfsg/include/config_sym_default.h --- coinor-symphony-5.6.16+repack1/include/config_sym_default.h 2017-01-16 21:18:15.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/include/config_sym_default.h 2019-02-24 15:00:41.000000000 +0000 @@ -5,7 +5,7 @@ /***************************************************************************/ /* Version number of project */ -#define SYMPHONY_VERSION "5.6.16" +#define SYMPHONY_VERSION "5.6.17" /* Major Version number of project */ #define SYMPHONY_VERSION_MAJOR 5 @@ -14,6 +14,6 @@ #define SYMPHONY_VERSION_MINOR 6 /* Release Version number of project */ -#define SYMPHONY_VERSION_RELEASE 16 +#define SYMPHONY_VERSION_RELEASE 17 diff -Nru coinor-symphony-5.6.16+repack1/include/sym_cg.h coinor-symphony-5.6.17+dfsg/include/sym_cg.h --- coinor-symphony-5.6.16+repack1/include/sym_cg.h 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/include/sym_cg.h 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/include/sym_cg_params.h coinor-symphony-5.6.17+dfsg/include/sym_cg_params.h --- coinor-symphony-5.6.16+repack1/include/sym_cg_params.h 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/include/sym_cg_params.h 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/include/sym_cg_u.h coinor-symphony-5.6.17+dfsg/include/sym_cg_u.h --- coinor-symphony-5.6.16+repack1/include/sym_cg_u.h 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/include/sym_cg_u.h 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/include/sym_constants.h coinor-symphony-5.6.17+dfsg/include/sym_constants.h --- coinor-symphony-5.6.16+repack1/include/sym_constants.h 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/include/sym_constants.h 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/include/sym_cp.h coinor-symphony-5.6.17+dfsg/include/sym_cp.h --- coinor-symphony-5.6.16+repack1/include/sym_cp.h 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/include/sym_cp.h 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/include/sym_cp_params.h coinor-symphony-5.6.17+dfsg/include/sym_cp_params.h --- coinor-symphony-5.6.16+repack1/include/sym_cp_params.h 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/include/sym_cp_params.h 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/include/sym_cp_u.h coinor-symphony-5.6.17+dfsg/include/sym_cp_u.h --- coinor-symphony-5.6.16+repack1/include/sym_cp_u.h 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/include/sym_cp_u.h 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/include/sym_dg.h coinor-symphony-5.6.17+dfsg/include/sym_dg.h --- coinor-symphony-5.6.16+repack1/include/sym_dg.h 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/include/sym_dg.h 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/include/sym_dg_params.h coinor-symphony-5.6.17+dfsg/include/sym_dg_params.h --- coinor-symphony-5.6.16+repack1/include/sym_dg_params.h 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/include/sym_dg_params.h 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/include/sym_dg_u.h coinor-symphony-5.6.17+dfsg/include/sym_dg_u.h --- coinor-symphony-5.6.16+repack1/include/sym_dg_u.h 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/include/sym_dg_u.h 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/include/sym_lp.h coinor-symphony-5.6.17+dfsg/include/sym_lp.h --- coinor-symphony-5.6.16+repack1/include/sym_lp.h 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/include/sym_lp.h 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ @@ -194,7 +194,7 @@ int process_chain PROTO((lp_prob *p)); int fathom_branch PROTO((lp_prob *p)); int check_bounds PROTO((lp_prob *p, int *termcode)); -int fathom PROTO((lp_prob *p, int primal_feasible)); +int fathom PROTO((lp_prob *p, int primal_feasible, int time_limit_reached)); int repricing PROTO((lp_prob *p)); int bfind PROTO((int key, int *table, int size)); int collect_nonzeros PROTO((lp_prob *p, double *x, int *tind, double *tx)); diff -Nru coinor-symphony-5.6.16+repack1/include/sym_lp_params.h coinor-symphony-5.6.17+dfsg/include/sym_lp_params.h --- coinor-symphony-5.6.16+repack1/include/sym_lp_params.h 2015-09-22 15:39:51.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/include/sym_lp_params.h 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/include/sym_lp_solver.h coinor-symphony-5.6.17+dfsg/include/sym_lp_solver.h --- coinor-symphony-5.6.16+repack1/include/sym_lp_solver.h 2015-09-22 15:39:51.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/include/sym_lp_solver.h 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/include/sym_lp_u.h coinor-symphony-5.6.17+dfsg/include/sym_lp_u.h --- coinor-symphony-5.6.16+repack1/include/sym_lp_u.h 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/include/sym_lp_u.h 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/include/sym_macros.h coinor-symphony-5.6.17+dfsg/include/sym_macros.h --- coinor-symphony-5.6.16+repack1/include/sym_macros.h 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/include/sym_macros.h 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/include/sym_master.h coinor-symphony-5.6.17+dfsg/include/sym_master.h --- coinor-symphony-5.6.16+repack1/include/sym_master.h 2015-11-27 19:17:23.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/include/sym_master.h 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/include/sym_master_params.h coinor-symphony-5.6.17+dfsg/include/sym_master_params.h --- coinor-symphony-5.6.16+repack1/include/sym_master_params.h 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/include/sym_master_params.h 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/include/sym_master_u.h coinor-symphony-5.6.17+dfsg/include/sym_master_u.h --- coinor-symphony-5.6.16+repack1/include/sym_master_u.h 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/include/sym_master_u.h 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/include/sym_messages.h coinor-symphony-5.6.17+dfsg/include/sym_messages.h --- coinor-symphony-5.6.16+repack1/include/sym_messages.h 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/include/sym_messages.h 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/include/sym_pack_array.h coinor-symphony-5.6.17+dfsg/include/sym_pack_array.h --- coinor-symphony-5.6.16+repack1/include/sym_pack_array.h 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/include/sym_pack_array.h 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/include/sym_pack_cut.h coinor-symphony-5.6.17+dfsg/include/sym_pack_cut.h --- coinor-symphony-5.6.16+repack1/include/sym_pack_cut.h 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/include/sym_pack_cut.h 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/include/symphony.h coinor-symphony-5.6.17+dfsg/include/symphony.h --- coinor-symphony-5.6.16+repack1/include/symphony.h 2015-08-30 17:18:19.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/include/symphony.h 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2005-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2005-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/include/sym_prep.h coinor-symphony-5.6.17+dfsg/include/sym_prep.h --- coinor-symphony-5.6.16+repack1/include/sym_prep.h 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/include/sym_prep.h 2019-02-24 04:51:19.000000000 +0000 @@ -7,7 +7,7 @@ /* */ /* The author of this file is Menal Guzelsoy */ /* */ -/* (c) Copyright 2006-2015 Lehigh University. All Rights Reserved. */ +/* (c) Copyright 2006-2019 Lehigh University. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/include/sym_prep_params.h coinor-symphony-5.6.17+dfsg/include/sym_prep_params.h --- coinor-symphony-5.6.16+repack1/include/sym_prep_params.h 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/include/sym_prep_params.h 2019-02-24 04:51:19.000000000 +0000 @@ -7,7 +7,7 @@ /* */ /* The author of this file is Menal Guzelsoy */ /* */ -/* (c) Copyright 2006-2015 Lehigh University. All Rights Reserved. */ +/* (c) Copyright 2006-2019 Lehigh University. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/include/sym_primal_heuristics.h coinor-symphony-5.6.17+dfsg/include/sym_primal_heuristics.h --- coinor-symphony-5.6.16+repack1/include/sym_primal_heuristics.h 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/include/sym_primal_heuristics.h 2019-02-24 04:51:19.000000000 +0000 @@ -7,7 +7,7 @@ /* */ /* The author of this file is Ashutosh Mahajan */ /* */ -/* (c) Copyright 2006-2015 Lehigh University. All Rights Reserved. */ +/* (c) Copyright 2006-2019 Lehigh University. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/include/sym_proccomm.h coinor-symphony-5.6.17+dfsg/include/sym_proccomm.h --- coinor-symphony-5.6.16+repack1/include/sym_proccomm.h 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/include/sym_proccomm.h 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/include/sym_proto.h coinor-symphony-5.6.17+dfsg/include/sym_proto.h --- coinor-symphony-5.6.16+repack1/include/sym_proto.h 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/include/sym_proto.h 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/include/sym_qsort.h coinor-symphony-5.6.17+dfsg/include/sym_qsort.h --- coinor-symphony-5.6.16+repack1/include/sym_qsort.h 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/include/sym_qsort.h 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/include/sym_timemeas.h coinor-symphony-5.6.17+dfsg/include/sym_timemeas.h --- coinor-symphony-5.6.16+repack1/include/sym_timemeas.h 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/include/sym_timemeas.h 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/include/sym_tm.h coinor-symphony-5.6.17+dfsg/include/sym_tm.h --- coinor-symphony-5.6.16+repack1/include/sym_tm.h 2017-01-15 19:45:41.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/include/sym_tm.h 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/include/sym_tm_params.h coinor-symphony-5.6.17+dfsg/include/sym_tm_params.h --- coinor-symphony-5.6.16+repack1/include/sym_tm_params.h 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/include/sym_tm_params.h 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/include/sym_types.h coinor-symphony-5.6.17+dfsg/include/sym_types.h --- coinor-symphony-5.6.16+repack1/include/sym_types.h 2017-01-06 15:35:57.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/include/sym_types.h 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/include/sym_win32_time.h coinor-symphony-5.6.17+dfsg/include/sym_win32_time.h --- coinor-symphony-5.6.16+repack1/include/sym_win32_time.h 2016-02-13 04:24:53.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/include/sym_win32_time.h 2019-02-24 04:51:19.000000000 +0000 @@ -5,6 +5,8 @@ #include #if !(defined(__MINGW64__) || defined(__MINGW32__)) + +#if (__GNUC__ <= 7) || ((__GNUC__ == 7) && (__GNUC_MINOR__ < 3)) struct timeval { long tv_sec; /* seconds */ long tv_usec; /* and microseconds */ @@ -37,6 +39,6 @@ #pragma warning(disable:4700) #pragma warning(disable:4018) - +#endif #endif #endif diff -Nru coinor-symphony-5.6.16+repack1/Makefile.am coinor-symphony-5.6.17+dfsg/Makefile.am --- coinor-symphony-5.6.16+repack1/Makefile.am 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/Makefile.am 2019-02-24 04:51:19.000000000 +0000 @@ -7,7 +7,7 @@ # # # The author of this file is Menal Guzelsoy # # # -# (c) Copyright 2006-2015 Lehigh University. All Rights Reserved. # +# (c) Copyright 2006-2019 Lehigh University. All Rights Reserved. # # # # This software is licensed under the Eclipse Public License. Please see # # accompanying file for terms. # diff -Nru coinor-symphony-5.6.16+repack1/Makefile.in coinor-symphony-5.6.17+dfsg/Makefile.in --- coinor-symphony-5.6.16+repack1/Makefile.in 2017-01-15 20:09:10.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/Makefile.in 2019-02-24 04:51:19.000000000 +0000 @@ -23,7 +23,7 @@ # # # The author of this file is Menal Guzelsoy # # # -# (c) Copyright 2006-2015 Lehigh University. All Rights Reserved. # +# (c) Copyright 2006-2019 Lehigh University. All Rights Reserved. # # # # This software is licensed under the Eclipse Public License. Please see # # accompanying file for terms. # diff -Nru coinor-symphony-5.6.16+repack1/Osi.patch coinor-symphony-5.6.17+dfsg/Osi.patch --- coinor-symphony-5.6.16+repack1/Osi.patch 2016-01-24 19:21:37.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/Osi.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -Index: Osi/src/OsiCommonTest/OsiSolverInterfaceTest.cpp -=================================================================== ---- Osi/src/OsiCommonTest/OsiSolverInterfaceTest.cpp (revision 2035) -+++ Osi/src/OsiCommonTest/OsiSolverInterfaceTest.cpp (working copy) -@@ -3802,6 +3802,9 @@ - - // make sure col solution is something reasonable, - // that is between upper and lower bounds -+ OSIUNITTEST_CATCH_SEVERITY_EXPECTED(exmip1Si->initialSolve(), return, -+ *exmip1Si, "OsiSolverInterfaceCommonUnitTest: exmip1 initialSolve", -+ TestOutcome::ERROR, solverName == "vol"); - const double * cs = exmip1Si->getColSolution(); - int c; - bool okColSol=true; diff -Nru coinor-symphony-5.6.16+repack1/README coinor-symphony-5.6.17+dfsg/README --- coinor-symphony-5.6.16+repack1/README 2017-01-10 14:26:02.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/README 2017-01-29 20:06:39.000000000 +0000 @@ -1,4 +1,4 @@ -SYMPHONY Version 5.6.15 README +SYMPHONY Version 5.6.16 README ============================= Welcome to SYMPHONY. SYMPHONY is distributed under the Eclipse Public License @@ -261,10 +261,18 @@ WHAT'S NEW ========== +# Release 5.6.16 + * Fix problem with appveyor configuration + # Release 5.6.15 * Fix for configuration issue with OpenMP when building with Visual Studio compiler under Msys2 - + * Fix for bugs in PVM version + * Fix for bugs in computing lower bounds + * Fix for compilation error with gcc 6 + * Other minor fixes + * Enabling binary uploads with BinTray + # Release 5.6.14 * Fixing small bug with re-setting environment in user applications. * Fixing some memory errors arising with applications when extra variables are used. diff -Nru coinor-symphony-5.6.16+repack1/src/Common/pack_array.c coinor-symphony-5.6.17+dfsg/src/Common/pack_array.c --- coinor-symphony-5.6.16+repack1/src/Common/pack_array.c 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/Common/pack_array.c 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/src/Common/pack_cut.c coinor-symphony-5.6.17+dfsg/src/Common/pack_cut.c --- coinor-symphony-5.6.16+repack1/src/Common/pack_cut.c 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/Common/pack_cut.c 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/src/Common/proccomm.c coinor-symphony-5.6.17+dfsg/src/Common/proccomm.c --- coinor-symphony-5.6.16+repack1/src/Common/proccomm.c 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/Common/proccomm.c 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/src/Common/sym_qsort.c coinor-symphony-5.6.17+dfsg/src/Common/sym_qsort.c --- coinor-symphony-5.6.16+repack1/src/Common/sym_qsort.c 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/Common/sym_qsort.c 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/src/Common/timemeas.c coinor-symphony-5.6.17+dfsg/src/Common/timemeas.c --- coinor-symphony-5.6.16+repack1/src/Common/timemeas.c 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/Common/timemeas.c 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/src/CutGen/cg_func.c coinor-symphony-5.6.17+dfsg/src/CutGen/cg_func.c --- coinor-symphony-5.6.16+repack1/src/CutGen/cg_func.c 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/CutGen/cg_func.c 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/src/CutGen/cg_proccomm.c coinor-symphony-5.6.17+dfsg/src/CutGen/cg_proccomm.c --- coinor-symphony-5.6.16+repack1/src/CutGen/cg_proccomm.c 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/CutGen/cg_proccomm.c 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/src/CutGen/cg_wrapper.c coinor-symphony-5.6.17+dfsg/src/CutGen/cg_wrapper.c --- coinor-symphony-5.6.16+repack1/src/CutGen/cg_wrapper.c 2015-08-20 17:38:49.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/CutGen/cg_wrapper.c 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/src/CutGen/cut_gen.c coinor-symphony-5.6.17+dfsg/src/CutGen/cut_gen.c --- coinor-symphony-5.6.16+repack1/src/CutGen/cut_gen.c 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/CutGen/cut_gen.c 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/src/CutPool/cp_func.c coinor-symphony-5.6.17+dfsg/src/CutPool/cp_func.c --- coinor-symphony-5.6.16+repack1/src/CutPool/cp_func.c 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/CutPool/cp_func.c 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/src/CutPool/cp_proccomm.c coinor-symphony-5.6.17+dfsg/src/CutPool/cp_proccomm.c --- coinor-symphony-5.6.16+repack1/src/CutPool/cp_proccomm.c 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/CutPool/cp_proccomm.c 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/src/CutPool/cp_wrapper.c coinor-symphony-5.6.17+dfsg/src/CutPool/cp_wrapper.c --- coinor-symphony-5.6.16+repack1/src/CutPool/cp_wrapper.c 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/CutPool/cp_wrapper.c 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/src/CutPool/cut_pool.c coinor-symphony-5.6.17+dfsg/src/CutPool/cut_pool.c --- coinor-symphony-5.6.16+repack1/src/CutPool/cut_pool.c 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/CutPool/cut_pool.c 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/src/DrawGraph/draw_graph.c coinor-symphony-5.6.17+dfsg/src/DrawGraph/draw_graph.c --- coinor-symphony-5.6.16+repack1/src/DrawGraph/draw_graph.c 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/DrawGraph/draw_graph.c 2019-02-24 04:51:19.000000000 +0000 @@ -7,7 +7,7 @@ /* */ /* The Interactive Graph Drawing application was developed by Marta Eso. */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/src/DrawGraph/tester.c coinor-symphony-5.6.17+dfsg/src/DrawGraph/tester.c --- coinor-symphony-5.6.16+repack1/src/DrawGraph/tester.c 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/DrawGraph/tester.c 2019-02-24 04:51:19.000000000 +0000 @@ -7,7 +7,7 @@ /* */ /* The Interactive Graph Drawing application was developed by Marta Eso. */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/src/LP/lp_branch.c coinor-symphony-5.6.17+dfsg/src/LP/lp_branch.c --- coinor-symphony-5.6.16+repack1/src/LP/lp_branch.c 2017-01-15 19:45:41.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/LP/lp_branch.c 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/src/LP/lp.c coinor-symphony-5.6.17+dfsg/src/LP/lp.c --- coinor-symphony-5.6.16+repack1/src/LP/lp.c 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/LP/lp.c 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/src/LP/lp_free.c coinor-symphony-5.6.17+dfsg/src/LP/lp_free.c --- coinor-symphony-5.6.16+repack1/src/LP/lp_free.c 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/LP/lp_free.c 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/src/LP/lp_genfunc.c coinor-symphony-5.6.17+dfsg/src/LP/lp_genfunc.c --- coinor-symphony-5.6.16+repack1/src/LP/lp_genfunc.c 2017-01-15 19:45:41.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/LP/lp_genfunc.c 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ @@ -247,7 +247,7 @@ check_bounds(p, &termcode); if (termcode == LP_D_UNBOUNDED) { PRINT(verbosity, 1, ("Feasibility lost -- ")); - if (fathom(p, FALSE)) { + if (fathom(p, FALSE, FALSE)) { comp_times->communication += used_time(&p->tt); return(FUNCTION_TERMINATED_NORMALLY); } @@ -282,7 +282,7 @@ if (p->tm->par.time_limit >= 0.0 && (timeleft = p->tm->par.time_limit - wall_clock(NULL) + p->tm->start_time) <= 0.0) { - if (fathom(p, TRUE)){ //send in true for interrupted node + if (fathom(p, TRUE, TRUE)){ //send in true for interrupted node return(FUNCTION_TERMINATED_NORMALLY); }else{ return(FUNCTION_TERMINATED_ABNORMALLY); @@ -298,7 +298,7 @@ if(rs_mode_enabled && (iterleft = p->tm->par.rs_lp_iter_limit - p->tm->lp_stat.lp_iter_num) <= 0) { - if (fathom(p, TRUE)){ //send in true for interrupted node + if (fathom(p, TRUE, FALSE)){ //send in true for interrupted node return(FUNCTION_TERMINATED_NORMALLY); }else{ return(FUNCTION_TERMINATED_ABNORMALLY); @@ -414,7 +414,7 @@ case LP_TIME_LIMIT: /* now, we set time limit - solver returns the same termcode with itlim */ /* also, we might set iter limit if we are in search heuristics */ - if (fathom(p, TRUE)){ //send in true for interrupted node + if (fathom(p, TRUE, FALSE)){ //send in true for interrupted node return(FUNCTION_TERMINATED_NORMALLY); }else{ return(FUNCTION_TERMINATED_ABNORMALLY); @@ -499,7 +499,7 @@ break; } comp_times->lp += used_time(&p->tt); - if (fathom(p, (termcode != LP_D_UNBOUNDED))){ + if (fathom(p, (termcode != LP_D_UNBOUNDED), FALSE)){ comp_times->communication += used_time(&p->tt); return(FUNCTION_TERMINATED_NORMALLY); }else{ @@ -575,7 +575,7 @@ comp_times->lp += used_time(&p->tt); if (cuts < 0){ /* i.e. feasible solution is found */ - if (fathom(p, TRUE)){ + if (fathom(p, TRUE, FALSE)){ return(FUNCTION_TERMINATED_NORMALLY); }else{ first_in_loop = FALSE; @@ -642,7 +642,7 @@ case BRANCHING_INF_NODE: comp_times->strong_branching += used_time(&p->tt); - if (fathom(p, FALSE)){ + if (fathom(p, FALSE, FALSE)){ return(FUNCTION_TERMINATED_NORMALLY); }else{ return(FUNCTION_TERMINATED_ABNORMALLY); @@ -654,7 +654,7 @@ case FEAS_SOL_FOUND: PRINT(verbosity,2,("solution found before branching\n")); if(p->par.find_first_feasible){ - if(fathom(p, TRUE)){ //send in true for interrupted node + if(fathom(p, TRUE, FALSE)){ //send in true for interrupted node return(FUNCTION_TERMINATED_NORMALLY); }else{ return(FUNCTION_TERMINATED_ABNORMALLY); @@ -704,7 +704,7 @@ if (gap_limit_reached || (p->tm->par.time_limit >= 0.0 && wall_clock(NULL) - p->tm->start_time >= p->tm->par.time_limit)){ - if (fathom(p, TRUE)){ + if (fathom(p, TRUE, ((gap_limit_reached) ? FALSE : TRUE))){ return(FUNCTION_TERMINATED_NORMALLY); }else{ return(FUNCTION_TERMINATED_ABNORMALLY); @@ -713,7 +713,7 @@ #else if (p->par.time_limit >= 0.0 && wall_clock(NULL) - p->start_time >= p->par.time_limit){ - if (fathom(p, TRUE)){ + if (fathom(p, TRUE, TRUE)){ return(FUNCTION_TERMINATED_NORMALLY); }else{ return(FUNCTION_TERMINATED_ABNORMALLY); @@ -732,7 +732,7 @@ /* fathom() returns true if it has really fathomed the node, false otherwise (i.e., if it had added few variables) */ -int fathom(lp_prob *p, int primal_feasible) +int fathom(lp_prob *p, int primal_feasible, int time_limit_reached) { LPdata *lp_data = p->lp_data; our_col_set *new_cols = NULL; @@ -752,23 +752,27 @@ PRINT(p->par.verbosity, 1, ("fathoming node (no more cols to check)\n\n")); if (primal_feasible){ - switch (termcode){ - case LP_OPT_FEASIBLE: - send_node_desc(p, FEASIBLE_PRUNED); - break; - case LP_OPTIMAL: - send_node_desc(p, OVER_UB_PRUNED); - break; - case LP_D_ITLIM: - send_node_desc(p, ITERATION_LIMIT); - break; - case LP_TIME_LIMIT: - send_node_desc(p, TIME_LIMIT); - break; - default: - send_node_desc(p, OVER_UB_PRUNED); - break; - } + if (time_limit_reached) { + send_node_desc(p, TIME_LIMIT); + } else { + switch (termcode){ + case LP_OPT_FEASIBLE: + send_node_desc(p, FEASIBLE_PRUNED); + break; + case LP_OPTIMAL: + send_node_desc(p, OVER_UB_PRUNED); + break; + case LP_D_ITLIM: + send_node_desc(p, ITERATION_LIMIT); + break; + case LP_TIME_LIMIT: + send_node_desc(p, TIME_LIMIT); + break; + default: + send_node_desc(p, OVER_UB_PRUNED); + break; + } + } }else{ send_node_desc(p, INFEASIBLE_PRUNED); } @@ -959,7 +963,7 @@ break; } comp_times->lp += used_time(&p->tt); - if (fathom(p, (termcode != LP_D_UNBOUNDED))){ + if (fathom(p, (termcode != LP_D_UNBOUNDED), FALSE)){ comp_times->communication += used_time(&p->tt); return(FUNCTION_TERMINATED_NORMALLY); }else{ @@ -1021,7 +1025,7 @@ comp_times->lp += used_time(&p->tt); if (cuts < 0){ /* i.e. feasible solution is found */ - if (fathom(p, TRUE)){ + if (fathom(p, TRUE, FALSE)){ comp_times->communication += used_time(&p->tt); return(FUNCTION_TERMINATED_NORMALLY); }else{ @@ -2429,7 +2433,7 @@ send_to_pool); should_stop_adding_cgl_cuts(p, i, &should_stop); - if(i < 0 && num_cuts > 0) should_stop = TRUE; + if(i < 0 && *num_cuts > 0) should_stop = TRUE; //} if (should_stop == TRUE) { break; diff -Nru coinor-symphony-5.6.16+repack1/src/LP/lp_heuristics.c coinor-symphony-5.6.17+dfsg/src/LP/lp_heuristics.c --- coinor-symphony-5.6.16+repack1/src/LP/lp_heuristics.c 2015-12-29 03:42:45.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/LP/lp_heuristics.c 2019-02-24 04:51:19.000000000 +0000 @@ -7,7 +7,7 @@ /* */ /* The author of this file is Ashutosh Mahajan */ /* */ -/* (c) Copyright 2006-2015 Lehigh University. All Rights Reserved. */ +/* (c) Copyright 2006-2019 Lehigh University. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/src/LP/lp_proccomm.c coinor-symphony-5.6.17+dfsg/src/LP/lp_proccomm.c --- coinor-symphony-5.6.16+repack1/src/LP/lp_proccomm.c 2017-01-15 19:45:41.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/LP/lp_proccomm.c 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/src/LP/lp_pseudo_branch.c coinor-symphony-5.6.17+dfsg/src/LP/lp_pseudo_branch.c --- coinor-symphony-5.6.16+repack1/src/LP/lp_pseudo_branch.c 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/LP/lp_pseudo_branch.c 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/src/LP/lp_rowfunc.c coinor-symphony-5.6.17+dfsg/src/LP/lp_rowfunc.c --- coinor-symphony-5.6.16+repack1/src/LP/lp_rowfunc.c 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/LP/lp_rowfunc.c 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/src/LP/lp_solver.c coinor-symphony-5.6.17+dfsg/src/LP/lp_solver.c --- coinor-symphony-5.6.16+repack1/src/LP/lp_solver.c 2017-01-15 19:45:41.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/LP/lp_solver.c 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* The OSI interface in this file was written by Menal Guzelsoy. */ /* The OSL interface was written by Ondrej Medek. */ diff -Nru coinor-symphony-5.6.16+repack1/src/LP/lp_sp.c coinor-symphony-5.6.17+dfsg/src/LP/lp_sp.c --- coinor-symphony-5.6.16+repack1/src/LP/lp_sp.c 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/LP/lp_sp.c 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/src/LP/lp_varfunc.c coinor-symphony-5.6.17+dfsg/src/LP/lp_varfunc.c --- coinor-symphony-5.6.16+repack1/src/LP/lp_varfunc.c 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/LP/lp_varfunc.c 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/src/LP/lp_wrapper.c coinor-symphony-5.6.17+dfsg/src/LP/lp_wrapper.c --- coinor-symphony-5.6.16+repack1/src/LP/lp_wrapper.c 2015-11-27 19:17:23.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/LP/lp_wrapper.c 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* The OSI interface in this file was written by Menal Guzelsoy. */ /* The OSL interface was written by Ondrej Medek. */ diff -Nru coinor-symphony-5.6.16+repack1/src/Makefile.am coinor-symphony-5.6.17+dfsg/src/Makefile.am --- coinor-symphony-5.6.16+repack1/src/Makefile.am 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/Makefile.am 2019-02-24 04:51:19.000000000 +0000 @@ -7,7 +7,7 @@ # # # The author of this file is Menal Guzelsoy # # # -# (c) Copyright 2006-2015 Lehigh University. All Rights Reserved. # +# (c) Copyright 2006-2019 Lehigh University. All Rights Reserved. # # # # This software is licensed under the Eclipse Public License. Please see # # accompanying file for terms. # @@ -386,7 +386,7 @@ libSymAppl_tm_cp.la libSymAppl_tm_lp_cg.la libSymAppl_tm_lp_cg_cp.la \ libSymAppl_m_tm.la libSymAppl_m_tm_lp.la libSymAppl_m_tm_cp.la \ libSymAppl_m_tm_lp_cg.la libSymAppl_m_tm_lp_cg_cp.la \ - libSymAppl_cp.la libSym_m.la libSymAppl_m.la libSymApplStubs.la + libSymAppl_cp.la libSym_m.la libSymApplStubs.la libSymAppl_m.la #$(WHATTOMAKELIBS) $(WHATTOMAKEBINS) #if !SYM_PARALLEL diff -Nru coinor-symphony-5.6.16+repack1/src/Makefile.in coinor-symphony-5.6.17+dfsg/src/Makefile.in --- coinor-symphony-5.6.16+repack1/src/Makefile.in 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/Makefile.in 2019-02-24 04:51:19.000000000 +0000 @@ -23,7 +23,7 @@ # # # The author of this file is Menal Guzelsoy # # # -# (c) Copyright 2006-2015 Lehigh University. All Rights Reserved. # +# (c) Copyright 2006-2019 Lehigh University. All Rights Reserved. # # # # This software is licensed under the Eclipse Public License. Please see # # accompanying file for terms. # @@ -2929,7 +2929,7 @@ libSymAppl_tm_cp.la libSymAppl_tm_lp_cg.la libSymAppl_tm_lp_cg_cp.la \ libSymAppl_m_tm.la libSymAppl_m_tm_lp.la libSymAppl_m_tm_cp.la \ libSymAppl_m_tm_lp_cg.la libSymAppl_m_tm_lp_cg_cp.la \ - libSymAppl_cp.la libSym_m.la libSymAppl_m.la libSymApplStubs.la + libSymAppl_cp.la libSym_m.la libSymApplStubs.la libSymAppl_m.la #$(WHATTOMAKELIBS) $(WHATTOMAKEBINS) #if !SYM_PARALLEL diff -Nru coinor-symphony-5.6.16+repack1/src/Master/main.c coinor-symphony-5.6.17+dfsg/src/Master/main.c --- coinor-symphony-5.6.16+repack1/src/Master/main.c 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/Master/main.c 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/src/Master/master.c coinor-symphony-5.6.17+dfsg/src/Master/master.c --- coinor-symphony-5.6.16+repack1/src/Master/master.c 2017-01-15 19:45:41.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/Master/master.c 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ @@ -67,7 +67,7 @@ { printf("\n"); printf("== Welcome to the SYMPHONY MILP Solver \n"); - printf("== Copyright 2000-2015 Ted Ralphs and others \n"); + printf("== Copyright 2000-2019 Ted Ralphs and others \n"); printf("== All Rights Reserved. \n"); printf("== Distributed under the Eclipse Public License 1.0 \n"); if (strcmp(SYMPHONY_VERSION, "trunk")){ @@ -847,7 +847,7 @@ if (!env->par.tm_par.rs_mode_enabled){ #ifdef _OPENMP env->par.tm_par.max_active_nodes = omp_get_num_procs(); - PRINT(env->par.verbosity, -1, + PRINT(env->par.verbosity, 0, ("Automatically setting number of threads to %d\n\n", env->par.tm_par.max_active_nodes)); #else diff -Nru coinor-symphony-5.6.16+repack1/src/Master/master_func.c coinor-symphony-5.6.17+dfsg/src/Master/master_func.c --- coinor-symphony-5.6.16+repack1/src/Master/master_func.c 2015-11-27 19:17:23.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/Master/master_func.c 2019-02-24 04:51:19.000000000 +0000 @@ -7,7 +7,7 @@ /* */ /* This file was developed by Menal Guzelsoy for the SYMPHONY OSI interface. */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/src/Master/master_io.c coinor-symphony-5.6.17+dfsg/src/Master/master_io.c --- coinor-symphony-5.6.16+repack1/src/Master/master_io.c 2017-01-15 19:45:41.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/Master/master_io.c 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ @@ -575,8 +575,9 @@ c); }else{ i++; - tm_par->verbosity = lp_par->verbosity = cg_par->verbosity = - cp_par->verbosity = env->par.verbosity = tmpi; + prep_par->verbosity = tm_par->verbosity = lp_par->verbosity = + cg_par->verbosity = cp_par->verbosity = env->par.verbosity = + tmpi; } }else{ printf("Warning: Missing argument to command-line switch -%c\n",c); diff -Nru coinor-symphony-5.6.16+repack1/src/Master/master_prep_base.c coinor-symphony-5.6.17+dfsg/src/Master/master_prep_base.c --- coinor-symphony-5.6.16+repack1/src/Master/master_prep_base.c 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/Master/master_prep_base.c 2019-02-24 04:51:19.000000000 +0000 @@ -7,7 +7,7 @@ /* */ /* The author of this file is Menal Guzelsoy */ /* */ -/* (c) Copyright 2006-2015 Lehigh University. All Rights Reserved. */ +/* (c) Copyright 2006-2019 Lehigh University. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ @@ -4113,6 +4113,12 @@ // char obj_sense = env->mip->obj_sense; if (mip->mip_inf){ + FREE(mip->mip_inf->c_ind); + FREE(mip->mip_inf->c_val); + FREE(mip->mip_inf->c_beg); + FREE(mip->mip_inf->c_sense); + FREE(mip->mip_inf->c_rhs); + FREE(mip->mip_inf->c_tmp); FREE(mip->mip_inf->rows); FREE(mip->mip_inf->cols); FREE(mip->mip_inf); diff -Nru coinor-symphony-5.6.16+repack1/src/Master/master_prep.c coinor-symphony-5.6.17+dfsg/src/Master/master_prep.c --- coinor-symphony-5.6.16+repack1/src/Master/master_prep.c 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/Master/master_prep.c 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2006-2015 Lehigh University. All Rights Reserved. */ +/* (c) Copyright 2006-2019 Lehigh University. All Rights Reserved. */ /* */ /* The author of this file is Menal Guzelsoy */ /* */ diff -Nru coinor-symphony-5.6.16+repack1/src/Master/master_prep_sr.c coinor-symphony-5.6.17+dfsg/src/Master/master_prep_sr.c --- coinor-symphony-5.6.16+repack1/src/Master/master_prep_sr.c 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/Master/master_prep_sr.c 2019-02-24 04:51:19.000000000 +0000 @@ -7,7 +7,7 @@ /* */ /* The author of this file is Menal Guzelsoy */ /* */ -/* (c) Copyright 2006-2015 Lehigh University. All Rights Reserved. */ +/* (c) Copyright 2006-2019 Lehigh University. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/src/Master/master_wrapper.c coinor-symphony-5.6.17+dfsg/src/Master/master_wrapper.c --- coinor-symphony-5.6.16+repack1/src/Master/master_wrapper.c 2015-11-27 19:17:23.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/Master/master_wrapper.c 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/src/TreeManager/tm_func.c coinor-symphony-5.6.17+dfsg/src/TreeManager/tm_func.c --- coinor-symphony-5.6.16+repack1/src/TreeManager/tm_func.c 2017-01-15 19:45:41.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/TreeManager/tm_func.c 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/src/TreeManager/tm_proccomm.c coinor-symphony-5.6.17+dfsg/src/TreeManager/tm_proccomm.c --- coinor-symphony-5.6.16+repack1/src/TreeManager/tm_proccomm.c 2017-01-15 19:45:41.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/TreeManager/tm_proccomm.c 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/src/TreeManager/treemanager.c coinor-symphony-5.6.17+dfsg/src/TreeManager/treemanager.c --- coinor-symphony-5.6.16+repack1/src/TreeManager/treemanager.c 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/src/TreeManager/treemanager.c 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2000-2015 Ted Ralphs. All Rights Reserved. */ +/* (c) Copyright 2000-2019 Ted Ralphs. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/test/Makefile.am coinor-symphony-5.6.17+dfsg/test/Makefile.am --- coinor-symphony-5.6.16+repack1/test/Makefile.am 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/test/Makefile.am 2019-02-24 04:51:19.000000000 +0000 @@ -7,7 +7,7 @@ # # # The author of this file is Menal Guzelsoy # # # -# (c) Copyright 2006-2015 Lehigh University. All Rights Reserved. # +# (c) Copyright 2006-2019 Lehigh University. All Rights Reserved. # # # # This software is licensed under the Eclipse Public License. Please see # # accompanying file for terms. # diff -Nru coinor-symphony-5.6.16+repack1/test/Makefile.in coinor-symphony-5.6.17+dfsg/test/Makefile.in --- coinor-symphony-5.6.16+repack1/test/Makefile.in 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/test/Makefile.in 2019-02-24 04:51:19.000000000 +0000 @@ -23,7 +23,7 @@ # # # The author of this file is Menal Guzelsoy # # # -# (c) Copyright 2006-2015 Lehigh University. All Rights Reserved. # +# (c) Copyright 2006-2019 Lehigh University. All Rights Reserved. # # # # This software is licensed under the Eclipse Public License. Please see # # accompanying file for terms. # diff -Nru coinor-symphony-5.6.16+repack1/test/OsiSymSolverInterfaceTest.cpp coinor-symphony-5.6.17+dfsg/test/OsiSymSolverInterfaceTest.cpp --- coinor-symphony-5.6.16+repack1/test/OsiSymSolverInterfaceTest.cpp 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/test/OsiSymSolverInterfaceTest.cpp 2019-02-24 04:51:19.000000000 +0000 @@ -7,7 +7,7 @@ /* */ /* The author of this file is Menal Guzelsoy */ /* */ -/* (c) Copyright 2006-2015 Lehigh University. All Rights Reserved. */ +/* (c) Copyright 2006-2019 Lehigh University. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */ diff -Nru coinor-symphony-5.6.16+repack1/test/unitTestSym.cpp coinor-symphony-5.6.17+dfsg/test/unitTestSym.cpp --- coinor-symphony-5.6.16+repack1/test/unitTestSym.cpp 2015-03-07 20:52:32.000000000 +0000 +++ coinor-symphony-5.6.17+dfsg/test/unitTestSym.cpp 2019-02-24 04:51:19.000000000 +0000 @@ -5,7 +5,7 @@ /* SYMPHONY was jointly developed by Ted Ralphs (ted@lehigh.edu) and */ /* Laci Ladanyi (ladanyi@us.ibm.com). */ /* */ -/* (c) Copyright 2006-2015 Lehigh University. All Rights Reserved. */ +/* (c) Copyright 2006-2019 Lehigh University. All Rights Reserved. */ /* */ /* This software is licensed under the Eclipse Public License. Please see */ /* accompanying file for terms. */