Save

Author: chesnokoff

modules/core/src/main/java/jsymbolic2/featureutils/Feature.java

@@ -1,6 +1,7 @@
 package jsymbolic2.featureutils;
 
 import ace.datatypes.FeatureDefinition;
+import java.util.Objects;
 import jsymbolic2.processing.MIDIIntermediateRepresentations;
 
 import javax.sound.midi.Sequence;
@@ -97,4 +98,9 @@ public int[] getDependencyOffsets() {
     public String toString() {
         return getFeatureDefinition().getFeatureDescription();
     }
+
+    @Override
+    public boolean equals(Object obj) {
+        return Objects.equals();
+    }
 }

modules/core/src/main/java/jsymbolic2/processing/MIDIFeatureProcessor.java

@@ -3,12 +3,12 @@
 import ace.datatypes.DataBoard;
 import ace.datatypes.DataSet;
 import ace.datatypes.FeatureDefinition;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ForkJoinTask;
 import jsymbolic2.featureutils.Feature;
 import jsymbolic2.featureutils.FeatureExtractorAccess;
-import jsymbolic2.featureutils.MEIFeatureExtractor;
-import jsymbolic2.featureutils.Feature;
 import mckay.utilities.sound.midi.MIDIMethods;
 import org.apache.commons.lang3.ArrayUtils;
 import org.ddmal.jmei2midi.meielements.meispecific.MeiSpecificStorage;
@@ -65,7 +65,13 @@ public class MIDIFeatureProcessor {
      * The features that are to be extracted (including dependencies of features to be saved, not just the
      * features to be saved themselves).
      */
-    private Feature[] features;
+    private List<Feature> features;
+
+    /**
+     * The features that are to be extracted (including dependencies of features to be saved, not just the
+     * features to be saved themselves).
+     */
+    private Set<String> features;
 
     /**
      * The dependencies of the features in the feature_extractors field.
@@ -416,59 +422,6 @@ public double[][][] getFeatures(Sequence[] windows, MeiSpecificStorage meiSpecif
         return results;
     }
 
-    private void processFeature(Sequence[] windows, MeiSpecificStorage meiSpecificStorage, double[][][] results, int win, MIDIIntermediateRepresentations intermediate, int feat) throws Exception {
-        // Only extract this feature if enough previous information
-        // is available to extract this feature
-        if (win >= maxFeatureOffsets[feat]) {
-            // Find the correct feature
-            Feature feature = features[feat];
-
-            double[][] otherFeatureValues = findPreviousExtractedFeatures(results, win, feat, feature);
-
-            //Check here if the file is an MEI file and if the feature is an MEI feature
-            //Otherwise just extract the midi feature data
-            if (null == meiSpecificStorage && feature instanceof MEIFeatureExtractor) {
-                //Skip if this is a non-mei file as mei features are not valid
-                return;
-            }
-            if (null != meiSpecificStorage && feature instanceof MEIFeatureExtractor) {
-                results[win][feat] = ((MEIFeatureExtractor) feature).extractMEIFeature(meiSpecificStorage, windows[win], intermediate, otherFeatureValues);
-                return;
-            }
-            // Store the extracted feature values
-            results[win][feat] = feature.extractFeature(windows[win], intermediate, otherFeatureValues);
-            return;
-        }
-        results[win][feat] = null;
-    }
-
-    /**
-     * Find previously extracted feature values that this feature needs
-     *
-     * @param results
-     * @param win
-     * @param feat
-     * @param feature
-     * @return
-     */
-    private double[][] findPreviousExtractedFeatures(double[][][] results, int win, int feat, Feature feature) {
-        double[][] otherFeatureValues = null;
-        if (featureExtractorDependencies[feat] != null) {
-            otherFeatureValues = new double[featureExtractorDependencies[feat].length][];
-            for (int i = 0; i < featureExtractorDependencies[feat].length; i++) {
-                int featureIndice = featureExtractorDependencies[feat][i];
-                /* TODO Check if this is a correct bug fix */
-                if (feature.getDependencyOffsets() == null) {
-                    otherFeatureValues[i] = results[win][featureIndice];
-                } else {
-                    int offset = feature.getDependencyOffsets()[i];
-                    otherFeatureValues[i] = results[win + offset][featureIndice];
-                }
-            }
-        }
-        return otherFeatureValues;
-    }
-
     /**
      * Generates DataBoard based in list of DataSets that were constructed during features extractions
      *
@@ -639,63 +592,6 @@ private void updateExtraDependencies(Feature[] allFeatureExtractors, String[] al
         }
     }
 
-    /**
-     * Find the indices of the feature extractor dependencies for each feature extractor
-     */
-    private void prepareIndicies() {
-        featureExtractorDependencies = new int[features.length][];
-        String[] feature_names = new String[features.length];
-        for (int feat = 0; feat < feature_names.length; feat++)
-            feature_names[feat] = features[feat].getFeatureDefinition().name;
-        String[][] featureDependenciesStr = new String[features.length][];
-        for (int feat = 0; feat < featureDependenciesStr.length; feat++)
-            featureDependenciesStr[feat] = features[feat].getDependencies();
-        for (int i = 0; i < featureDependenciesStr.length; i++)
-            if (null != featureDependenciesStr[i]) {
-                featureExtractorDependencies[i] = new int[featureDependenciesStr[i].length];
-                for (int j = 0; j < featureDependenciesStr[i].length; j++)
-                    for (int k = 0; k < feature_names.length; k++)
-                        if (featureDependenciesStr[i][j].equals(feature_names[k]))
-                            featureExtractorDependencies[i][j] = k;
-            }
-    }
-
-    /**
-     * Find the maximum offset for each feature
-     */
-    private void setMaxOffset() {
-        maxFeatureOffsets = new int[features.length];
-        for (int feat = 0; feat < maxFeatureOffsets.length; feat++) {
-            if (null == features[feat].getDependencyOffsets()) {
-                maxFeatureOffsets[feat] = 0;
-                continue;
-            }
-            int[] offsetsOfCurrentFeature = features[feat].getDependencyOffsets();
-            maxFeatureOffsets[feat] = Math.abs(offsetsOfCurrentFeature[0]);
-            for (int offsetOfCurrentFeature : offsetsOfCurrentFeature) {
-                maxFeatureOffsets[feat] = Math.max(Math.abs(offsetOfCurrentFeature), offsetOfCurrentFeature);
-            }
-        }
-    }
-
-    /**
-     * Find the dependencies of each feature marked to be extracted.
-     * Mark an entry as null if that entry's matching feature is not set to be extracted.
-     * Note that an entry will also be null if the corresponding feature has no dependencies.
-     *
-     * @param allFeatureExtractors
-     * @param featuresToSaveAmongAll
-     * @return
-     */
-    private String[][] getDependencies(Feature[] allFeatureExtractors, boolean[] featuresToSaveAmongAll) {
-        String[][] dependencies = new String[allFeatureExtractors.length][];
-        for (int feat = 0; feat < allFeatureExtractors.length; feat++) {
-            dependencies[feat] = null;
-            if (featuresToSaveAmongAll[feat]) dependencies[feat] = allFeatureExtractors[feat].getDependencies();
-        }
-        return dependencies;
-    }
-
     /**
      * Find the names of all features
      *