comparison src/descriptors.c @ 123:efb1c1ae2ba8

- reimplemented xtract_spectral_variance() xtract_spectral_skewness() and xtract_spectral_kurtosis() using correct maths
- removed xtract_spectral_average_deviation()

             case XTRACT_SPECTRAL_VARIANCE:
             case XTRACT_STANDARD_DEVIATION:
             case XTRACT_DIFFERENCE_VECTOR: 
             case XTRACT_AVERAGE_DEVIATION:
             case XTRACT_SPECTRAL_STANDARD_DEVIATION:
-            case XTRACT_SPECTRAL_AVERAGE_DEVIATION:
+            /* case XTRACT_SPECTRAL_AVERAGE_DEVIATION: */
             case XTRACT_LOWEST_VALUE:
             case XTRACT_TONALITY:
             case XTRACT_MFCC:
             case XTRACT_LPC:
             case XTRACT_LPCC:

                 *argv_donor = XTRACT_MEAN;
                 break;
             case XTRACT_SPECTRAL_STANDARD_DEVIATION:
                 *argv_donor = XTRACT_SPECTRAL_VARIANCE;
                 break;
-            case XTRACT_SPECTRAL_AVERAGE_DEVIATION:
+            /* case XTRACT_SPECTRAL_AVERAGE_DEVIATION:
                 *argv_donor = XTRACT_SPECTRAL_MEAN;
-                break;
+                break; */
             case XTRACT_SPECTRAL_INHARMONICITY:
                 *argv_donor = XTRACT_FAILSAFE_F0;
                 break;
             case XTRACT_FLATNESS_DB:
                 *argv_donor = XTRACT_FLATNESS;

                 *data_format = XTRACT_ARBITRARY_SERIES;
                 break;
             case XTRACT_SPECTRAL_MEAN:
             case XTRACT_SPECTRAL_VARIANCE:
             case XTRACT_SPECTRAL_STANDARD_DEVIATION:
-            case XTRACT_SPECTRAL_AVERAGE_DEVIATION:
+            /* case XTRACT_SPECTRAL_AVERAGE_DEVIATION: */
             case XTRACT_SPECTRAL_SKEWNESS:
             case XTRACT_SPECTRAL_KURTOSIS:
             case XTRACT_SPECTRAL_CENTROID:
             case XTRACT_SPECTRAL_SLOPE:
                 *data_format = XTRACT_SPECTRAL;     

                 *data_unit = XTRACT_ANY;
                 break;
             case XTRACT_SPECTRAL_MEAN:
             case XTRACT_SPECTRAL_VARIANCE:
             case XTRACT_SPECTRAL_STANDARD_DEVIATION:
-            case XTRACT_SPECTRAL_AVERAGE_DEVIATION:
+            /* case XTRACT_SPECTRAL_AVERAGE_DEVIATION: */
             case XTRACT_SPECTRAL_SKEWNESS:
             case XTRACT_SPECTRAL_KURTOSIS:
             case XTRACT_SPECTRAL_CENTROID:
             case XTRACT_SPECTRAL_SLOPE:
             case XTRACT_HARMONIC_SPECTRUM:

                         "Extract the standard deviation of an input spectrum");
                 strcpy(p_desc, 
                         "Extract the standard deviation of an audio spectrum");
                 strcpy(author, "");
                 break;
-            case XTRACT_SPECTRAL_AVERAGE_DEVIATION:
+            /* case XTRACT_SPECTRAL_AVERAGE_DEVIATION:
                 strcpy(name, "spectral_average_deviation");
                 strcpy(p_name, "Spectral Average Deviation");
                 strcpy(desc, 
                         "Extract the average deviation of an input spectrum");
                 strcpy(p_desc, 
                         "Extract the average deviation of an audio spectrum");
                 strcpy(author, "");
                 break;
+                */
             case XTRACT_ROLLOFF:
                 strcpy(name, "rolloff");
                 strcpy(p_name, "Spectral Rolloff");
                 strcpy(desc, 
                         "Extract the rolloff point of a spectrum");

             case XTRACT_VARIANCE:
             case XTRACT_STANDARD_DEVIATION:
             case XTRACT_AVERAGE_DEVIATION:
             case XTRACT_SPECTRAL_VARIANCE:
             case XTRACT_SPECTRAL_STANDARD_DEVIATION:
-            case XTRACT_SPECTRAL_AVERAGE_DEVIATION:
+            /* case XTRACT_SPECTRAL_AVERAGE_DEVIATION: */
             case XTRACT_SPECTRAL_INHARMONICITY:
             case XTRACT_LOWEST_VALUE:
             case XTRACT_F0:
             case XTRACT_FAILSAFE_F0:
             case XTRACT_FLATNESS_DB:

             case XTRACT_SKEWNESS:
             case XTRACT_KURTOSIS:
             case XTRACT_SPECTRAL_MEAN:
             case XTRACT_SPECTRAL_VARIANCE:
             case XTRACT_SPECTRAL_STANDARD_DEVIATION:
-            case XTRACT_SPECTRAL_AVERAGE_DEVIATION:
+            /* case XTRACT_SPECTRAL_AVERAGE_DEVIATION: */
             case XTRACT_SPECTRAL_SKEWNESS:
             case XTRACT_SPECTRAL_KURTOSIS:
             case XTRACT_SPECTRAL_CENTROID:
             case XTRACT_IRREGULARITY_K:
             case XTRACT_IRREGULARITY_J:

             case XTRACT_SKEWNESS:
             case XTRACT_KURTOSIS:
             case XTRACT_SPECTRAL_MEAN:
             case XTRACT_SPECTRAL_VARIANCE:
             case XTRACT_SPECTRAL_STANDARD_DEVIATION:
-            case XTRACT_SPECTRAL_AVERAGE_DEVIATION:
+            /* case XTRACT_SPECTRAL_AVERAGE_DEVIATION: */
             case XTRACT_SPECTRAL_SKEWNESS:
             case XTRACT_SPECTRAL_KURTOSIS:
             case XTRACT_SPECTRAL_CENTROID:
             case XTRACT_IRREGULARITY_K:
             case XTRACT_IRREGULARITY_J:

                     *result_max = XTRACT_ANY;
                     break;
                 case XTRACT_SPECTRAL_MEAN:
                 case XTRACT_SPECTRAL_VARIANCE:
                 case XTRACT_SPECTRAL_STANDARD_DEVIATION:
-                case XTRACT_SPECTRAL_AVERAGE_DEVIATION:
+                /* case XTRACT_SPECTRAL_AVERAGE_DEVIATION: */
                 case XTRACT_SPECTRAL_CENTROID:
                 case XTRACT_SPREAD:
                 case XTRACT_F0:
                 case XTRACT_FAILSAFE_F0:
                 case XTRACT_HPS: