Merge branch '5-jetstatistics-divides-by-the-wrong-value' into 'master'

Resolve "JetStatistics divides by the wrong value"

Closes #5

See merge request !13

bob/ip/gabor/cpp/JetStatistics.cpp

@@ -142,7 +142,7 @@ double bob::ip::gabor::JetStatistics::logLikelihood(const boost::shared_ptr<bob:
     auto kernels = m_gwt->waveletFrequencies();
     auto abs = jet->abs(), phase = jet->phase();
     for (int j = jet->length(); j--;){
-      q_phase += sqr(adjust_phase(phase(j) + kernels[j][0] * disp[0] + kernels[j][1] * disp[1] - m_meanPhase(j))) / m_varPhase(j) * abs(j) / m_varAbs(j);
+      q_phase += sqr(adjust_phase(phase(j) + kernels[j][0] * disp[0] + kernels[j][1] * disp[1] - m_meanPhase(j))) / m_varPhase(j) * abs(j) / m_meanAbs(j);
     }
 //    q_phase *= blitz::sum(m_varPhase);
     factor = 2.;

bob/ip/gabor/test.py

@@ -347,7 +347,7 @@ def test_statistics():
   assert numpy.allclose(disparity, (2.12029, -3.76835)), disparity
   abs_sim = stats(jets[0], False)
   phase_sim = stats(jets[0], True)
-  assert numpy.allclose((abs_sim, phase_sim), (-1.097344, -5.451094)), str((abs_sim, phase_sim))
+  assert numpy.allclose((abs_sim, phase_sim), (-1.097344, -0.792773)), str((abs_sim, phase_sim))
 
   stats.gwt = None
   assert stats.gwt is None