some post merge fixes

Author: pmbittner

linegraph/createGraph.py

@@ -35,17 +35,6 @@ def nodeColour(difftype):
     elif difftype == g.DIFFTYPE_REM:
         return g.DIFFTYPE_REM_COLOR
 
-
-# the colour of the edge according to the specification, for "a", "b", and "ab"
-def edgeColour(edge):
-    if edge == "a":
-        return g.EDGE_A_COLOUR
-    elif edge == "b":
-        return g.EDGE_B_COLOUR
-    else: # "ab"
-        return g.EDGE_AB_COLOUR
-
-
 # draw a node within a sub graph
 def drawNode(cluster, tree, nodeId, nodeLabel):
     nodedata = NODE_PARSER(nodeId, nodeLabel)
@@ -65,7 +54,7 @@ def drawEdge(cluster, tree, childNodeId, parentNodeId, nodeLabel):
     cluster.edge(
         tree + "_" + childNodeId, # identifier of the destination node (where the edge arrow points to)
         tree + "_" + parentNodeId, # identifier of the source node (where the edge arrow points from)
-        color=edgeColour(nodeLabel)) # colour of the edge
+        color=g.edgeColour(nodeLabel)) # colour of the edge
 
 
 # draw one tree, i.e. sub graph, of the patterns file

linegraph/graphGeneration.py

@@ -1,30 +1,33 @@
 #!/bin/python3
 
-
 # constants from our Java code
 JAVA_TREE_NAME_SEPARATOR = "$$$"
-JAVA_ID_LINE_NUMBER_OFFSET = 16
-JAVA_ID_DIFF_TYPE_OFFSET = 8
+JAVA_ID_LINE_NUMBER_OFFSET = 6 #16
+JAVA_ID_DIFF_TYPE_OFFSET = 3 #8
 JAVA_ID_DIFFLINE_FROM_OFFSET = 1
 
 # export names
 # DIR_SEPARATOR = "$"
 DIR_SEPARATOR = "___"
 
+COLORFUL_DELETED = '#A00000'
+COLORFUL_INSERTED = '#00A000'
+COLORFUL_MACRO = '#579'
+
 # colour of a node shows diff type
-DIFFTYPE_ADD_COLOR = 'green'
-DIFFTYPE_REM_COLOR = 'red'
+DIFFTYPE_ADD_COLOR = 'green' #COLORFUL_INSERTED #
+DIFFTYPE_REM_COLOR = 'red' #COLORFUL_DELETED #'#ff9129'
 DIFFTYPE_NON_COLOR = '#d1d1e0' # light purple gray
 
 # border colour of a node shows code type
-CODE_TYPE_CODE_COLOR = '#3399ff'
-CODE_TYPE_OTHER_COLOR = 'black'
+CODE_TYPE_CODE_COLOR = 'black'
+CODE_TYPE_OTHER_COLOR = '#3399ff'#COLORFUL_MACRO#
 TYPE_BORDER_SIZE = (8.0 / 7.0)
 
-# edge colours
-EDGE_A_COLOUR = "#bbeb37"
-EDGE_B_COLOUR = "#ff9129"
-EDGE_AB_COLOUR = "black"
+# colour of edges
+EDGE_ADD_COLOR = '#bbeb37'
+EDGE_REM_COLOR = '#ff9129'
+EDGE_NON_COLOR = 'black'
 
 RELEASE_PATTERNS_CODE_PREFIX = "c"
 RELEASE_PATTERNS_MACRO_PREFIX = "m"
@@ -224,4 +227,14 @@ def parseNodeReleaseAtomics(id, name):
     else:
         raise Exception("Node " + name + " has unknown type. Expected prefix " + RELEASE_PATTERNS_CODE_PREFIX + " or " + RELEASE_PATTERNS_MACRO_PREFIX + " but was none.")
 
-    return result 
+    return result
+
+def edgeColour(edge):
+    if edge.startswith("a"):
+        return EDGE_ADD_COLOR
+    elif edge.startswith("ba"):
+        return EDGE_NON_COLOR
+    elif edge.startswith("b"):
+        return EDGE_REM_COLOR
+    else:
+        raise Exception("Cannot parse edge label " + edge)

linegraph/renderLinegraph.py

@@ -5,6 +5,8 @@
 import re
 import sys
 
+import graphGeneration as g
+
 ## settings for running example
 # for diff
 # NODE_POSITION_LAYOUT = "circo"
@@ -17,8 +19,6 @@
 # POS_SCALING_Y = 0.5
 # plt.margins(x=0.11)
 
-import graphGeneration as g
-
 # + install graphviz on your system: https://www.graphviz.org/download/
 
 # format
@@ -153,6 +153,8 @@ def plot_graphs(S, exportDir):
                 node_colors.append(g.DIFFTYPE_ADD_COLOR)
             elif nodedata.difftype == g.DIFFTYPE_REM:
                 node_colors.append(g.DIFFTYPE_REM_COLOR)
+            else:
+                raise Exception("Could not determine color of node " + str(nodedata.difftype))
 
             if nodedata.codetype == g.CODETYPE_CODE:
                 node_type_colors.append(g.CODE_TYPE_CODE_COLOR)
@@ -164,12 +166,7 @@ def plot_graphs(S, exportDir):
         edge_colors = []
         for _, _, d in difftree.edges.data():
             typeName = str(d['label'])
-            if typeName.startswith("a"):
-                edge_colors.append(EDGE_ADD_COLOR)
-            if typeName.startswith("ba"):
-                edge_colors.append(EDGE_NON_COLOR)
-            elif typeName.startswith("b"):
-                edge_colors.append(EDGE_REM_COLOR)
+            edge_colors.append(g.edgeColour(typeName))
 
         # pos = nx.spring_layout(S[i], scale=3)
         # pos = nx.planar_layout(S[i], scale=3)
@@ -198,6 +195,9 @@ def plot_graphs(S, exportDir):
         ycenter = (ymax + ymin) / 2
         yhalf = (ymax - ymin) / 2
 
+        if yhalf == 0:
+            yhalf = ycenter / 2
+
         # 3: shift our nodes and normalize their position on the y scale
         new_pos = {}
         for k, v in pos.items():
@@ -216,7 +216,8 @@ def plot_graphs(S, exportDir):
         # draw nodes
         if SHOW_LABELS:
             node_labels = dict([(v, d['label']) for v, d in difftree.nodes(data=True)])
-            nx.draw(difftree, pos,
+            nx.draw(difftree,
+                    pos,
                     node_size=NODE_SIZE,
                     node_color=node_colors,
                     width=EDGE_SIZE,
@@ -283,6 +284,7 @@ def getAllFilesInDirectoryRecusivelyThat(dirname, condition):
     FONT_SIZE = args.fontsize
     LINE_NO_OFFSET = args.startlineno
 
+#     print("args.format", args.format)
     if args.format == "default":
         NODE_PARSER = g.parseNodeDefault
     elif args.format == "patternsdebug":

src/main/java/org/variantsync/diffdetective/main/SimpleRenderer.java

@@ -49,6 +49,7 @@ public class SimpleRenderer {
             .build();
 
     private static final RenderOptions renderExampleOptions = new RenderOptions.Builder()
+            .setTreeFormat(new RWCompositePatternTreeFormat())
             .setNodesize(3*RenderOptions.DEFAULT.nodesize())
             .setEdgesize(2*RenderOptions.DEFAULT.edgesize())
             .setArrowsize(2*RenderOptions.DEFAULT.arrowsize())
@@ -67,6 +68,8 @@ public class SimpleRenderer {
             .addExtraArguments("--format", "patternsdebug")
             .build();
 
+    private static final RenderOptions RENDER_OPTIONS_TO_USE = renderExampleOptions;
+
     private final static boolean collapseMultipleCodeLines = true;
     private final static boolean ignoreEmptyLines = true;
     private final static List<String> SUPPORTED_FILE_TYPES = List.of(".diff", ".c", ".cpp", ".h", ".hpp");
@@ -80,7 +83,7 @@ private static void render(final Path fileToRender) {
         final String fileToRenderStr = fileToRender.toString();
         if (fileToRenderStr.endsWith(".lg")) {
             Logger.info("Rendering " + fileToRender);
-            renderer.renderFile(fileToRender, vulkanRenderOptions);
+            renderer.renderFile(fileToRender, RENDER_OPTIONS_TO_USE);
         } else if (SUPPORTED_FILE_TYPES.stream().anyMatch(fileToRenderStr::endsWith)) {
             Logger.info("Rendering " + fileToRender);
             final DiffTree t;
@@ -95,7 +98,7 @@ private static void render(final Path fileToRender) {
                     fileToRender.getFileName().toString(),
                     GetRelativeOutputDir.apply(fileToRender),
 //                    renderExampleOptions
-                    renderCompositePatterns
+                    RENDER_OPTIONS_TO_USE
             );
         } else {
             Logger.warn("Skipping unsupported file " + fileToRender);
@@ -137,7 +140,7 @@ public static void main(String[] args) throws IOException {
             final PatchDiff patch = DiffTreeParser.parsePatch(repository, file, commit);
             assert patch != null;
             DiffTreeTransformer.apply(transform, patch.getDiffTree());
-            renderer.render(patch, Path.of("render", repoName), vulkanRenderOptions);
+            renderer.render(patch, Path.of("render", repoName), RENDER_OPTIONS_TO_USE);
         }
 
         System.out.println("done");