[opengm] 214/386: first bugfixes for maxlikelihoodlearning - need more

[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 9b96a90525f208be0fc78afdc8d5cdb20e8ba91d
Author: joergkappes <kappes at math.uni-heidelberg.de>
Date:   Mon Jan 12 08:28:23 2015 +0100

    first bugfixes for maxlikelihoodlearning - need more
---
 include/opengm/learning/maximum-likelihood-learning.hxx   | 5 +++--
 src/unittest/learning/test_maximum_likelihood_learner.cxx | 9 +++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/include/opengm/learning/maximum-likelihood-learning.hxx b/include/opengm/learning/maximum-likelihood-learning.hxx
index be6dfc4..d2d6718 100644
--- a/include/opengm/learning/maximum-likelihood-learning.hxx
+++ b/include/opengm/learning/maximum-likelihood-learning.hxx
@@ -69,7 +69,8 @@ public:
 
     class Parameter{
     public:
-        Parameter(){;}
+       size_t maxNumSteps_;
+       Parameter() :maxNumSteps_(100){;}
     };
 
 
@@ -263,7 +264,7 @@ void MaximumLikelihoodLearner<DATASET>::learn(const typename INF::Parameter &wei
             bestLoss=loss;
         }
 
-        if (count>=1000000 ){
+        if (count>=param_.maxNumSteps_){
             search = false;
         }else{
             // Calculate the next point
diff --git a/src/unittest/learning/test_maximum_likelihood_learner.cxx b/src/unittest/learning/test_maximum_likelihood_learner.cxx
index 181497d..b312846 100644
--- a/src/unittest/learning/test_maximum_likelihood_learner.cxx
+++ b/src/unittest/learning/test_maximum_likelihood_learner.cxx
@@ -58,10 +58,11 @@ int main() {
    {
       DS1 dataset;
       std::cout << "Dataset includes " << dataset.getNumberOfModels() << " instances and has " << dataset.getNumberOfWeights() << " parameters."<<std::endl;
-      opengm::learning::MaximumLikelihoodLearner<DS1>::Parameter weight;
-      opengm::learning::MaximumLikelihoodLearner<DS1> learner(dataset,weight);
-      INF::Parameter infWeight;
-      learner.learn<INF>(infWeight);
+      opengm::learning::MaximumLikelihoodLearner<DS1>::Parameter param;
+      param.maxNumSteps_=3;
+      opengm::learning::MaximumLikelihoodLearner<DS1> learner(dataset,param);
+      INF::Parameter infParam;
+      learner.learn<INF>(infParam);
       
    }
 /*

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