Merge pull request #104 from tscircuit/path-simplify2

fix bug with path collisions for simplifying paths
tscircuit · Jan 9, 2025 · 5739d9d · 5739d9d
2 parents 9b43f87 + 248327a
commit 5739d9d
Show file tree

Hide file tree

Showing 6 changed files with 634 additions and 28 deletions.
diff --git a/...ite-grid-ijump-astar/tests/__snapshots__/shorten-path-with-shortcuts-4.snap.svg b/...ite-grid-ijump-astar/tests/__snapshots__/shorten-path-with-shortcuts-4.snap.svg
diff --git a/algos/infinite-grid-ijump-astar/tests/shorten-path-with-shortcuts-3.test.tsx b/algos/infinite-grid-ijump-astar/tests/shorten-path-with-shortcuts-3.test.tsx
@@ -49,18 +49,18 @@ test("shorten-path-with-shortcuts 3 with obstacle", () => {
   const obstacleList = new ObstacleList(obstacles as Obstacle[])
 
   const simplifiedPath = shortenPathWithShortcuts(pathToOptimize, (A, B) => {
-    const minX = Math.min(A.x, B.x)
-    const minY = Math.min(A.y, B.y)
-    const maxX = Math.max(A.x, B.x)
-    const maxY = Math.max(A.y, B.y)
-    return (
-      obstacleList.getObstaclesOverlappingRegion({
-        minX,
-        minY,
-        maxX,
-        maxY,
-      }).length > 0
+    const collision = obstacleList.getOrthoDirectionCollisionInfo(
+      A,
+      {
+        dx: Math.sign(B.x - A.x),
+        dy: Math.sign(B.y - A.y),
+      },
+      {
+        margin: 0.05,
+      },
     )
+    const dist = Math.sqrt((A.x - B.x) ** 2 + (A.y - B.y) ** 2)
+    return collision.wallDistance < dist
   })
 
   expect(