define #1 #2 safest path using the order of RouteStoreLoaded's

alicia-lyu · Aug 17, 2023 · 402e60e · 402e60e
1 parent 6ac205f
commit 402e60e
Showing 1 changed file with 18 additions and 38 deletions.
diff --git a/src/stores/SafetyStore.ts b/src/stores/SafetyStore.ts
@@ -2,24 +2,18 @@ import { RouteStoreCleared, RouteStoreLoaded } from "@/actions/Actions";
 import { IndexStoreState, SegmentWithIndex } from ".";
 import RouteStore from "./RouteStore";
 import Store from "./Store";
-import { Path, RoutingArgs } from "@/api/graphhopper";
+import { Path } 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 #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: [] }
 
+    private static safestPathFound: boolean = false
+    private static secondSafestPathFound: boolean = false
 
-    constructor(routeStore: RouteStore, queryStore: QueryStore) {
+    constructor(routeStore: RouteStore) {
         super(SafetyStore.getInitialState())
         this.routeStore = routeStore
-        this.queryStore = queryStore
     }
 
     private static getInitialState(): IndexStoreState {
@@ -34,33 +28,12 @@ export default class SafetyStore extends Store<IndexStoreState> {
         } else if (action instanceof RouteStoreLoaded) {
             // Generate safety index for paths newly added to route store
             // while reserving safety index for paths already in route store
-            return SafetyStore.generateSafetyForPaths(action.newPaths)
+            return SafetyStore.generateSafetyForPaths(state, action)
         } else {
             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.
@@ -71,16 +44,23 @@ export default class SafetyStore extends Store<IndexStoreState> {
      *                 in addition to the paths already in route store
      * @returns the new state of SafetyStore
      */
-    private static generateSafetyForPaths(newPaths: Path[]): IndexStoreState {
-        // 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
+    private static generateSafetyForPaths(state: IndexStoreState, action: RouteStoreLoaded): IndexStoreState {
+        const newPaths = action.newPaths;
+        const middlePointAdded = action.middlePointsAdded; 
+        // Use ⬆ and safestPathFound and secondSafestPathFound to find the #1, #2 safest paths:
+        //  #1 safest path: the first member in this.routeStore.state.routingResult.paths which has middlePoints added.
+        //  #2 safest path: the first member in this.routeStore.state.routingResult.paths which has no middlePoints added.
+        // 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
+        // Also, have a look at the IndexStoreState interface in src/stores/index.d.ts
+
         newPaths.forEach(path => {
             let coordinatesArray = path.points.coordinates
             coordinatesArray.forEach(coordinates => {
                 if (!this.checkSegmentInStore(coordinates, this.indexStoreState)) {
+                    // replace this.indexStoreState with state
                     let safetyIndex = calcGaussianRandom(0.1, 0.01)
                     let newSegment: SegmentWithIndex = {
                         coordinates: [coordinates],