diff dsp/tonal/TonalEstimator.cpp @ 505:930b5b0f707d

Merge branch 'codestyle-and-tidy'

--- a/dsp/tonal/TonalEstimator.cpp	Thu May 30 16:18:13 2019 +0100
+++ b/dsp/tonal/TonalEstimator.cpp	Wed Jun 05 12:55:15 2019 +0100
@@ -18,67 +18,57 @@
 #include <cmath>
 #include <iostream>
 
-#ifndef PI
-#define PI (3.14159265358979232846)
-#endif
-
 TonalEstimator::TonalEstimator()
 {
-	m_Basis.resize(6);
+    m_Basis.resize(6);
 
-	int i = 0;
-	
-	
-	// 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);
-	}
-	
-	i++;
+    int i = 0;
+        
+        
+    // 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 * 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);
-	}
-	
-	i++;
-	
-	
-	// 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);
-	}
-	
-	i++;
+    m_Basis[i].resize(12);
+    for (int iP = 0; iP < 12; iP++) {
+        m_Basis[i][iP] = std::cos( (7.0 / 6.0) * iP * M_PI);
+    }
+        
+    i++;
+        
+        
+    // 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 * 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].resize(12);
+    for (int iP = 0; iP < 12; iP++) {
+        m_Basis[i][iP] = 0.6 * std::cos( (2.0 / 3.0) * iP * M_PI);
+    }
 
-	i++;
+    i++;
 
 
-	// 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);
-	}
-	
-	i++;
+    // 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 * 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].resize(12);
+    for (int iP = 0; iP < 12; iP++) {
+        m_Basis[i][iP] = 1.1 * std::cos( (3.0 / 2.0) * iP * M_PI);
+    }
 
 }
 
@@ -88,16 +78,14 @@
 
 TCSVector TonalEstimator::transform2TCS(const ChromaVector& rVector)
 {
-	TCSVector vaRetVal;
-	vaRetVal.resize(6, 0.0);
-		
-	for (int i = 0; i < 6; i++)
-	{
-		for (int iP = 0; iP < 12; iP++)
-		{
-			vaRetVal[i] += m_Basis[i][iP] * rVector[iP];
-		}
-	}
-	
-	return vaRetVal;
+    TCSVector vaRetVal;
+    vaRetVal.resize(6, 0.0);
+                
+    for (int i = 0; i < 6; i++) {
+        for (int iP = 0; iP < 12; iP++) {
+            vaRetVal[i] += m_Basis[i][iP] * rVector[iP];
+        }
+    }
+        
+    return vaRetVal;
 }