Reduce edge kinds

Wilfred · Oct 7, 2022 · 10ce859 · 10ce859
1 parent 005a5a6
commit 10ce859
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 19 deletions.
diff --git a/src/diff/dijkstra.rs b/src/diff/dijkstra.rs
@@ -253,7 +253,7 @@ mod tests {
                     contiguous: false,
                     probably_punctuation: false,
                 },
-                ExitDelimiterBoth,
+                ExitDelimiter,
             ]
         );
     }
@@ -303,7 +303,7 @@ mod tests {
                     contiguous: false,
                     probably_punctuation: false
                 },
-                ExitDelimiterBoth,
+                ExitDelimiter,
             ]
         );
     }
@@ -353,8 +353,8 @@ mod tests {
                 UnchangedNode {
                     depth_difference: 0
                 },
-                ExitDelimiterRHS,
-                ExitDelimiterLHS,
+                ExitDelimiter,
+                ExitDelimiter,
             ],
         );
     }
@@ -434,7 +434,7 @@ mod tests {
                     contiguous: true,
                     probably_punctuation: false
                 },
-                ExitDelimiterLHS,
+                ExitDelimiter,
             ]
         );
     }
@@ -476,7 +476,7 @@ mod tests {
                     contiguous: true,
                     probably_punctuation: false
                 },
-                ExitDelimiterLHS,
+                ExitDelimiter,
                 NovelAtomLHS {
                     contiguous: true,
                     probably_punctuation: true

diff --git a/src/diff/graph.rs b/src/diff/graph.rs
@@ -315,9 +315,7 @@ pub enum Edge {
     EnterNovelDelimiterRHS {
         contiguous: bool,
     },
-    ExitDelimiterLHS,
-    ExitDelimiterRHS,
-    ExitDelimiterBoth,
+    ExitDelimiter,
 }
 
 const NOT_CONTIGUOUS_PENALTY: u64 = 50;
@@ -329,12 +327,7 @@ impl Edge {
             // delimiter possibility, so the cost doesn't matter. We
             // choose a non-zero number as it's easier to reason
             // about.
-            ExitDelimiterBoth => 1,
-            // Choose a higher value for exiting individually. This
-            // shouldn't matter since entering a novel delimiter is
-            // already more expensive than entering a matched
-            // delimiter, but be defensive.
-            ExitDelimiterLHS | ExitDelimiterRHS => 2,
+            ExitDelimiter => 1,
 
             // Matching nodes is always best.
             UnchangedNode { depth_difference } => min(40, u64::from(depth_difference) + 1),
@@ -454,7 +447,7 @@ pub fn get_neighbours<'syn, 'b>(
 
         // Continue from sibling of parent.
         add_neighbor(
-            ExitDelimiterBoth,
+            ExitDelimiter,
             Vertex {
                 lhs_syntax: next_sibling(v.lhs_syntax.parent().unwrap()),
                 rhs_syntax: next_sibling(v.rhs_syntax.parent().unwrap()),
@@ -470,7 +463,7 @@ pub fn get_neighbours<'syn, 'b>(
 
         // Continue from sibling of parent.
         add_neighbor(
-            ExitDelimiterLHS,
+            ExitDelimiter,
             Vertex {
                 lhs_syntax: next_sibling(v.lhs_syntax.parent().unwrap()),
                 rhs_syntax: v.rhs_syntax,
@@ -486,7 +479,7 @@ pub fn get_neighbours<'syn, 'b>(
 
         // Continue from sibling of parent.
         add_neighbor(
-            ExitDelimiterRHS,
+            ExitDelimiter,
             Vertex {
                 lhs_syntax: v.lhs_syntax,
                 rhs_syntax: next_sibling(v.rhs_syntax.parent().unwrap()),
@@ -667,7 +660,7 @@ pub fn populate_change_map<'a, 'b>(
 
     for (e, v) in route {
         match e {
-            ExitDelimiterBoth | ExitDelimiterLHS | ExitDelimiterRHS => {
+            ExitDelimiter => {
                 // Nothing to do: we have already marked this node when we entered it.
             }
             UnchangedNode { .. } => {