[opengm] 119/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 a5b9266147e5133545b5af3cca9af9347396cd47
Merge: 2d26d9c beeee2e
Author: DerThorsten <thorsten.beier at iwr.uni-heidelberg.de>
Date:   Thu Dec 18 14:47:07 2014 +0100

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

 fubar/example1.py                                  |  7 ++
 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  | 24 ++++++-
 src/interfaces/python/opengm/learning/learning.cxx |  7 +-
 .../opengm/learning/pyStructMaxMarginLearner.cxx   | 75 ++++++++++++++++++++++
 12 files changed, 175 insertions(+), 70 deletions(-)

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