[opengm] 240/386: Merge branch 'master' of https://bitbucket.org/jkappes/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 10aa887930e6d299ae3d6943740bf7255f9f5693
Merge: f9041d9 04f52f7
Author: DerThorsten <thorsten.beier at iwr.uni-heidelberg.de>
Date:   Wed Jan 14 17:24:28 2015 +0100

    Merge branch 'master' of https://bitbucket.org/jkappes/opengm-learning

 CMakeLists.txt                                     |  7 +++++-
 .../learning/maximum_likelihood_learning.hxx       | 29 ++++++++++++++++------
 include/opengm/learning/subgradient_ssvm.hxx       | 26 ++++++++++++++++---
 .../python/opengm/learning/CMakeLists.txt          | 10 +++++---
 src/interfaces/python/opengm/learning/helper.hxx   |  2 +-
 src/unittest/learning/CMakeLists.txt               |  4 +++
 src/unittest/learning/test_learning.cxx            | 15 +++++------
 src/unittest/learning/test_subgradient_ssvm.cxx    |  4 +--
 8 files changed, 73 insertions(+), 24 deletions(-)

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