[opengm] 380/386: Merge tag 'v2.3.6+20160814' into debian/master
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Wed Aug 31 08:38:38 UTC 2016
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch debian/master
in repository opengm.
commit b132f2ccc73da6b0bffdb1a357ec2767247eba1b
Merge: 3231030 d73e5a7
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Thu Aug 25 08:45:56 2016 +0100
Merge tag 'v2.3.6+20160814' into debian/master
.travis.yml | 155 +++++--
CMakeLists.txt | 9 +
README.md | 6 +-
cmake/modules/FindHDF5.cmake | 130 +++---
cmake/modules/checkHDF5version.c | 8 +-
include/opengm/datastructures/fast_sequence.hxx | 2 +-
.../opengm/datastructures/marray/marray_hdf5.hxx | 25 ++
include/opengm/functions/constant.hxx | 1 +
.../linear_constraint_function_base.hxx | 9 +-
.../opengm/functions/function_properties_base.hxx | 11 +-
include/opengm/functions/l_potts.hxx | 202 ---------
include/opengm/functions/learnable/lpotts.hxx | 254 +++++++++++
include/opengm/functions/learnable/lunary.hxx | 478 +++++++++++++++++++++
.../learnable/lweightedsum_of_functions.hxx | 264 ++++++++++++
include/opengm/functions/potts.hxx | 4 +-
include/opengm/functions/readme.txt | 3 +
.../sum_constraint_function.hxx | 1 +
include/opengm/functions/unary_loss_function.hxx | 151 +++++++
include/opengm/functions/view_convert_function.hxx | 36 +-
include/opengm/graphicalmodel/graphicalmodel.hxx | 42 ++
.../graphicalmodel/graphicalmodel_factor.hxx | 27 ++
.../graphicalmodel_function_wrapper.hxx | 79 ++++
include/opengm/graphicalmodel/weights.hxx | 282 ++++++++++++
include/opengm/inference/alphabetaswap.hxx | 33 +-
include/opengm/inference/alphaexpansion.hxx | 85 ++--
include/opengm/inference/alphaexpansionfusion.hxx | 75 ++--
include/opengm/inference/astar.hxx | 139 +++---
.../auxiliary/fusion_move/fusion_mover.hxx | 27 ++
.../fusion_move/permutable_label_fusion_mover.hxx | 237 ++--------
.../auxiliary/lp_solver/lp_solver_interface.hxx | 12 +-
.../opengm/inference/auxiliary/minstcutboost.hxx | 2 +-
include/opengm/inference/bruteforce.hxx | 21 +-
include/opengm/inference/combilp.hxx | 11 +
include/opengm/inference/dmc.hxx | 3 +-
.../dualdecomposition/dualdecomposition_bundle.hxx | 28 ++
.../dualdecomposition_subgradient.hxx | 37 +-
include/opengm/inference/dynamicprogramming.hxx | 20 +
include/opengm/inference/external/ad3.hxx | 23 +
include/opengm/inference/external/daoopt.hxx | 26 ++
include/opengm/inference/external/fastPD.hxx | 16 +
include/opengm/inference/external/mrflib.hxx | 15 +
include/opengm/inference/external/qpbo.hxx | 31 +-
include/opengm/inference/external/trws.hxx | 38 +-
include/opengm/inference/fusion_based_inf.hxx | 23 +-
include/opengm/inference/graphcut.hxx | 29 +-
include/opengm/inference/greedygremlin.hxx | 19 +-
include/opengm/inference/hqpbo.hxx | 45 +-
include/opengm/inference/icm.hxx | 63 +--
include/opengm/inference/infandflip.hxx | 23 +
include/opengm/inference/inference.hxx | 9 +
.../opengm/inference/intersection_based_inf.hxx | 4 +-
include/opengm/inference/lazyflipper.hxx | 161 ++++---
include/opengm/inference/loc.hxx | 29 ++
include/opengm/inference/lp_inference_base.hxx | 1 -
include/opengm/inference/lpcplex.hxx | 96 +++--
include/opengm/inference/lpcplex2.hxx | 10 +
include/opengm/inference/lpgurobi.hxx | 80 +++-
include/opengm/inference/lpgurobi2.hxx | 10 +
include/opengm/inference/lsatr.hxx | 26 +-
.../inference/messagepassing/messagepassing.hxx | 30 ++
.../inference/messagepassing/messagepassing_bp.hxx | 11 +
.../messagepassing/messagepassing_trbp.hxx | 9 +
include/opengm/inference/movemaker.hxx | 8 +
include/opengm/inference/mqpbo.hxx | 31 +-
include/opengm/inference/multicut.hxx | 39 +-
include/opengm/inference/partition-move.hxx | 15 +-
include/opengm/inference/qpbo.hxx | 17 +-
include/opengm/inference/reducedinference.hxx | 150 ++++---
include/opengm/inference/sat.hxx | 18 +-
include/opengm/inference/self_fusion.hxx | 47 +-
.../opengm/inference/trws/smoothing_strategy.hxx | 1 +
.../inference/trws/trws_subproblemsolver.hxx | 2 +-
include/opengm/opengm.hxx | 33 +-
include/opengm/operations/logsumexp.hxx | 83 ++++
include/opengm/python/numpyview.hxx | 22 +-
include/opengm/python/opengmpython.hxx | 63 +--
include/opengm/utilities/meminfo.hxx | 2 +-
include/opengm/utilities/metaprogramming.hxx | 105 +++--
include/opengm/utilities/shape_accessor.hxx | 78 +++-
src/examples/unsorted-examples/inference_types.cxx | 9 +-
.../commandline/double/opengm_min_sum.cxx | 9 +-
src/interfaces/python/opengm/__init__.py | 5 +-
.../opengm/_inference_interface_generator.py | 59 +++
src/interfaces/python/opengm/functionhelper.py | 4 +-
.../python/opengm/inference/CMakeLists.txt | 10 +-
.../python/opengm/inference/inf_def_visitor.hxx | 1 +
.../python/opengm/inference/inference.cpp | 29 +-
.../opengm/inference/param/multicut_param.hxx | 8 +-
src/interfaces/python/opengm/inference/pyBp.cxx | 2 +
.../python/opengm/inference/pyBruteforce.cxx | 3 +
.../python/opengm/inference/pyFusionMoves.cxx | 4 +-
.../opengm/inference/pyIntersectionBased.cxx | 4 +-
.../python/opengm/opengmcore/CMakeLists.txt | 9 +-
.../python/opengm/opengmcore/__init__.py | 19 +-
.../python/opengm/opengmcore/function_injector.py | 11 +-
.../python/opengm/opengmcore/opengmcore.cpp | 40 +-
.../python/opengm/opengmcore/pyFunctionGen.cxx | 57 +++
.../python/opengm/opengmcore/pyFunctionTypes.cxx | 241 +++++++++--
src/interfaces/python/opengm/opengmcore/pyGm.cxx | 25 +-
src/interfaces/python/test.py | 3 +-
src/tutorials/c++/basics/doMinSumInference.cxx | 2 +-
src/tutorials/c++/basics/doSumProdInference.cxx | 2 +-
src/unittest/CMakeLists.txt | 11 +-
src/unittest/inference/test_graphcut.cxx | 6 +-
src/unittest/inference/test_lazyflipper.cxx | 2 +-
src/unittest/inference/test_messagepassing.cxx | 20 +-
src/unittest/inference/test_nesterov.cxx | 7 +
src/unittest/test_gm_learning_functions.cxx | 23 +-
src/unittest/test_learnable_functions.cxx | 79 ++++
src/unittest/test_linear_constraint.cxx | 1 +
src/unittest/test_lp_solver.cxx | 11 +-
src/unittest/test_partitions.cxx | 2 +-
112 files changed, 4093 insertions(+), 1075 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opengm.git
More information about the debian-science-commits
mailing list