diff dsp/tonal/TonalEstimator.h @ 482:cbe668c7d724

Untabify, indent, tidy

--- a/dsp/tonal/TonalEstimator.h	Fri May 31 10:54:02 2019 +0100
+++ b/dsp/tonal/TonalEstimator.h	Fri May 31 11:02:28 2019 +0100
@@ -25,81 +25,68 @@
 class ChromaVector : public std::valarray<double>
 {
 public:
-	ChromaVector(size_t uSize = 12) : std::valarray<double>()
-	{ resize(uSize, 0.0f); }
-	
-	virtual ~ChromaVector() {};
-	
-	void printDebug()
-	{
-		for (int i = 0; i < int(size()); i++)
-		{
-			std::cout <<  (*this)[i] << ";";
-		}
-		
-		std::cout << std::endl;
-	}
-	
-	void normalizeL1()
-	{
-		// normalize the chroma vector (L1 norm)
-		double dSum = 0.0;
-	
-		for (size_t i = 0; i < 12; (dSum += std::abs((*this)[i++]))) ;
-		for (size_t i = 0; i < 12; dSum > 0.0000001?((*this)[i] /= dSum):(*this)[i]=0.0, i++) ;
+    ChromaVector(size_t uSize = 12) : std::valarray<double>() {
+        resize(uSize, 0.0f);
+    }
+        
+    virtual ~ChromaVector() {};
+        
+    void printDebug() {
+        for (int i = 0; i < int(size()); i++) {
+            std::cout <<  (*this)[i] << ";";
+        }
+        std::cout << std::endl;
+    }
+        
+    void normalizeL1() {
+        // normalize the chroma vector (L1 norm)
+        double dSum = 0.0;
+        
+        for (size_t i = 0; i < 12; (dSum += std::abs((*this)[i++]))) ;
+        for (size_t i = 0; i < 12; dSum > 0.0000001?((*this)[i] /= dSum):(*this)[i]=0.0, i++) ;
+    }
 
-	}
-
-    void clear()
-    {
+    void clear() {
         for (size_t i = 0; i < 12; ++i) (*this)[i] = 0.0;
     }
-        
-	
 };
 
 class TCSVector : public std::valarray<double>
 {
 public:
-	TCSVector() : std::valarray<double>()
-	{ resize(6, 0.0f); }
-	
-	virtual ~TCSVector() {};
+    TCSVector() : std::valarray<double>() {
+        resize(6, 0.0f);
+    }
+        
+    virtual ~TCSVector() {};
 
-	void printDebug()
-	{
-		for (int i = 0; i < int(size()); i++)
-		{
-			std::cout <<  (*this)[i] << ";";
-		}
-		
-		std::cout << std::endl;
-	}
-	
-	double magnitude() const
-	{
-		double dMag = 0.0;
-		
-		for (size_t i = 0; i < 6; i++)
-		{
-			dMag += std::pow((*this)[i], 2.0);
-		}
-		
-		return std::sqrt(dMag);
-	}
-
+    void printDebug() {
+        for (int i = 0; i < int(size()); i++) {
+            std::cout <<  (*this)[i] << ";";
+        }
+        std::cout << std::endl;
+    }
+        
+    double magnitude() const {
+        double dMag = 0.0;
+                
+        for (size_t i = 0; i < 6; i++) {
+            dMag += std::pow((*this)[i], 2.0);
+        }
+                
+        return std::sqrt(dMag);
+    }
 };
 
-
-
 class TonalEstimator
 {
 public:
-	TonalEstimator();
-	virtual ~TonalEstimator();
-	TCSVector transform2TCS(const ChromaVector& rVector);
+    TonalEstimator();
+    virtual ~TonalEstimator();
+    TCSVector transform2TCS(const ChromaVector& rVector);
+    
 protected:
-	std::valarray< std::valarray<double> > m_Basis;
+    std::valarray< std::valarray<double> > m_Basis;
 };
 
 #endif // _TONALESTIMATOR_