diff src/Modules/Features/ModuleGaussians.cc @ 162:9fcf55c040fe

- Added property svn:eol-style native to all text files

--- a/src/Modules/Features/ModuleGaussians.cc	Thu Jul 22 01:19:52 2010 +0000
+++ b/src/Modules/Features/ModuleGaussians.cc	Thu Jul 22 04:14:20 2010 +0000
@@ -27,10 +27,6 @@
 
 #include <math.h>
 
-#ifdef _WINDOWS
-#include <float.h>
-#endif
-
 #include "Modules/Features/ModuleGaussians.h"
 #include "Support/Common.h"
 
@@ -42,17 +38,17 @@
   module_type_ = "features";
   module_version_ = "$Id$";
 
-  m_iParamNComp = parameters_->DefaultInt("gaussians.ncomp", 4);
-  m_fParamVar = parameters_->DefaultFloat("gaussians.var", 115.0);
-  m_fParamPosteriorExp = parameters_->DefaultFloat("gaussians.posterior_exp",
-                                                   6.0);
-  m_iParamMaxIt = parameters_->DefaultInt("gaussians.maxit", 250);
+  m_iParamNComp = parameters_->DefaultInt("features.gaussians.ncomp", 4);
+  m_fParamVar = parameters_->DefaultFloat("features.gaussians.var", 115.0);
+  m_fParamPosteriorExp =
+    parameters_->DefaultFloat("features.gaussians.posterior_exp", 6.0);
+  m_iParamMaxIt = parameters_->DefaultInt("features.gaussians.maxit", 250);
 
   // The parameters system doesn't support tiny numbers well, to define this
   // variable as a string, then convert it to a float afterwards
-  parameters_->DefaultString("gaussians.priors_converged", "1e-7");
-  priors_converged_ = parameters_->GetFloat("gaussians.priors_converged");
-  output_positions_ = parameters_->DefaultBool("gaussians.positions", false);
+  parameters_->DefaultString("features.gaussians.priors_converged", "1e-7");
+  m_fParamPriorsConverged =
+    parameters_->GetFloat("features.gaussians.priors_converged");
 }
 
 ModuleGaussians::~ModuleGaussians() {
@@ -64,9 +60,8 @@
 
   // Assuming the number of channels is greater than twice the number of
   // Gaussian components, this is ok
-  output_component_count_ = 1; // Energy component
   if (input.channel_count() >= 2 * m_iParamNComp) {
-    output_component_count_ += (m_iParamNComp - 1);
+    output_.Initialize(m_iParamNComp, 1, input.sample_rate());
   } else {
     LOG_ERROR(_T("Too few channels in filterbank to produce sensible "
                  "Gaussian features. Either increase the number of filterbank"
@@ -74,12 +69,6 @@
     return false;
   }
 
-  if (output_positions_) {
-    output_component_count_ += m_iParamNComp;
-  }
-
-  output_.Initialize(output_component_count_, 1, input.sample_rate());
-
   m_iNumChannels = input.channel_count();
   m_pSpectralProfile.resize(m_iNumChannels, 0.0f);
 
@@ -100,14 +89,17 @@
     LOG_ERROR(_T("Module ModuleGaussians not initialized."));
     return;
   }
-  output_.set_start_time(input.start_time());
   // Calculate spectral profile
-  for (int ch = 0; ch < input.channel_count(); ++ch) {
-    m_pSpectralProfile[ch] = 0.0f;
-    for (int i = 0; i < input.buffer_length(); ++i) {
-      m_pSpectralProfile[ch] += input[ch][i];
+  for (int iChannel = 0;
+       iChannel < input.channel_count();
+       ++iChannel) {
+    m_pSpectralProfile[iChannel] = 0.0f;
+    for (int iSample = 0;
+         iSample < input.buffer_length();
+         ++iSample) {
+      m_pSpectralProfile[iChannel] += input[iChannel][iSample];
     }
-    m_pSpectralProfile[ch] /= static_cast<float>(input.buffer_length());
+    m_pSpectralProfile[iChannel] /= static_cast<float>(input.buffer_length());
   }
 
   float spectral_profile_sum = 0.0f;
@@ -115,35 +107,36 @@
     spectral_profile_sum += m_pSpectralProfile[i];
   }
 
-  // Set the last component of the feature vector to be the log energy
   float logsum = log(spectral_profile_sum);
   if (!isinf(logsum)) {
-    output_.set_sample(output_component_count_ - 1, 0, logsum);
+    output_.set_sample(m_iParamNComp - 1, 0, logsum);
   } else {
-    output_.set_sample(output_component_count_ - 1, 0, -1000.0);
+    output_.set_sample(m_iParamNComp - 1, 0, -1000.0);
   }
 
-  for (int ch = 0; ch < input.channel_count(); ++ch) {
-    m_pSpectralProfile[ch] = pow(m_pSpectralProfile[ch], 0.8f);
+  for (int iChannel = 0;
+       iChannel < input.channel_count();
+       ++iChannel) {
+    m_pSpectralProfile[iChannel] = pow(m_pSpectralProfile[iChannel], 0.8);
   }
 
   RubberGMMCore(2, true);
 
-  float mean1 = m_pMu[0];
-  float mean2 = m_pMu[1];
+  float fMean1 = m_pMu[0];
+  float fMean2 = m_pMu[1];
   // LOG_INFO(_T("Orig. mean 0 = %f"), m_pMu[0]);
   // LOG_INFO(_T("Orig. mean 1 = %f"), m_pMu[1]);
   // LOG_INFO(_T("Orig. prob 0 = %f"), m_pA[0]);
   // LOG_INFO(_T("Orig. prob 1 = %f"), m_pA[1]);
 
-  float a1 = 0.05 * m_pA[0];
-  float a2 = 1.0 - 0.25 * m_pA[1];
+  float fA1 = 0.05 * m_pA[0];
+  float fA2 = 1.0 - 0.25 * m_pA[1];
 
   // LOG_INFO(_T("fA1 = %f"), fA1);
   // LOG_INFO(_T("fA2 = %f"), fA2);
 
-  float gradient = (mean2 - mean1) / (a2 - a1);
-  float intercept = mean2 - gradient * a2;
+  float fGradient = (fMean2 - fMean1) / (fA2 - fA1);
+  float fIntercept = fMean2 - fGradient * fA2;
 
   // LOG_INFO(_T("fGradient = %f"), fGradient);
   // LOG_INFO(_T("fIntercept = %f"), fIntercept);
@@ -151,7 +144,7 @@
   for (int i = 0; i < m_iParamNComp; ++i) {
     m_pMu[i] = (static_cast<float>(i)
                 / (static_cast<float>(m_iParamNComp) - 1.0f))
-                * gradient + intercept;
+                * fGradient + fIntercept;
                 // LOG_INFO(_T("mean %d = %f"), i, m_pMu[i]);
   }
 
@@ -161,7 +154,6 @@
 
   RubberGMMCore(m_iParamNComp, false);
 
-  // Amplitudes first
   for (int i = 0; i < m_iParamNComp - 1; ++i) {
     if (!isnan(m_pA[i])) {
       output_.set_sample(i, 0, m_pA[i]);
@@ -170,19 +162,6 @@
     }
   }
 
-  // Then means if required
-  if (output_positions_) {
-    int idx = 0;
-    for (int i = m_iParamNComp - 1; i < 2 * m_iParamNComp - 1; ++i) {
-      if (!isnan(m_pMu[i])) {
-        output_.set_sample(i, 0, m_pMu[idx]);
-      } else {
-        output_.set_sample(i, 0, 0.0f);
-      }
-      ++idx;
-    }
-  }
-
   PushOutput();
 }
 
@@ -190,12 +169,12 @@
   int iSizeX = m_iNumChannels;
 
   // Normalise the spectral profile
-  float SpectralProfileTotal = 0.0f;
+  float fSpectralProfileTotal = 0.0f;
   for (int iCount = 0; iCount < iSizeX; iCount++) {
-    SpectralProfileTotal += m_pSpectralProfile[iCount];
+    fSpectralProfileTotal += m_pSpectralProfile[iCount];
   }
   for (int iCount = 0; iCount < iSizeX; iCount++) {
-    m_pSpectralProfile[iCount] /= SpectralProfileTotal;
+    m_pSpectralProfile[iCount] /= fSpectralProfileTotal;
   }
 
   if (bDoInit) {
@@ -221,12 +200,12 @@
       pP_mod_X[i] = 0.0f;
     }
 
-    for (int c = 0; c < iNComponents; c++) {
+    for (int i = 0; i < iNComponents; i++) {
       for (int iCount = 0; iCount < iSizeX; iCount++) {
         pP_mod_X[iCount] += 1.0f / sqrt(2.0f * M_PI * m_fParamVar)
                             * exp((-0.5f)
-                            * pow(static_cast<float>(iCount+1) - m_pMu[c], 2)
-                            / m_fParamVar) * m_pA[c];
+                            * pow(static_cast<float>(iCount+1) - m_pMu[i], 2)
+                            / m_fParamVar) * m_pA[i];
       }
     }
 
@@ -272,7 +251,7 @@
     }
     fPrdist /= iNComponents;
 
-    if (fPrdist < priors_converged_) {
+    if (fPrdist < m_fParamPriorsConverged) {
       // LOG_INFO("Converged!");
       break;
     }