Merge pull request #6175 from opentripplanner/flex-transit-speed-test

Update Washington state flex speed test
opentripplanner · Oct 17, 2024 · 18c8246 · 18c8246
2 parents f9ea044 + 786805a
commit 18c8246
Show file tree

Hide file tree

Showing 6 changed files with 408 additions and 711 deletions.
diff --git a/.github/workflows/performance-test.yml b/.github/workflows/performance-test.yml
@@ -106,11 +106,11 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.location }}-travelSearch-results.csv
-          path: test/performance/${{ matrix.location }}/travelSearch-results.csv
+          path: test/performance/${{ matrix.location }}/travelSearch-results-md.csv
 
       - name: Archive Flight Recorder instrumentation file
         if: matrix.profile == 'core' || github.ref == 'refs/heads/dev-2.x'
         uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.location }}-flight-recorder
-          path: ${{ matrix.location}}-speed-test.jfr
+          path: application/${{ matrix.location }}-speed-test.jfr
diff --git a/test/performance/washington-state/build-config.json b/test/performance/washington-state/build-config.json
@@ -1,127 +1,67 @@
 {
-  "transitServiceStart": "2022-01-01",
-  "transitServiceEnd": "2022-12-31",
+  "transitServiceStart": "2024-09-01",
+  "transitServiceEnd": "2024-12-31",
   "transitModelTimeZone": "America/Los_Angeles",
   "transitFeeds": [
     {
       "type": "gtfs",
-      "source": "https://otp-performance.leonard.io/data/washington-state/Community_Transit-20221020T085912Z.gtfs.zip",
+      "source": "https://otp-performance.leonard.io/data/washington-state-new/catholiccommunity-wa-us-king--flex-v2.zip",
+      "feedId": "ccsww-kc"
+    },
+    {
+      "type": "gtfs",
+      "source": "https://otp-performance.leonard.io/data/washington-state-new/community-transit.gtfs.zip",
       "feedId": "commtrans"
     },
     {
       "type": "gtfs",
-      "source": "https://otp-performance.leonard.io/data/washington-state/Everett_Transit-20221022T085914Z.gtfs.zip",
-      "feedId": "everett"
+      "source": "https://otp-performance.leonard.io/data/washington-state-new/communitytransit-wa-us--flex-v2.zip",
+      "feedId": "commtrans-flex"
     },
     {
       "type": "gtfs",
-      "source": "https://otp-performance.leonard.io/data/washington-state/Homage_Senior_Services-20221013T085917Z.gtfs.zip",
+      "source": "https://otp-performance.leonard.io/data/washington-state-new/homage-wa-us-darrington--flex-v2.zip",
       "feedId": "homage"
     },
     {
       "type": "gtfs",
-      "source": "https://otp-performance.leonard.io/data/washington-state/Island_Transit-20221013T085915Z.gtfs.zip",
-      "feedId": "island-transit"
+      "source": "https://otp-performance.leonard.io/data/washington-state-new/hopelink-wa-us--flex-v2.zip",
+      "feedId": "hopelink"
     },
     {
       "type": "gtfs",
-      "source": "https://otp-performance.leonard.io/data/washington-state/King_County_Metro-20221022T085912Z.gtfs.zip",
+      "source": "https://otp-performance.leonard.io/data/washington-state-new/kcm.gtfs.zip",
       "feedId": "kcm"
     },
     {
       "type": "gtfs",
-      "source": "https://otp-performance.leonard.io/data/washington-state/Kitsap_Transit-20221021T090015Z.gtfs.zip",
+      "source": "https://otp-performance.leonard.io/data/washington-state-new/kitsap.gtfs.zip",
       "feedId": "kitsap"
     },
     {
       "type": "gtfs",
-      "source": "https://otp-performance.leonard.io/data/washington-state/Muckleshoot_Indian_Tribe-20221012T214902Z.gtfs.zip",
-      "feedId": "muckleshoot"
-    },
-    {
-      "type": "gtfs",
-      "source": "https://otp-performance.leonard.io/data/washington-state/Pierce_County_Ferries-20221012T215215Z.gtfs.zip",
-      "feedId": "pierce-ferries"
-    },
-    {
-      "type": "gtfs",
-      "source": "https://otp-performance.leonard.io/data/washington-state/Pierce_County_Human_Services-20221021T085916Z.gtfs.zip",
-      "feedId": "pierce-human-services"
-    },
-    {
-      "type": "gtfs",
-      "source": "https://otp-performance.leonard.io/data/washington-state/Pierce_County_Human_Services_Flex-20221012T215555Z.gtfs.zip",
-      "feedId": "pierce-flex"
-    },
-    {
-      "type": "gtfs",
-      "source": "https://otp-performance.leonard.io/data/washington-state/Pierce_Transit-20221022T085914Z.gtfs.zip",
-      "feedId": "pierce-transit"
-    },
-    {
-      "type": "gtfs",
-      "source": "https://otp-performance.leonard.io/data/washington-state/Puget_Sound_Educational_Service_District-20221012T215720Z.gtfs.zip",
-      "feedId": "pudget-sound-educational"
-    },
-    {
-      "type": "gtfs",
-      "source": "https://otp-performance.leonard.io/data/washington-state/Seattle_Childrens_Hospital-20221019T085918Z.gtfs.zip",
-      "feedId": "childrens-hospital"
-    },
-    {
-      "type": "gtfs",
-      "source": "https://otp-performance.leonard.io/data/washington-state/Seattle_Monorail-20221019T085918Z.gtfs.zip",
+      "source": "https://otp-performance.leonard.io/data/washington-state-new/monorail.gtfs.zip",
       "feedId": "monorail"
     },
     {
       "type": "gtfs",
-      "source": "https://otp-performance.leonard.io/data/washington-state/Skagit_Transit-20221012T212605Z.gtfs.zip",
-      "feedId": "skagit"
-    },
-    {
-      "type": "gtfs",
-      "source": "https://otp-performance.leonard.io/data/washington-state/Snoqualmie_Valley_Transportation-20221012T221032Z.gtfs.zip",
-      "feedId": "snoqualmie"
-    },
-    {
-      "type": "gtfs",
-      "source": "https://otp-performance.leonard.io/data/washington-state/Snoqualmie_Valley_Transportation_Flex-20221012T221125Z.gtfs.zip",
-      "feedId": "snoqualmie-flex"
-    },
-    {
-      "type": "gtfs",
-      "source": "https://otp-performance.leonard.io/data/washington-state/Solid_Ground-20221012T221409Z.gtfs.zip",
-      "feedId": "solid-ground"
-    },
-    {
-      "type": "gtfs",
-      "source": "https://otp-performance.leonard.io/data/washington-state/Sound_Generations-20221012T221622Z.gtfs.zip",
-      "feedId": "sound-generations"
-    },
-    {
-      "type": "gtfs",
-      "source": "https://otp-performance.leonard.io/data/washington-state/Sound_Transit-20221022T085914Z.gtfs.zip",
-      "feedId": "sound-transit"
-    },
-    {
-      "type": "gtfs",
-      "source": "https://otp-performance.leonard.io/data/washington-state/WA_State_Ferry-20221024T085913Z.gtfs.zip",
-      "feedId": "state-ferry"
+      "source": "https://otp-performance.leonard.io/data/washington-state-new/pierce-transit.gtfs.zip",
+      "feedId": "pierce"
     },
     {
       "type": "gtfs",
-      "source": "https://otp-performance.leonard.io/data/washington-state/WSDOT_Public_Transportation-20221012T213935Z.gtfs.zip",
-      "feedId": "wsdot"
+      "source": "https://otp-performance.leonard.io/data/washington-state-new/soundgenerations-wa-us-hyde--flex-v2.zip",
+      "feedId": "hyde"
     },
     {
       "type": "gtfs",
-      "source": "https://otp-performance.leonard.io/data/washington-state/Whatcom_Transportation_Authority-20221012T213144Z.gtfs.zip",
-      "feedId": "whatcom"
+      "source": "https://otp-performance.leonard.io/data/washington-state-new/soundgenerations-wa-us-volunteer--flex-v2.zip",
+      "feedId": "volunteer"
     }
   ],
   "osm": [
     {
-      "source": "https://otp-performance.leonard.io/data/washington-state/nw-washington-state-2022-12-01.osm.pbf"
+      "source": "https://otp-performance.leonard.io/data/washington-state-new/north-east-washington-2024-17-10.osm.pbf"
     }
   ]
 }
diff --git a/test/performance/washington-state/generate_test_cases.py b/test/performance/washington-state/generate_test_cases.py
@@ -17,14 +17,6 @@
         "coordinates":  "47.3978844,-122.30898",
         "name": "Des Moines"
     },
-    {
-        "coordinates":  "47.340218616,-122.2246170043",
-        "name": "North Auburn"
-    },
-    {
-        "coordinates":  "47.31322426310727,-122.336540222167",
-        "name": "Federal Way"
-    },
     {
         "coordinates":  "47.571024,-122.3877811",
         "name": "West Seattle"
@@ -47,19 +39,19 @@
     },
 ]
 
-failing_cases = [16, 64, 70, 82, 88, 120, 128, 130, 132, 134, 136, 138, 146, 152, 154, 158, 164, 172]
+failing_cases = []
 
 rows = []
 
 modes = [
     {
-        "mode": "TRANSIT|WALK",
-        "category": "transit",
+        "mode": "FLEX_DIRECT|WALK",
+        "category": "flex-direct",
         "window": ""
     },
     {
         "mode": "FLEX_ACCESS|FLEX_EGRESS|TRANSIT",
-        "category": "flex",
+        "category": "flex-and-transit",
         "window": "6h"
     }
 ]

diff --git a/test/performance/washington-state/speed-test-config.json b/test/performance/washington-state/speed-test-config.json
@@ -1,6 +1,6 @@
 {
   // Run all test-cases on the given date
-  "testDate": "2022-11-01",
+  "testDate": "2024-10-17",
   "feedId": "1",
   // Default: "graph.obj"
   "graph": "graph.obj",