[coinor-symphony] 11/13: Merge tag 'upstream/5.6.16+repack1'
Anton Gladky
gladk at moszumanska.debian.org
Mon Jun 5 18:54:27 UTC 2017
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch experimental
in repository coinor-symphony.
commit d544be725287b7fb3ec457c85b26305fd229d134
Merge: f04a8f7 1a506c6
Author: Anton Gladky <gladk at debian.org>
Date: Mon Jun 5 20:48:18 2017 +0200
Merge tag 'upstream/5.6.16+repack1'
Upstream version 5.6.16+repack1
Applications/CNRP/MSVisualStudio/v10/cnrp.sln | 89 -
Applications/CNRP/MSVisualStudio/v10/cnrp.suo | Bin 19456 -> 0 bytes
Applications/CNRP/MSVisualStudio/v10/cnrp.vcxproj | 358 ----
Applications/CNRP/MSVisualStudio/v8/cnrp.sln | 64 -
Applications/CNRP/MSVisualStudio/v8/cnrp.suo | Bin 10752 -> 0 bytes
Applications/CNRP/MSVisualStudio/v8/cnrp.vcproj | 571 -------
Applications/CNRP/MSVisualStudio/v9/cnrp.sln | 64 -
Applications/CNRP/MSVisualStudio/v9/cnrp.suo | Bin 13312 -> 0 bytes
Applications/CNRP/MSVisualStudio/v9/cnrp.vcproj | 570 -------
Applications/CNRP/Makefile.in | 2 +-
Applications/MATCH/MSVisualStudio/v10/match.sln | 89 -
Applications/MATCH/MSVisualStudio/v10/match.suo | Bin 19456 -> 0 bytes
.../MATCH/MSVisualStudio/v10/match.vcxproj | 274 ---
Applications/MATCH/MSVisualStudio/v8/match.sln | 64 -
Applications/MATCH/MSVisualStudio/v8/match.suo | Bin 14848 -> 0 bytes
Applications/MATCH/MSVisualStudio/v8/match.vcproj | 385 -----
Applications/MATCH/MSVisualStudio/v9/match.sln | 64 -
Applications/MATCH/MSVisualStudio/v9/match.suo | Bin 11264 -> 0 bytes
Applications/MATCH/MSVisualStudio/v9/match.vcproj | 384 -----
Applications/MATCH/Makefile.in | 2 +-
Applications/MCKP/MSVisualStudio/v10/mckp.sln | 90 -
Applications/MCKP/MSVisualStudio/v10/mckp.suo | Bin 19968 -> 0 bytes
Applications/MCKP/MSVisualStudio/v10/mckp.vcxproj | 225 ---
Applications/MCKP/MSVisualStudio/v8/mckp.sln | 64 -
Applications/MCKP/MSVisualStudio/v8/mckp.suo | Bin 10752 -> 0 bytes
Applications/MCKP/MSVisualStudio/v8/mckp.vcproj | 244 ---
Applications/MCKP/MSVisualStudio/v9/mckp.sln | 64 -
Applications/MCKP/MSVisualStudio/v9/mckp.suo | Bin 10752 -> 0 bytes
Applications/MCKP/MSVisualStudio/v9/mckp.vcproj | 243 ---
Applications/MCKP/Makefile.in | 2 +-
Applications/MCKP/mckp_main.c | 2 +-
Applications/MPP/MSVisualStudio/v10/mpp.sln | 89 -
Applications/MPP/MSVisualStudio/v10/mpp.suo | Bin 19968 -> 0 bytes
Applications/MPP/MSVisualStudio/v10/mpp.vcxproj | 315 ----
Applications/MPP/MSVisualStudio/v8/mpp.sln | 64 -
Applications/MPP/MSVisualStudio/v8/mpp.suo | Bin 11264 -> 0 bytes
Applications/MPP/MSVisualStudio/v8/mpp.vcproj | 390 -----
Applications/MPP/MSVisualStudio/v9/mpp.sln | 64 -
Applications/MPP/MSVisualStudio/v9/mpp.suo | Bin 11264 -> 0 bytes
Applications/MPP/MSVisualStudio/v9/mpp.vcproj | 389 -----
Applications/MPP/Makefile.in | 2 +-
Applications/MPP/src/Master/mpp_main.c | 2 +
Applications/MPP/src/Master/mpp_master.c | 2 +-
.../MSVisualStudio/v10/libSymphony.vcxproj | 565 ------
Applications/MSVisualStudio/v8/libSymphony.vcproj | 984 -----------
Applications/MSVisualStudio/v9/libSymphony.vcproj | 972 -----------
Applications/Makefile.Applications.in | 7 +-
.../SPP+CUTS/MSVisualStudio/v10/spp_with_cuts.sln | 89 -
.../SPP+CUTS/MSVisualStudio/v10/spp_with_cuts.suo | Bin 19968 -> 0 bytes
.../MSVisualStudio/v10/spp_with_cuts.vcxproj | 344 ----
.../SPP+CUTS/MSVisualStudio/v8/spp_with_cuts.sln | 64 -
.../SPP+CUTS/MSVisualStudio/v8/spp_with_cuts.suo | Bin 10752 -> 0 bytes
.../MSVisualStudio/v8/spp_with_cuts.vcproj | 509 ------
.../SPP+CUTS/MSVisualStudio/v9/spp_with_cuts.sln | 64 -
.../SPP+CUTS/MSVisualStudio/v9/spp_with_cuts.suo | Bin 10752 -> 0 bytes
.../MSVisualStudio/v9/spp_with_cuts.vcproj | 508 ------
Applications/SPP+CUTS/Makefile.in | 8 +-
Applications/SPP/MSVisualStudio/v10/spp.sln | 88 -
Applications/SPP/MSVisualStudio/v10/spp.suo | Bin 19968 -> 0 bytes
Applications/SPP/MSVisualStudio/v10/spp.vcxproj | 310 ----
Applications/SPP/MSVisualStudio/v8/spp.sln | 64 -
Applications/SPP/MSVisualStudio/v8/spp.suo | Bin 10752 -> 0 bytes
Applications/SPP/MSVisualStudio/v8/spp.vcproj | 441 -----
Applications/SPP/MSVisualStudio/v9/spp.sln | 64 -
Applications/SPP/MSVisualStudio/v9/spp.suo | Bin 10752 -> 0 bytes
Applications/SPP/MSVisualStudio/v9/spp.vcproj | 440 -----
Applications/SPP/Makefile.in | 2 +-
Applications/USER/MSVisualStudio/v10/user.sln | 94 -
Applications/USER/MSVisualStudio/v10/user.suo | Bin 19968 -> 0 bytes
Applications/USER/MSVisualStudio/v10/user.vcxproj | 262 ---
Applications/USER/MSVisualStudio/v8/user.sln | 64 -
Applications/USER/MSVisualStudio/v8/user.suo | Bin 10752 -> 0 bytes
Applications/USER/MSVisualStudio/v8/user.vcproj | 398 -----
Applications/USER/MSVisualStudio/v9/user.sln | 64 -
Applications/USER/MSVisualStudio/v9/user.suo | Bin 10752 -> 0 bytes
Applications/USER/MSVisualStudio/v9/user.vcproj | 397 -----
Applications/USER/Makefile.in | 2 +-
Applications/VRP/MSVisualStudio/v10/vrp.sln | 94 -
Applications/VRP/MSVisualStudio/v10/vrp.suo | Bin 28160 -> 0 bytes
.../VRP/MSVisualStudio/v10/vrp.vcxproj.user | 3 -
Applications/VRP/MSVisualStudio/v8/vrp.sln | 64 -
Applications/VRP/MSVisualStudio/v8/vrp.suo | Bin 13824 -> 0 bytes
Applications/VRP/MSVisualStudio/v8/vrp.vcproj | 751 --------
Applications/VRP/MSVisualStudio/v9/vrp.sln | 56 -
Applications/VRP/MSVisualStudio/v9/vrp.suo | Bin 24064 -> 0 bytes
Applications/VRP/MSVisualStudio/v9/vrp.vcproj | 750 --------
Applications/VRP/Makefile.in | 2 +-
Applications/VRP/src/Master/vrp_master_functions.c | 4 +-
Doc/biblio.tex | 2 +-
Doc/man-API.tex | 6 +-
Doc/man-SYMPHONY.tex | 2 +-
Doc/man-background.tex | 2 +-
Doc/man-callable.tex | 76 +-
Doc/man-cg.tex | 2 +-
Doc/man-cp.tex | 2 +-
Doc/man-design.tex | 2 +-
Doc/man-dg.tex | 2 +-
Doc/man-intro.tex | 2 +-
Doc/man-lp.tex | 2 +-
Doc/man-param.tex | 79 +-
Doc/man-start.tex | 72 +-
Doc/man-tm.tex | 2 +-
Doc/man.tex | 43 +-
Examples/Makefile.in | 2 +-
Examples/SYMPHONYExamples.sln | 22 +
Examples/SYMPHONYExamples.vcxproj | 89 +
Examples/milp.c | 2 +-
Examples/milp2.c | 2 +-
Examples/{milp.c => milp3.c} | 20 +-
Examples/milpOsi.c | 6 +-
Examples/milpOsi2.c | 2 +-
Examples/sensitivity.c | 2 +-
Examples/warm_start1.c | 2 +-
Examples/warm_start2.c | 2 +-
Examples/warm_start3.c | 2 +-
MSVisualStudio/sym.mak | 379 -----
MSVisualStudio/v10/libOsiSym.vcxproj | 128 --
MSVisualStudio/v10/libSymphony.vcxproj | 573 -------
MSVisualStudio/v10/symphony.sln | 131 --
MSVisualStudio/v10/symphony.suo | Bin 23552 -> 0 bytes
MSVisualStudio/v10/symphony.vcxproj | 210 ---
MSVisualStudio/v10/unitTest.vcxproj | 175 --
MSVisualStudio/v9/libOsiSym.vcproj | 315 ----
MSVisualStudio/v9/libSymphony.vcproj | 1759 -------------------
MSVisualStudio/v9/symphony.sln | 131 --
MSVisualStudio/v9/symphony.suo | Bin 33280 -> 0 bytes
MSVisualStudio/v9/symphony.vcproj | 442 -----
MSVisualStudio/v9/unitTest.sln | 70 -
MSVisualStudio/v9/unitTest.vcproj | 361 ----
Makefile.am | 4 +-
Makefile.in | 103 +-
Osi.patch | 14 +
README | 858 ++++++----
configure | 195 ++-
configure.ac | 59 +-
include/config_sym_default.h | 4 +-
include/sym_cg.h | 2 +-
include/sym_cg_params.h | 2 +-
include/sym_cg_u.h | 2 +-
include/sym_constants.h | 2 +-
include/sym_cp.h | 2 +-
include/sym_cp_params.h | 2 +-
include/sym_cp_u.h | 2 +-
include/sym_dg.h | 2 +-
include/sym_dg_params.h | 2 +-
include/sym_dg_u.h | 2 +-
include/sym_lp.h | 2 +-
include/sym_lp_params.h | 3 +-
include/sym_lp_solver.h | 3 +-
include/sym_lp_u.h | 2 +-
include/sym_macros.h | 2 +-
include/sym_master.h | 5 +-
include/sym_master_params.h | 2 +-
include/sym_master_u.h | 2 +-
include/sym_messages.h | 2 +-
include/sym_pack_array.h | 2 +-
include/sym_pack_cut.h | 2 +-
include/sym_prep.h | 2 +-
include/sym_prep_params.h | 2 +-
include/sym_primal_heuristics.h | 4 +-
include/sym_proccomm.h | 2 +-
include/sym_proto.h | 2 +-
include/sym_qsort.h | 2 +-
include/sym_timemeas.h | 2 +-
include/sym_tm.h | 7 +-
include/sym_tm_params.h | 2 +-
include/sym_types.h | 6 +-
include/sym_win32_time.h | 2 +-
include/symphony.h | 11 +-
scripts/pprof.awk | 30 +
scripts/pprof.py | 295 ++++
scripts/pprof_solved.awk | 57 +
scripts/speedup.awk | 72 +
src/Common/pack_array.c | 2 +-
src/Common/pack_cut.c | 2 +-
src/Common/proccomm.c | 2 +-
src/Common/sym_qsort.c | 2 +-
src/Common/timemeas.c | 2 +-
src/CutGen/cg_func.c | 2 +-
src/CutGen/cg_proccomm.c | 2 +-
src/CutGen/cg_wrapper.c | 4 +-
src/CutGen/cut_gen.c | 2 +-
src/CutPool/cp_func.c | 2 +-
src/CutPool/cp_proccomm.c | 2 +-
src/CutPool/cp_wrapper.c | 2 +-
src/CutPool/cut_pool.c | 2 +-
src/DrawGraph/draw_graph.c | 2 +-
src/DrawGraph/tester.c | 2 +-
src/LP/lp.c | 2 +-
src/LP/lp_branch.c | 148 +-
src/LP/lp_free.c | 2 +-
src/LP/lp_genfunc.c | 48 +-
src/LP/lp_heuristics.c | 59 +-
src/LP/lp_proccomm.c | 52 +-
src/LP/lp_pseudo_branch.c | 2 +-
src/LP/lp_rowfunc.c | 2 +-
src/LP/lp_solver.c | 127 +-
src/LP/lp_sp.c | 2 +-
src/LP/lp_varfunc.c | 2 +-
src/LP/lp_wrapper.c | 33 +-
src/Makefile.am | 102 +-
src/Makefile.in | 1793 +++++++++++---------
src/Master/main.c | 40 +-
src/Master/master.c | 334 +++-
src/Master/master_func.c | 122 +-
src/Master/master_io.c | 588 ++++---
src/Master/master_prep.c | 51 +-
src/Master/master_prep_base.c | 6 +-
src/Master/master_prep_sr.c | 2 +-
src/Master/master_wrapper.c | 64 +-
src/OsiSym/Makefile.in | 3 +
src/OsiSym/OsiSymSolverInterface.cpp | 69 +-
src/TreeManager/tm_func.c | 441 ++---
src/TreeManager/tm_proccomm.c | 10 +-
src/TreeManager/treemanager.c | 2 +-
symphony-app.pc.in | 4 +-
symphony.pc.in | 4 +-
test/Makefile.am | 2 +-
test/Makefile.in | 5 +-
test/OsiSymSolverInterfaceTest.cpp | 7 +-
test/unitTestSym.cpp | 13 +-
221 files changed, 4114 insertions(+), 20723 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/coinor-symphony.git
More information about the debian-science-commits
mailing list