Fix bug with path

ShortestPathLab · Apr 24, 2023 · fe8ae6c · fe8ae6c
1 parent cea7253
commit fe8ae6c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/client/src/components/renderer/grid/Path.tsx b/client/src/components/renderer/grid/Path.tsx
@@ -1,6 +1,6 @@
 import { Graphics } from "@inlet/react-pixi";
 import { Graphics as PixiGraphics } from "@pixi/graphics";
-import { isNull, isUndefined, keyBy } from "lodash";
+import { isNull, isUndefined, keyBy, range } from "lodash";
 import { TraceEvent } from "protocol/Trace";
 import { useMemo } from "react";
 import { getColor } from "../colors";
@@ -22,13 +22,13 @@ type PathProps = {
 
 export function Path({ nodes = [], step = 0, scale: { to } }: PathProps) {
   const path = useMemo(() => {
-    const memo = keyBy(nodes, "id");
+    const memo = range(nodes.length).map((i) => keyBy(nodes.slice(0, i), "id"));
     return (s: number) => {
       const out = [];
       let next: TraceEvent | undefined = nodes[s];
       while (next) {
         out.push(next);
-        next = defined(next.pId) ? memo[`${next.pId}`] : undefined;
+        next = defined(next.pId) ? memo[s][`${next.pId}`] : undefined;
       }
       return out;
     };

diff --git a/client/src/components/renderer/mesh/Path.tsx b/client/src/components/renderer/mesh/Path.tsx
@@ -1,6 +1,6 @@
 import { Graphics } from "@inlet/react-pixi";
 import { Graphics as PixiGraphics } from "@pixi/graphics";
-import { isNull, isUndefined, keyBy } from "lodash";
+import { isNull, isUndefined, keyBy, range } from "lodash";
 import { TraceEvent } from "protocol/Trace";
 import { useMemo } from "react";
 import { getColor } from "../colors";
@@ -22,13 +22,13 @@ type PathProps = {
 
 export function Path({ nodes = [], step = 0, scale }: PathProps) {
   const path = useMemo(() => {
-    const memo = keyBy(nodes, "id");
+    const memo = range(nodes.length).map((i) => keyBy(nodes.slice(0, i), "id"));
     return (s: number) => {
       const out = [];
       let next: TraceEvent | undefined = nodes[s];
       while (next) {
         out.push(next);
-        next = defined(next.pId) ? memo[`${next.pId}`] : undefined;
+        next = defined(next.pId) ? memo[s][`${next.pId}`] : undefined;
       }
       return out;
     };

diff --git a/client/src/components/renderer/network/Path.tsx b/client/src/components/renderer/network/Path.tsx
@@ -1,6 +1,6 @@
 import { Graphics } from "@inlet/react-pixi";
 import { Graphics as PixiGraphics } from "@pixi/graphics";
-import { isNull, isUndefined, keyBy } from "lodash";
+import { isNull, isUndefined, keyBy, range } from "lodash";
 import { TraceEvent } from "protocol/Trace";
 import { useMemo } from "react";
 import { getColor } from "../colors";
@@ -22,13 +22,13 @@ type PathProps = {
 
 export function Path({ nodes = [], step = 0, scale: { to } }: PathProps) {
   const path = useMemo(() => {
-    const memo = keyBy(nodes, "id");
+    const memo = range(nodes.length).map((i) => keyBy(nodes.slice(0, i), "id"));
     return (s: number) => {
       const out = [];
       let next: TraceEvent | undefined = nodes[s];
       while (next) {
         out.push(next);
-        next = defined(next.pId) ? memo[`${next.pId}`] : undefined;
+        next = defined(next.pId) ? memo[s][`${next.pId}`] : undefined;
       }
       return out;
     };