Changes from releases/5.6.9 at r2722 to releases/5.6.10 at r2722
- 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
r2722 r2722 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. 1 Eclipse Public License -v 1.0 2 3 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC 4 LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM 5 CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. 6 7 1. DEFINITIONS 8 9 "Contribution" means: 10 11 a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and 12 13 b) in the case of each subsequent Contributor: 14 15 i) changes to the Program, and 16 17 ii) additions to the Program; 18 19 where such changes and/or additions to the Program originate from and are 20 distributed by that particular Contributor. A Contribution 'originates' from a 21 Contributor if it was added to the Program by such Contributor itself or 22 anyone acting on such Contributor's behalf. Contributions do not include 23 additions to the Program which: (i) are separate modules of software 24 distributed in conjunction with the Program under their own license agreement, 25 and (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 30 necessarily infringed by the use or sale of its Contribution alone or when 31 combined with the Program. 32 33 "Program" means the Contributions distributed in accordance with this 34 Agreement. 35 36 "Recipient" means anyone who receives the Program under this Agreement, 37 including all Contributors. 38 39 2. GRANT OF RIGHTS 40 41 a) Subject to the terms of this Agreement, each Contributor hereby grants 42 Recipient a non-exclusive, worldwide, royalty-free copyright license to 43 reproduce, prepare derivative works of, publicly display, publicly perform, 44 distribute and sublicense the Contribution of such Contributor, if any, and 45 such derivative works, in source code and object code form. 46 47 b) Subject to the terms of this Agreement, each Contributor hereby grants 48 Recipient a non-exclusive, worldwide, royalty-free patent license under 49 Licensed Patents to make, use, sell, offer to sell, import and otherwise 50 transfer the Contribution of such Contributor, if any, in source code and 51 object code form. This patent license shall apply to the combination of the 52 Contribution and the Program if, at the time the Contribution is added by the 53 Contributor, such addition of the Contribution causes such combination to be 54 covered by the Licensed Patents. The patent license shall not apply to any 55 other combinations which include the Contribution. No hardware per se is 56 licensed hereunder. 57 58 c) Recipient understands that although each Contributor grants the licenses to 59 its Contributions set forth herein, no assurances are provided by any 60 Contributor that the Program does not infringe the patent or other 61 intellectual property rights of any other entity. Each Contributor disclaims 62 any liability to Recipient for claims brought by any other entity based on 63 infringement of intellectual property rights or otherwise. As a condition to 64 exercising the rights and licenses granted hereunder, each Recipient hereby 65 assumes sole responsibility to secure any other intellectual property rights 66 needed, if any. For example, if a third party patent license is required to 67 allow Recipient to distribute the Program, it is Recipient's responsibility to 68 acquire that license before distributing the Program. 69 70 d) Each Contributor represents that to its knowledge it has sufficient 71 copyright rights in its Contribution, if any, to grant the copyright license 72 set forth in this Agreement. 73 74 3. REQUIREMENTS 75 76 A Contributor may choose to distribute the Program in object code form under 77 its own license agreement, provided that: 78 79 a) it complies with the terms and conditions of this Agreement; and 80 81 b) its license agreement: 82 83 i) effectively disclaims on behalf of all Contributors all warranties and 84 conditions, express and implied, including warranties or conditions of title 85 and non-infringement, and implied warranties or conditions of merchantability 86 and fitness for a particular purpose; 87 88 ii) effectively excludes on behalf of all Contributors all liability for 89 damages, including direct, indirect, special, incidental and consequential 90 damages, such as lost profits; 91 92 iii) states that any provisions which differ from this Agreement are offered 93 by that Contributor alone and not by any other party; and 94 95 iv) states that source code for the Program is available from such 96 Contributor, and informs licensees how to obtain it in a reasonable manner on 97 or through a medium customarily used for software exchange. 98 99 When the Program is made available in source code form: 100 101 a) it must be made available under this Agreement; and 102 103 b) a copy of this Agreement must be included with each copy of the Program. 104 105 Contributors may not remove or alter any copyright notices contained within 106 the Program. 107 108 Each Contributor must identify itself as the originator of its Contribution, 109 if any, in a manner that reasonably allows subsequent Recipients to identify 110 the originator of the Contribution. 111 112 4. COMMERCIAL DISTRIBUTION 113 114 Commercial distributors of software may accept certain responsibilities with 115 respect to end users, business partners and the like. While this license is 116 intended to facilitate the commercial use of the Program, the Contributor who 117 includes the Program in a commercial product offering should do so in a manner 118 which does not create potential liability for other Contributors. Therefore, 119 if a Contributor includes the Program in a commercial product offering, such 120 Contributor ("Commercial Contributor") hereby agrees to defend and indemnify 121 every other Contributor ("Indemnified Contributor") against any losses, 122 damages and costs (collectively "Losses") arising from claims, lawsuits and 123 other legal actions brought by a third party against the Indemnified 124 Contributor to the extent caused by the acts or omissions of such Commercial 125 Contributor in connection with its distribution of the Program in a commercial 126 product offering. The obligations in this section do not apply to any claims 127 or Losses relating to any actual or alleged intellectual property 128 infringement. In order to qualify, an Indemnified Contributor must: a) 129 promptly notify the Commercial Contributor in writing of such claim, and b) 130 allow the Commercial Contributor to control, and cooperate with the Commercial 131 Contributor in, the defense and any related settlement negotiations. The 132 Indemnified Contributor may participate in any such claim at its own expense. 133 134 For example, a Contributor might include the Program in a commercial product 135 offering, Product X. That Contributor is then a Commercial Contributor. If 136 that Commercial Contributor then makes performance claims, or offers 137 warranties related to Product X, those performance claims and warranties are 138 such Commercial Contributor's responsibility alone. Under this section, the 139 Commercial Contributor would have to defend claims against the other 140 Contributors related to those performance claims and warranties, and if a 141 court requires any other Contributor to pay any damages as a result, the 142 Commercial Contributor must pay those damages. 143 144 5. NO WARRANTY 145 146 EXCEPT 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 148 IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, 149 NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each 150 Recipient is solely responsible for determining the appropriateness of using 151 and distributing the Program and assumes all risks associated with its 152 exercise of rights under this Agreement , including but not limited to the 153 risks and costs of program errors, compliance with applicable laws, damage to 154 or loss of data, programs or equipment, and unavailability or interruption of 155 operations. 156 157 6. DISCLAIMER OF LIABILITY 158 159 EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY 160 CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, 161 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION 162 LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 163 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 164 ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE 165 EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY 166 OF SUCH DAMAGES. 167 168 7. GENERAL 169 170 If any provision of this Agreement is invalid or unenforceable under 171 applicable law, it shall not affect the validity or enforceability of the 172 remainder of the terms of this Agreement, and without further action by the 173 parties hereto, such provision shall be reformed to the minimum extent 174 necessary to make such provision valid and enforceable. 175 176 If Recipient institutes patent litigation against any entity (including a 177 cross-claim or counterclaim in a lawsuit) alleging that the Program itself 178 (excluding combinations of the Program with other software or hardware) 179 infringes such Recipient's patent(s), then such Recipient's rights granted 180 under Section 2(b) shall terminate as of the date such litigation is filed. 181 182 All Recipient's rights under this Agreement shall terminate if it fails to 183 comply with any of the material terms or conditions of this Agreement and does 184 not cure such failure in a reasonable period of time after becoming aware of 185 such noncompliance. If all Recipient's rights under this Agreement terminate, 186 Recipient agrees to cease use and distribution of the Program as soon as 187 reasonably practicable. However, Recipient's obligations under this Agreement 188 and any licenses granted by Recipient relating to the Program shall continue 189 and survive. 190 191 Everyone is permitted to copy and distribute copies of this Agreement, but in 192 order to avoid inconsistency the Agreement is copyrighted and may only be 193 modified in the following manner. The Agreement Steward reserves the right to 194 publish new versions (including revisions) of this Agreement from time to 195 time. No one other than the Agreement Steward has the right to modify this 196 Agreement. The Eclipse Foundation is the initial Agreement Steward. The 197 Eclipse Foundation may assign the responsibility to serve as the Agreement 198 Steward to a suitable separate entity. Each new version of the Agreement will 199 be given a distinguishing version number. The Program (including 200 Contributions) may always be distributed subject to the version of the 201 Agreement under which it was received. In addition, after a new version of the 202 Agreement is published, Contributor may elect to distribute the Program 203 (including its Contributions) under the new version. Except as expressly 204 stated in Sections 2(a) and 2(b) above, Recipient receives no rights or 205 licenses to the intellectual property of any Contributor under this Agreement, 206 whether expressly, by implication, estoppel or otherwise. All rights in the 207 Program not expressly granted under this Agreement are reserved. 208 209 This Agreement is governed by the laws of the State of New York and the 210 intellectual property laws of the United States of America. No party to this 211 Agreement will bring a legal action under this Agreement more than one year 212 after the cause of action arose. Each party waives its rights to a jury trial 213 in any resulting litigation. 214 -
releases/5.6.10/Makefile.in
r2722 r2722 264 264 DISTCLEANFILES = coin_subdirs.txt $(am__append_2) \ 265 265 $(VPATH_DISTCLEANFILES) 266 DocFiles = README AUTHORS LICENSE 266 DocFiles = README AUTHORS LICENSE 267 267 DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME) 268 COIN_HAS_DOXYGEN = @COIN_HAS_DOXYGEN_TRUE@TRUE 269 COIN_HAS_LATEX = @COIN_HAS_LATEX_TRUE@TRUE 268 270 all: all-recursive 269 271 … … 716 718 .PHONY: test unitTest ptest punitTest tests unitTests fulltest pfulltest 717 719 718 install-doc: $(DocFiles) 720 doxygen-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 727 pdf-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 738 clean-doxygen-docs: 739 if test -d "doxydoc/"; then \ 740 cd doxydoc ;\ 741 rm -rf html latex *.log *.tag;\ 742 fi 743 744 install-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 760 uninstall-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 768 all-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 781 clean-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 788 install-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 801 uninstall-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 808 install-doc: $(DocFiles) 719 809 test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)" 720 810 for file in $(DocFiles); do \ 721 811 if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \ 722 812 if test -f "$$dir$$file"; then $(INSTALL_DATA) "$$dir$$file" "$(DESTDIR)$(DocInstallDir)/$$file"; fi; \ 723 done 813 done 724 814 725 815 uninstall-doc: -
releases/5.6.10/README
r2722 r2722 1 SYMPHONY Version 5.6 .6README2 =========================== ==1 SYMPHONY Version 5.6 README 2 =========================== 3 3 4 4 For the SYMPHONY README file, please see the file README.md. For the -
releases/5.6.10/README.md
r2722 r2722 1 # SYMPHONY Version 5.6. 9README1 # SYMPHONY Version 5.6.10 README 2 2 3 3 Welcome to SYMPHONY. SYMPHONY is distributed under the Eclipse Public License … … 229 229 ## CHANGELOG 230 230 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 231 236 ### Release 5.6.9 232 237 * Fixed memory leak -
releases/5.6.10/SYMPHONY
- Property svn:mergeinfo changed
/trunk/SYMPHONY merged: 2443-2446,2448
- Property svn:mergeinfo changed
-
releases/5.6.10/SYMPHONY/Doc/man-API.tex
r2722 r2722 58 58 \begin{verbatim} 59 59 ******************************************************* 60 * This is SYMPHONY Version 5.6. 9*60 * This is SYMPHONY Version 5.6.10 * 61 61 * Copyright 2000-2015 Ted Ralphs * 62 62 * All Rights Reserved. * -
releases/5.6.10/SYMPHONY/Doc/man.tex
r2722 r2722 97 97 \def\CP{{Cut Pool Parameters}} 98 98 \def\CGP{{Cut Generator Parameters}} 99 \def\VER{{5.6. 9}}99 \def\VER{{5.6.10}} 100 100 \lstloadlanguages{C++} 101 101 -
releases/5.6.10/SYMPHONY/Makefile.in
r2722 r2722 516 516 # Files that are generated and should be cleaned with make distclean 517 517 DISTCLEANFILES = $(am__append_3) $(VPATH_DISTCLEANFILES) 518 DocFiles = README AUTHORS LICENSE 518 DocFiles = README AUTHORS LICENSE 519 519 DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME) 520 COIN_HAS_DOXYGEN = @COIN_HAS_DOXYGEN_TRUE@TRUE 521 COIN_HAS_LATEX = @COIN_HAS_LATEX_TRUE@TRUE 520 522 all: all-recursive 521 523 … … 1065 1067 rm -f $(addlibsdir)/sym_addlibs.txt 1066 1068 1067 install-doc: $(DocFiles) 1069 doxygen-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 1076 pdf-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 1087 clean-doxygen-docs: 1088 if test -d "doxydoc/"; then \ 1089 cd doxydoc ;\ 1090 rm -rf html latex *.log *.tag;\ 1091 fi 1092 1093 install-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 1109 uninstall-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 1117 all-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 1130 clean-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 1137 install-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 1150 uninstall-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 1157 install-doc: $(DocFiles) 1068 1158 test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)" 1069 1159 for file in $(DocFiles); do \ 1070 1160 if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \ 1071 1161 if test -f "$$dir$$file"; then $(INSTALL_DATA) "$$dir$$file" "$(DESTDIR)$(DocInstallDir)/$$file"; fi; \ 1072 done 1162 done 1073 1163 1074 1164 uninstall-doc: -
releases/5.6.10/SYMPHONY/README
r2722 r2722 1 SYMPHONY Version 5.6. 9README1 SYMPHONY Version 5.6.10 README 2 2 ============================= 3 3 … … 246 246 ========== 247 247 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 248 253 # Release 5.6.9 249 254 * Fixed memory leak -
releases/5.6.10/SYMPHONY/configure
r2722 r2722 1 1 #! /bin/sh 2 2 # 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. 4 4 # 5 5 # Report bugs to <symphony@list.coin-or.org>. … … 440 440 PACKAGE_NAME='SYMPHONY' 441 441 PACKAGE_TARNAME='symphony' 442 PACKAGE_VERSION='5.6. 9'443 PACKAGE_STRING='SYMPHONY 5.6. 9'442 PACKAGE_VERSION='5.6.10' 443 PACKAGE_STRING='SYMPHONY 5.6.10' 444 444 PACKAGE_BUGREPORT='symphony@list.coin-or.org' 445 445 … … 1016 1016 # This message is too long to be a string in the A/UX 3.1 sh. 1017 1017 cat <<_ACEOF 1018 \`configure' configures SYMPHONY 5.6. 9to adapt to many kinds of systems.1018 \`configure' configures SYMPHONY 5.6.10 to adapt to many kinds of systems. 1019 1019 1020 1020 Usage: $0 [OPTION]... [VAR=VALUE]... … … 1082 1082 if test -n "$ac_init_help"; then 1083 1083 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:";; 1085 1085 esac 1086 1086 cat <<\_ACEOF … … 1336 1336 if $ac_init_version; then 1337 1337 cat <<\_ACEOF 1338 SYMPHONY configure 5.6. 91338 SYMPHONY configure 5.6.10 1339 1339 generated by GNU Autoconf 2.59 1340 1340 … … 1366 1366 running configure, to aid debugging if configure makes a mistake. 1367 1367 1368 It was created by SYMPHONY $as_me 5.6. 9, which was1368 It was created by SYMPHONY $as_me 5.6.10, which was 1369 1369 generated by GNU Autoconf 2.59. Invocation command line was 1370 1370 … … 1892 1892 1893 1893 # Capture libtool library version, if given. 1894 coin_libversion=9: 9:61894 coin_libversion=9:10:6 1895 1895 1896 1896 … … 4621 4621 # Define the identity of the package. 4622 4622 PACKAGE='symphony' 4623 VERSION='5.6. 9'4623 VERSION='5.6.10' 4624 4624 4625 4625 … … 29967 29967 cat >&5 <<_CSEOF 29968 29968 29969 This file was extended by SYMPHONY $as_me 5.6. 9, which was29969 This file was extended by SYMPHONY $as_me 5.6.10, which was 29970 29970 generated by GNU Autoconf 2.59. Invocation command line was 29971 29971 … … 30030 30030 cat >>$CONFIG_STATUS <<_ACEOF 30031 30031 ac_cs_version="\\ 30032 SYMPHONY config.status 5.6. 930032 SYMPHONY config.status 5.6.10 30033 30033 configured by $0, generated by GNU Autoconf 2.59, 30034 30034 with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -
releases/5.6.10/SYMPHONY/configure.ac
r2722 r2722 23 23 AC_PREREQ(2.59) 24 24 25 AC_INIT([SYMPHONY],[5.6. 9],[symphony@list.coin-or.org])25 AC_INIT([SYMPHONY],[5.6.10],[symphony@list.coin-or.org]) 26 26 27 27 AC_COPYRIGHT([ … … 62 62 # externals. The following macro ensures that those externals are 63 63 # retrieved by svn if they are not there yet. 64 AC_COIN_PROJECTDIR_INIT(SYMPHONY,9: 9:6)64 AC_COIN_PROJECTDIR_INIT(SYMPHONY,9:10:6) 65 65 66 66 # Check if user wants to produce debugging code -
releases/5.6.10/SYMPHONY/include/config_sym_default.h
r2722 r2722 6 6 7 7 /* Version number of project */ 8 #define SYMPHONY_VERSION "5.6. 9"8 #define SYMPHONY_VERSION "5.6.10" 9 9 10 10 /* Major Version number of project */ … … 15 15 16 16 /* Release Version number of project */ 17 #define SYMPHONY_VERSION_RELEASE 917 #define SYMPHONY_VERSION_RELEASE 10 18 18 19 19 -
releases/5.6.10/SYMPHONY/src/Master/master_io.c
r2722 r2722 547 547 } 548 548 #endif 549 #else 550 tm_par->max_active_nodes = tmpi; 549 551 #endif 550 552 } -
releases/5.6.10/SYMPHONY/src/Master/master_wrapper.c
r2722 r2722 777 777 { 778 778 int i; 779 779 MIPdesc *tmp; 780 780 781 #ifdef USE_SYM_APPLICATION 781 782 CALL_USER_FUNCTION( user_free_master(&env->user) ); … … 784 785 FREE(env->best_sol.xval); 785 786 786 if ( env->mip){787 if (tmp = env->mip){ 787 788 free_mip_desc(env->mip); 788 789 FREE(env->mip); 789 790 } 790 791 791 if(env->prep_mip ){792 if(env->prep_mip && env->prep_mip != tmp){ 792 793 free_mip_desc(env->prep_mip); 793 794 FREE(env->prep_mip); 795 }else{ //We made a copy, so don't free it again 796 env->prep_mip = NULL; 794 797 } 795 798 … … 835 838 } 836 839 #endif 837 # endif840 #ifdef COMPILE_IN_LP 838 841 if (env->sp){ 839 842 sp_free_sp(env->sp); 840 843 FREE(env->sp); 841 844 } 845 #endif 846 #endif 842 847 843 848 return(FUNCTION_TERMINATED_NORMALLY); -
releases/5.6.10/SYMPHONY/src/TreeManager/tm_func.c
r2722 r2722 364 364 scand_num = tm->samephase_candnum; 365 365 } 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 ){ 367 371 i = start_node(tm, thread_num); 368 372 }else{ … … 3888 3892 3889 3893 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(std out);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); 3892 3896 fgets(temp, MAX_LINE_LENGTH, stdin); 3893 3897 if(temp[1] == '\n' && (temp[0] == 'a' || temp[0] == 'A')){ 3894 printf("\nTerminating...\n");3895 fflush(std out);3898 fprintf(stderr, "\nTerminating...\n"); 3899 fflush(stderr); 3896 3900 exit(0); 3897 3901 }else if(temp[1] == '\n' && (temp[0] == 'e' || temp[0] == 'E')){ 3898 3902 c_count++; 3899 3903 } else{ 3900 printf("\nContinuing...\n");3901 fflush(std out);3904 fprintf(stderr, "\nContinuing...\n"); 3905 fflush(stderr); 3902 3906 c_count = 0; 3903 3907 } -
releases/5.6.10/configure
r2722 r2722 2 2 # From configure.ac 0.9. 3 3 # 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. 5 5 # 6 6 # Report bugs to <https://projects.coin-or.org/svn/SYMPHONY/newticket>. … … 441 441 PACKAGE_NAME='SYMPHONY' 442 442 PACKAGE_TARNAME='symphony' 443 PACKAGE_VERSION='5.6. 9'444 PACKAGE_STRING='SYMPHONY 5.6. 9'443 PACKAGE_VERSION='5.6.10' 444 PACKAGE_STRING='SYMPHONY 5.6.10' 445 445 PACKAGE_BUGREPORT='https://projects.coin-or.org/svn/SYMPHONY/newticket' 446 446 … … 1045 1045 # This message is too long to be a string in the A/UX 3.1 sh. 1046 1046 cat <<_ACEOF 1047 \`configure' configures SYMPHONY 5.6. 9to adapt to many kinds of systems.1047 \`configure' configures SYMPHONY 5.6.10 to adapt to many kinds of systems. 1048 1048 1049 1049 Usage: $0 [OPTION]... [VAR=VALUE]... … … 1111 1111 if test -n "$ac_init_help"; then 1112 1112 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:";; 1114 1114 esac 1115 1115 cat <<\_ACEOF … … 1326 1326 if $ac_init_version; then 1327 1327 cat <<\_ACEOF 1328 SYMPHONY configure 5.6. 91328 SYMPHONY configure 5.6.10 1329 1329 generated by GNU Autoconf 2.59 1330 1330 … … 1356 1356 running configure, to aid debugging if configure makes a mistake. 1357 1357 1358 It was created by SYMPHONY $as_me 5.6. 9, which was1358 It was created by SYMPHONY $as_me 5.6.10, which was 1359 1359 generated by GNU Autoconf 2.59. Invocation command line was 1360 1360 … … 5123 5123 # Define the identity of the package. 5124 5124 PACKAGE='symphony' 5125 VERSION='5.6. 9'5125 VERSION='5.6.10' 5126 5126 5127 5127 … … 22871 22871 cat >&5 <<_CSEOF 22872 22872 22873 This file was extended by SYMPHONY $as_me 5.6. 9, which was22873 This file was extended by SYMPHONY $as_me 5.6.10, which was 22874 22874 generated by GNU Autoconf 2.59. Invocation command line was 22875 22875 … … 22929 22929 cat >>$CONFIG_STATUS <<_ACEOF 22930 22930 ac_cs_version="\\ 22931 SYMPHONY config.status 5.6. 922931 SYMPHONY config.status 5.6.10 22932 22932 configured by $0, generated by GNU Autoconf 2.59, 22933 22933 with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -
releases/5.6.10/configure.ac
r2722 r2722 23 23 AC_PREREQ(2.59) 24 24 25 AC_INIT([SYMPHONY],[5.6. 9],[https://projects.coin-or.org/svn/SYMPHONY/newticket])25 AC_INIT([SYMPHONY],[5.6.10],[https://projects.coin-or.org/svn/SYMPHONY/newticket]) 26 26 27 27 AC_COPYRIGHT([
Note: See TracChangeset
for help on using the changeset viewer.