[opengm] 127/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 db39600cad06a730ecf619e5e8d38ee649ead074
Merge: c44dd71 d3b1ab9
Author: Steffen-Wolf <Steffen.Wolf at stud.uni-heidelberg.de>
Date:   Thu Dec 18 16:02:45 2014 +0100

    Merge branch 'master' of github.com:joergkappes/opengm-learning
    
    Conflicts:
    	include/opengm/learning/gradient-accumulator.hxx

 fubar/example1.py                                  |  7 ++
 .../opengm/functions/learnable/sum_of_experts.hxx  |  2 +-
 include/opengm/functions/readme.txt                |  1 +
 include/opengm/learning/dataset/dataset.hxx        | 10 ++-
 .../opengm/learning/dataset/editabledataset.hxx    |  6 +-
 include/opengm/learning/dataset/testdatasets.hxx   |  8 +++
 include/opengm/learning/gradient-accumulator.hxx   |  6 +-
 .../learning/loss/generalized-hammingloss.hxx      | 11 ++++
 include/opengm/learning/loss/hammingloss.hxx       | 10 +++
 include/opengm/learning/loss/noloss.hxx            | 76 +++++++++++++---------
 include/opengm/learning/solver/CplexBackend.h      | 28 ++++----
 include/opengm/learning/solver/GurobiBackend.h     | 30 ++++-----
 include/opengm/learning/solver/LinearConstraint.h  | 13 ++--
 include/opengm/learning/solver/LinearConstraints.h |  7 +-
 .../opengm/learning/solver/QuadraticObjective.h    | 19 +++---
 include/opengm/learning/solver/Solution.h          |  4 +-
 include/opengm/learning/struct-max-margin.hxx      | 15 +++--
 .../python/opengm/learning/CMakeLists.txt          | 16 ++---
 src/interfaces/python/opengm/learning/__init__.py  | 31 ++++++++-
 src/interfaces/python/opengm/learning/helper.hxx   | 53 +++++++++++++++
 src/interfaces/python/opengm/learning/learning.cxx | 13 +++-
 .../python/opengm/learning/pyGridSearchLearner.cxx | 25 +------
 src/interfaces/python/opengm/learning/pyLoss.cxx   | 56 +++++++++++-----
 .../opengm/learning/pyStructMaxMarginLearner.cxx   | 60 +++++++++++++++++
 src/unittest/learning/test_learning.cxx            |  4 +-
 25 files changed, 355 insertions(+), 156 deletions(-)


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