Mercurial > hg > qm-dsp

diff dsp/tonal/TonalEstimator.cpp @ 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 cbe668c7d724
children
line wrap: on
line diff
--- 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);
     }
 
 }