[opengm] 378/386: Merge pull request #471 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 a685857ad34ce02e67c01f9e6e52d3869cd0246d
Merge: 14d5c0e ef1a4dc
Author: Joerg Kappes <kappes at math.uni-heidelberg.de>
Date:   Thu Aug 4 23:13:12 2016 +0200

    Merge pull request #471 from joergkappes/master
    
    merging changes from learning-branch into master

 include/opengm/python/numpyview.hxx                |  22 +-
 include/opengm/python/opengmpython.hxx             |  63 +++---
 src/interfaces/python/opengm/__init__.py           |   2 +-
 .../opengm/_inference_interface_generator.py       |  59 +++++
 src/interfaces/python/opengm/functionhelper.py     |   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 +-
 13 files changed, 456 insertions(+), 99 deletions(-)

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