fixup! fixup! WIP

Author: shenriotpro

src/app/view/editor-tools-view-component/editor-tools-view.component.ts

@@ -512,26 +512,27 @@ export class EditorToolsViewComponent {
     headers.push($localize`:@@app.view.editor-side-view.editor-tools-view-component.connections:Connections`);
     headers.push($localize`:@@app.view.editor-side-view.editor-tools-view-component.totalCost:Total cost`);
 
+    const nodes = this.nodeService.getNodes();
     const selectedNodes = this.nodeService.getSelectedNodes();
-    const nodes = selectedNodes.length > 0 ? selectedNodes : this.nodeService.getVisibleNodes();
+    const odNodes = selectedNodes.length > 0 ? selectedNodes : this.nodeService.getVisibleNodes();
     const trainruns = this.trainrunService.getVisibleTrainruns();
 
-    const edges = buildEdges(nodes, trainruns, connectionPenalty, this.trainrunService, timeLimit);
+    const edges = buildEdges(nodes, odNodes, trainruns, connectionPenalty, this.trainrunService, timeLimit);
 
     const neighbors = computeNeighbors(edges);
     const vertices = topoSort(neighbors);
     // In theory we could parallelize the pathfindings, but the overhead might be too big.
     const res = new Map<string, [number, number]>();
-    nodes.forEach((origin) => {
+    odNodes.forEach((origin) => {
       computeShortestPaths(origin.getId(), neighbors, vertices).forEach((value, key) => {
         res.set([origin.getId(), key].join(","), value);
       });
     });
 
     const rows = [];
-    nodes.sort((a, b) => a.getFullName().localeCompare(b.getFullName()));
-    nodes.forEach((origin) => {
-      nodes.forEach((destination) => {
+    odNodes.sort((a, b) => a.getFullName().localeCompare(b.getFullName()));
+    odNodes.forEach((origin) => {
+      odNodes.forEach((destination) => {
         const costs = res.get([origin.getId(), destination.getId()].join(","));
         if (costs === undefined) {
           // Keep empty if no path is found.

src/app/view/util/origin-destination-graph.ts

@@ -27,7 +27,7 @@ export class Edge {
     ){}
 }
 
-export const buildEdges = (nodes: Node[], trainruns: Trainrun[], connectionPenalty: number, trainrunService: TrainrunService,
+export const buildEdges = (nodes: Node[], odNodes: Node[], trainruns: Trainrun[], connectionPenalty: number, trainrunService: TrainrunService,
     timeLimit: number
 ): Edge[] => {
     let edges = buildSectionEdges(trainruns, trainrunService, timeLimit);
@@ -59,7 +59,7 @@ export const buildEdges = (nodes: Node[], trainruns: Trainrun[], connectionPenal
     });
 
     // Note: pushing too many elements at once does not work well.
-    edges = [...edges, ...buildConvenienceEdges(nodes, verticesDepartureByNode, verticesArrivalByNode)];
+    edges = [...edges, ...buildConvenienceEdges(odNodes, verticesDepartureByNode, verticesArrivalByNode)];
     edges = [...edges, ...buildConnectionEdges(nodes, verticesDepartureByNode, verticesArrivalByNode, connectionPenalty)];
 
     return edges;

src/integration-testing/origin.destination.csv.test.spec.ts

@@ -80,7 +80,7 @@ describe("Origin Destination CSV Test", () => {
     const connectionPenalty = 5;
     const timeLimit = 60*10;
 
-    const edges = buildEdges(nodes, trainruns, connectionPenalty, trainrunService, timeLimit);
+    const edges = buildEdges(nodes, nodes, trainruns, connectionPenalty, trainrunService, timeLimit);
 
     const neighbors = computeNeighbors(edges);
     const vertices = topoSort(neighbors);