sascha
/
difftastic
mirror of https://github.com/Wilfred/difftastic/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use u32 for edge cost 

This is performance neutral (both runtime and memory size) but the
code is slightly readable as there are fewer conversions.
pull/454/head
Wilfred Hughes 2023-01-08 21:34:49 +07:00
parent c6d8dedc5d
commit c310fb34f9
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/diff/graph.rs
Unescape Escape View File

@ -50,7 +50,7 @@ use Edge::*;
#[derive(Debug, Clone)]
pub struct Vertex<'a, 'b> {
pub neighbours: RefCell<Option<Vec<(Edge, &'b Vertex<'a, 'b>)>>>,
pub predecessor: Cell<Option<(u64, &'b Vertex<'a, 'b>)>>,
pub predecessor: Cell<Option<(u32, &'b Vertex<'a, 'b>)>>,
pub lhs_syntax: Option<&'a Syntax<'a>>,
pub rhs_syntax: Option<&'a Syntax<'a>>,
parents: Stack<EnteredDelimiter<'a>>,
@ -299,20 +299,18 @@ pub enum Edge {
},
}
const NOT_CONTIGUOUS_PENALTY: u64 = 50;
const NOT_CONTIGUOUS_PENALTY: u32 = 50;
impl Edge {
pub fn cost(self) -> u64 {
pub fn cost(self) -> u32 {
match self {
// Matching nodes is always best.
UnchangedNode { depth_difference } => min(40, u64::from(depth_difference) + 1),
UnchangedNode { depth_difference } => min(40, depth_difference + 1),
// Matching an outer delimiter is good.
EnterUnchangedDelimiter { depth_difference } => {
100 + min(40, u64::from(depth_difference))
}
EnterUnchangedDelimiter { depth_difference } => 100 + min(40, depth_difference),
// Replacing a comment is better than treating it as novel.
ReplacedComment { levenshtein_pct } => 150 + u64::from(100 - levenshtein_pct),
ReplacedComment { levenshtein_pct } => 150 + u32::from(100 - levenshtein_pct),
// Otherwise, we've added/removed a node.
NovelAtomLHS {