[opengm] 89/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 101b8dfa51dd19f49e4983790ed889167cc60b51
Merge: 1c56b64 563716c
Author: Steffen-Wolf <Steffen.Wolf at stud.uni-heidelberg.de>
Date:   Wed Dec 17 14:22:35 2014 +0100

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

 fubar/python_stuff.py                              | 14 +++-
 include/opengm/functions/learnable/lunary.hxx      |  1 -
 .../opengm/functions/learnable/sum_of_experts.hxx  |  6 +-
 include/opengm/learning/dataset/dataset.hxx        | 30 ++++----
 .../opengm/learning/dataset/editabledataset.hxx    | 20 ++++--
 include/opengm/learning/dataset/testdatasets.hxx   | 63 +++++++++++++++++
 .../learning/loss/generalized-hammingloss.hxx      | 30 +++-----
 include/opengm/learning/loss/hammingloss.hxx       |  6 ++
 include/opengm/learning/loss/noloss.hxx            |  6 ++
 include/opengm/utilities/meminfo.hxx               |  1 +
 src/interfaces/python/opengm/CMakeLists.txt        |  1 +
 .../python/opengm/learning/CMakeLists.txt          | 79 ++++++++++++++++++++++
 src/interfaces/python/opengm/learning/__init__.py  |  1 +
 src/interfaces/python/opengm/learning/learning.cxx | 48 +++++++++++++
 .../opengm/{opengmcore => learning}/pyDataset.cxx  | 36 ++++++++--
 .../python/opengm/learning/pyGridSearchLearner.cxx | 33 +++++++++
 .../opengm/{opengmcore => learning}/pyLoss.cxx     | 26 ++++++-
 .../python/opengm/learning/pyWeights.cxx           | 36 ++++++++++
 .../python/opengm/opengmcore/CMakeLists.txt        |  4 --
 .../python/opengm/opengmcore/opengmcore.cpp        | 17 +----
 .../python/opengm/opengmcore/pyDataset.hxx         |  4 --
 src/interfaces/python/opengm/opengmcore/pyLoss.hxx |  4 --
 src/tutorials/c++/applications/CMakeLists.txt      | 10 +--
 src/unittest/learning/test_dataset.cxx             | 30 +++++++-
 .../learning/test_generalized_hammingloss.cxx      | 22 +++---
 25 files changed, 428 insertions(+), 100 deletions(-)

diff --cc include/opengm/learning/dataset/editabledataset.hxx
index ea384e7,560bcbb..affe43f
--- a/include/opengm/learning/dataset/editabledataset.hxx
+++ b/include/opengm/learning/dataset/editabledataset.hxx
@@@ -26,10 -27,10 +27,10 @@@ namespace opengm 
           typedef std::vector<LabelType> GTVector;
  
           EditableDataset(size_t numInstances=0) : Dataset<GM, LOSS>(numInstances) {}
-          EditableDataset(std::vector<GM>& gms, std::vector<GTVector >& gts);
+          EditableDataset(std::vector<GM>& gms, std::vector<GTVector >& gts, std::vector<LossParameterType>& lossParams);
  
-          void setInstance(const size_t i, GM& gm, GTVector& gt);
-          void pushBackInstance(const GM& gm, const GTVector& gt);
 -         void setInstance(const size_t i, GM& gm, GTVector& gt, LossParameterType& p=LossParameterType());
 -         void pushBackInstance(GM& gm, GTVector& gt, LossParameterType& p=LossParameterType());
++         void setInstance(const size_t i, const GM& gm, const GTVector& gt, const LossParameterType& p=LossParameterType());
++         void pushBackInstance(const GM& gm, const GTVector& gt, const LossParameterType& p=LossParameterType());
           void setWeights(Weights& w);
        };
  
@@@ -45,9 -47,10 +47,10 @@@
      }
  
      template<class GM, class LOSS>
-     void EditableDataset<GM, LOSS>::setInstance(const size_t i, GM& gm, GTVector& gt) {
 -    void EditableDataset<GM, LOSS>::setInstance(const size_t i, GM& gm, GTVector& gt, LossParameterType& p) {
++    void EditableDataset<GM, LOSS>::setInstance(const size_t i, const GM& gm, const GTVector& gt, const LossParameterType& p) {
          OPENGM_CHECK_OP(i, <, this->gms_.size(),"");
          OPENGM_CHECK_OP(i, <, this->gts_.size(),"");
+         OPENGM_CHECK_OP(i, <, this->lossParams_.size(),"");
          OPENGM_CHECK_OP(i, <, this->gmsWithLoss_.size(),"");
          this->gms_[i] = gm;
          this->gts_[i] = gt;
@@@ -55,9 -59,10 +59,10 @@@
      }
  
      template<class GM, class LOSS>
-     void EditableDataset<GM, LOSS>::pushBackInstance(const GM& gm, const GTVector& gt) {
 -    void EditableDataset<GM, LOSS>::pushBackInstance(GM& gm, GTVector& gt, LossParameterType& p) {
++    void EditableDataset<GM, LOSS>::pushBackInstance(const GM& gm, const GTVector& gt, const LossParameterType& p) {
          this->gms_.push_back(gm);
          this->gts_.push_back(gt);
+         this->lossParams_.push_back(p);
          this->gmsWithLoss_.resize(this->gts_.size());
          this->buildModelWithLoss(this->gts_.size()-1);
          OPENGM_CHECK_OP(this->gms_.size(), ==, this->gts_.size(),"");

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