[opengm] 146/386: Merge branch 'master' of 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 674853249c358dadc7b066efcdc3480cf3fc45ff
Merge: 32572ee 7043133
Author: Steffen-Wolf <Steffen.Wolf at stud.uni-heidelberg.de>
Date:   Fri Dec 19 10:15:06 2014 +0100

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

 fubar/real_example.py                              | 61 ++++++++++++----------
 include/opengm/functions/learnable/lunary.hxx      | 37 +++++--------
 .../opengm/functions/learnable/sum_of_experts.hxx  |  2 +-
 src/interfaces/python/opengm/learning/__init__.py  | 23 +++++++-
 .../python/opengm/opengmcore/pyFunctionTypes.cxx   |  6 ++-
 5 files changed, 75 insertions(+), 54 deletions(-)

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