Merge pull request #76 from sp-nitech/window

Support periodic window

Author: takenori-y

src/main/window.cc

@@ -42,6 +42,7 @@ const int kDefaultFrameLength(256);
 const sptk::DataWindowing::NormalizationType kDefaultNormalizationType(
     sptk::DataWindowing::NormalizationType::kPower);
 const LocalWindowType kDefaultWindowType(kBlackman);
+const bool kDefaultPeriodicFlag(false);
 
 void PrintUsage(std::ostream* stream) {
   // clang-format off
@@ -65,6 +66,7 @@ void PrintUsage(std::ostream* stream) {
   *stream << "                 4 (trapezoidal)" << std::endl;
   *stream << "                 5 (rectangular)" << std::endl;
   *stream << "                 6 (Nuttall)" << std::endl;
+  *stream << "       -p    : use periodic window    (  bool)[" << std::setw(5) << std::right << sptk::ConvertBooleanToString(kDefaultPeriodicFlag) << "]" << std::endl;  // NOLINT
   *stream << "       -h    : print this message" << std::endl;
   *stream << "  infile:" << std::endl;
   *stream << "       data sequence                  (double)[stdin]" << std::endl;  // NOLINT
@@ -99,6 +101,8 @@ void PrintUsage(std::ostream* stream) {
  *     \arg @c 4 Trapezoidal
  *     \arg @c 5 Rectangular
  *     \arg @c 6 Nuttall
+ * - @b -p
+ *   - use periodic window instead of symmetric one
  * - @b infile @e str
  *   - double-type data sequence
  * - @b stdout
@@ -121,9 +125,10 @@ int main(int argc, char* argv[]) {
   sptk::DataWindowing::NormalizationType normalization_type(
       kDefaultNormalizationType);
   LocalWindowType local_window_type(kDefaultWindowType);
+  bool periodic(kDefaultPeriodicFlag);
 
   for (;;) {
-    const int option_char(getopt_long(argc, argv, "l:L:n:w:h", NULL, NULL));
+    const int option_char(getopt_long(argc, argv, "l:L:n:w:ph", NULL, NULL));
     if (-1 == option_char) break;
 
     switch (option_char) {
@@ -183,6 +188,10 @@ int main(int argc, char* argv[]) {
         local_window_type = static_cast<LocalWindowType>(tmp);
         break;
       }
+      case 'p': {
+        periodic = true;
+        break;
+      }
       case 'h': {
         PrintUsage(&std::cout);
         return 0;
@@ -268,7 +277,7 @@ int main(int argc, char* argv[]) {
     }
   }
 
-  sptk::StandardWindow standard_window(input_length, window_type, false);
+  sptk::StandardWindow standard_window(input_length, window_type, periodic);
   sptk::DataWindowing data_windowing(&standard_window, output_length,
                                      normalization_type);
   if (!data_windowing.IsValid()) {

src/window/standard_window.cc

@@ -16,7 +16,7 @@
 
 #include "SPTK/window/standard_window.h"
 
-#include <algorithm>  // std::fill
+#include <algorithm>  // std::fill, std::min
 #include <cmath>      // std::round
 #include <vector>     // std::vector
 
@@ -26,7 +26,7 @@ namespace {
 
 void MakeBartlett(bool periodic, std::vector<double>* window) {
   const int size(static_cast<int>(window->size()));
-  const int center(sptk::IsEven(size) ? size / 2 : (size + 1) / 2);
+  const int center((sptk::IsEven(size) ? size : (size + 1)) / 2);
   const double slope(2.0 / (periodic ? size : size - 1));
   double* w(&((*window)[0]));
   for (int i(0); i < center; ++i) {
@@ -87,16 +87,11 @@ void MakeRectangular(std::vector<double>* window) {
 }
 
 void MakeTrapezoidal(bool periodic, std::vector<double>* window) {
+  MakeBartlett(periodic, window);
   const int size(static_cast<int>(window->size()));
-  const int quarter_size(static_cast<int>(std::round(0.25 * size)));
-  const double slope(4.0 / (periodic ? size : size - 1));
   double* w(&((*window)[0]));
-  for (int i(0); i < quarter_size; ++i) {
-    w[i] = slope * i;
-  }
-  std::fill(window->begin() + quarter_size, window->end() - quarter_size, 1.0);
-  for (int i(size - quarter_size); i < size; ++i) {
-    w[i] = 4.0 - slope * i;
+  for (int i(0); i < size; ++i) {
+    w[i] = std::min(2.0 * w[i], 1.0);
   }
 }
 

test/test_window.bats

@@ -28,18 +28,20 @@ teardown() {
 }
 
 @test "window: compatibility" {
-    $sptk3/nrand -l 20 > $tmp/1
-    for w in $(seq 0 5); do
-        $sptk3/window -w "$w" $tmp/1 > $tmp/2
-        $sptk4/window -w "$w" $tmp/1 > $tmp/3
-        run $sptk4/aeq $tmp/2 $tmp/3
-        [ "$status" -eq 0 ]
-    done
-    for n in $(seq 0 2); do
-        $sptk3/window -n "$n" $tmp/1 > $tmp/2
-        $sptk4/window -n "$n" $tmp/1 > $tmp/3
-        run $sptk4/aeq $tmp/2 $tmp/3
-        [ "$status" -eq 0 ]
+    for l in 19 20; do
+        $sptk3/nrand -l $l > $tmp/1
+        for w in $(seq 0 5); do
+            $sptk3/window -w "$w" $tmp/1 > $tmp/2
+            $sptk4/window -w "$w" $tmp/1 > $tmp/3
+            run $sptk4/aeq $tmp/2 $tmp/3
+            [ "$status" -eq 0 ]
+        done
+        for n in $(seq 0 2); do
+            $sptk3/window -n "$n" $tmp/1 > $tmp/2
+            $sptk4/window -n "$n" $tmp/1 > $tmp/3
+            run $sptk4/aeq $tmp/2 $tmp/3
+            [ "$status" -eq 0 ]
+        done
     done
 }