[opengm] 67/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 5df619d38d6672765b5eb79942a80a9c17ac7794
Merge: ff9f288 636ef8c
Author: DerThorsten <thorsten.beier at iwr.uni-heidelberg.de>
Date:   Tue Dec 16 14:45:35 2014 +0100

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

 include/opengm/learning/dataset/dataset.hxx        |  27 +++--
 include/opengm/learning/dataset/dataset_io.hxx     |  95 +++++++++++----
 include/opengm/learning/dataset/testdataset.hxx    |  15 ++-
 include/opengm/learning/dataset/testdataset2.hxx   |  14 ++-
 include/opengm/learning/dataset/testdatasets.hxx   | 129 ++++++++++++++++++---
 .../learning/loss/generalized-hammingloss.hxx      |   2 +-
 include/opengm/learning/loss/hammingloss.hxx       |   2 +-
 src/unittest/CMakeLists.txt                        |   3 -
 src/unittest/learning/CMakeLists.txt               |   4 +
 src/unittest/learning/test_dataset.cxx             |  15 ++-
 src/unittest/learning/test_dataset_io.cxx          |  22 ++--
 .../learning/test_generalized_hammingloss.cxx      |   2 +-
 .../{ => learning}/test_gridsearch_learner.cxx     |  19 +--
 13 files changed, 256 insertions(+), 93 deletions(-)

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