Allow half-hourly truck arrival distributions

conflowgen/api/container_dwell_time_distribution_manager.py

@@ -62,7 +62,8 @@ def set_container_dwell_time_distribution(
         )
         DataSummariesCache.reset_cache()
 
-    def get_average_container_dwell_time(self, start_date: datetime.date, end_date: datetime.date) -> float:
+    @staticmethod
+    def get_average_container_dwell_time(start_date: datetime.date, end_date: datetime.date) -> float:
         """
         Uses :class:`.ModeOfTransportDistributionManager` to calculate the expected average container dwell time
         based on the scheduled container flow.

conflowgen/api/truck_arrival_distribution_manager.py

@@ -29,7 +29,7 @@ def get_truck_arrival_distribution(self) -> typing.Dict[int, float]:
         """
         return self.truck_arrival_distribution_repository.get_distribution()
 
-    def set_truck_arrival_distribution(self, distribution: typing.Dict[int, float]) -> None:
+    def set_truck_arrival_distribution(self, distribution: typing.Dict[float, float]) -> None:
         """
 
         Args:
@@ -40,7 +40,7 @@ def set_truck_arrival_distribution(self, distribution: typing.Dict[int, float])
         """
         sanitized_distribution = self._normalize_and_validate_distribution_without_dependent_variables(
             distribution,
-            int,
+            float,
             values_are_frequencies=True
         )
         self.truck_arrival_distribution_repository.set_distribution(sanitized_distribution)

conflowgen/domain_models/distribution_models/truck_arrival_distribution.py

@@ -1,11 +1,11 @@
-from peewee import FloatField, IntegerField
+from peewee import FloatField
 
 from conflowgen.domain_models.base_model import BaseModel
 
 
 class TruckArrivalDistribution(BaseModel):
     """The truck arrival distribution (both inbound and outbound journeys)"""
-    hour_in_the_week = IntegerField(null=False, primary_key=True, unique=True)
+    hour_in_the_week = FloatField(null=False, primary_key=True, unique=True)
     fraction = FloatField(null=False)
 
     def __repr__(self):

conflowgen/domain_models/distribution_validators.py

@@ -135,7 +135,7 @@ def _check_all_keys_are_of_intended_primitive_type(
     return sanitized_distribution
 
 
-SUPPORTED_PRIMITIVE_KEY_TYPES = (int, )
+SUPPORTED_PRIMITIVE_KEY_TYPES = (int, float)
 
 
 def _check_all_required_keys_are_set_in_distribution(
@@ -194,7 +194,7 @@ def _check_value_range_of_frequencies_in_distribution(
 
 def validate_distribution_with_no_dependent_variables(
         distribution: Dict[enum.Enum | int, Any],
-        key_type: Type[enum.Enum] | Type[int],
+        key_type: Type[enum.Enum] | Type[float],
         values_are_frequencies: bool
 ) -> Dict[enum.Enum | int, float]:
     sanitized_distribution = _check_all_required_keys_are_set_in_distribution(distribution, key_type)

conflowgen/previews/truck_gate_throughput_preview_report.py

@@ -3,6 +3,8 @@
 import pandas as pd
 
 import matplotlib
+import matplotlib.ticker
+import matplotlib.axes
 from matplotlib import pyplot as plt
 
 from conflowgen.domain_models.data_types.mode_of_transport import ModeOfTransport
@@ -63,7 +65,7 @@ def get_report_as_text(self, inbound: bool = True, outbound: bool = True, **kwar
         count = 0
         # Find min, max, and average for each day of the week
         for time in sorted(truck_distribution):
-            day = time // 24
+            day = int(time // 24)
             if day == 0:
                 count += 1  # Count the number of data points in a single day
             data[day]['minimum'] = min(data[day]['minimum'], truck_distribution[time])