add ProbabilisticTemplateGenerator for person template

examples/gen_pt_drivers.py

@@ -1,4 +1,5 @@
-from mosstool.trip.generator.generate_from_od import TripGenerator
+from mosstool.trip.generator import (TripGenerator,
+ default_bus_template_generator)
 from mosstool.type import Map, Persons
 
 # map from `./examples/add_pt_to_map.py` and `./examples/add_pt_post_process.py`
@@ -7,6 +8,7 @@
  m.ParseFromString(f.read())
 tg = TripGenerator(
  m=m,
+ template_func=default_bus_template_generator,
 )
 bus_drivers = tg.generate_public_transport_drivers()
 persons_output_path = "data/temp/bus_drivers.pb"

examples/random_persons.py

@@ -1,4 +1,5 @@
-from mosstool.trip.generator import (DEFAULT_PERSON, PositionMode,
+from mosstool.trip.generator import (PositionMode,
+ ProbabilisticTemplateGenerator,
  RandomGenerator)
 from mosstool.trip.route import RoutingClient, pre_route
 from mosstool.type import Map, Person, Persons, TripMode
@@ -9,18 +10,15 @@ async def main():
  with open("data/temp/map.pb", "rb") as f:
  m = Map()
  m.ParseFromString(f.read())
-
- template = Person()
- template.CopyFrom(DEFAULT_PERSON)
- template.vehicle_attribute.model = "normal"
- template.pedestrian_attribute.model = "normal"
+ pg = ProbabilisticTemplateGenerator(
+ headway_values=[1.5, 2, 2.5], headway_probabilities=[1, 1, 1]
+ )
  rg = RandomGenerator(
  m,
  [PositionMode.LANE, PositionMode.LANE],
  TripMode.TRIP_MODE_DRIVE_ONLY,
- template=template,
+ template_func=pg.template_generator,
  )
-
  persons = rg.uniform(
  num=100,
  first_departure_time_range=(8 * 3600, 9 * 3600),
@@ -43,6 +41,7 @@ async def main():
  with open("data/temp/persons.json", "w") as f:
  f.write(pb2json(pb))
 
+
 if __name__ == "__main__":
  import asyncio
 

mosstool/trip/generator/__init__.py

@@ -2,10 +2,14 @@
 from .generate_from_od import TripGenerator
 from .gravity import GravityGenerator
 from .random import PositionMode, RandomGenerator
-from .template import DEFAULT_PERSON
+from .template import (ProbabilisticTemplateGenerator,
+ default_bus_template_generator,
+ default_vehicle_template_generator)
 
 __all__ = [
- "DEFAULT_PERSON",
+ "ProbabilisticTemplateGenerator",
+ "default_vehicle_template_generator",
+ "default_bus_template_generator",
  "RandomGenerator",
  "PositionMode",
  "GravityGenerator",