[opengm] 376/386: Merge pull request #470 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 14d5c0e364984049d58a22a6326784c9b91affb2
Merge: 5ecf60c 74026da
Author: Joerg Kappes <kappes at math.uni-heidelberg.de>
Date:   Thu Aug 4 20:13:35 2016 +0200

    Merge pull request #470 from joergkappes/master
    
     	merge changes for functions and graphical model from the learning branch

 .../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/external/qpbo.hxx         |   4 +-
 include/opengm/utilities/metaprogramming.hxx       | 105 +++--
 src/unittest/CMakeLists.txt                        |   5 +-
 src/unittest/test_gm_learning_functions.cxx        |  23 +-
 src/unittest/test_learnable_functions.cxx          |  79 ++++
 22 files changed, 1833 insertions(+), 252 deletions(-)

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