[opengm] 138/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 32572ee72dbc96a4e68aa7a5e6d239385c708015
Merge: 874061c 119d873
Author: Steffen-Wolf <Steffen.Wolf at stud.uni-heidelberg.de>
Date:   Thu Dec 18 17:28:45 2014 +0100

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

 .../opengm/functions/learnable/sum_of_experts.hxx  |  2 +
 include/opengm/learning/dataset/dataset_io.hxx     | 40 +++++++++---
 .../learning/loss/generalized-hammingloss.hxx      | 66 +++++++++++++++++++-
 include/opengm/learning/loss/hammingloss.hxx       | 18 ++++++
 include/opengm/learning/loss/noloss.hxx            | 18 ++++++
 src/unittest/learning/test_dataset_io.cxx          | 71 +++++++++++++++++-----
 6 files changed, 188 insertions(+), 27 deletions(-)

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