rename: Construction -> construction.GumTreeDiff

Author: pmbittner

src/main/java/org/variantsync/diffdetective/experiments/thesis_bm/ConstructionValidation.java

@@ -35,7 +35,7 @@
 import org.variantsync.diffdetective.util.IO;
 import org.variantsync.diffdetective.variation.DiffLinesLabel;
 import org.variantsync.diffdetective.variation.Label;
-import org.variantsync.diffdetective.variation.diff.Construction;
+import org.variantsync.diffdetective.variation.diff.construction.GumTreeDiff;
 import org.variantsync.diffdetective.variation.diff.DiffNode;
 import org.variantsync.diffdetective.variation.diff.VariationDiff;
 import org.variantsync.diffdetective.variation.diff.Projection;
@@ -59,8 +59,8 @@
  * This experiment computes the variation diff from
  * <ol>
  * <li>a line matching ({@link VariationDiffParser#createVariationDiff Viegener's algorithm}
- * <li>a tree matching computed by Gumtree ({@link Construction#diffUsingMatching}
- * <li>a hybrid matching ({@link Construction#improveMatching})
+ * <li>a tree matching computed by Gumtree ({@link GumTreeDiff#diffUsingMatching}
+ * <li>a hybrid matching ({@link GumTreeDiff#improveMatching})
  * </ol>
  * compares them using some quality metrics and stores timing statistics.
  *
@@ -291,7 +291,7 @@ public boolean analyzeVariationDiff(Analysis analysis) throws Exception, DiffPar
             afterVariationTree.assertConsistency();
 
             clock.start();
-            final DiffNode<DiffLinesLabel> newVariationDiffRoot = Construction.diffUsingMatching(
+            final DiffNode<DiffLinesLabel> newVariationDiffRoot = GumTreeDiff.diffUsingMatching(
                 beforeVariationTree.getRoot().projection(BEFORE),
                 afterVariationTree.getRoot().projection(AFTER),
                 augmentedMatcher(statistics.variationDiff[1])
@@ -304,7 +304,7 @@ public boolean analyzeVariationDiff(Analysis analysis) throws Exception, DiffPar
             final VariationDiff<DiffLinesLabel> improvedVariationDiff = analysis.getCurrentVariationDiff().deepCopy();
             improvedVariationDiff.assertConsistency();
             clock.start();
-            Construction.improveMatching(improvedVariationDiff.getRoot(), augmentedMatcher(statistics.variationDiff[2]));
+            GumTreeDiff.improveMatching(improvedVariationDiff.getRoot(), augmentedMatcher(statistics.variationDiff[2]));
             statistics.variationDiff[2].constructionDuration += clock.getPassedMilliseconds() - statistics.variationDiff[2].matchingDuration;
             improvedVariationDiff.assertConsistency();
 

…tective/variation/diff/Construction.java …ation/diff/construction/GumTreeDiff.javasrc/main/java/org/variantsync/diffdetective/variation/diff/Construction.java renamed to src/main/java/org/variantsync/diffdetective/variation/diff/construction/GumTreeDiff.java src/main/java/org/variantsync/diffdetective/variation/diff/Construction.java renamed to src/main/java/org/variantsync/diffdetective/variation/diff/construction/GumTreeDiff.java

@@ -1,4 +1,4 @@
-package org.variantsync.diffdetective.variation.diff;
+package org.variantsync.diffdetective.variation.diff.construction;
 
 import com.github.gumtreediff.matchers.MappingStore;
 import com.github.gumtreediff.matchers.Matcher;
@@ -10,6 +10,8 @@
 import org.variantsync.diffdetective.gumtree.VariationTreeAdapter;
 import org.variantsync.diffdetective.util.Assert;
 import org.variantsync.diffdetective.variation.Label;
+import org.variantsync.diffdetective.variation.diff.DiffNode;
+import org.variantsync.diffdetective.variation.diff.VariationDiff;
 import org.variantsync.diffdetective.variation.diff.source.VariationTreeDiffSource;
 import org.variantsync.diffdetective.variation.diff.traverse.VariationDiffTraversal;
 import org.variantsync.diffdetective.variation.tree.VariationNode;
@@ -25,7 +27,7 @@
 import static org.variantsync.diffdetective.variation.diff.Time.AFTER;
 import static org.variantsync.diffdetective.variation.diff.Time.BEFORE;
 
-public class Construction {
+public class GumTreeDiff {
     /**
      * Create a {@link VariationDiff} by matching nodes between {@code before} and {@code after} with the
      * default GumTree matcher.

src/test/java/TreeDiffingTest.java

@@ -8,7 +8,7 @@
 import org.variantsync.diffdetective.feature.CPPAnnotationParser;
 import org.variantsync.diffdetective.util.IO;
 import org.variantsync.diffdetective.variation.DiffLinesLabel;
-import org.variantsync.diffdetective.variation.diff.Construction;
+import org.variantsync.diffdetective.variation.diff.construction.GumTreeDiff;
 import org.variantsync.diffdetective.variation.diff.VariationDiff;
 import org.variantsync.diffdetective.variation.diff.parse.VariationDiffParseOptions;
 import org.variantsync.diffdetective.variation.diff.parse.VariationDiffParser;
@@ -80,7 +80,7 @@ public void testCase(TestCase testCase) throws IOException, DiffParseException {
         VariationTree<DiffLinesLabel> beforeEdit = parseVariationTree(testCase.beforeEdit());
         VariationTree<DiffLinesLabel> afterEdit = parseVariationTree(testCase.afterEdit());
 
-        VariationDiff<DiffLinesLabel> variationDiff = Construction.diffUsingMatching(beforeEdit, afterEdit);
+        VariationDiff<DiffLinesLabel> variationDiff = GumTreeDiff.diffUsingMatching(beforeEdit, afterEdit);
 
         try (var output = IO.newBufferedOutputStream(testCase.actual())) {
             new LineGraphExporter<>(new Format<>(new FullNodeFormat(), new ChildOrderEdgeFormat<>()))