Mercurial > hg > qm-dsp

changeset 488:7992d0923626

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use M_PI
author Chris Cannam <cannam@all-day-breakfast.com>
date Fri, 31 May 2019 16:48:29 +0100
parents 5998ee1042d3
children 701233f8ed41
files dsp/tonal/ChangeDetectionFunction.cpp dsp/tonal/TonalEstimator.cpp
diffstat 2 files changed, 7 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/dsp/tonal/ChangeDetectionFunction.cpp	Fri May 31 16:33:55 2019 +0100
+++ b/dsp/tonal/ChangeDetectionFunction.cpp	Fri May 31 16:48:29 2019 +0100
@@ -15,10 +15,6 @@
 
 #include "ChangeDetectionFunction.h"
 
-#ifndef PI
-#define PI (3.14159265358979232846)
-#endif
-
 ChangeDetectionFunction::ChangeDetectionFunction(ChangeDFConfig config) :
     m_dFilterSigma(0.0), m_iFilterWidth(0)
 {
@@ -38,7 +34,7 @@
     m_dFilterSigma = double(m_iFilterWidth) / double(2*2.3548);
     m_vaGaussian.resize(m_iFilterWidth);
         
-    double dScale = 1.0 / (m_dFilterSigma*sqrt(2*PI));
+    double dScale = 1.0 / (m_dFilterSigma*sqrt(2*M_PI));
         
     for (int x = -(m_iFilterWidth-1)/2; x <= (m_iFilterWidth-1)/2; x++) {
         double w = dScale * std::exp ( -(x*x)/(2*m_dFilterSigma*m_dFilterSigma) );
--- a/dsp/tonal/TonalEstimator.cpp	Fri May 31 16:33:55 2019 +0100
+++ b/dsp/tonal/TonalEstimator.cpp	Fri May 31 16:48:29 2019 +0100
@@ -18,10 +18,6 @@
 #include <cmath>
 #include <iostream>
 
-#ifndef PI
-#define PI (3.14159265358979232846)
-#endif
-
 TonalEstimator::TonalEstimator()
 {
     m_Basis.resize(6);
@@ -32,14 +28,14 @@
     // circle of fifths
     m_Basis[i].resize(12);
     for (int iP = 0; iP < 12; iP++) {
-        m_Basis[i][iP] = std::sin( (7.0 / 6.0) * iP * PI);
+        m_Basis[i][iP] = std::sin( (7.0 / 6.0) * iP * M_PI);
     }
         
     i++;
 
     m_Basis[i].resize(12);
     for (int iP = 0; iP < 12; iP++) {
-        m_Basis[i][iP] = std::cos( (7.0 / 6.0) * iP * PI);
+        m_Basis[i][iP] = std::cos( (7.0 / 6.0) * iP * M_PI);
     }
         
     i++;
@@ -48,14 +44,14 @@
     // circle of major thirds
     m_Basis[i].resize(12);
     for (int iP = 0; iP < 12; iP++) {
-        m_Basis[i][iP] = 0.6 * std::sin( (2.0 / 3.0) * iP * PI);
+        m_Basis[i][iP] = 0.6 * std::sin( (2.0 / 3.0) * iP * M_PI);
     }
         
     i++;
 
     m_Basis[i].resize(12);
     for (int iP = 0; iP < 12; iP++) {
-        m_Basis[i][iP] = 0.6 * std::cos( (2.0 / 3.0) * iP * PI);
+        m_Basis[i][iP] = 0.6 * std::cos( (2.0 / 3.0) * iP * M_PI);
     }
 
     i++;
@@ -64,14 +60,14 @@
     // circle of minor thirds
     m_Basis[i].resize(12);
     for (int iP = 0; iP < 12; iP++) {
-        m_Basis[i][iP] = 1.1 * std::sin( (3.0 / 2.0) * iP * PI);
+        m_Basis[i][iP] = 1.1 * std::sin( (3.0 / 2.0) * iP * M_PI);
     }
         
     i++;
 
     m_Basis[i].resize(12);
     for (int iP = 0; iP < 12; iP++) {
-        m_Basis[i][iP] = 1.1 * std::cos( (3.0 / 2.0) * iP * PI);
+        m_Basis[i][iP] = 1.1 * std::cos( (3.0 / 2.0) * iP * M_PI);
     }
 
 }