clean up

Author: piameier

src/main/java/org/variantsync/diffdetective/shell/ShellExecutor.java

@@ -100,7 +100,7 @@ public List<String> execute(ShellCommand command, Path executionDir) throws Shel
         List<String> output = new LinkedList<>();
         Consumer<String> shareOutput = s -> {
             output.add(s);
-//            outputReader.accept(s);
+            outputReader.accept(s);
         };
         try {
             process = builder.start();

src/main/java/org/variantsync/diffdetective/util/StringUtils.java

@@ -48,7 +48,7 @@ public static String prettyPrintNestedCollections(final Collection<?> collection
     public static String clamp(int maxlen, String s) {
         return s.substring(0, Math.min(s.length(), maxlen));
     }
-    
+
     /**
      * @return the longest prefix of the given string that contains only of whitespace
      */

src/main/java/org/variantsync/diffdetective/variation/diff/DiffNode.java

@@ -823,7 +823,7 @@ public static <T extends VariationNode<T, L>, L extends Label> DiffNode<L> uncha
                 variationNode.getLabel()
         );
     }
-    
+
     /**
      * Transforms a {@code VariationNode} into a {@code DiffNode} by diffing {@code variationNode}
      * to itself. Recursively translates all children.
@@ -846,7 +846,7 @@ public static <T extends VariationNode<T, L1>, L1 extends Label, L2 extends Labe
 
         return diffNode;
     }
-    
+
     public DiffNode<L> deepCopy() {
         return deepCopy(new HashMap<>());
     }
@@ -948,7 +948,7 @@ public void makeUnchanged() {
     public static <T extends VariationNode<T, L>, L extends Label> DiffNode<L> unchanged(VariationNode<T, L> variationNode) {
         return unchanged(DiffNode::unchangedFlat, variationNode);
     }
-    
+
     /**
      * Returns true if this subtree is exactly equal to {@code other}.
      * This check uses equality checks instead of identity.

src/main/java/org/variantsync/diffdetective/variation/diff/VariationDiff.java

@@ -35,10 +35,8 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
@@ -375,24 +373,6 @@ public int count(final Predicate<DiffNode<L>> nodesToCount) {
         return count.get();
     }
 
-
-//    /**
-//     * Returns all variable names occurring in annotations (i.e., formulas of mapping nodes) in this variation diff.
-//     * @return A set of every occuring feature name.
-//     */
-//    public Set<String> computeAllFeatureNames() {
-//        Set<String> features = new LinkedHashSet<>();
-//        forAll(node -> {
-//                if (node.isConditionalAnnotation()) {
-//                    features.addAll(node.getFormula().getUniqueContainedFeatures());
-//                }
-//            });
-//        // Since FeatureIDE falsely reports constants "True" and "False" as feature names, we have to remove them from the resulting set.
-//        features.removeIf(FixTrueFalse::isTrueLiteral);
-//        features.removeIf(FixTrueFalse::isFalseLiteral);
-//        return features;
-//    }
-
     /**
      * Returns all variable names occurring in annotations (i.e., formulas of mapping nodes) in this variation diff.
      * This method is deterministic: It will return the feature names always in the same order, assuming the variation diff is not changed inbetween.

src/main/java/org/variantsync/diffdetective/variation/diff/transform/EliminateEmptyAlternatives.java

@@ -9,7 +9,6 @@
 import org.variantsync.diffdetective.variation.tree.VariationTree;
 import org.variantsync.diffdetective.variation.tree.VariationTreeNode;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import static org.variantsync.diffdetective.util.fide.FormulaUtils.*;
@@ -80,8 +79,7 @@ private static void elim(VariationTreeNode<DiffLinesLabel> subtree) {
 
         // When there are no children, 'subtree' is an empty annotation that can be eliminated.
         if (children.isEmpty()) {
-//            subtree.drop();
-        	nodesToDrop.add(subtree);
+            subtree.drop();
         }
         // When there is exactly one child and that child is an 'else' or 'elif' we can simplify that nesting.
         else if (children.size() == 1) {
@@ -97,8 +95,7 @@ else if (children.size() == 1) {
                 subtree.setLabel(updatedLabel(subtree.getLabel(), newFormula));
 
                 // simplify tree
-//                child.drop();
-                nodesToDrop.add(child);
+                child.drop();
                 subtree.stealChildrenOf(child);
             }
         }

src/main/java/org/variantsync/diffdetective/variation/tree/view/relevance/Configure.java

@@ -14,11 +14,6 @@
 import org.variantsync.diffdetective.variation.tree.VariationNode;
 import org.variantsync.diffdetective.variation.tree.view.relevance.spec.ConfigureSpec;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.function.Consumer;
-
 /**
  * Relevance predicate that generates (partial) variants from variation trees.
  * This relevance predicate is the implementation of Equation 5 in our SPLC'23 paper.
@@ -64,7 +59,7 @@ public Configure(final Node configuration) {
      * then we construct a formula A ∧ (¬ B) ∧ C.
      */
     public Configure(final Map<String, Boolean> assignment) {
-        // We use commutativity if ∧ to iterate the map only once instead of twice as shown in the formula above.
+        // We use commutativity of ∧ to iterate the map only once instead of twice as shown in the formula above.
         final Formula[] fixedFeatures = new Formula[assignment.size()];
         int i = 0;
         for (Entry<String, Boolean> entry : assignment.entrySet()) {