Regenerate prebaked data. #1118

a-b-street · Sep 29, 2023 · abcf812 · abcf812
1 parent 419f96c
commit abcf812
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 35 deletions.
diff --git a/apps/game/src/challenges/prebake.rs b/apps/game/src/challenges/prebake.rs
@@ -24,18 +24,20 @@ pub fn prebake_all() {
     }
 
     let mut summaries = Vec::new();
-    for name in vec![
-        //MapName::seattle("arboretum"),
-        MapName::seattle("montlake"),
-        //MapName::seattle("lakeslice"),
-        //MapName::seattle("phinney"),
-        //MapName::seattle("qa"),
-        //MapName::seattle("wallingford"),
-    ] {
-        let map = map_model::Map::load_synchronously(name.path(), &mut timer);
-        let scenario: Scenario =
-            abstio::read_binary(abstio::path_scenario(map.get_name(), "weekday"), &mut timer);
-        summaries.push(prebake(&map, scenario, &mut timer));
+    if false {
+        for name in vec![
+            //MapName::seattle("arboretum"),
+            MapName::seattle("montlake"),
+            //MapName::seattle("lakeslice"),
+            //MapName::seattle("phinney"),
+            //MapName::seattle("qa"),
+            //MapName::seattle("wallingford"),
+        ] {
+            let map = map_model::Map::load_synchronously(name.path(), &mut timer);
+            let scenario: Scenario =
+                abstio::read_binary(abstio::path_scenario(map.get_name(), "weekday"), &mut timer);
+            summaries.push(prebake(&map, scenario, &mut timer));
+        }
     }
 
     // Since adding off-map traffic, these all gridlock now

diff --git a/data/MANIFEST.json b/data/MANIFEST.json
@@ -1906,9 +1906,9 @@
       "compressed_size_bytes": 322827
     },
     "data/system/br/sao_paulo/prebaked_results/sao_miguel_paulista/Full.bin": {
-      "checksum": "fe10522df3baefe2af326e9c2faaea0e",
-      "uncompressed_size_bytes": 26172612,
-      "compressed_size_bytes": 8964604
+      "checksum": "69970fe65718df6be06b0a84d07da7c2",
+      "uncompressed_size_bytes": 19793161,
+      "compressed_size_bytes": 6980768
     },
     "data/system/br/sao_paulo/scenarios/sao_miguel_paulista/Full.bin": {
       "checksum": "f464d2228d1686c06c45c79ac1e6b405",
@@ -3945,11 +3945,6 @@
       "uncompressed_size_bytes": 5138080,
       "compressed_size_bytes": 1902328
     },
-    "data/system/ir/tehran/prebaked_results/parliament/random people going to and from work.bin": {
-      "checksum": "2946cf0560b72d968ca86080a6e4259a",
-      "uncompressed_size_bytes": 7366156,
-      "compressed_size_bytes": 2618945
-    },
     "data/system/jp/hiroshima/maps/uni.bin": {
       "checksum": "f10b26db68c0e1ef55c73e202e63b14b",
       "uncompressed_size_bytes": 1672245,
@@ -4195,11 +4190,6 @@
       "uncompressed_size_bytes": 4884,
       "compressed_size_bytes": 1436
     },
-    "data/system/us/seattle/prebaked_results/montlake/weekday.bin": {
-      "checksum": "b804537cfad1e1b2f766e3e6af04ff75",
-      "uncompressed_size_bytes": 9608528,
-      "compressed_size_bytes": 3698888
-    },
     "data/system/us/seattle/scenarios/arboretum/weekday.bin": {
       "checksum": "5e101af7dfcdd4792962b06ff9f76362",
       "uncompressed_size_bytes": 2739669,

diff --git a/tests/goldenfiles/prebaked_summaries.json b/tests/goldenfiles/prebaked_summaries.json
@@ -1,16 +1,9 @@
 [
-  {
-    "map": "montlake (in seattle (us))",
-    "scenario": "weekday",
-    "finished_trips": 36247,
-    "cancelled_trips": 549,
-    "total_trip_duration_seconds": 27149692.881700013
-  },
   {
     "map": "sao_miguel_paulista (in sao_paulo (br))",
     "scenario": "Full",
-    "finished_trips": 115166,
-    "cancelled_trips": 6178,
-    "total_trip_duration_seconds": 42328660.89240033
+    "finished_trips": 114679,
+    "cancelled_trips": 6665,
+    "total_trip_duration_seconds": 59147450.89379932
   }
 ]