Client rewrite and METS-R model expansion.

BerkeleyLearnVerify · Oct 30, 2024 · df47b2e · df47b2e
1 parent a27e06e
commit df47b2e
Show file tree

Hide file tree

Showing 5 changed files with 221 additions and 474 deletions.
diff --git a/examples/metsr/test.scenic b/examples/metsr/test.scenic
@@ -1,9 +1,24 @@
+param startTime = 0
+param map = "CARLA_TOWN5"
 model scenic.simulators.metsr.model
 
-zone_2_center = (-0.0024190, -0.0000165, 0)
-zone_9_center = (0.0013876, -0.0000135, 0)
+scenario CustomCommuterTrafficStream(origin, destination):
+    setup:
+        num_commuters = Range(100, 200)
+        morning_peak_time = 1*60*60 # Normal(9*60*60, 30*60)
+        evening_peak_time = 2*60*60 # Normal(17*60*60, 30*60)
+        traffic_stddev = 15*60 # Normal(1*60*60, 10*60)
 
+    compose:
+        do CommuterTrafficStream(origin, destination, num_commuters,
+                    morning_peak_time, evening_peak_time, traffic_stddev)
 
 scenario Main():
     compose:
-        do ConstantTrafficStream(2,9,60)
+        ts_2_21  = CustomCommuterTrafficStream(2, 21)
+        ts_3_21  = CustomCommuterTrafficStream(3, 21)
+        ts_4_21  = CustomCommuterTrafficStream(4, 21)
+        ts_7_21  = CustomCommuterTrafficStream(7, 21)
+        ts_11_21 = CustomCommuterTrafficStream(11, 21)
+
+        do ts_2_21, ts_3_21, ts_4_21, ts_7_21, ts_11_21 for 3*60*60 seconds # 16*60*60 seconds