finalizations before first eval run

Author: pmbittner

src/main/java/org/variantsync/diffdetective/experiments/views/Main.java

@@ -40,7 +40,6 @@ public static Analysis AnalysisFactory(Repository repo, Path repoOutputDir) {
         return new Analysis(
                 "Views Analysis",
                 new ArrayList<>(List.of(
-//                        new PreprocessingAnalysis(new CutNonEditedSubtrees(true)),
                         new FilterAnalysis( // filters unwanted trees
                                 DiffTreeFilter.notEmpty()
                         ),
@@ -70,7 +69,9 @@ public static void main(String[] args) throws IOException {
         AnalysisRunner.run(analysisOptions, (repository, path) -> {
             //1b424533675341a2090b79a6ffc420ac6b179ce7
 //            Analysis.forSinglePatch("2254b6c09cff8f3a83684fd159289d0e305b0e7d", "src/alloc.c", AnalysisFactory(repository, path));
-            Analysis.forEachCommit(() -> AnalysisFactory(repository, path));
+            Analysis.forEachCommit(() -> AnalysisFactory(repository, path)
+//                    , 1000, 1
+            );
         });
     }
 }

src/main/java/org/variantsync/diffdetective/experiments/views/ViewAnalysis.java

@@ -26,7 +26,7 @@
 
 public class ViewAnalysis implements Analysis.Hooks {
     // Result data
-    public static final String EDIT_COMPLEXITIES_EXTENSION = ".views.csv";
+    public static final String VIEW_CSV_EXTENSION = ".views.csv";
     private StringBuilder csv;
     private Random random;
 
@@ -78,6 +78,12 @@ private void runQueryExperiment(Analysis analysis, final DiffTree d, final Query
         csv.append(e.toCSV()).append(StringUtils.LINEBREAK);
     }
 
+//    @Override
+//    public boolean onParsedCommit(Analysis analysis) throws Exception {
+//        Logger.info("Processing " + analysis.getCurrentCommitDiff().getCommitHash());
+//        return Analysis.Hooks.super.onParsedCommit(analysis);
+//    }
+
     @Override
     public boolean analyzeDiffTree(Analysis analysis) throws Exception {
         final DiffTree d                = analysis.getCurrentDiffTree();
@@ -91,9 +97,9 @@ public boolean analyzeDiffTree(Analysis analysis) throws Exception {
     }
 
     private List<Query> generateRandomQueries(final DiffTree d) {
-        final List<Node> deselectedPCs = new ArrayList<>();
-        final Set<String> features = new HashSet<>();
-        final Set<String> artifacts = new HashSet<>();
+        final List<Node>  deselectedPCs = new ArrayList<>();
+        final Set<String> features      = new HashSet<>();
+        final Set<String> artifacts     = new HashSet<>();
 
         d.forAll(a -> {
             if (a.isArtifact()) {
@@ -116,12 +122,15 @@ else if (a.isConditionalAnnotation()) {
         features.remove(FixTrueFalse.False.var.toString());
 
         final List<Query> queries = new ArrayList<>(3);
-//        addRandomQuery(deselectedPCs, this::randomVariantQuery,  queries);
-//        addRandomQuery(features,      this::randomFeatureQuery,  queries);
-//        addRandomQuery(artifacts,     this::randomArtifactQuery, queries);
-        addAll(deselectedPCs, this::allVariantQueries,  queries);
-        addAll(features,      this::allFeatureQueries,  queries);
-        addAll(artifacts,     this::allArtifactQueries, queries);
+        addRandomQuery(deselectedPCs, this::randomVariantQuery,  queries);
+        addRandomQuery(features,      this::randomFeatureQuery,  queries);
+        addRandomQuery(artifacts,     this::randomArtifactQuery, queries);
+
+        // For debugging:
+//        addAll(deselectedPCs, this::allVariantQueries,  queries);
+//        addAll(features,      this::allFeatureQueries,  queries);
+//        addAll(artifacts,     this::allArtifactQueries, queries);
+
         return queries;
     }
 
@@ -230,7 +239,7 @@ private Query randomArtifactQuery(final Set<String> artifacts) {
     @Override
     public void endBatch(Analysis analysis) throws IOException {
         IO.write(
-                FileUtils.addExtension(analysis.getOutputFile(), EDIT_COMPLEXITIES_EXTENSION),
+                FileUtils.addExtension(analysis.getOutputFile(), VIEW_CSV_EXTENSION),
                 csv.toString()
         );
     }

src/main/java/org/variantsync/diffdetective/experiments/views/result/ViewEvaluation.java

@@ -39,7 +39,7 @@ public static String makeHeader(String delimiter) {
                 "commit",
                 "file",
                 "vtype",
-                "vargs",
+//                "vargs",
                 "msnaive",
                 "msoptimized",
                 "diffNodeCount",
@@ -56,7 +56,7 @@ public String toCSV(String delimiter) {
                 commit,
                 file,
                 query.getFunctionName(),
-                getQueryArguments(),
+//                getQueryArguments(),
                 msNaive,
                 msOptimized,
                 diffStatistics.nodeCount,