comparison plugins/Transcription.cpp @ 183:258939b7c810

OSX build updates and compiler warning fixes
author Chris Cannam <c.cannam@qmul.ac.uk>
date Thu, 26 May 2016 14:17:43 +0100
parents f96ea0e4b475
children af6a5ba00a8f
comparison
equal deleted inserted replaced
182:9c52dac85835 183:258939b7c810
21 21
22 using std::string; 22 using std::string;
23 using std::vector; 23 using std::vector;
24 using std::cerr; 24 using std::cerr;
25 using std::endl; 25 using std::endl;
26
27 const double CNum[8] = {
28 3.025328153863e-005,0.0002117729707704,0.0006353189123113, 0.001058864853852,
29 0.001058864853852,0.0006353189123113,0.0002117729707704,3.025328153863e-005
30 };
31
32 const double CDen[8] = {
33 1, -4.647847898799, 9.540784706769, -11.14354542746,
34 7.967285533211, -3.477244449085, 0.8559660579522, -0.09152610255505
35 };
36
37 const int A[10] = {0, 120, 190, 240, 279, 310, 337, 360, 380, 399};
38
39
40 26
41 const double EualCurve960[960] = { 27 const double EualCurve960[960] = {
42 83.750025,83.532690,83.315770,83.099260,82.883159,82.667463,82.452170,82.237276,82.022779,81.808675, 28 83.750025,83.532690,83.315770,83.099260,82.883159,82.667463,82.452170,82.237276,82.022779,81.808675,
43 81.594963,81.381639,81.168699,80.956142,80.743964,80.532163,80.320735,80.109677,79.898987,79.688663,79.478700,79.269096,79.059848,78.850953, 29 81.594963,81.381639,81.168699,80.956142,80.743964,80.532163,80.320735,80.109677,79.898987,79.688663,79.478700,79.269096,79.059848,78.850953,
44 78.642408,78.434211,78.226359,78.018848,77.811676,77.604839,77.398336,77.192162,76.986316,76.780794,76.575593,76.370710,76.166143,75.961889, 30 78.642408,78.434211,78.226359,78.018848,77.811676,77.604839,77.398336,77.192162,76.986316,76.780794,76.575593,76.370710,76.166143,75.961889,
1893 { 1879 {
1894 D[j]=1; 1880 D[j]=1;
1895 } 1881 }
1896 } 1882 }
1897 1883
1898 if ((j>34)&&(abs(A5[j]-337.0-A5[j-34])<3.0)&&(D[j]>0)&&(D[j-34]>0)) 1884 if ((j>34)&&(fabs(A5[j]-337.0-A5[j-34])<3.0)&&(D[j]>0)&&(D[j-34]>0))
1899 { 1885 {
1900 1886
1901 D[j]=0; D2[j]=0; 1887 D[j]=0; D2[j]=0;
1902 if((A4[j]>25)&&(A3[j]>40)&&(A3[j]>(A3[j-34]-3))&&((A1[j]>8)||(A6[j]>0.8))) 1888 if((A4[j]>25)&&(A3[j]>40)&&(A3[j]>(A3[j-34]-3))&&((A1[j]>8)||(A6[j]>0.8)))
1903 { 1889 {