[opengm] 151/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 e2b2567bf03c66372effa67c3682b7f63c963de4
Merge: 6748532 0d73385
Author: Steffen-Wolf <Steffen.Wolf at stud.uni-heidelberg.de>
Date:   Fri Dec 19 10:47:11 2014 +0100

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

 include/opengm/functions/l_potts.hxx               | 203 ---------------------
 .../{sum_of_experts.hxx => lsum_of_experts.hxx}    |  58 +++---
 include/opengm/functions/learnablefunction.hxx     | 144 ---------------
 include/opengm/learning/dataset/testdataset.hxx    |  96 ----------
 include/opengm/learning/dataset/testdataset2.hxx   | 103 -----------
 include/opengm/learning/dataset/testdatasets.hxx   |   6 +-
 .../python/opengm/learning/CMakeLists.txt          |  14 ++
 .../python/opengm/opengmcore/pyFunctionTypes.cxx   |   8 +-
 src/unittest/learning/test_dataset.cxx             |   4 +-
 src/unittest/learning/test_dataset_io.cxx          |   4 +-
 src/unittest/learning/test_gridsearch_learner.cxx  |   4 +-
 src/unittest/learning/test_learning.cxx            |   4 +-
 12 files changed, 58 insertions(+), 590 deletions(-)

diff --cc include/opengm/learning/dataset/testdatasets.hxx
index fff5437,7208fda..465fe69
--- a/include/opengm/learning/dataset/testdatasets.hxx
+++ b/include/opengm/learning/dataset/testdatasets.hxx
@@@ -6,9 -6,8 +6,9 @@@
  #include <cstdlib>
  
  #include <opengm/learning/dataset/dataset.hxx>
 +#include <opengm/learning/dataset/editabledataset.hxx>
  #include <opengm/functions/learnable/lpotts.hxx>
- #include <opengm/functions/learnable/sum_of_experts.hxx>
+ #include <opengm/functions/learnable/lsum_of_experts.hxx>
  
  namespace opengm {
     namespace datasets{

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