attached logging to new meyer diff algorithm

wumpz · wumpz · commit e413d79ecd0a · 2021-07-18T01:30:44.000+02:00
diff --git a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.java
@@ -69,7 +69,7 @@ public List<Change> computeDiff(List<T> source, List<T> target, DiffAlgorithmLis
 
     private void buildScript(DiffData data, int start1, int end1, int start2, int end2, Consumer<Integer> progress) {
         if (progress != null) {
-            progress.accept(start1);
+            progress.accept((end1 - start1) / 2 + (end2 - start2) / 2);
         }
         final Snake middle = getMiddleSnake(data, start1, end1, start2, end2);
         if (middle == null
diff --git a/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpaceTest.java b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpaceTest.java
@@ -71,7 +71,7 @@ public void diffEnd() {
         assertEquals(5, patch.getDeltas().size());
         assertEquals("Patch{deltas=[[InsertDelta, position: 0, lines: [C]], [DeleteDelta, position: 0, lines: [A]], [DeleteDelta, position: 2, lines: [C]], [DeleteDelta, position: 5, lines: [B]], [InsertDelta, position: 7, lines: [C]]]}", patch.toString());
         System.out.println(logdata);
-        assertEquals(8, logdata.size());
+        assertEquals(11, logdata.size());
     }
     
     

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public List<Change> computeDiff(List<T> source, List<T> target, DiffAlgorithmLis`
`69`	`69`
`70`	`70`	`private void buildScript(DiffData data, int start1, int end1, int start2, int end2, Consumer<Integer> progress) {`
`71`	`71`	`if (progress != null) {`
`72`		`- progress.accept(start1);`
	`72`	`+ progress.accept((end1 - start1) / 2 + (end2 - start2) / 2);`
`73`	`73`	`}`
`74`	`74`	`final Snake middle = getMiddleSnake(data, start1, end1, start2, end2);`
`75`	`75`	`if (middle == null`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public void diffEnd() {`
`71`	`71`	`assertEquals(5, patch.getDeltas().size());`
`72`	`72`	`assertEquals("Patch{deltas=[[InsertDelta, position: 0, lines: [C]], [DeleteDelta, position: 0, lines: [A]], [DeleteDelta, position: 2, lines: [C]], [DeleteDelta, position: 5, lines: [B]], [InsertDelta, position: 7, lines: [C]]]}", patch.toString());`
`73`	`73`	`System.out.println(logdata);`
`74`		`- assertEquals(8, logdata.size());`
	`74`	`+ assertEquals(11, logdata.size());`
`75`	`75`	`}`
`76`	`76`
`77`	`77`