[opengm] 45/386: Merge branch 'master' of https://github.com/joergkappes/opengm-learning

[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 c3e711220346927b5c7409fb00634704e9e77928
Merge: aec27e0 1e49cc8
Author: Joerg Kappes <jkappes at goedel.(none)>
Date:   Mon Dec 15 15:11:34 2014 +0100

    Merge branch 'master' of https://github.com/joergkappes/opengm-learning

 .gitignore                                         |  1 +
 fubar/python_stuff.py                              | 40 +++++++++++
 include/opengm/graphicalmodel/weights.hxx          | 14 ++--
 include/opengm/learning/bundle-optimizer.hxx       | 81 ++++++++++++----------
 include/opengm/learning/solver/BundleCollector.h   | 49 +++++++++++++
 include/opengm/python/opengmpython.hxx             | 61 +++++++++-------
 .../python/opengm/opengmcore/opengmcore.cpp        | 19 +++++
 .../python/opengm/opengmcore/pyFunctionTypes.cxx   | 36 +++++++++-
 src/interfaces/python/opengm/opengmcore/pyGm.cxx   | 10 +--
 9 files changed, 238 insertions(+), 73 deletions(-)

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