[opengm] 102/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 bb962293264a08967ffbd2a3bde174770635320e
Merge: 5dd8870 9da4972
Author: Steffen-Wolf <Steffen.Wolf at stud.uni-heidelberg.de>
Date:   Wed Dec 17 14:54:19 2014 +0100

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

 .../opengm/functions/learnable/sum_of_experts.hxx  |  2 +-
 .../opengm/learning/dataset/editabledataset.hxx    |  1 -
 include/opengm/learning/dataset/testdatasets.hxx   | 56 +++++++++++++++++++
 include/opengm/learning/gradient-accumulator.hxx   | 23 ++++++--
 include/opengm/learning/gridsearch-learning.hxx    | 15 ++---
 include/opengm/learning/struct-max-margin.hxx      |  4 +-
 include/opengm/python/opengmpython.hxx             |  9 +++
 .../python/opengm/learning/CMakeLists.txt          |  6 +-
 src/interfaces/python/opengm/learning/learning.cxx | 10 ++++
 .../python/opengm/learning/pyDataset.cxx           | 17 ++++++
 .../python/opengm/learning/pyGridSearchLearner.cxx | 28 ++++++----
 src/unittest/learning/test_gridsearch_learner.cxx  |  8 +--
 src/unittest/learning/test_learning.cxx            | 65 ++++++++++++++--------
 13 files changed, 188 insertions(+), 56 deletions(-)


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