improve imageToDocument precision

SuduIDE · Dec 20, 2024 · c871a92 · c871a92
1 parent 3d40a81
commit c871a92
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/demo-edit/src/main/java/org/sudu/experiments/editor/DiffImage.java b/demo-edit/src/main/java/org/sudu/experiments/editor/DiffImage.java
@@ -142,7 +142,9 @@ static int findDiff(
   }
 
   static int imageToDocument(int imgPos, int imageLength, int docLength) {
-    int line = Numbers.divRound(imgPos, docLength, imageLength);
+    int round = Math.min(imageLength, docLength) / 2;
+    int line = (imgPos * docLength + round) / imageLength;
+
     return Numbers.clamp(0, line, docLength - 1);
   }
 }
diff --git a/demo-edit/src/test/java/org/sudu/experiments/editor/DiffImageTest.java b/demo-edit/src/test/java/org/sudu/experiments/editor/DiffImageTest.java
@@ -2,6 +2,7 @@
 
 import org.junit.jupiter.api.Assertions;
 import org.sudu.experiments.diff.LineDiff;
+import org.sudu.experiments.math.Numbers;
 import org.sudu.experiments.math.XorShiftRandom;
 
 import java.util.Arrays;
@@ -18,12 +19,38 @@ public static void main(String[] args) {
     testMin(doc);
     testBlur();
 
+    testImageToDoc();
+
 //    DiffColors diffColors = DiffColors.codeDiffDark();
 //    GL.ImageData img = new GL.ImageData(1, diffCode.length);
 //    applyDiffPalette(diffCode, img, diffColors);
 
   }
 
+  static int imageToDocumentBad(int imgPos, int imageLength, int docLength) {
+    int line1 = (int) ((double) (imgPos * docLength) / imageLength + 0.5);
+
+    return Numbers.clamp(0, line1, docLength - 1);
+  }
+
+
+  private static void testImageToDoc() {
+    int qqq = 620 / 50;
+
+    int i0 = imageToDocumentBad(6, 620, 50);
+    int i1 = imageToDocumentBad(7, 620, 50);
+    int e0 = imageToDocumentBad(11, 620, 50);
+    int j1 = imageToDocumentBad(18, 620, 50);
+    int i48 = imageToDocumentBad(601, 620, 50);
+    int i49 = imageToDocumentBad(602, 620, 50);
+    int j49 = imageToDocumentBad(619, 620, 50);
+//    System.out.println("j49 = " + j49);
+    int f0 = DiffImage.imageToDocument(11, 620, 50);
+    int f1 = DiffImage.imageToDocument(12, 620, 50);
+    Assertions.assertEquals(0, f0);
+    Assertions.assertEquals(1, f1);
+  }
+
   static LineDiff[] model(int doc) {
     LineDiff[] model = new LineDiff[doc];