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

Location:

releases/5.6.10

Files:

• Dependencies (modified) (1 prop)
• LICENSE (modified) (1 diff)
• Makefile.in (modified) (2 diffs)
• README (modified) (1 diff)
• README.md (modified) (2 diffs)
• SYMPHONY (modified) (1 prop)
• SYMPHONY/Doc/man-API.tex (modified) (1 diff)
• SYMPHONY/Doc/man.tex (modified) (1 diff)
• SYMPHONY/Makefile.in (modified) (2 diffs)
• SYMPHONY/README (modified) (2 diffs)
• SYMPHONY/configure (modified) (10 diffs)
• SYMPHONY/configure.ac (modified) (2 diffs)
• SYMPHONY/include/config_sym_default.h (modified) (2 diffs)
• SYMPHONY/src/Master/master_io.c (modified) (1 diff)
• SYMPHONY/src/Master/master_wrapper.c (modified) (3 diffs)
• SYMPHONY/src/TreeManager/tm_func.c (modified) (2 diffs)
• configure (modified) (9 diffs)
• configure.ac (modified) (1 diff)

releases/5.6.10/LICENSE

@@ -1 @@
-For SYMPHONY license information, please see the LICENSE file in the SYMPHONY
-subdirectory. For licensing information for any other COIN-OR or third-party
-source code that was automatically checked out with SYMPHONY, please see the
-LICENSE file in the appropriate subdirectories.
+Eclipse Public License -v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
+CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+
+b) in the case of each subsequent Contributor:
+
+i) changes to the Program, and
+
+ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are
+distributed by that particular Contributor. A Contribution 'originates' from a
+Contributor if it was added to the Program by such Contributor itself or
+anyone acting on such Contributor's behalf. Contributions do not include
+additions to the Program which: (i) are separate modules of software
+distributed in conjunction with the Program under their own license agreement,
+and (ii) are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are
+necessarily infringed by the use or sale of its Contribution alone or when
+combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this
+Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement,
+including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free copyright license to
+reproduce, prepare derivative works of, publicly display, publicly perform,
+distribute and sublicense the Contribution of such Contributor, if any, and
+such derivative works, in source code and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free patent license under
+Licensed Patents to make, use, sell, offer to sell, import and otherwise
+transfer the Contribution of such Contributor, if any, in source code and
+object code form. This patent license shall apply to the combination of the
+Contribution and the Program if, at the time the Contribution is added by the
+Contributor, such addition of the Contribution causes such combination to be
+covered by the Licensed Patents. The patent license shall not apply to any
+other combinations which include the Contribution. No hardware per se is
+licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses to
+its Contributions set forth herein, no assurances are provided by any
+Contributor that the Program does not infringe the patent or other
+intellectual property rights of any other entity. Each Contributor disclaims
+any liability to Recipient for claims brought by any other entity based on
+infringement of intellectual property rights or otherwise. As a condition to
+exercising the rights and licenses granted hereunder, each Recipient hereby
+assumes sole responsibility to secure any other intellectual property rights
+needed, if any. For example, if a third party patent license is required to
+allow Recipient to distribute the Program, it is Recipient's responsibility to
+acquire that license before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient
+copyright rights in its Contribution, if any, to grant the copyright license
+set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under
+its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title
+and non-infringement, and implied warranties or conditions of merchantability
+and fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability for
+damages, including direct, indirect, special, incidental and consequential
+damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are offered
+by that Contributor alone and not by any other party; and
+
+iv) states that source code for the Program is available from such
+Contributor, and informs licensees how to obtain it in a reasonable manner on
+or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within
+the Program.
+
+Each Contributor must identify itself as the originator of its Contribution,
+if any, in a manner that reasonably allows subsequent Recipients to identify
+the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with
+respect to end users, business partners and the like. While this license is
+intended to facilitate the commercial use of the Program, the Contributor who
+includes the Program in a commercial product offering should do so in a manner
+which does not create potential liability for other Contributors. Therefore,
+if a Contributor includes the Program in a commercial product offering, such
+Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
+every other Contributor ("Indemnified Contributor") against any losses,
+damages and costs (collectively "Losses") arising from claims, lawsuits and
+other legal actions brought by a third party against the Indemnified
+Contributor to the extent caused by the acts or omissions of such Commercial
+Contributor in connection with its distribution of the Program in a commercial
+product offering. The obligations in this section do not apply to any claims
+or Losses relating to any actual or alleged intellectual property
+infringement. In order to qualify, an Indemnified Contributor must: a)
+promptly notify the Commercial Contributor in writing of such claim, and b)
+allow the Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product
+offering, Product X. That Contributor is then a Commercial Contributor. If
+that Commercial Contributor then makes performance claims, or offers
+warranties related to Product X, those performance claims and warranties are
+such Commercial Contributor's responsibility alone. Under this section, the
+Commercial Contributor would have to defend claims against the other
+Contributors related to those performance claims and warranties, and if a
+court requires any other Contributor to pay any damages as a result, the
+Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
+Recipient is solely responsible for determining the appropriateness of using
+and distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to the
+risks and costs of program errors, compliance with applicable laws, damage to
+or loss of data, programs or equipment, and unavailability or interruption of
+operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
+CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION
+LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY
+OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of the
+remainder of the terms of this Agreement, and without further action by the
+parties hereto, such provision shall be reformed to the minimum extent
+necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+(excluding combinations of the Program with other software or hardware)
+infringes such Recipient's patent(s), then such Recipient's rights granted
+under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to
+comply with any of the material terms or conditions of this Agreement and does
+not cure such failure in a reasonable period of time after becoming aware of
+such noncompliance. If all Recipient's rights under this Agreement terminate,
+Recipient agrees to cease use and distribution of the Program as soon as
+reasonably practicable. However, Recipient's obligations under this Agreement
+and any licenses granted by Recipient relating to the Program shall continue
+and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in
+order to avoid inconsistency the Agreement is copyrighted and may only be
+modified in the following manner. The Agreement Steward reserves the right to
+publish new versions (including revisions) of this Agreement from time to
+time. No one other than the Agreement Steward has the right to modify this
+Agreement. The Eclipse Foundation is the initial Agreement Steward. The
+Eclipse Foundation may assign the responsibility to serve as the Agreement
+Steward to a suitable separate entity. Each new version of the Agreement will
+be given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version of the
+Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly
+stated in Sections 2(a) and 2(b) above, Recipient receives no rights or
+licenses to the intellectual property of any Contributor under this Agreement,
+whether expressly, by implication, estoppel or otherwise. All rights in the
+Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the
+intellectual property laws of the United States of America. No party to this
+Agreement will bring a legal action under this Agreement more than one year
+after the cause of action arose. Each party waives its rights to a jury trial
+in any resulting litigation.
+

releases/5.6.10/Makefile.in

@@ -264 +264 @@
 DISTCLEANFILES = coin_subdirs.txt $(am__append_2) \
         $(VPATH_DISTCLEANFILES)
-DocFiles = README AUTHORS LICENSE
+DocFiles = README AUTHORS LICENSE 
 DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME)
+COIN_HAS_DOXYGEN = @COIN_HAS_DOXYGEN_TRUE@TRUE
+COIN_HAS_LATEX = @COIN_HAS_LATEX_TRUE@TRUE
 all: all-recursive
 
@@ -716 +718 @@
 .PHONY: test unitTest ptest punitTest tests unitTests fulltest pfulltest
 
-install-doc: $(DocFiles)
+doxygen-docs: 
+        if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
+          if test -d "doxydoc/"; then \
+            doxygen doxydoc/doxygen.conf;\
+          fi;\
+        fi
+
+pdf-doxygen-docs: doxygen-docs
+        if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
+          if test -d "doxydoc/latex"; then \
+            if test "$(COIN_HAS_LATEX)" = TRUE; then \
+              cd doxydoc/latex;\
+              $(MAKE) pdf;\
+              cd -;\
+            fi;\
+          fi;\
+        fi
+
+clean-doxygen-docs:
+        if test -d "doxydoc/"; then \
+          cd doxydoc ;\
+          rm -rf html latex *.log *.tag;\
+        fi
+
+install-doxygen-docs: doxygen-docs
+        if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
+          if test -d "doxydoc/"; then \
+            test -d "$(DESTDIR)$(DocInstallDir)/doxydoc" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)/doxydoc"; \
+            $(INSTALL_DATA) @coin_doxy_tagname@ "$(DESTDIR)$(DocInstallDir)/@coin_doxy_tagname@";\
+            if test -f "doxydoc/latex/refman.pdf"; then \
+              $(INSTALL_DATA) doxydoc/latex/refman.pdf "$(DESTDIR)$(DocInstallDir)";\
+            fi;\
+            if test -d "doxydoc/html"; then \
+              test -d "$(DESTDIR)$(DocInstallDir)/doxydoc/search/" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)/doxydoc/search/"; \
+              $(INSTALL_DATA) doxydoc/html/*.* "$(DESTDIR)$(DocInstallDir)/doxydoc";\
+              $(INSTALL_DATA) doxydoc/html/search/*.* "$(DESTDIR)$(DocInstallDir)/doxydoc/search";\
+            fi;\
+          fi;\
+        fi
+
+uninstall-doxygen-docs:
+        if test -d "$(DESTDIR)$(DocInstallDir)/doxydoc/"; then \
+          rm -rf "$(DESTDIR)$(DocInstallDir)/doxydoc/"; \
+        fi
+        if test -f "$(DESTDIR)$(DocInstallDir)/refman.pdf"; then \
+          rm -f "$(DESTDIR)$(DocInstallDir)/refman.pdf"; \
+        fi
+
+all-doxygen-docs:
+        for dir in $(subdirs) ; do \
+          do_project=true;\
+          for proj in $(COIN_SKIP_DOXYGEN); do\
+            if test $$dir = $$proj; then\
+              do_project=false;\
+            fi;\
+          done;\
+          if test -r $$dir/doxydoc & $$do_project = true; then \
+            (cd $$dir ; $(MAKE) doxygen-docs) \
+          fi ; \
+        done ; 
+
+clean-all-doxygen-docs:
+        for dir in $(subdirs) ; do \
+          if test -r $$dir/doxydoc ; then \
+            (cd $$dir ; $(MAKE) clean-doxygen-docs) \
+          fi ; \
+        done ; 
+
+install-all-doxygen-docs: all-doxygen-docs
+        for dir in $(subdirs) ; do \
+          do_project=true;\
+          for proj in $(COIN_SKIP_DOXYGEN); do\
+            if test $$dir = $$proj; then\
+              do_project=false;\
+            fi;\
+          done;\
+          if test -r $$dir/doxydoc & $$do_project = true; then \
+            (cd $$dir ; $(MAKE) install-doxygen-docs) \
+          fi ; \
+        done ; 
+
+uninstall-all-doxygen-docs:
+        for dir in $(subdirs) ; do \
+          if test -r $$dir/doxydoc ; then \
+            (cd $$dir ; $(MAKE) uninstall-doxygen-docs) \
+          fi ; \
+        done ; 
+
+install-doc: $(DocFiles) 
         test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)"
         for file in $(DocFiles); do \
           if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
           if test -f "$$dir$$file"; then $(INSTALL_DATA) "$$dir$$file" "$(DESTDIR)$(DocInstallDir)/$$file"; fi; \
-        done
+        done 
 
 uninstall-doc:

releases/5.6.10/README

@@ -1 @@
-SYMPHONY Version 5.6.6 README
-=============================
+SYMPHONY Version 5.6 README
+===========================
 
 For the SYMPHONY README file, please see the file README.md. For the

releases/5.6.10/README.md

@@ -1 @@
-# SYMPHONY Version 5.6.9 README
+# SYMPHONY Version 5.6.10 README
 
 Welcome to SYMPHONY. SYMPHONY is distributed under the Eclipse Public License
@@ -229 +229 @@
 ## CHANGELOG
 
+### Release 5.6.10
+  * Fixed bug with using more the 1 process in PVM
+  * Print to stderr on ctrl-c
+  * Fixed double free with prep level < 1
+
 ### Release 5.6.9
   * Fixed memory leak

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

@@ -58 +58 @@
 \begin{verbatim}
  *******************************************************
- *   This is SYMPHONY Version 5.6.9                    *
+ *   This is SYMPHONY Version 5.6.10                   *
  *   Copyright 2000-2015 Ted Ralphs                    *
  *   All Rights Reserved.                              *

releases/5.6.10/SYMPHONY/Doc/man.tex

@@ -97 +97 @@
 \def\CP{{Cut Pool Parameters}}
 \def\CGP{{Cut Generator Parameters}}
-\def\VER{{5.6.9}}
+\def\VER{{5.6.10}}
 \lstloadlanguages{C++}
 

releases/5.6.10/SYMPHONY/Makefile.in

@@ -516 +516 @@
 # Files that are generated and should be cleaned with make distclean
 DISTCLEANFILES = $(am__append_3) $(VPATH_DISTCLEANFILES)
-DocFiles = README AUTHORS LICENSE
+DocFiles = README AUTHORS LICENSE 
 DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME)
+COIN_HAS_DOXYGEN = @COIN_HAS_DOXYGEN_TRUE@TRUE
+COIN_HAS_LATEX = @COIN_HAS_LATEX_TRUE@TRUE
 all: all-recursive
 
@@ -1065 +1067 @@
         rm -f $(addlibsdir)/sym_addlibs.txt
 
-install-doc: $(DocFiles)
+doxygen-docs: 
+        if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
+          if test -d "doxydoc/"; then \
+            doxygen doxydoc/doxygen.conf;\
+          fi;\
+        fi
+
+pdf-doxygen-docs: doxygen-docs
+        if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
+          if test -d "doxydoc/latex"; then \
+            if test "$(COIN_HAS_LATEX)" = TRUE; then \
+              cd doxydoc/latex;\
+              $(MAKE) pdf;\
+              cd -;\
+            fi;\
+          fi;\
+        fi
+
+clean-doxygen-docs:
+        if test -d "doxydoc/"; then \
+          cd doxydoc ;\
+          rm -rf html latex *.log *.tag;\
+        fi
+
+install-doxygen-docs: doxygen-docs
+        if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
+          if test -d "doxydoc/"; then \
+            test -d "$(DESTDIR)$(DocInstallDir)/doxydoc" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)/doxydoc"; \
+            $(INSTALL_DATA) @coin_doxy_tagname@ "$(DESTDIR)$(DocInstallDir)/@coin_doxy_tagname@";\
+            if test -f "doxydoc/latex/refman.pdf"; then \
+              $(INSTALL_DATA) doxydoc/latex/refman.pdf "$(DESTDIR)$(DocInstallDir)";\
+            fi;\
+            if test -d "doxydoc/html"; then \
+              test -d "$(DESTDIR)$(DocInstallDir)/doxydoc/search/" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)/doxydoc/search/"; \
+              $(INSTALL_DATA) doxydoc/html/*.* "$(DESTDIR)$(DocInstallDir)/doxydoc";\
+              $(INSTALL_DATA) doxydoc/html/search/*.* "$(DESTDIR)$(DocInstallDir)/doxydoc/search";\
+            fi;\
+          fi;\
+        fi
+
+uninstall-doxygen-docs:
+        if test -d "$(DESTDIR)$(DocInstallDir)/doxydoc/"; then \
+          rm -rf "$(DESTDIR)$(DocInstallDir)/doxydoc/"; \
+        fi
+        if test -f "$(DESTDIR)$(DocInstallDir)/refman.pdf"; then \
+          rm -f "$(DESTDIR)$(DocInstallDir)/refman.pdf"; \
+        fi
+
+all-doxygen-docs:
+        for dir in $(subdirs) ; do \
+          do_project=true;\
+          for proj in $(COIN_SKIP_DOXYGEN); do\
+            if test $$dir = $$proj; then\
+              do_project=false;\
+            fi;\
+          done;\
+          if test -r $$dir/doxydoc & $$do_project = true; then \
+            (cd $$dir ; $(MAKE) doxygen-docs) \
+          fi ; \
+        done ; 
+
+clean-all-doxygen-docs:
+        for dir in $(subdirs) ; do \
+          if test -r $$dir/doxydoc ; then \
+            (cd $$dir ; $(MAKE) clean-doxygen-docs) \
+          fi ; \
+        done ; 
+
+install-all-doxygen-docs: all-doxygen-docs
+        for dir in $(subdirs) ; do \
+          do_project=true;\
+          for proj in $(COIN_SKIP_DOXYGEN); do\
+            if test $$dir = $$proj; then\
+              do_project=false;\
+            fi;\
+          done;\
+          if test -r $$dir/doxydoc & $$do_project = true; then \
+            (cd $$dir ; $(MAKE) install-doxygen-docs) \
+          fi ; \
+        done ; 
+
+uninstall-all-doxygen-docs:
+        for dir in $(subdirs) ; do \
+          if test -r $$dir/doxydoc ; then \
+            (cd $$dir ; $(MAKE) uninstall-doxygen-docs) \
+          fi ; \
+        done ; 
+
+install-doc: $(DocFiles) 
         test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)"
         for file in $(DocFiles); do \
           if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
           if test -f "$$dir$$file"; then $(INSTALL_DATA) "$$dir$$file" "$(DESTDIR)$(DocInstallDir)/$$file"; fi; \
-        done
+        done 
 
 uninstall-doc:

releases/5.6.10/SYMPHONY/README

@@ -1 @@
-SYMPHONY Version 5.6.9 README
+SYMPHONY Version 5.6.10 README
 =============================
 
@@ -246 +246 @@
 ==========
 
+# Release 5.6.10
+  * Fixed bug with using more the 1 process in PVM
+  * Print to stderr on ctrl-c
+  * Fixed double free with prep level < 1
+
 # Release 5.6.9
   * Fixed memory leak

releases/5.6.10/SYMPHONY/configure

@@ -1 +1 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for SYMPHONY 5.6.9.
+# Generated by GNU Autoconf 2.59 for SYMPHONY 5.6.10.
 #
 # Report bugs to <symphony@list.coin-or.org>.
@@ -440 +440 @@
 PACKAGE_NAME='SYMPHONY'
 PACKAGE_TARNAME='symphony'
-PACKAGE_VERSION='5.6.9'
-PACKAGE_STRING='SYMPHONY 5.6.9'
+PACKAGE_VERSION='5.6.10'
+PACKAGE_STRING='SYMPHONY 5.6.10'
 PACKAGE_BUGREPORT='symphony@list.coin-or.org'
 
@@ -1016 +1016 @@
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures SYMPHONY 5.6.9 to adapt to many kinds of systems.
+\`configure' configures SYMPHONY 5.6.10 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1082 +1082 @@
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of SYMPHONY 5.6.9:";;
+     short | recursive ) echo "Configuration of SYMPHONY 5.6.10:";;
    esac
   cat <<\_ACEOF
@@ -1336 +1336 @@
 if $ac_init_version; then
   cat <<\_ACEOF
-SYMPHONY configure 5.6.9
+SYMPHONY configure 5.6.10
 generated by GNU Autoconf 2.59
 
@@ -1366 +1366 @@
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by SYMPHONY $as_me 5.6.9, which was
+It was created by SYMPHONY $as_me 5.6.10, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
@@ -1892 +1892 @@
 
 # Capture libtool library version, if given.
- coin_libversion=9:9:6
+ coin_libversion=9:10:6
 
 
@@ -4621 +4621 @@
 # Define the identity of the package.
  PACKAGE='symphony'
- VERSION='5.6.9'
+ VERSION='5.6.10'
 
 
@@ -29967 +29967 @@
 cat >&5 <<_CSEOF
 
-This file was extended by SYMPHONY $as_me 5.6.9, which was
+This file was extended by SYMPHONY $as_me 5.6.10, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
@@ -30030 +30030 @@
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-SYMPHONY config.status 5.6.9
+SYMPHONY config.status 5.6.10
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

releases/5.6.10/SYMPHONY/configure.ac

@@ -23 +23 @@
 AC_PREREQ(2.59)
 
-AC_INIT([SYMPHONY],[5.6.9],[symphony@list.coin-or.org])
+AC_INIT([SYMPHONY],[5.6.10],[symphony@list.coin-or.org])
 
 AC_COPYRIGHT([
@@ -62 +62 @@
 # externals.  The following macro ensures that those externals are
 # retrieved by svn if they are not there yet.
-AC_COIN_PROJECTDIR_INIT(SYMPHONY,9:9:6)
+AC_COIN_PROJECTDIR_INIT(SYMPHONY,9:10:6)
 
 # Check if user wants to produce debugging code

releases/5.6.10/SYMPHONY/include/config_sym_default.h

@@ -6 +6 @@
 
 /* Version number of project */
-#define SYMPHONY_VERSION "5.6.9"
+#define SYMPHONY_VERSION "5.6.10"
 
 /* Major Version number of project */
@@ -15 +15 @@
 
 /* Release Version number of project */
-#define SYMPHONY_VERSION_RELEASE 9
+#define SYMPHONY_VERSION_RELEASE 10
 
 

releases/5.6.10/SYMPHONY/src/Master/master_io.c

@@ -547 +547 @@
                }
 #endif
+#else
+               tm_par->max_active_nodes = tmpi;
 #endif
             }

releases/5.6.10/SYMPHONY/src/Master/master_wrapper.c

@@ -777 +777 @@
 {
    int i;
-
+   MIPdesc *tmp;
+   
 #ifdef USE_SYM_APPLICATION
    CALL_USER_FUNCTION( user_free_master(&env->user) );
@@ -784 +785 @@
    FREE(env->best_sol.xval);
    
-   if (env->mip){
+   if (tmp = env->mip){
       free_mip_desc(env->mip);
       FREE(env->mip);
    }
 
-   if(env->prep_mip){
+   if(env->prep_mip && env->prep_mip != tmp){
       free_mip_desc(env->prep_mip);
       FREE(env->prep_mip);
+   }else{ //We made a copy, so don't free it again
+      env->prep_mip = NULL;
    }
    
@@ -835 +838 @@
    }
 #endif
-#endif
+#ifdef COMPILE_IN_LP
    if (env->sp){
       sp_free_sp(env->sp);
       FREE(env->sp);
    }
+#endif
+#endif
    
    return(FUNCTION_TERMINATED_NORMALLY);   

releases/5.6.10/SYMPHONY/src/TreeManager/tm_func.c

@@ -364 +364 @@
             scand_num = tm->samephase_candnum;
             }
-            if (scand_num > 0 && (thread_num != 0 || tm->par.max_active_nodes == 1)){
+            if (scand_num > 0
+#ifndef __PVM__
+                && (thread_num != 0 || tm->par.max_active_nodes == 1)
+#endif
+                ){
                i = start_node(tm, thread_num);
             }else{
@@ -3888 +3892 @@
    
    strcpy(temp, "");
-   printf("\nDo you want to abort immediately, exit gracefully (from the current solve call only), or continue? [a/e/c]: ");
-   fflush(stdout);   
+   fprintf(stderr, "\nDo you want to abort immediately, exit gracefully (from the current solve call only), or continue? [a/e/c]: ");
+   fflush(stderr);   
    fgets(temp, MAX_LINE_LENGTH, stdin);
    if(temp[1] == '\n' && (temp[0] == 'a' || temp[0] == 'A')){
-      printf("\nTerminating...\n");
-      fflush(stdout);
+      fprintf(stderr, "\nTerminating...\n");
+      fflush(stderr);
       exit(0);
    }else if(temp[1] == '\n' && (temp[0] == 'e' || temp[0] == 'E')){    
       c_count++;            
    } else{
-      printf("\nContinuing...\n");
-      fflush(stdout);
+      fprintf(stderr, "\nContinuing...\n");
+      fflush(stderr);
       c_count = 0;      
    }

releases/5.6.10/configure

@@ -2 +2 @@
 # From configure.ac 0.9.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for SYMPHONY 5.6.9.
+# Generated by GNU Autoconf 2.59 for SYMPHONY 5.6.10.
 #
 # Report bugs to <https://projects.coin-or.org/svn/SYMPHONY/newticket>.
@@ -441 +441 @@
 PACKAGE_NAME='SYMPHONY'
 PACKAGE_TARNAME='symphony'
-PACKAGE_VERSION='5.6.9'
-PACKAGE_STRING='SYMPHONY 5.6.9'
+PACKAGE_VERSION='5.6.10'
+PACKAGE_STRING='SYMPHONY 5.6.10'
 PACKAGE_BUGREPORT='https://projects.coin-or.org/svn/SYMPHONY/newticket'
 
@@ -1045 +1045 @@
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures SYMPHONY 5.6.9 to adapt to many kinds of systems.
+\`configure' configures SYMPHONY 5.6.10 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1111 +1111 @@
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of SYMPHONY 5.6.9:";;
+     short | recursive ) echo "Configuration of SYMPHONY 5.6.10:";;
    esac
   cat <<\_ACEOF
@@ -1326 +1326 @@
 if $ac_init_version; then
   cat <<\_ACEOF
-SYMPHONY configure 5.6.9
+SYMPHONY configure 5.6.10
 generated by GNU Autoconf 2.59
 
@@ -1356 +1356 @@
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by SYMPHONY $as_me 5.6.9, which was
+It was created by SYMPHONY $as_me 5.6.10, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
@@ -5123 +5123 @@
 # Define the identity of the package.
  PACKAGE='symphony'
- VERSION='5.6.9'
+ VERSION='5.6.10'
 
 
@@ -22871 +22871 @@
 cat >&5 <<_CSEOF
 
-This file was extended by SYMPHONY $as_me 5.6.9, which was
+This file was extended by SYMPHONY $as_me 5.6.10, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
@@ -22929 +22929 @@
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-SYMPHONY config.status 5.6.9
+SYMPHONY config.status 5.6.10
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

releases/5.6.10/configure.ac

@@ -23 +23 @@
 AC_PREREQ(2.59)
 
-AC_INIT([SYMPHONY],[5.6.9],[https://projects.coin-or.org/svn/SYMPHONY/newticket])
+AC_INIT([SYMPHONY],[5.6.10],[https://projects.coin-or.org/svn/SYMPHONY/newticket])
 
 AC_COPYRIGHT([