To designate #1, #2, etc safest paths in SafeStore

alicia-lyu · Aug 17, 2023 · 6ac205f · 6ac205f
1 parent e654bbb
commit 6ac205f
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 9 deletions.
diff --git a/src/actions/Actions.ts b/src/actions/Actions.ts
@@ -254,8 +254,10 @@ export class RouteStoreCleared implements Action {}
 
 export class RouteStoreLoaded implements Action {
     readonly newPaths: Path[]
-    constructor(newPaths: Path[]) {
+    readonly middlePointsAdded: boolean
+    constructor(newPaths: Path[], middlePointsAdded: boolean) {
         this.newPaths = newPaths
+        this.middlePointsAdded = middlePointsAdded
     }
 }
 

diff --git a/src/stores/RouteStore.ts b/src/stores/RouteStore.ts
@@ -118,7 +118,7 @@ export default class RouteStore extends Store<RouteStoreState> {
                 };
                 restoredPaths.push(restoredPath);
             }
-            Dispatcher.dispatch(new RouteStoreLoaded(restoredPaths))
+            Dispatcher.dispatch(new RouteStoreLoaded(restoredPaths, true))
             return {
                 routingResult: {
                     ...state.routingResult,
@@ -137,7 +137,7 @@ export default class RouteStore extends Store<RouteStoreState> {
                     newPaths.push(path)
                 }
             })
-            Dispatcher.dispatch(new RouteStoreLoaded(newPaths))
+            Dispatcher.dispatch(new RouteStoreLoaded(newPaths, false))
             return {
                 routingResult: {
                     ...state.routingResult,

diff --git a/src/stores/SafetyStore.ts b/src/stores/SafetyStore.ts
@@ -2,16 +2,17 @@ import { RouteStoreCleared, RouteStoreLoaded } from "@/actions/Actions";
 import { IndexStoreState, SegmentWithIndex } from ".";
 import RouteStore from "./RouteStore";
 import Store from "./Store";
-import { Path } from "@/api/graphhopper";
+import { Path, RoutingArgs } from "@/api/graphhopper";
 import { calcGaussianRandom } from './utils'
 import QueryStore from "./QueryStore";
 
 
 export default class SafetyStore extends Store<IndexStoreState> {
     readonly routeStore: RouteStore
     readonly queryStore: QueryStore
-    // We use queryStore to designate the default safest path:
-    // the first path in this.routeStore.state.routingResult.paths which has middlePoints added.
+    // We use queryStore to designate the default #1, #2, #3 safest paths
+    // #2: the first path in this.routeStore.state.routingResult.paths which has no middlePoints added.
+    // #3: the second path in this.routeStore.state.routingResult.paths which has middlePoints added.
     private static indexStoreState: IndexStoreState = { paths: [] }
 
 
@@ -38,6 +39,28 @@ export default class SafetyStore extends Store<IndexStoreState> {
             return state;
         }
     }
+
+    // #1 safest path: the first member in this.routeStore.state.routingResult.paths which has middlePoints added.
+    private static getTheSafestPath(paths: Path[], middlePointsAdded: boolean): Path {
+        // TODO (Jingwen): implement this method
+        // To look up whether middlePoints are added
+        // 
+        throw new Error("Method not implemented.");
+    }
+
+    // #2 safest path: the first member in this.routeStore.state.routingResult.paths which has no middlePoints added.
+    private static getTheSecondSafestPath(paths: Path[], middlePointsAdded: boolean): Path {
+        // TODO (Jingwen): implement this method
+        throw new Error("Method not implemented.");
+    }
+
+    // #3 safest path: all the rest members in this.routeStore.state.routingResult.paths.
+    private static getTheThirdSafestPath(paths: Path[], middlePointsAdded: boolean): Path {
+        // TODO (Jingwen): implement this method
+        throw new Error("Method not implemented.");
+    }
+
+
     /**
      * Generate safety index for paths newly added to route store
      * while reserving safety index for paths already in route store.
@@ -49,8 +72,11 @@ export default class SafetyStore extends Store<IndexStoreState> {
      * @returns the new state of SafetyStore
      */
     private static generateSafetyForPaths(newPaths: Path[]): IndexStoreState {
-        // TODO (Jingwen)
-        // For normal distribution, use calcGaussianRandom in ./utils.ts
+        // TODO (Jingwen): edit this method to use the updated data structure of IndexStoreState
+        // Edit this method to use different normal distribution to generate safety index for #1, #2, #3 safest paths
+        // #1: mean 4.5, std 1
+        // #2: mean 3.5, std 1
+        // #3 and beyond: mean 2.5, std 1
         newPaths.forEach(path => {
             let coordinatesArray = path.points.coordinates
             coordinatesArray.forEach(coordinates => {
@@ -68,6 +94,7 @@ export default class SafetyStore extends Store<IndexStoreState> {
     }
 
     private static checkSegmentInStore(coordinatesInput: number[], indexStoreState: IndexStoreState): boolean {
+        // TODO (Jingwen): edit this method to use the updated data structure of IndexStoreState
         if (indexStoreState.Segments != null) {
             for (let segmentWithIndex of indexStoreState.Segments) {
                 let coordinates = segmentWithIndex.coordinates

diff --git a/src/stores/index.d.ts b/src/stores/index.d.ts
@@ -1,3 +1,5 @@
+import { Path } from "@/api/graphhopper"
+
 
 // index of safety or congestion
 export interface IndexStoreState {
@@ -9,7 +11,7 @@ export interface SegmentWithIndex {
     index: number
 }
 
-export interface PathWithIndex {
+export interface PathWithIndex extends Path {
     segments: SegmentWithIndex[],
     overAllIndex: number
 }