[opengm] 91/386: merged

[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 f99a75c376d2a4694bbe4ba5fb9a48efec9e3bd2
Merge: 16a3bed 63623e9
Author: DerThorsten <thorsten.beier at iwr.uni-heidelberg.de>
Date:   Wed Dec 17 14:27:10 2014 +0100

    merged

 include/opengm/functions/learnable/lunary.hxx      |  1 -
 include/opengm/learning/dataset/dataset.hxx        |  1 +
 .../opengm/learning/dataset/editabledataset.hxx    |  5 +--
 include/opengm/python/opengmpython.hxx             |  2 +-
 .../python/opengm/learning/CMakeLists.txt          |  2 +-
 src/interfaces/python/opengm/learning/learning.cxx |  5 +++
 .../python/opengm/learning/pyDataset.cxx           | 46 +++++++++++++++++++---
 7 files changed, 51 insertions(+), 11 deletions(-)

diff --cc include/opengm/python/opengmpython.hxx
index ef97043,840b5cc..84c54d2
--- a/include/opengm/python/opengmpython.hxx
+++ b/include/opengm/python/opengmpython.hxx
@@@ -119,11 -115,6 +119,11 @@@ namespace python
        FTLGen<GmValueType,GmIndexType>::type
     >::type   GmAdder;
  
 +
 +   typedef opengm::datasets::Dataset<GmAdder, opengm::learning::HammingLoss > GmAdderHammingLossDataset;
- 
++   typedef opengm::datasets::Dataset<GmAdder, opengm::learning::GeneralizedHammingLoss > GmAdderGeneralizedHammingLossDataset;
 +
 +
     typedef GmAdder::FactorType FactorGmAdder;
     typedef FactorGmAdder GmAdderFactor;
  
diff --cc src/interfaces/python/opengm/learning/learning.cxx
index 913f421,32f633a..01eddb9
--- a/src/interfaces/python/opengm/learning/learning.cxx
+++ b/src/interfaces/python/opengm/learning/learning.cxx
@@@ -47,7 -44,5 +47,12 @@@ BOOST_PYTHON_MODULE_INIT(_learning) 
      // templated datasets
      opengm::export_dataset<op::GmAdder, ol::HammingLoss >("DatasetWithHammingLoss");
      opengm::export_dataset<op::GmAdder, ol::NoLoss >("DatasetWithNoLoss");
+     opengm::export_dataset<op::GmAdder, ol::GeneralizedHammingLoss >("DatasetWithGeneralizedHammingLoss");
 +
 +
 +    opengm::export_grid_search_learner<GmAdderHammingLossDataset>("GridSearch_HammingLoss");
++    opengm::export_grid_search_learner<GmAdderGeneralizedHammingLossDataset>("GridSearch_GeneralizedHammingLoss");
++    
++    
++
  }

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