[opengm] 175/386: Change in eta.

[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 120aa3e04b01cf96abba182d3c45cf664c648c06
Author: Janez Ales <janez.ales at iwr.uni-heidelberg.de>
Date:   Fri Dec 19 11:32:22 2014 +0100

    Change in eta.
---
 include/opengm/learning/maximum-likelihood-learning.hxx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/opengm/learning/maximum-likelihood-learning.hxx b/include/opengm/learning/maximum-likelihood-learning.hxx
index 518c6db..df19be8 100644
--- a/include/opengm/learning/maximum-likelihood-learning.hxx
+++ b/include/opengm/learning/maximum-likelihood-learning.hxx
@@ -137,10 +137,10 @@ void MaximumLikelihoodLearner<DATASET, LOSS>::learn(typename INF::Parameter& wei
             w[m][v]=(ValueType)gt[v];
     }
 
-    ValueType eta = 0.01;
+    ValueType eta = 0.1;
     ValueType delta = 0.25; // 0 <= delta <= 0.5
     ValueType D_a = 1.0; // distance treshold
-    ValueType optFun, bestOptFun=0.0;
+    ValueType optFunTmp, optFun, bestOptFun=0.0;
 
     while(search){
         ++count;
@@ -173,6 +173,7 @@ void MaximumLikelihoodLearner<DATASET, LOSS>::learn(typename INF::Parameter& wei
         }
 
         optFun=0.0;
+        optFunTmp=0.0;
 
         /***********************************************************************************************************/
         // Loopy Belief Propagation setup
@@ -250,10 +251,11 @@ void MaximumLikelihoodLearner<DATASET, LOSS>::learn(typename INF::Parameter& wei
                     sum[p] += (b[m][f] - piW[m][f]) * f_x;
                     // ( ground truth - marginals ) * factor
                     optFun += b[m][f] - piW[m][f] * factor(labelVector.begin());
+                    optFunTmp += (b[m][f] - piW[m][f]) * factor(labelVector.begin());
                 }
             }
         }
-        std::cout << " loss = " << loss << " optFun = " << optFun << std::endl;
+        std::cout << " loss = " << loss << " optFun = " << optFun << " optFunTmp = " << optFunTmp << std::endl;
 
         if(loss<=bestLoss){
             bestLoss=loss;

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