[opengm] 136/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 e841b8b1758797a7f9b0fc5608026c9f3c8d8046
Merge: 94af389 c26a004
Author: mschiegg <martin.schiegg at iwr.uni-heidelberg.de>
Date:   Thu Dec 18 17:26:04 2014 +0100

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

 fubar/example1.py                                  |   4 +-
 fubar/real_example.py                              | 106 +++++++++++++++++++++
 include/opengm/learning/gradient-accumulator.hxx   |   6 +-
 include/opengm/learning/struct-max-margin.hxx      |   6 +-
 src/interfaces/python/opengm/learning/__init__.py  |   4 +-
 src/interfaces/python/opengm/learning/helper.hxx   |  64 +++++++++++++
 .../python/opengm/learning/pyGridSearchLearner.cxx |  25 +----
 .../opengm/learning/pyStructMaxMarginLearner.cxx   |  24 +----
 src/unittest/learning/test_learning.cxx            |  39 ++++----
 9 files changed, 202 insertions(+), 76 deletions(-)

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