[opengm] 293/386: Merge pull request #399 from ilastikdev/structured_learning_2

[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 83d4f90b0bb5fff625a7dfcf4635e691bfd5282c
Merge: 7c1b6f0 adf58c8
Author: opengm <opengm at hci.iwr.uni-heidelberg.de>
Date:   Fri Nov 6 13:08:38 2015 +0100

    Merge pull request #399 from ilastikdev/structured_learning_2
    
    Structured learning 2

 .../learnable/lweightedsum_of_functions.hxx        |  7 ++-
 include/opengm/inference/lp_inference_base.hxx     |  1 -
 include/opengm/inference/lpcplex.hxx               | 15 +++---
 include/opengm/learning/bundle-optimizer.hxx       | 34 ++++++++++---
 include/opengm/learning/gradient-accumulator.hxx   |  9 ----
 include/opengm/learning/solver/CplexBackend.h      |  1 -
 include/opengm/learning/struct-max-margin.hxx      | 57 ++++++++++++++++------
 src/unittest/test_gm_learning_functions.cxx        |  4 +-
 8 files changed, 83 insertions(+), 45 deletions(-)

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