feat: extract the type of each line (e.g., artifact, if, else, endif)

Author: AlexanderSchultheiss

src/main/java/org/variantsync/vevos/extraction/analysis/VariabilityAnalysis.java

@@ -71,22 +71,20 @@ static void analyzeNode(FileGT.Mutable fileGT, DiffNode<DiffLinesLabel> node, Ti
         }
 
         for (int lineNumber = fromLine; lineNumber < toLine; lineNumber++) {
-            LineAnnotation existingAnnotation = fileGT.get(lineNumber - 1);
+            LineAnnotation existingAnnotation = fileGT.get(lineNumber);
             if (existingAnnotation != null && existingAnnotation.nodeType().equals("artifact") && node.isAnnotation()) {
                 // Never overwrite artifact pcs with annotation pcs
                 continue;
             }
-            LineAnnotation annotation;
-            if (node.isAnnotation() && ignorePCChanges) {
-                // We set the PC and Mapping of all macro lines to '0', i.e., 'false
-                annotation = new LineAnnotation(lineNumber,
-                        new FeatureMapping("0"), new PresenceCondition("0"),
-                        node.getNodeType().name, presenceCondition.getUniqueContainedFeatures());
-            } else {
-                annotation = new LineAnnotation(lineNumber,
-                        new FeatureMapping(featureMapping.toString()), new PresenceCondition(presenceCondition.toString()),
-                        node.getNodeType().name, presenceCondition.getUniqueContainedFeatures());
+            String nodeType = node.getNodeType().name;
+            if (node.isAnnotation() && lineNumber == toLine - 1) {
+                // The last line of any annotation is the 'endif'
+                // If it is an else, or elif, it will be overwritten by the next node
+                nodeType = "endif";
             }
+            LineAnnotation annotation = new LineAnnotation(lineNumber,
+                    new FeatureMapping(featureMapping.toString()), new PresenceCondition(presenceCondition.toString()),
+                    nodeType, presenceCondition.getUniqueContainedFeatures());
             fileGT.insert(annotation);
         }
     }

src/main/java/org/variantsync/vevos/extraction/gt/BlockAnnotation.java

@@ -23,13 +23,16 @@ public final class BlockAnnotation implements Serializable {
     private final PresenceCondition presenceCondition;
     private int lineStartInclusive;
     private int lineEndInclusive;
+    private String nodeType;
 
     public BlockAnnotation(int lineStartInclusive, int lineEndInclusive,
-                           FeatureMapping featureMapping, PresenceCondition presenceCondition) {
+                           FeatureMapping featureMapping, PresenceCondition presenceCondition,
+                           String nodeType) {
         this.lineStartInclusive = lineStartInclusive;
         this.lineEndInclusive = lineEndInclusive;
         this.featureMapping = featureMapping;
         this.presenceCondition = presenceCondition;
+        this.nodeType = nodeType;
     }
 
     public void setLineStartInclusive(int lineStartInclusive) {
@@ -48,6 +51,8 @@ public int lineEndExclusive() {
         return lineEndInclusive;
     }
 
+    public String nodeType() {return nodeType;}
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -56,36 +61,41 @@ public boolean equals(Object o) {
         return lineStartInclusive == that.lineStartInclusive
                 && lineEndInclusive == that.lineEndInclusive
                 && Objects.equals(featureMapping, that.featureMapping)
-                && Objects.equals(presenceCondition, that.presenceCondition);
+                && Objects.equals(presenceCondition, that.presenceCondition)
+                && Objects.equals(nodeType, that.nodeType);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(featureMapping, presenceCondition, lineStartInclusive, lineEndInclusive);
+        return Objects.hash(featureMapping, presenceCondition, lineStartInclusive, lineEndInclusive, nodeType);
     }
 
     public boolean annotationEquals(BlockAnnotation other) {
         return this.featureMapping.equals(other.featureMapping)
-                && this.presenceCondition.equals(other.presenceCondition);
+                && this.presenceCondition.equals(other.presenceCondition)
+                && this.nodeType.equals(other.nodeType);
     }
 
     public boolean annotationEquals(LineAnnotation other) {
         return this.featureMapping.equals(other.featureMapping())
-                && this.presenceCondition.equals(other.presenceCondition());
+                && this.presenceCondition.equals(other.presenceCondition())
+                && this.nodeType.equals(other.nodeType());
     }
 
     @Override
     public String toString() {
         return "[" +
                 "lineStartInclusive=" + lineStartInclusive + ", " +
                 "lineEndExclusive=" + lineEndInclusive + ", " +
+                "nodeType=" + nodeType + ", " +
                 "featureMapping=" + featureMapping + ", " +
                 "presenceCondition=" + presenceCondition + ']';
     }
 
     public String asCSVLine() {
-        return "%s;%s;%d;%d".formatted(normalizeCondition(this.featureMapping.mapping()),
+        return "%s;%s;%s;%d;%d".formatted(normalizeCondition(this.featureMapping.mapping()),
                 normalizeCondition(this.presenceCondition.condition()),
+                this.nodeType,
                 this.lineStartInclusive,
                 this.lineEndInclusive);
     }

src/main/java/org/variantsync/vevos/extraction/gt/FileGT.java

@@ -274,7 +274,7 @@ private static String csvMatchingLines(Complete complete) {
         private static ArrayList<BlockAnnotation> aggregateBlocks(Complete complete) {
             ArrayList<BlockAnnotation> blocks = new ArrayList<>();
             // The root annotation is always true and covers all lines
-            BlockAnnotation rootBlock = new BlockAnnotation(1, complete.size(), new FeatureMapping("True"), new PresenceCondition("True"));
+            BlockAnnotation rootBlock = new BlockAnnotation(1, complete.size(), new FeatureMapping("True"), new PresenceCondition("True"), "ROOT");
 
             LinkedList<BlockAnnotation> blockStack = new LinkedList<>();
             blockStack.push(rootBlock);
@@ -312,7 +312,7 @@ private static ArrayList<BlockAnnotation> aggregateBlocks(Complete complete) {
                 // If the current line is in a new block
                 if (annotationChange) {
                     // Push a new block onto the stack
-                    blockStack.push(new BlockAnnotation(line.lineNumber(), line.lineNumber(), line.featureMapping(), line.presenceCondition()));
+                    blockStack.push(new BlockAnnotation(line.lineNumber(), line.lineNumber(), line.featureMapping(), line.presenceCondition(), line.nodeType()));
                 }
             }
             // Unwind the stack fully

src/main/java/org/variantsync/vevos/extraction/gt/GroundTruth.java

@@ -102,7 +102,7 @@ public String combinedVariablesListAsString(GroundTruth other) {
 
     public String asPcCsvString() {
         return generateCsv(
-                "Path;File Condition;Block Condition;Presence Condition;start;end",
+                "Path;File Condition;Block Condition;Line Type;Presence Condition;start;end",
                 FileGT.Complete::csvPCLines
         );
     }