[opengm] 371/386: Merge pull request #467 from joergkappes/master

[Ghislain Vaillant]

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 5ecf60cbe9463d2a09bd5ab4a4699de4c4de3296
Merge: 3ae6d00 bd965a0
Author: Joerg Kappes <kappes at math.uni-heidelberg.de>
Date:   Wed Jul 27 23:53:39 2016 +0200

    Merge pull request #467 from joergkappes/master
    
    merge changes on inference methods from learning branch

 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  |   4 +-
 .../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         |  27 +++-
 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    |   2 +-
 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 +++++-
 include/opengm/opengm.hxx                          |  33 ++++-
 include/opengm/utilities/shape_accessor.hxx        |  78 +++++++++-
 src/examples/unsorted-examples/inference_types.cxx |   9 +-
 .../commandline/double/opengm_min_sum.cxx          |   9 +-
 .../python/opengm/inference/CMakeLists.txt         |  10 +-
 .../python/opengm/inference/inf_def_visitor.hxx    |   1 +
 .../python/opengm/inference/inference.cpp          |   4 +-
 .../python/opengm/inference/pyFusionMoves.cxx      |   4 +-
 src/tutorials/c++/basics/doMinSumInference.cxx     |   2 +-
 src/tutorials/c++/basics/doSumProdInference.cxx    |   2 +-
 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_linear_constraint.cxx            |   1 +
 src/unittest/test_lp_solver.cxx                    |  11 +-
 63 files changed, 1427 insertions(+), 415 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opengm.git