[coinor-symphony] branch master updated (6b22eb6 -> 842cf89)
Miles Lubin
mlubin-guest at moszumanska.debian.org
Thu Sep 4 01:36:08 UTC 2014
This is an automated email from the git hooks/post-receive script.
mlubin-guest pushed a change to branch master
in repository coinor-symphony.
from 6b22eb6 bump; prepare for unstable
adds 1006f45 Imported Upstream version 5.6.0
new 6a3c5af Merge tag 'upstream/5.6.0'
new 842cf89 bump (same changes as coinutils)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
Applications/CNRP/Makefile.in | 2 +-
Applications/MATCH/Makefile.in | 2 +-
Applications/MCKP/Makefile.in | 2 +-
Applications/MCKP/mckp_main.c | 2 +-
Applications/MPP/Makefile.in | 2 +-
Applications/Makefile.Applications.in | 4 +
Applications/SPP+CUTS/Makefile.in | 2 +-
Applications/SPP/Makefile.in | 2 +-
Applications/USER/Makefile.in | 2 +-
Applications/VRP/Makefile.in | 2 +-
Applications/VRP/src/Heuristics/binomial.c | 322 ++++
Applications/VRP/src/Heuristics/exchange.c | 278 +++
Applications/VRP/src/Heuristics/exchange2.c | 311 ++++
Applications/VRP/src/Heuristics/farnear_ins.c | 151 ++
Applications/VRP/src/Heuristics/farthest_ins.c | 130 ++
Applications/VRP/src/Heuristics/heur_main.c | 96 +
Applications/VRP/src/Heuristics/heur_routines.c | 129 ++
Applications/VRP/src/Heuristics/ins_routines.c | 364 ++++
Applications/VRP/src/Heuristics/ins_routines2.c | 510 ++++++
Applications/VRP/src/Heuristics/mst.c | 201 +++
.../mst_ins_rout.c} | 246 +--
Applications/VRP/src/Heuristics/near_cluster.c | 125 ++
Applications/VRP/src/Heuristics/nearest_ins.c | 130 ++
.../heurs/sweep.h => src/Heuristics/qsort.c} | 64 +-
Applications/VRP/src/Heuristics/s_path.c | 213 +++
Applications/VRP/src/Heuristics/savings.c | 129 ++
Applications/VRP/src/Heuristics/savings2.c | 192 ++
Applications/VRP/src/Heuristics/savings3.c | 192 ++
Applications/VRP/src/Heuristics/savings_rout.c | 152 ++
Applications/VRP/src/Heuristics/savings_rout2.c | 258 +++
Applications/VRP/src/Heuristics/savings_rout3.c | 177 ++
Applications/VRP/src/Heuristics/sp.c | 208 +++
Applications/VRP/src/Heuristics/sweep.c | 166 ++
Applications/VRP/src/Heuristics/tsp_fi.c | 145 ++
Applications/VRP/src/Heuristics/tsp_fini.c | 174 ++
Applications/VRP/src/Heuristics/tsp_ins_rout.c | 289 ++++
Applications/VRP/src/Heuristics/tsp_ni.c | 145 ++
Doc/biblio.tex | 2 +-
Doc/man-API.tex | 6 +-
Doc/man-SYMPHONY.tex | 2 +-
Doc/man-background.tex | 2 +-
Doc/man-callable.tex | 2 +-
Doc/man-cg.tex | 2 +-
Doc/man-cp.tex | 2 +-
Doc/man-design.tex | 2 +-
Doc/man-dg.tex | 2 +-
Doc/man-intro.tex | 4 +-
Doc/man-lp.tex | 2 +-
Doc/man-param.tex | 18 +-
Doc/man-start.tex | 9 +-
Doc/man-tm.tex | 2 +-
Doc/man.tex | 4 +-
Examples/Makefile.in | 2 +-
Examples/milp.c | 2 +-
Examples/milp2.c | 2 +-
Examples/milpOsi.c | 2 +-
Examples/milpOsi2.c | 2 +-
Examples/sensitivity.c | 2 +-
Examples/warm_start1.c | 2 +-
Examples/warm_start2.c | 10 +-
Examples/warm_start3.c | 2 +-
MSVisualStudio/sym.mak | 379 ++++
MSVisualStudio/v10/libSymphony.vcxproj | 6 +-
Makefile.am | 5 +-
Makefile.in | 8 +-
README | 47 +-
configure | 303 ++--
configure.ac | 155 +-
debian/changelog | 9 +
debian/control | 11 +-
debian/patches/series | 1 -
debian/patches/shlibdeps.patch | 54 -
debian/rules | 4 +-
include/config_sym_default.h | 6 +-
include/decomp/decomp.h | 37 +
include/decomp/decomp_lp.h | 9 +
include/decomp/decomp_types.h | 31 +
include/decomp/sp_params.h | 28 +
include/sym_cg.h | 2 +-
include/sym_cg_params.h | 2 +-
include/sym_cg_u.h | 2 +-
include/sym_constants.h | 34 +-
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 | 6 +-
include/sym_lp_params.h | 3 +-
include/sym_lp_solver.h | 6 +-
include/sym_lp_u.h | 2 +-
include/sym_macros.h | 30 +-
include/sym_master.h | 2 +-
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 | 5 +-
include/sym_types.h | 2 +-
include/symphony.h | 23 +-
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 | 2 +-
src/CutGen/cut_gen.c | 2 +-
src/CutPool/cp_func.c | 2 +-
src/CutPool/cp_proccomm.c | 2 +-
src/CutPool/cp_wrapper.c | 5 +-
src/CutPool/cut_pool.c | 2 +-
src/DrawGraph/draw_graph.c | 2 +-
src/DrawGraph/tester.c | 2 +-
src/LP/lp.c | 4 +-
src/LP/lp_branch.c | 80 +-
src/LP/lp_free.c | 2 +-
src/LP/lp_genfunc.c | 124 +-
src/LP/lp_heuristics.c | 14 +-
src/LP/lp_proccomm.c | 23 +-
src/LP/lp_pseudo_branch.c | 2 +-
src/LP/lp_rowfunc.c | 2 +-
src/LP/lp_solver.c | 213 +--
src/LP/lp_sp.c | 2 +-
src/LP/lp_varfunc.c | 8 +-
src/LP/lp_wrapper.c | 121 +-
src/Makefile.am | 19 +-
src/Makefile.in | 1828 ++++++++++----------
src/Master/main.c | 36 +-
src/Master/master.c | 146 +-
src/Master/master_func.c | 44 +-
src/Master/master_io.c | 198 ++-
src/Master/master_prep.c | 28 +-
src/Master/master_prep_base.c | 6 +-
src/Master/master_prep_sr.c | 2 +-
src/Master/master_wrapper.c | 21 +-
src/OsiSym/Makefile.am | 5 +
src/OsiSym/Makefile.in | 7 +-
src/OsiSym/OsiSymSolverInterface.cpp | 3 +
src/OsiSym/OsiSymSolverParameters.hpp | 1 +
src/TreeManager/tm_func.c | 637 +++++--
src/TreeManager/tm_proccomm.c | 29 +-
src/TreeManager/treemanager.c | 2 +-
symphony-app.pc.in | 2 +-
test/Makefile.am | 10 +-
test/Makefile.in | 10 +-
test/OsiSymSolverInterfaceTest.cpp | 2 +-
test/unitTestSym.cpp | 24 +-
159 files changed, 8326 insertions(+), 2225 deletions(-)
create mode 100644 Applications/VRP/src/Heuristics/binomial.c
create mode 100644 Applications/VRP/src/Heuristics/exchange.c
create mode 100644 Applications/VRP/src/Heuristics/exchange2.c
create mode 100644 Applications/VRP/src/Heuristics/farnear_ins.c
create mode 100644 Applications/VRP/src/Heuristics/farthest_ins.c
create mode 100644 Applications/VRP/src/Heuristics/heur_main.c
create mode 100644 Applications/VRP/src/Heuristics/heur_routines.c
create mode 100644 Applications/VRP/src/Heuristics/ins_routines.c
create mode 100644 Applications/VRP/src/Heuristics/ins_routines2.c
create mode 100644 Applications/VRP/src/Heuristics/mst.c
copy Applications/VRP/src/{CutGen/Decomp/decomp_lower_bound.c => Heuristics/mst_ins_rout.c} (56%)
create mode 100644 Applications/VRP/src/Heuristics/near_cluster.c
create mode 100644 Applications/VRP/src/Heuristics/nearest_ins.c
copy Applications/VRP/{include/heurs/sweep.h => src/Heuristics/qsort.c} (56%)
create mode 100644 Applications/VRP/src/Heuristics/s_path.c
create mode 100644 Applications/VRP/src/Heuristics/savings.c
create mode 100644 Applications/VRP/src/Heuristics/savings2.c
create mode 100644 Applications/VRP/src/Heuristics/savings3.c
create mode 100644 Applications/VRP/src/Heuristics/savings_rout.c
create mode 100644 Applications/VRP/src/Heuristics/savings_rout2.c
create mode 100644 Applications/VRP/src/Heuristics/savings_rout3.c
create mode 100644 Applications/VRP/src/Heuristics/sp.c
create mode 100644 Applications/VRP/src/Heuristics/sweep.c
create mode 100644 Applications/VRP/src/Heuristics/tsp_fi.c
create mode 100644 Applications/VRP/src/Heuristics/tsp_fini.c
create mode 100644 Applications/VRP/src/Heuristics/tsp_ins_rout.c
create mode 100644 Applications/VRP/src/Heuristics/tsp_ni.c
create mode 100644 MSVisualStudio/sym.mak
delete mode 100644 debian/patches/shlibdeps.patch
create mode 100644 include/decomp/decomp.h
create mode 100644 include/decomp/decomp_lp.h
create mode 100644 include/decomp/decomp_types.h
create mode 100644 include/decomp/sp_params.h
--
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