Diff: main.cpp

Revision:

1:ec14a181cab8

Parent:

0:24c904911225

Child:

3:8f384ccbbe66

diff -r 24c904911225 -r ec14a181cab8 main.cpp
--- a/main.cpp	Tue Oct 21 13:31:29 2014 +0000
+++ b/main.cpp	Tue Oct 21 13:33:42 2014 +0000
@@ -15,8 +15,6 @@
 using namespace Mikami;
 
 const int ORDER_ = 6;   // order
-struct Un { float u1, u2; };
-struct Coefs { float a1, a2, b1, b2; };
 
 // 低域通過フィルタ
 // 連立チェビシェフ特性
@@ -26,9 +24,9 @@
 // 通過域のリップル： 0.50 dB
 // 阻止域の減衰量　：40.00 dB
 const Biquad::Coefs ck_[ORDER_/2] = {
-    {  1.837790E+00f, -8.507293E-01f, -1.603320E+00f,  1.000000E+00f},  // 1段目
-    {  1.904445E+00f, -9.382561E-01f, -1.919647E+00f,  1.000000E+00f},  // 2段目
-    {  1.942552E+00f, -9.865720E-01f, -1.942961E+00f,  1.000000E+00f}}; // 3段目
+    {  1.837790E+00f, -8.507293E-01f, -1.603320E+00f,  1.0E+00f},  // 1段目
+    {  1.904445E+00f, -9.382561E-01f, -1.919647E+00f,  1.0E+00f},  // 2段目
+    {  1.942552E+00f, -9.865720E-01f, -1.942961E+00f,  1.0E+00f}}; // 3段目
 const float g0_ = 1.000028E-02f;    // 利得定数
 
 const int FS_ = 12000;          // Sampling frequency: 12 kHz