clean OriginalFeature (#266)

Author: monperrus

src/main/java/fr/inria/coming/codefeatures/P4JFeatureAnalyzer.java

@@ -14,6 +14,7 @@
 import java.util.Map;
 
 import fr.inria.coming.core.entities.interfaces.IRevisionPair;
+import fr.inria.prophet4j.feature.extended.ExtendedFeatureCross;
 import org.apache.log4j.Logger;
 
 import com.google.gson.JsonObject;
@@ -26,7 +27,6 @@
 import fr.inria.coming.main.ComingProperties;
 import fr.inria.prophet4j.feature.Feature;
 import fr.inria.prophet4j.feature.FeatureCross;
-import fr.inria.prophet4j.feature.original.OriginalFeatureCross;
 import fr.inria.prophet4j.utility.CodeDiffer;
 import fr.inria.prophet4j.utility.Option;
 import fr.inria.prophet4j.utility.Option.FeatureOption;
@@ -98,7 +98,7 @@ public JsonObject extractFeatures(Map<String, File> filePaths) {
 			return null;
 		}
 		Option option = new Option();
-		option.featureOption = FeatureOption.ORIGINAL;
+		option.featureOption = FeatureOption.EXTENDED;
 		//We set the first parameter of CodeDiffer as False to not allow the code generation at buggy location
 		//By default, coming extracts simple P4J features, so the cross sets to false
 		Boolean cross = ComingProperties.getPropertyBoolean("cross");
@@ -109,27 +109,26 @@ public JsonObject extractFeatures(Map<String, File> filePaths) {
 		//Get feature vector
 		JsonObject jsonfile = null;
 		//	csvfile = genVectorsCSV(option,target,featureMatrix);
-		jsonfile = getSimleP4JJSON(option,target,featureMatrix,true);
+		jsonfile = getP4JJSON(option,target,featureMatrix,true);
 		return jsonfile;
 	}
 
 
-	public JsonObject getSimleP4JJSON(Option option, File target, List<FeatureMatrix> featureMatrix, Boolean numericalIndixator) {
+	public JsonObject getP4JJSON(Option option, File target, List<FeatureMatrix> featureMatrix, Boolean numericalIndixator) {
 
 	        JsonObject jsonfile = new JsonObject();
 
 	        for (FeatureVector featureVector : featureMatrix.get(0).getFeatureVectors()) {
                 List<FeatureCross> featureCrosses = featureVector.getNonSortedFeatureCrosses();
 
                 for (FeatureCross featureCross : featureCrosses) {
-            			List<Feature> simpleP4JFeatures= featureCross.getSimpleP4JFeatures();
-	                	OriginalFeatureCross ofc = (OriginalFeatureCross) featureCross;
+            			List<Feature> simpleP4JFeatures= featureCross.getFeatures();
 	                	for(Feature f: simpleP4JFeatures) {
-	                		Boolean positive = ofc.containFeature(f);
+	                		Boolean positive = featureCross.containFeature(f);
 	                		if(numericalIndixator) {
-		                		jsonfile.addProperty("P4J_"+ofc.getCrossType()+"_"+f, positive?"1":"0");
+		                		jsonfile.addProperty("P4J_"+f, positive?"1":"0");
 	                		}else {
-		                		jsonfile.addProperty("P4J_"+ofc.getCrossType()+"_"+f, positive?"true":"false");
+		                		jsonfile.addProperty("P4J_"+f, positive?"true":"false");
 	                		}
 	                	}
 
@@ -156,7 +155,7 @@ public JsonObject genVectorsCSV(Option option, File patchedFile, List<FeatureMat
 	        //Initial all vector  as 0.
 	        for (int idx = 0; idx < parameterVector.size(); idx++) {
 	            FeatureCross featureCross;
-	            featureCross = new OriginalFeatureCross(idx);
+	            featureCross = new ExtendedFeatureCross(idx);
                 header.add(featureCross.getFeatures().toString());
 	            values.add("0");
 	        }

src/main/java/fr/inria/prophet4j/feature/FeatureCross.java

@@ -9,7 +9,6 @@ public interface FeatureCross {
     Double getDegree();
 
     List<Feature> getFeatures();
-    List<Feature> getSimpleP4JFeatures();
 
     boolean containFeature(Feature feature);
 }

src/main/java/fr/inria/prophet4j/feature/S4R/S4RFeatureCross.java

@@ -61,9 +61,4 @@ public String toString() {
         return "FeatureCross: " + features;
     }
 
-	@Override
-	public List<Feature> getSimpleP4JFeatures() {
-		// TODO Auto-generated method stub
-		return null;
-	}
 }

src/main/java/fr/inria/prophet4j/feature/enhanced/EnhancedFeatureCross.java

@@ -225,9 +225,4 @@ public String toString() {
         return "FeatureCross: " + features;
     }
 
-	@Override
-	public List<Feature> getSimpleP4JFeatures() {
-		// TODO Auto-generated method stub
-		return null;
-	}
 }

src/main/java/fr/inria/prophet4j/feature/extended/ExtendedFeatureCross.java

@@ -161,9 +161,4 @@ public String toString() {
         return "FeatureCross: " + features;
     }
 
-	@Override
-	public List<Feature> getSimpleP4JFeatures() {
-		// TODO Auto-generated method stub
-		return null;
-	}
 }