trunk: some changes applied to test code for pitch-functions

git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3330 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8

diff --git a/src/feat/pitch-functions-test.cc b/src/feat/pitch-functions-test.cc
index d02aa030246f23b22d0acaac9dda4ee8842d3ed7..8bf0a95027fde0063b3999180e1a8eee48f08224 100644 (file)
--- a/src/feat/pitch-functions-test.cc
+++ b/src/feat/pitch-functions-test.cc
@@ -1,7 +1,6 @@
 // feat/pitch-functions-test.cc
 
-// Copyright    2013  Pegah Ghahremani 
-
+// Copyright    2013  Pegah Ghahremani
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -22,147 +21,141 @@
 #include "base/kaldi-math.h"
 #include "matrix/kaldi-matrix-inl.h"
 #include "feat/wave-reader.h"
-#include <sys/timeb.h>
-#include <sys/stat.h>
-#include <sys/types.h> 
-
+#include "sys/timeb.h"
+#include "sys/stat.h"
+#include "sys/types.h" 
 using namespace kaldi;
 
 std::string ConvertIntToString(const int &number) {
-  std::stringstream ss;  //create a stringstream
-  ss << number;  //add number to the stream
-  return ss.str();  //return a string with the contents of the stream
+  std::stringstream ss;  // create a stringstream
+  ss << number;  // add number to the stream
+  return ss.str();  // return a string with the contents of the stream
 }
 bool DirExist(const std::string &dirname) {
   struct stat st;
-  if(stat(dirname.c_str(),&st) != 0) {
-    std::cout << " directory " << dirname << " does not exist!" ;
+  if (stat(dirname.c_str(), &st) != 0) {
+    KALDI_LOG << " directory " << dirname << " does not exist!";
     return false;
   }
   return true;
 }
 
 static void UnitTestSimple() {
-  std::cout << "=== UnitTestSimple() ===\n";
-
+  KALDI_LOG << "=== UnitTestSimple() ===\n";
   Vector<BaseFloat> v(1000);
   Vector<BaseFloat> out;
   Matrix<BaseFloat> m;
   // init with noise
   for (int32 i = 0; i < v.Dim(); i++) {
-    v(i) = (abs( i * 433024253 ) % 65535) - (65535 / 2);
+    v(i) = (abs(i * 433024253) % 65535) - (65535 / 2);
   }
-  std::cout << "<<<=== Just make sure it runs... Nothing is compared\n";
+  KALDI_LOG << "<<<=== Just make sure it runs... Nothing is compared\n";
   // the parametrization object
   PitchExtractionOptions op;
   // trying to have same opts as baseline.
   // compute pitch.
   Compute(op, v, &m);
-  std::cout << "Test passed :)\n";
+  KALDI_LOG << "Test passed :)\n";
 }
-
-
-// Compare pitch using Kaldi pitch tracker on KEELE corpora 
+// Compare pitch using Kaldi pitch tracker on KEELE corpora
 static void UnitTestKeele() {
-  std::cout << "=== UnitTestKeele() ===\n";
+  KALDI_LOG << "=== UnitTestKeele() ===\n";
   for (int32 i = 1; i < 11; i++) {
     std::string wavefile;
     std::string num;
-    if( i < 6) {
+    if (i < 6) {
       num = "f" + ConvertIntToString(i) + "nw0000";
       wavefile = "keele/16kHz/"+num+".wav";
     } else {
-      num = "m" + ConvertIntToString(i-5) + "nw0000";  
+      num = "m" + ConvertIntToString(i-5) + "nw0000";
       wavefile = "keele/16kHz/"+num+".wav";
     }
-    std::cout << "--- " << wavefile << " ---\n";
+    KALDI_LOG << "--- " << wavefile << " ---\n";
     std::ifstream is(wavefile.c_str());
-    WaveData wave;  
-    wave.Read(is);    
-    KALDI_ASSERT(wave.Data().NumRows() == 1);       
-    SubVector<BaseFloat> waveform(wave.Data(), 0); 
+    WaveData wave;
+    wave.Read(is);
+    KALDI_ASSERT(wave.Data().NumRows() == 1);
+    SubVector<BaseFloat> waveform(wave.Data(), 0);
     // use pitch code with default configuration..
     PitchExtractionOptions op;
     op.nccf_ballast = 0.1;
     // compute pitch.
     Matrix<BaseFloat> m;
-    Compute(op, waveform, &m);    
+    Compute(op, waveform, &m);
     std::string outfile = "keele/"+num+"-kaldi.txt";
-    std::ofstream os(outfile.c_str()); 
+    std::ofstream os(outfile.c_str());
     m.Write(os, false);
   }
 }
 /* change freq_weight to investigate the results */
 static void UnitTestPenaltyFactor() {
-  std::cout << "=== UnitTestPenaltyFactor() ===\n";
-  for(int32 k = 1; k < 5; k++) {
+  KALDI_LOG << "=== UnitTestPenaltyFactor() ===\n";
+  for (int32 k = 1; k < 5; k++) {
     for (int32 i = 1; i < 4; i++) {
       std::string wavefile;
       std::string num;
-      if( i < 6) {
+      if (i < 6) {
         num = "f"+ConvertIntToString(i)+"nw0000";
         wavefile = "keele/16kHz/"+num+".wav";
       } else {
         num = "m"+ConvertIntToString(i-5)+"nw0000";
         wavefile = "keele/16kHz/"+num+".wav";
       }
-      std::cout << "--- " << wavefile << " ---\n";
+      KALDI_LOG << "--- " << wavefile << " ---\n";
       std::ifstream is(wavefile.c_str());
-      WaveData wave;  
-      wave.Read(is);     
-      KALDI_ASSERT(wave.Data().NumRows() == 1);        
-      SubVector<BaseFloat> waveform(wave.Data(), 0); 
+      WaveData wave;
+      wave.Read(is);
+      KALDI_ASSERT(wave.Data().NumRows() == 1);
+      SubVector<BaseFloat> waveform(wave.Data(), 0);
       // use pitch code with default configuration..
-      PitchExtractionOptions op;  
+      PitchExtractionOptions op;
       op.penalty_factor = k * 0.05;
       op.nccf_ballast = 0.1;
       // compute pitch.
       Matrix<BaseFloat> m;
-      Compute(op, waveform, &m);    
+      Compute(op, waveform, &m);
       std::string penaltyfactor = ConvertIntToString(k);
       std::string outfile = "keele/"+num+"-kaldi-penalty-"+penaltyfactor+".txt";
-      std::ofstream os(outfile.c_str()); 
+      std::ofstream os(outfile.c_str());
       m.Write(os, false);
     }
   }
 }
-
 static void UnitTestKeeleNccfBallast() {
-  std::cout << "=== UnitTestKeeleNccfBallast() ===\n";
-  for(int32 k = 1; k < 10; k++) {
+  KALDI_LOG << "=== UnitTestKeeleNccfBallast() ===\n";
+  for (int32 k = 1; k < 10; k++) {
     for (int32 i = 1; i < 2; i++) {
       std::string wavefile;
       std::string num;
-      if( i < 6) {
+      if (i < 6) {
         num = "f"+ConvertIntToString(i)+"nw0000";
         wavefile = "keele/16kHz/"+num+".wav";
       } else {
         num = "m"+ConvertIntToString(i-5)+"nw0000";
         wavefile = "keele/16kHz/"+num+".wav";
       }
-      std::cout << "--- " << wavefile << " ---\n";
+      KALDI_LOG << "--- " << wavefile << " ---\n";
       std::ifstream is(wavefile.c_str());
-      WaveData wave;  
-      wave.Read(is);     
-      KALDI_ASSERT(wave.Data().NumRows() == 1);        
-      SubVector<BaseFloat> waveform(wave.Data(), 0); 
+      WaveData wave;
+      wave.Read(is);
+      KALDI_ASSERT(wave.Data().NumRows() == 1);
+      SubVector<BaseFloat> waveform(wave.Data(), 0);
       // use pitch code with default configuration..
-      PitchExtractionOptions op;  
-      op.nccf_ballast = 0.05 * k;  
-      std::cout << " nccf_ballast " << op.nccf_ballast << std::endl;
+      PitchExtractionOptions op;
+      op.nccf_ballast = 0.05 * k;
+      KALDI_LOG << " nccf_ballast " << op.nccf_ballast << std::endl;
       // compute pitch.
       Matrix<BaseFloat> m;
-      Compute(op, waveform, &m); 
-      std::string nccfballast = ConvertIntToString(op.nccf_ballast); 
+      Compute(op, waveform, &m);
+      std::string nccfballast = ConvertIntToString(op.nccf_ballast);
       std::string outfile = "keele/"+num+"-kaldi-nccf-ballast-"+nccfballast+".txt";
       std::ofstream os(outfile.c_str());
       m.Write(os, false);
     }
   }
 }
-
 static void UnitTestWeightedMwn() {
-  std::cout << "=== UnitTestWeightedMwn1() ===\n";
+  KALDI_LOG << "=== UnitTestWeightedMwn1() ===\n";
   // compare the results of WeightedMwn1 and Sliding CMN with uniform weights.
   for (int32 i = 0; i < 1000; i++) {
     int32 num_frames = 1 + (rand()%10 * 10);
@@ -178,13 +171,13 @@ static void UnitTestWeightedMwn() {
     opts.cmn_window = normalization_win_size;
     opts.center = true;
     opts.min_window = 1 + rand() % 100;
-    if (opts.min_window > opts.cmn_window)  
-      opts.min_window = opts.cmn_window; 
+    if (opts.min_window > opts.cmn_window)
+      opts.min_window = opts.cmn_window;
     Matrix<BaseFloat> output_feat2(num_frames, 2);
     SlidingWindowCmn(opts, feat, &output_feat2);
     for (int32 j = 0; j < num_frames; j++)
       output_feat(j, 0) = 0.0;
-    if ( ! output_feat.ApproxEqual(output_feat2, 0.001)) {
+    if (!output_feat.ApproxEqual(output_feat2, 0.001)) {
       KALDI_ERR << "Feafures differ " << output_feat << " vs." << output_feat2;
     }
   }
@@ -195,35 +188,34 @@ static void UnitTestWeightedMwn() {
     output_feat(num_frames, 2);
   for (int32 j = 0; j < num_frames; j++) {
     int32 r = rand() % 2;
-    feat(j,0) = RandUniform()/(1+1000.0*r);
-    feat(j,1) = feat(j,1) * feat(j,0);
+    feat(j, 0) = RandUniform() / (1 + 1000.0 * r);
+    feat(j, 1) = feat(j, 1) * feat(j, 0);
   }
-  ProcessPovFeatures(&feat, 2, true);  
+  ProcessPovFeatures(&feat, 2, true);
   WeightedMwn(normalization_win_size, feat, &output_feat);
 }
-
 static void UnitTestTakeLogOfPitch() {
- for (int32 i = 0; i < 100; i++) {
-   int num_frame = 50 + (rand() % 200 * 200);
-   Matrix<BaseFloat> input(num_frame, 2);
-   input.SetRandn();
-   input.Scale(100);
-   Matrix<BaseFloat> output(input);
-   for (int j = 0; j < num_frame; j++) {
-     if (input(j,1) < 1 ) { 
-       input(j, 1) = 10;
-       output(j, 1) = 10;
-     }
-     output(j, 1) = log(input(j,2));   
-   }
-   TakeLogOfPitch(&input);
-   if ( input.ApproxEqual(output, 0.0001)) {
-     KALDI_ERR << " Log of Matrix differs " << input << " vs. " << output;
-   }
- }
+  for (int32 i = 0; i < 100; i++) {
+    int num_frame = 50 + (rand() % 200 * 200);
+    Matrix<BaseFloat> input(num_frame, 2);
+    input.SetRandn();
+    input.Scale(100);
+    Matrix<BaseFloat> output(input);
+    for (int j = 0; j < num_frame; j++) {
+      if (input(j, 1) < 1) {
+        input(j, 1) = 10;
+        output(j, 1) = 10;
+      }
+      output(j, 1) = log(input(j, 2));
+    }
+    TakeLogOfPitch(&input);
+    if (input.ApproxEqual(output, 0.0001)) {
+      KALDI_ERR << " Log of Matrix differs " << input << " vs. " << output;
+    }
+  } 
 }
 static void UnitTestPitchExtractionSpeed() {
-  std::cout << "=== UnitTestPitchExtractionSpeed() ===\n";
+  KALDI_LOG << "=== UnitTestPitchExtractionSpeed() ===\n";
   // use pitch code with default configuration..
   PitchExtractionOptions op;
   op.nccf_ballast = 0.1;
@@ -231,18 +223,18 @@ static void UnitTestPitchExtractionSpeed() {
   for (int32 i = 1; i < 2; i++) {
     std::string wavefile;
     std::string num;
-    if( i < 6) {
+    if (i < 6) {
       num = "f"+ConvertIntToString(i)+"nw0000";
       wavefile = "keele/16kHz/"+num+".wav";
     } else {
       num = "m"+ConvertIntToString(i-5)+"nw0000";
       wavefile = "keele/16kHz/"+num+".wav";
     }
-    std::cout << "--- " << wavefile << " ---\n";
+    KALDI_LOG << "--- " << wavefile << " ---\n";
     std::ifstream is(wavefile.c_str());
-    WaveData wave;  
-    wave.Read(is);     
-    KALDI_ASSERT(wave.Data().NumRows() == 1);       
+    WaveData wave;
+    wave.Read(is);
+    KALDI_ASSERT(wave.Data().NumRows() == 1);
     SubVector<BaseFloat> waveform(wave.Data(), 0);
     // compute pitch.
     int test_num = 10;
@@ -251,52 +243,52 @@ static void UnitTestPitchExtractionSpeed() {
     int tstart = 0, tend = 0;
     double tot_ft = 0;
     // compute time for Pitch Extraction
-    ftime( &tstruct );
+    ftime(&tstruct);
     tstart = tstruct.time * 1000 + tstruct.millitm;
     for (int32 t = 0; t < test_num; t++)
       Compute(op, waveform, &m);
-    ftime( &tstruct );
+    ftime(&tstruct);
     tend = tstruct.time * 1000 + tstruct.millitm;
     double tot_real_time = test_num * waveform.Dim() / op.samp_freq;
     tot_ft = (tend - tstart)/tot_real_time;
-    std::cout << " Pitch extraction time per second of speech " 
+    KALDI_LOG << " Pitch extraction time per second of speech "
               << tot_ft << " msec " << std::endl;
   }
 }
 static void UnitTestPitchExtractorCompareKeele() {
-  std::cout << "=== UnitTestPitchExtractorCompareKeele() ===\n";
+  KALDI_LOG << "=== UnitTestPitchExtractorCompareKeele() ===\n";
   // use pitch code with default configuration..
   PitchExtractionOptions op;
   op.nccf_ballast = 0.1;
   for (int32 i = 1; i < 11; i++) {
     std::string wavefile;
     std::string num;
-    if( i < 6) {
+    if (i < 6) {
       num = "f"+ConvertIntToString(i)+"nw0000";
       wavefile = "keele/16kHz/"+num+".wav";
     } else {
       num = "m"+ConvertIntToString(i-5)+"nw0000";
       wavefile = "keele/16kHz/"+num+".wav";
     }
-    std::cout << "--- " << wavefile << " ---\n";
+    KALDI_LOG << "--- " << wavefile << " ---\n";
     std::ifstream is(wavefile.c_str());
-    WaveData wave;  
-    wave.Read(is);     
-    KALDI_ASSERT(wave.Data().NumRows() == 1);       
+    WaveData wave;
+    wave.Read(is);
+    KALDI_ASSERT(wave.Data().NumRows() == 1);
     SubVector<BaseFloat>  waveform(wave.Data(), 0);
     // compute pitch.
     Matrix<BaseFloat> m;
     Compute(op, waveform, &m);
     std::string outfile = "keele/"+num+"-speedup-kaldi1.txt";
-    std::ofstream os(outfile.c_str()); 
+    std::ofstream os(outfile.c_str());
     m.Write(os, false);
   }
 }
 void UnitTestDiffSampleRate() {
-  // you need to use sox to change sampling rate 
+  // you need to use sox to change sampling rate
   // e.g. sox -r 10k input.wav output.wav
   // put them in keele/(samp_rate in kHz)+"kHz" e.g. keele/10kHz  
-  int sample_rate = 16000; 
+  int sample_rate = 16000;
   PitchExtractionOptions op;
   op.samp_freq = static_cast<double>(sample_rate);
   op.lowpass_cutoff = 1000;
@@ -305,42 +297,42 @@ void UnitTestDiffSampleRate() {
   for (int32 i = 1; i < 11; i++) {
     std::string wavefile;
     std::string num;
-    if( i < 6) {
+    if (i < 6) {
       num = "f"+ConvertIntToString(i)+"nw0000";
       wavefile = "keele/"+samp_rate+"kHz/"+num+".wav";
     } else {
       num = "m"+ConvertIntToString(i-5)+"nw0000";
       wavefile = "keele/"+samp_rate+"kHz/"+num+".wav";
     }
-    std::cout << "--- " << wavefile << " ---\n";
+    KALDI_LOG << "--- " << wavefile << " ---\n";
     std::ifstream is(wavefile.c_str());
-    WaveData wave;  
-    wave.Read(is);     
-    KALDI_ASSERT(wave.Data().NumRows() == 1);       
+    WaveData wave;
+    wave.Read(is);
+    KALDI_ASSERT(wave.Data().NumRows() == 1);
     SubVector<BaseFloat> waveform(wave.Data(), 0);
     Matrix<BaseFloat> m;
     Compute(op, waveform, &m);
     std::string outfile = "keele/"+num+"-kaldi-samp-freq-"+samp_rate+"kHz.txt";
-    std::ofstream os(outfile.c_str()); 
-    m.Write(os, false); 
+    std::ofstream os(outfile.c_str());
+    m.Write(os, false);
   } 
 }
 void UnitTestPostProcess() {
   for (int32 i = 1; i < 11; i++) {
     std::string wavefile;
     std::string num;
-    if( i < 6) {
+    if (i < 6) {
       num = "f"+ConvertIntToString(i)+"nw0000";
       wavefile = "keele/16kHz/"+num+".wav";
     } else {
       num = "m"+ConvertIntToString(i-5)+"nw0000";
       wavefile = "keele/16kHz/"+num+".wav";
     }
-    std::cout << "--- " << wavefile << " ---\n";
+    KALDI_LOG << "--- " << wavefile << " ---\n";
     std::ifstream is(wavefile.c_str());
-    WaveData wave;  
-    wave.Read(is);     
-    KALDI_ASSERT(wave.Data().NumRows() == 1);       
+    WaveData wave;
+    wave.Read(is);
+    KALDI_ASSERT(wave.Data().NumRows() == 1);
     SubVector<BaseFloat> waveform(wave.Data(), 0);
     PitchExtractionOptions op;
     op.lowpass_cutoff = 1000;
@@ -352,30 +344,33 @@ void UnitTestPostProcess() {
     postprop_op.pov_nonlinearity = 2;
     PostProcessPitch(postprop_op, m, &m2);
     std::string outfile = "keele/"+num+"-processed-kaldi.txt";
-    std::ofstream os(outfile.c_str()); 
-    m2.Write(os, false); 
+    std::ofstream os(outfile.c_str());
+    m2.Write(os, false);
   } 
 }
 void UnitTestDeltaPitch() {
-  std::cout << "=== UnitTestDeltaPitch() ===\n";
+  KALDI_LOG << "=== UnitTestDeltaPitch() ===\n";
   for (int32 i = 0; i < 1; i++) {
-    int32 num_frames = 1 + (rand()%10 * 10);
+    int32 num_frames = 1 + (rand()%10 * 1000);
     Vector<BaseFloat> feat(num_frames),
       output_feat(num_frames), output_feat2(num_frames);
     for (int32 j = 0; j < num_frames; j++)
       feat(j) = 0.2 * j;
-    for (int32 j = 2; j < num_frames-2; j++)  
+    for (int32 j = 2; j < num_frames - 2; j++)  
       output_feat2(j) = 1.0 / 10.0  *
-        (-2.0 * feat(j-2) - feat(j-1) + feat(j+1) + 2.0 * feat(j+2));
+        (-2.0 * feat(j - 2) - feat(j - 1) + feat(j + 1) + 2.0 * feat(j + 2));
     PostProcessOptions op;  
+    op.delta_pitch_noise_stddev = 0;
     ExtractDeltaPitch(op, feat, &output_feat);
+    if (!output_feat.ApproxEqual(output_feat2, 0.05)) {
+      KALDI_ERR << "output feat " << output_feat << " vs. " << " ouput feat2 " << output_feat2;
+    }
     for (int32 j = 0; j < num_frames; j++)
-      std::cout << output_feat(j) << " , " << output_feat2(j) << " ";
+      KALDI_LOG << output_feat(j) << " , " << output_feat2(j) << " ";
   }
 }
-
 void UnitTestResample() {
-  std::cout << "=== UnitTestResample() ===\n";
+  KALDI_LOG << "=== UnitTestResample() ===\n";
   // Resample the sine wave
   double sample_freq = 2000;
   double resample_freq = 1000;
@@ -383,10 +378,10 @@ void UnitTestResample() {
   int sample_num = 1000;
   int32 lowpass_filter_width = 2;   
   Matrix<double> input_wave(1, sample_num);
-  for (int32 i = 0; i < sample_num; i++) 
+  for (int32 i = 0; i < sample_num; i++)
     input_wave(0, i) = sin(2*M_PI/sample_freq * i);
-  double dt = sample_freq / resample_freq;  
-  int32 resampled_len = static_cast<int>(sample_num/dt); 
+  double dt = sample_freq / resample_freq;
+  int32 resampled_len = static_cast<int>(sample_num/dt);
   std::vector<double> resampled_t(resampled_len); 
   Matrix<double> resampled_wave1(1, resampled_len),    
                  resampled_wave2(1, resampled_len); 
@@ -399,8 +394,9 @@ void UnitTestResample() {
                              lowpass_filter_width);
   resample.Upsample(input_wave, &resampled_wave1);
   
-  if(!resampled_wave1.ApproxEqual(resampled_wave2, 0.01)) {
-    KALDI_ERR << "Resampled wave " << resampled_wave1 << " vs. " << resampled_wave2;
+  if (!resampled_wave1.ApproxEqual(resampled_wave2, 0.01)) {
+    KALDI_ERR << "Resampled wave " << resampled_wave1 
+              << " vs. " << resampled_wave2;
   }
 }
 
@@ -411,31 +407,30 @@ static void UnitTestFeatNoKeele() {
   UnitTestWeightedMwn();
   UnitTestResample();
 }
-
 static void UnitTestFeatWithKeele() {
-  UnitTestKeele();
-  UnitTestPenaltyFactor();
-  UnitTestKeeleNccfBallast();
-  UnitTestPitchExtractionSpeed();
-  UnitTestPitchExtractorCompareKeele();
-  UnitTestDiffSampleRate();
-  UnitTestPostProcess();
+  //UnitTestKeele();
+  //UnitTestPenaltyFactor();
+  //UnitTestKeeleNccfBallast();
+  //UnitTestPitchExtractionSpeed();
+  //UnitTestPitchExtractorCompareKeele();
+  //UnitTestDiffSampleRate();
+  //UnitTestPostProcess();
 }
 
 int main() {
   try {
     UnitTestFeatNoKeele();
     if (DirExist("keele/16kHz")) {
-      UnitTestFeatWithKeele();  
+      UnitTestFeatWithKeele();
     } else {
       KALDI_LOG << "Not running tests that require the Keele database, "
         << "please ask g.meyer@somewhere.edu for the database if you need it.\n"
         << " you need to put keele wave file in keele/16kHz directory";
     }
-    std::cout << "Tests succeeded.\n";
+    KALDI_LOG << "Tests succeeded.\n";
     return 0;
-  } catch (const std::exception &e) {
-    std::cerr << e.what();
+  } catch(const std::exception &e) {
+    KALDI_ERR << e.what();
     return 1;
   }
 }