fix: csiChord function updated to work with non standard roots.

SequenceComparison/calcul.cpp

@@ -271,7 +271,7 @@ double calcul::distance_dtw_csiChroma(vtr<double> const &u, vtr<double> const &v
 ///@param[in] uKey element of the compared key time series (12d vector)
 ///@param[in] vKey element of the compared key time series (12d vector)
 ///@return chord distance
-double calcul::distance_dtw_csiChord(vtr<double> const  &u, vtr<double> const &v, vtr<int> const &uKey, vtr<int> const &vKey)
+double calcul::distance_dtw_csiChord(vtr<double> const &u, vtr<double> const &v, vtr<int> const &uKey, vtr<int> const &vKey)
 {
 	auto getRoot = [](vtr<double> const &chord) {
 		auto getShift = [](int idx) { return idx > 11 ? idx % 12 : idx; };
@@ -286,8 +286,21 @@ double calcul::distance_dtw_csiChord(vtr<double> const  &u, vtr<double> const &v
 			}
 		}
 				
-		//if (chord == vtr<double>{0,0,0,0,0,0,0,0,0,0,0,0})
+		if (chord == vtr<double>{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0})
+			return 0;
+		else {
+			int c = 0;
+			for (int i = 0; i < (int)chord.size(); i++)
+				if (chord[i] > 0) c++;
 			
+			if (c != 3)
+			{
+				cout << print::vector(chord);
+				return -1;
+			}
+		}
+		//chord = vtr<double>{ 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0 }; */
+
 		return 0;
 	};