Changes from releases/5.6.9 at r2709 to releases/5.6.10 at r2709


Ignore:
Location:
releases/5.6.10
Files:
18 edited

Legend:

Unmodified
Added
Removed
  • releases/5.6.10/Dependencies

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

    r2709 r2709  
    1 For SYMPHONY license information, please see the LICENSE file in the SYMPHONY
    2 subdirectory. For licensing information for any other COIN-OR or third-party
    3 source code that was automatically checked out with SYMPHONY, please see the
    4 LICENSE file in the appropriate subdirectories.
     1Eclipse Public License -v 1.0
     2
     3THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
     4LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
     5CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
     6
     71. DEFINITIONS
     8
     9"Contribution" means:
     10
     11a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
     12
     13b) in the case of each subsequent Contributor:
     14
     15i) changes to the Program, and
     16
     17ii) additions to the Program;
     18
     19where such changes and/or additions to the Program originate from and are
     20distributed by that particular Contributor. A Contribution 'originates' from a
     21Contributor if it was added to the Program by such Contributor itself or
     22anyone acting on such Contributor's behalf. Contributions do not include
     23additions to the Program which: (i) are separate modules of software
     24distributed in conjunction with the Program under their own license agreement,
     25and (ii) are not derivative works of the Program.
     26
     27"Contributor" means any person or entity that distributes the Program.
     28
     29"Licensed Patents " mean patent claims licensable by a Contributor which are
     30necessarily infringed by the use or sale of its Contribution alone or when
     31combined with the Program.
     32
     33"Program" means the Contributions distributed in accordance with this
     34Agreement.
     35
     36"Recipient" means anyone who receives the Program under this Agreement,
     37including all Contributors.
     38
     392. GRANT OF RIGHTS
     40
     41a) Subject to the terms of this Agreement, each Contributor hereby grants
     42Recipient a non-exclusive, worldwide, royalty-free copyright license to
     43reproduce, prepare derivative works of, publicly display, publicly perform,
     44distribute and sublicense the Contribution of such Contributor, if any, and
     45such derivative works, in source code and object code form.
     46
     47b) Subject to the terms of this Agreement, each Contributor hereby grants
     48Recipient a non-exclusive, worldwide, royalty-free patent license under
     49Licensed Patents to make, use, sell, offer to sell, import and otherwise
     50transfer the Contribution of such Contributor, if any, in source code and
     51object code form. This patent license shall apply to the combination of the
     52Contribution and the Program if, at the time the Contribution is added by the
     53Contributor, such addition of the Contribution causes such combination to be
     54covered by the Licensed Patents. The patent license shall not apply to any
     55other combinations which include the Contribution. No hardware per se is
     56licensed hereunder.
     57
     58c) Recipient understands that although each Contributor grants the licenses to
     59its Contributions set forth herein, no assurances are provided by any
     60Contributor that the Program does not infringe the patent or other
     61intellectual property rights of any other entity. Each Contributor disclaims
     62any liability to Recipient for claims brought by any other entity based on
     63infringement of intellectual property rights or otherwise. As a condition to
     64exercising the rights and licenses granted hereunder, each Recipient hereby
     65assumes sole responsibility to secure any other intellectual property rights
     66needed, if any. For example, if a third party patent license is required to
     67allow Recipient to distribute the Program, it is Recipient's responsibility to
     68acquire that license before distributing the Program.
     69
     70d) Each Contributor represents that to its knowledge it has sufficient
     71copyright rights in its Contribution, if any, to grant the copyright license
     72set forth in this Agreement.
     73
     743. REQUIREMENTS
     75
     76A Contributor may choose to distribute the Program in object code form under
     77its own license agreement, provided that:
     78
     79a) it complies with the terms and conditions of this Agreement; and
     80
     81b) its license agreement:
     82
     83i) effectively disclaims on behalf of all Contributors all warranties and
     84conditions, express and implied, including warranties or conditions of title
     85and non-infringement, and implied warranties or conditions of merchantability
     86and fitness for a particular purpose;
     87
     88ii) effectively excludes on behalf of all Contributors all liability for
     89damages, including direct, indirect, special, incidental and consequential
     90damages, such as lost profits;
     91
     92iii) states that any provisions which differ from this Agreement are offered
     93by that Contributor alone and not by any other party; and
     94
     95iv) states that source code for the Program is available from such
     96Contributor, and informs licensees how to obtain it in a reasonable manner on
     97or through a medium customarily used for software exchange.
     98
     99When the Program is made available in source code form:
     100
     101a) it must be made available under this Agreement; and
     102
     103b) a copy of this Agreement must be included with each copy of the Program.
     104
     105Contributors may not remove or alter any copyright notices contained within
     106the Program.
     107
     108Each Contributor must identify itself as the originator of its Contribution,
     109if any, in a manner that reasonably allows subsequent Recipients to identify
     110the originator of the Contribution.
     111
     1124. COMMERCIAL DISTRIBUTION
     113
     114Commercial distributors of software may accept certain responsibilities with
     115respect to end users, business partners and the like. While this license is
     116intended to facilitate the commercial use of the Program, the Contributor who
     117includes the Program in a commercial product offering should do so in a manner
     118which does not create potential liability for other Contributors. Therefore,
     119if a Contributor includes the Program in a commercial product offering, such
     120Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
     121every other Contributor ("Indemnified Contributor") against any losses,
     122damages and costs (collectively "Losses") arising from claims, lawsuits and
     123other legal actions brought by a third party against the Indemnified
     124Contributor to the extent caused by the acts or omissions of such Commercial
     125Contributor in connection with its distribution of the Program in a commercial
     126product offering. The obligations in this section do not apply to any claims
     127or Losses relating to any actual or alleged intellectual property
     128infringement. In order to qualify, an Indemnified Contributor must: a)
     129promptly notify the Commercial Contributor in writing of such claim, and b)
     130allow the Commercial Contributor to control, and cooperate with the Commercial
     131Contributor in, the defense and any related settlement negotiations. The
     132Indemnified Contributor may participate in any such claim at its own expense.
     133
     134For example, a Contributor might include the Program in a commercial product
     135offering, Product X. That Contributor is then a Commercial Contributor. If
     136that Commercial Contributor then makes performance claims, or offers
     137warranties related to Product X, those performance claims and warranties are
     138such Commercial Contributor's responsibility alone. Under this section, the
     139Commercial Contributor would have to defend claims against the other
     140Contributors related to those performance claims and warranties, and if a
     141court requires any other Contributor to pay any damages as a result, the
     142Commercial Contributor must pay those damages.
     143
     1445. NO WARRANTY
     145
     146EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
     147"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
     148IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
     149NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
     150Recipient is solely responsible for determining the appropriateness of using
     151and distributing the Program and assumes all risks associated with its
     152exercise of rights under this Agreement , including but not limited to the
     153risks and costs of program errors, compliance with applicable laws, damage to
     154or loss of data, programs or equipment, and unavailability or interruption of
     155operations.
     156
     1576. DISCLAIMER OF LIABILITY
     158
     159EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
     160CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
     161SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION
     162LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
     163CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
     164ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
     165EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY
     166OF SUCH DAMAGES.
     167
     1687. GENERAL
     169
     170If any provision of this Agreement is invalid or unenforceable under
     171applicable law, it shall not affect the validity or enforceability of the
     172remainder of the terms of this Agreement, and without further action by the
     173parties hereto, such provision shall be reformed to the minimum extent
     174necessary to make such provision valid and enforceable.
     175
     176If Recipient institutes patent litigation against any entity (including a
     177cross-claim or counterclaim in a lawsuit) alleging that the Program itself
     178(excluding combinations of the Program with other software or hardware)
     179infringes such Recipient's patent(s), then such Recipient's rights granted
     180under Section 2(b) shall terminate as of the date such litigation is filed.
     181
     182All Recipient's rights under this Agreement shall terminate if it fails to
     183comply with any of the material terms or conditions of this Agreement and does
     184not cure such failure in a reasonable period of time after becoming aware of
     185such noncompliance. If all Recipient's rights under this Agreement terminate,
     186Recipient agrees to cease use and distribution of the Program as soon as
     187reasonably practicable. However, Recipient's obligations under this Agreement
     188and any licenses granted by Recipient relating to the Program shall continue
     189and survive.
     190
     191Everyone is permitted to copy and distribute copies of this Agreement, but in
     192order to avoid inconsistency the Agreement is copyrighted and may only be
     193modified in the following manner. The Agreement Steward reserves the right to
     194publish new versions (including revisions) of this Agreement from time to
     195time. No one other than the Agreement Steward has the right to modify this
     196Agreement. The Eclipse Foundation is the initial Agreement Steward. The
     197Eclipse Foundation may assign the responsibility to serve as the Agreement
     198Steward to a suitable separate entity. Each new version of the Agreement will
     199be given a distinguishing version number. The Program (including
     200Contributions) may always be distributed subject to the version of the
     201Agreement under which it was received. In addition, after a new version of the
     202Agreement is published, Contributor may elect to distribute the Program
     203(including its Contributions) under the new version. Except as expressly
     204stated in Sections 2(a) and 2(b) above, Recipient receives no rights or
     205licenses to the intellectual property of any Contributor under this Agreement,
     206whether expressly, by implication, estoppel or otherwise. All rights in the
     207Program not expressly granted under this Agreement are reserved.
     208
     209This Agreement is governed by the laws of the State of New York and the
     210intellectual property laws of the United States of America. No party to this
     211Agreement will bring a legal action under this Agreement more than one year
     212after the cause of action arose. Each party waives its rights to a jury trial
     213in any resulting litigation.
     214
  • releases/5.6.10/Makefile.in

    r2709 r2709  
    264264DISTCLEANFILES = coin_subdirs.txt $(am__append_2) \
    265265        $(VPATH_DISTCLEANFILES)
    266 DocFiles = README AUTHORS LICENSE
     266DocFiles = README AUTHORS LICENSE 
    267267DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME)
     268COIN_HAS_DOXYGEN = @COIN_HAS_DOXYGEN_TRUE@TRUE
     269COIN_HAS_LATEX = @COIN_HAS_LATEX_TRUE@TRUE
    268270all: all-recursive
    269271
     
    716718.PHONY: test unitTest ptest punitTest tests unitTests fulltest pfulltest
    717719
    718 install-doc: $(DocFiles)
     720doxygen-docs:
     721        if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
     722          if test -d "doxydoc/"; then \
     723            doxygen doxydoc/doxygen.conf;\
     724          fi;\
     725        fi
     726
     727pdf-doxygen-docs: doxygen-docs
     728        if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
     729          if test -d "doxydoc/latex"; then \
     730            if test "$(COIN_HAS_LATEX)" = TRUE; then \
     731              cd doxydoc/latex;\
     732              $(MAKE) pdf;\
     733              cd -;\
     734            fi;\
     735          fi;\
     736        fi
     737
     738clean-doxygen-docs:
     739        if test -d "doxydoc/"; then \
     740          cd doxydoc ;\
     741          rm -rf html latex *.log *.tag;\
     742        fi
     743
     744install-doxygen-docs: doxygen-docs
     745        if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
     746          if test -d "doxydoc/"; then \
     747            test -d "$(DESTDIR)$(DocInstallDir)/doxydoc" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)/doxydoc"; \
     748            $(INSTALL_DATA) @coin_doxy_tagname@ "$(DESTDIR)$(DocInstallDir)/@coin_doxy_tagname@";\
     749            if test -f "doxydoc/latex/refman.pdf"; then \
     750              $(INSTALL_DATA) doxydoc/latex/refman.pdf "$(DESTDIR)$(DocInstallDir)";\
     751            fi;\
     752            if test -d "doxydoc/html"; then \
     753              test -d "$(DESTDIR)$(DocInstallDir)/doxydoc/search/" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)/doxydoc/search/"; \
     754              $(INSTALL_DATA) doxydoc/html/*.* "$(DESTDIR)$(DocInstallDir)/doxydoc";\
     755              $(INSTALL_DATA) doxydoc/html/search/*.* "$(DESTDIR)$(DocInstallDir)/doxydoc/search";\
     756            fi;\
     757          fi;\
     758        fi
     759
     760uninstall-doxygen-docs:
     761        if test -d "$(DESTDIR)$(DocInstallDir)/doxydoc/"; then \
     762          rm -rf "$(DESTDIR)$(DocInstallDir)/doxydoc/"; \
     763        fi
     764        if test -f "$(DESTDIR)$(DocInstallDir)/refman.pdf"; then \
     765          rm -f "$(DESTDIR)$(DocInstallDir)/refman.pdf"; \
     766        fi
     767
     768all-doxygen-docs:
     769        for dir in $(subdirs) ; do \
     770          do_project=true;\
     771          for proj in $(COIN_SKIP_DOXYGEN); do\
     772            if test $$dir = $$proj; then\
     773              do_project=false;\
     774            fi;\
     775          done;\
     776          if test -r $$dir/doxydoc & $$do_project = true; then \
     777            (cd $$dir ; $(MAKE) doxygen-docs) \
     778          fi ; \
     779        done ;
     780
     781clean-all-doxygen-docs:
     782        for dir in $(subdirs) ; do \
     783          if test -r $$dir/doxydoc ; then \
     784            (cd $$dir ; $(MAKE) clean-doxygen-docs) \
     785          fi ; \
     786        done ;
     787
     788install-all-doxygen-docs: all-doxygen-docs
     789        for dir in $(subdirs) ; do \
     790          do_project=true;\
     791          for proj in $(COIN_SKIP_DOXYGEN); do\
     792            if test $$dir = $$proj; then\
     793              do_project=false;\
     794            fi;\
     795          done;\
     796          if test -r $$dir/doxydoc & $$do_project = true; then \
     797            (cd $$dir ; $(MAKE) install-doxygen-docs) \
     798          fi ; \
     799        done ;
     800
     801uninstall-all-doxygen-docs:
     802        for dir in $(subdirs) ; do \
     803          if test -r $$dir/doxydoc ; then \
     804            (cd $$dir ; $(MAKE) uninstall-doxygen-docs) \
     805          fi ; \
     806        done ;
     807
     808install-doc: $(DocFiles)
    719809        test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)"
    720810        for file in $(DocFiles); do \
    721811          if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
    722812          if test -f "$$dir$$file"; then $(INSTALL_DATA) "$$dir$$file" "$(DESTDIR)$(DocInstallDir)/$$file"; fi; \
    723         done
     813        done 
    724814
    725815uninstall-doc:
  • releases/5.6.10/README

    r2709 r2709  
    1 SYMPHONY Version 5.6.6 README
    2 =============================
     1SYMPHONY Version 5.6 README
     2===========================
    33
    44For the SYMPHONY README file, please see the file README.md. For the
  • releases/5.6.10/README.md

    r2709 r2709  
    1 # SYMPHONY Version 5.6.9 README
     1# SYMPHONY Version 5.6.10 README
    22
    33Welcome to SYMPHONY. SYMPHONY is distributed under the Eclipse Public License
     
    229229## CHANGELOG
    230230
     231### Release 5.6.10
     232  * Fixed bug with using more the 1 process in PVM
     233  * Print to stderr on ctrl-c
     234  * Fixed double free with prep level < 1
     235
    231236### Release 5.6.9
    232237  * Fixed memory leak
  • releases/5.6.10/SYMPHONY

  • releases/5.6.10/SYMPHONY/Doc/man-API.tex

    r2709 r2709  
    5858\begin{verbatim}
    5959 *******************************************************
    60  *   This is SYMPHONY Version 5.6.9                    *
     60 *   This is SYMPHONY Version 5.6.10                   *
    6161 *   Copyright 2000-2015 Ted Ralphs                    *
    6262 *   All Rights Reserved.                              *
  • releases/5.6.10/SYMPHONY/Doc/man.tex

    r2709 r2709  
    9797\def\CP{{Cut Pool Parameters}}
    9898\def\CGP{{Cut Generator Parameters}}
    99 \def\VER{{5.6.9}}
     99\def\VER{{5.6.10}}
    100100\lstloadlanguages{C++}
    101101
  • releases/5.6.10/SYMPHONY/Makefile.in

    r2709 r2709  
    516516# Files that are generated and should be cleaned with make distclean
    517517DISTCLEANFILES = $(am__append_3) $(VPATH_DISTCLEANFILES)
    518 DocFiles = README AUTHORS LICENSE
     518DocFiles = README AUTHORS LICENSE 
    519519DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME)
     520COIN_HAS_DOXYGEN = @COIN_HAS_DOXYGEN_TRUE@TRUE
     521COIN_HAS_LATEX = @COIN_HAS_LATEX_TRUE@TRUE
    520522all: all-recursive
    521523
     
    10651067        rm -f $(addlibsdir)/sym_addlibs.txt
    10661068
    1067 install-doc: $(DocFiles)
     1069doxygen-docs:
     1070        if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
     1071          if test -d "doxydoc/"; then \
     1072            doxygen doxydoc/doxygen.conf;\
     1073          fi;\
     1074        fi
     1075
     1076pdf-doxygen-docs: doxygen-docs
     1077        if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
     1078          if test -d "doxydoc/latex"; then \
     1079            if test "$(COIN_HAS_LATEX)" = TRUE; then \
     1080              cd doxydoc/latex;\
     1081              $(MAKE) pdf;\
     1082              cd -;\
     1083            fi;\
     1084          fi;\
     1085        fi
     1086
     1087clean-doxygen-docs:
     1088        if test -d "doxydoc/"; then \
     1089          cd doxydoc ;\
     1090          rm -rf html latex *.log *.tag;\
     1091        fi
     1092
     1093install-doxygen-docs: doxygen-docs
     1094        if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
     1095          if test -d "doxydoc/"; then \
     1096            test -d "$(DESTDIR)$(DocInstallDir)/doxydoc" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)/doxydoc"; \
     1097            $(INSTALL_DATA) @coin_doxy_tagname@ "$(DESTDIR)$(DocInstallDir)/@coin_doxy_tagname@";\
     1098            if test -f "doxydoc/latex/refman.pdf"; then \
     1099              $(INSTALL_DATA) doxydoc/latex/refman.pdf "$(DESTDIR)$(DocInstallDir)";\
     1100            fi;\
     1101            if test -d "doxydoc/html"; then \
     1102              test -d "$(DESTDIR)$(DocInstallDir)/doxydoc/search/" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)/doxydoc/search/"; \
     1103              $(INSTALL_DATA) doxydoc/html/*.* "$(DESTDIR)$(DocInstallDir)/doxydoc";\
     1104              $(INSTALL_DATA) doxydoc/html/search/*.* "$(DESTDIR)$(DocInstallDir)/doxydoc/search";\
     1105            fi;\
     1106          fi;\
     1107        fi
     1108
     1109uninstall-doxygen-docs:
     1110        if test -d "$(DESTDIR)$(DocInstallDir)/doxydoc/"; then \
     1111          rm -rf "$(DESTDIR)$(DocInstallDir)/doxydoc/"; \
     1112        fi
     1113        if test -f "$(DESTDIR)$(DocInstallDir)/refman.pdf"; then \
     1114          rm -f "$(DESTDIR)$(DocInstallDir)/refman.pdf"; \
     1115        fi
     1116
     1117all-doxygen-docs:
     1118        for dir in $(subdirs) ; do \
     1119          do_project=true;\
     1120          for proj in $(COIN_SKIP_DOXYGEN); do\
     1121            if test $$dir = $$proj; then\
     1122              do_project=false;\
     1123            fi;\
     1124          done;\
     1125          if test -r $$dir/doxydoc & $$do_project = true; then \
     1126            (cd $$dir ; $(MAKE) doxygen-docs) \
     1127          fi ; \
     1128        done ;
     1129
     1130clean-all-doxygen-docs:
     1131        for dir in $(subdirs) ; do \
     1132          if test -r $$dir/doxydoc ; then \
     1133            (cd $$dir ; $(MAKE) clean-doxygen-docs) \
     1134          fi ; \
     1135        done ;
     1136
     1137install-all-doxygen-docs: all-doxygen-docs
     1138        for dir in $(subdirs) ; do \
     1139          do_project=true;\
     1140          for proj in $(COIN_SKIP_DOXYGEN); do\
     1141            if test $$dir = $$proj; then\
     1142              do_project=false;\
     1143            fi;\
     1144          done;\
     1145          if test -r $$dir/doxydoc & $$do_project = true; then \
     1146            (cd $$dir ; $(MAKE) install-doxygen-docs) \
     1147          fi ; \
     1148        done ;
     1149
     1150uninstall-all-doxygen-docs:
     1151        for dir in $(subdirs) ; do \
     1152          if test -r $$dir/doxydoc ; then \
     1153            (cd $$dir ; $(MAKE) uninstall-doxygen-docs) \
     1154          fi ; \
     1155        done ;
     1156
     1157install-doc: $(DocFiles)
    10681158        test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)"
    10691159        for file in $(DocFiles); do \
    10701160          if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
    10711161          if test -f "$$dir$$file"; then $(INSTALL_DATA) "$$dir$$file" "$(DESTDIR)$(DocInstallDir)/$$file"; fi; \
    1072         done
     1162        done 
    10731163
    10741164uninstall-doc:
  • releases/5.6.10/SYMPHONY/README

    r2709 r2709  
    1 SYMPHONY Version 5.6.9 README
     1SYMPHONY Version 5.6.10 README
    22=============================
    33
     
    246246==========
    247247
     248# Release 5.6.10
     249  * Fixed bug with using more the 1 process in PVM
     250  * Print to stderr on ctrl-c
     251  * Fixed double free with prep level < 1
     252
    248253# Release 5.6.9
    249254  * Fixed memory leak
  • releases/5.6.10/SYMPHONY/configure

    r2709 r2709  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.59 for SYMPHONY 5.6.9.
     3# Generated by GNU Autoconf 2.59 for SYMPHONY 5.6.10.
    44#
    55# Report bugs to <symphony@list.coin-or.org>.
     
    440440PACKAGE_NAME='SYMPHONY'
    441441PACKAGE_TARNAME='symphony'
    442 PACKAGE_VERSION='5.6.9'
    443 PACKAGE_STRING='SYMPHONY 5.6.9'
     442PACKAGE_VERSION='5.6.10'
     443PACKAGE_STRING='SYMPHONY 5.6.10'
    444444PACKAGE_BUGREPORT='symphony@list.coin-or.org'
    445445
     
    10161016  # This message is too long to be a string in the A/UX 3.1 sh.
    10171017  cat <<_ACEOF
    1018 \`configure' configures SYMPHONY 5.6.9 to adapt to many kinds of systems.
     1018\`configure' configures SYMPHONY 5.6.10 to adapt to many kinds of systems.
    10191019
    10201020Usage: $0 [OPTION]... [VAR=VALUE]...
     
    10821082if test -n "$ac_init_help"; then
    10831083  case $ac_init_help in
    1084      short | recursive ) echo "Configuration of SYMPHONY 5.6.9:";;
     1084     short | recursive ) echo "Configuration of SYMPHONY 5.6.10:";;
    10851085   esac
    10861086  cat <<\_ACEOF
     
    13361336if $ac_init_version; then
    13371337  cat <<\_ACEOF
    1338 SYMPHONY configure 5.6.9
     1338SYMPHONY configure 5.6.10
    13391339generated by GNU Autoconf 2.59
    13401340
     
    13661366running configure, to aid debugging if configure makes a mistake.
    13671367
    1368 It was created by SYMPHONY $as_me 5.6.9, which was
     1368It was created by SYMPHONY $as_me 5.6.10, which was
    13691369generated by GNU Autoconf 2.59.  Invocation command line was
    13701370
     
    18921892
    18931893# Capture libtool library version, if given.
    1894  coin_libversion=9:9:6
     1894 coin_libversion=9:10:6
    18951895
    18961896
     
    46214621# Define the identity of the package.
    46224622 PACKAGE='symphony'
    4623  VERSION='5.6.9'
     4623 VERSION='5.6.10'
    46244624
    46254625
     
    2996729967cat >&5 <<_CSEOF
    2996829968
    29969 This file was extended by SYMPHONY $as_me 5.6.9, which was
     29969This file was extended by SYMPHONY $as_me 5.6.10, which was
    2997029970generated by GNU Autoconf 2.59.  Invocation command line was
    2997129971
     
    3003030030cat >>$CONFIG_STATUS <<_ACEOF
    3003130031ac_cs_version="\\
    30032 SYMPHONY config.status 5.6.9
     30032SYMPHONY config.status 5.6.10
    3003330033configured by $0, generated by GNU Autoconf 2.59,
    3003430034  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • releases/5.6.10/SYMPHONY/configure.ac

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

    r2709 r2709  
    66
    77/* Version number of project */
    8 #define SYMPHONY_VERSION "5.6.9"
     8#define SYMPHONY_VERSION "5.6.10"
    99
    1010/* Major Version number of project */
     
    1515
    1616/* Release Version number of project */
    17 #define SYMPHONY_VERSION_RELEASE 9
     17#define SYMPHONY_VERSION_RELEASE 10
    1818
    1919
  • releases/5.6.10/SYMPHONY/src/Master/master_io.c

    r2709 r2709  
    547547               }
    548548#endif
     549#else
     550               tm_par->max_active_nodes = tmpi;
    549551#endif
    550552            }
  • releases/5.6.10/SYMPHONY/src/Master/master_wrapper.c

    r2709 r2709  
    777777{
    778778   int i;
    779 
     779   MIPdesc *tmp;
     780   
    780781#ifdef USE_SYM_APPLICATION
    781782   CALL_USER_FUNCTION( user_free_master(&env->user) );
     
    784785   FREE(env->best_sol.xval);
    785786   
    786    if (env->mip){
     787   if (tmp = env->mip){
    787788      free_mip_desc(env->mip);
    788789      FREE(env->mip);
    789790   }
    790791
    791    if(env->prep_mip){
     792   if(env->prep_mip && env->prep_mip != tmp){
    792793      free_mip_desc(env->prep_mip);
    793794      FREE(env->prep_mip);
     795   }else{ //We made a copy, so don't free it again
     796      env->prep_mip = NULL;
    794797   }
    795798   
     
    835838   }
    836839#endif
    837 #endif
     840#ifdef COMPILE_IN_LP
    838841   if (env->sp){
    839842      sp_free_sp(env->sp);
    840843      FREE(env->sp);
    841844   }
     845#endif
     846#endif
    842847   
    843848   return(FUNCTION_TERMINATED_NORMALLY);   
  • releases/5.6.10/SYMPHONY/src/TreeManager/tm_func.c

    r2709 r2709  
    364364            scand_num = tm->samephase_candnum;
    365365            }
    366             if (scand_num > 0 && (thread_num != 0 || tm->par.max_active_nodes == 1)){
     366            if (scand_num > 0
     367#ifndef __PVM__
     368                && (thread_num != 0 || tm->par.max_active_nodes == 1)
     369#endif
     370                ){
    367371               i = start_node(tm, thread_num);
    368372            }else{
     
    38883892   
    38893893   strcpy(temp, "");
    3890    printf("\nDo you want to abort immediately, exit gracefully (from the current solve call only), or continue? [a/e/c]: ");
    3891    fflush(stdout);   
     3894   fprintf(stderr, "\nDo you want to abort immediately, exit gracefully (from the current solve call only), or continue? [a/e/c]: ");
     3895   fflush(stderr);   
    38923896   fgets(temp, MAX_LINE_LENGTH, stdin);
    38933897   if(temp[1] == '\n' && (temp[0] == 'a' || temp[0] == 'A')){
    3894       printf("\nTerminating...\n");
    3895       fflush(stdout);
     3898      fprintf(stderr, "\nTerminating...\n");
     3899      fflush(stderr);
    38963900      exit(0);
    38973901   }else if(temp[1] == '\n' && (temp[0] == 'e' || temp[0] == 'E')){   
    38983902      c_count++;           
    38993903   } else{
    3900       printf("\nContinuing...\n");
    3901       fflush(stdout);
     3904      fprintf(stderr, "\nContinuing...\n");
     3905      fflush(stderr);
    39023906      c_count = 0;     
    39033907   }
  • releases/5.6.10/configure

    r2709 r2709  
    22# From configure.ac 0.9.
    33# Guess values for system-dependent variables and create Makefiles.
    4 # Generated by GNU Autoconf 2.59 for SYMPHONY 5.6.9.
     4# Generated by GNU Autoconf 2.59 for SYMPHONY 5.6.10.
    55#
    66# Report bugs to <https://projects.coin-or.org/svn/SYMPHONY/newticket>.
     
    441441PACKAGE_NAME='SYMPHONY'
    442442PACKAGE_TARNAME='symphony'
    443 PACKAGE_VERSION='5.6.9'
    444 PACKAGE_STRING='SYMPHONY 5.6.9'
     443PACKAGE_VERSION='5.6.10'
     444PACKAGE_STRING='SYMPHONY 5.6.10'
    445445PACKAGE_BUGREPORT='https://projects.coin-or.org/svn/SYMPHONY/newticket'
    446446
     
    10451045  # This message is too long to be a string in the A/UX 3.1 sh.
    10461046  cat <<_ACEOF
    1047 \`configure' configures SYMPHONY 5.6.9 to adapt to many kinds of systems.
     1047\`configure' configures SYMPHONY 5.6.10 to adapt to many kinds of systems.
    10481048
    10491049Usage: $0 [OPTION]... [VAR=VALUE]...
     
    11111111if test -n "$ac_init_help"; then
    11121112  case $ac_init_help in
    1113      short | recursive ) echo "Configuration of SYMPHONY 5.6.9:";;
     1113     short | recursive ) echo "Configuration of SYMPHONY 5.6.10:";;
    11141114   esac
    11151115  cat <<\_ACEOF
     
    13261326if $ac_init_version; then
    13271327  cat <<\_ACEOF
    1328 SYMPHONY configure 5.6.9
     1328SYMPHONY configure 5.6.10
    13291329generated by GNU Autoconf 2.59
    13301330
     
    13561356running configure, to aid debugging if configure makes a mistake.
    13571357
    1358 It was created by SYMPHONY $as_me 5.6.9, which was
     1358It was created by SYMPHONY $as_me 5.6.10, which was
    13591359generated by GNU Autoconf 2.59.  Invocation command line was
    13601360
     
    51235123# Define the identity of the package.
    51245124 PACKAGE='symphony'
    5125  VERSION='5.6.9'
     5125 VERSION='5.6.10'
    51265126
    51275127
     
    2287122871cat >&5 <<_CSEOF
    2287222872
    22873 This file was extended by SYMPHONY $as_me 5.6.9, which was
     22873This file was extended by SYMPHONY $as_me 5.6.10, which was
    2287422874generated by GNU Autoconf 2.59.  Invocation command line was
    2287522875
     
    2292922929cat >>$CONFIG_STATUS <<_ACEOF
    2293022930ac_cs_version="\\
    22931 SYMPHONY config.status 5.6.9
     22931SYMPHONY config.status 5.6.10
    2293222932configured by $0, generated by GNU Autoconf 2.59,
    2293322933  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • releases/5.6.10/configure.ac

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