Merge branch 'main' into develop

src/urban_meal_delivery/configuration.py

@@ -49,9 +49,9 @@ class Config:
     TIME_STEPS = [60]
 
     # Training horizons (in full weeks) used to train the forecasting models.
-    # For now, we only use 8 weeks as that was the best performing in
+    # For now, we only use 7 and 8 weeks as that was the best performing in
     # a previous study (note:4f79e8fa).
-    TRAIN_HORIZONS = [8]
+    TRAIN_HORIZONS = [7, 8]
 
     # The demand forecasting methods used in the simulations.
     FORECASTING_METHODS = ['hets', 'rtarima']

src/urban_meal_delivery/console/forecasts.py

@@ -104,8 +104,13 @@ def tactical_heuristic(  # noqa:C901,WPS213,WPS216,WPS231
         # commands are added the make `Forecast`s without the heuristic!
         # Continue with forecasting on the day the last prediction was made ...
         last_predict_at = (  # noqa:ECE001
-            db.session.query(func.max(db.Forecast.start_at))
+            db.session.query(func.max(db.Forecast.start_at))  # noqa:WPS221
+            .join(db.Pixel, db.Forecast.pixel_id == db.Pixel.id)
+            .join(db.Grid, db.Pixel.grid_id == db.Grid.id)
             .filter(db.Forecast.pixel == pixel)
+            .filter(db.Grid.side_length == side_length)
+            .filter(db.Forecast.time_step == time_step)
+            .filter(db.Forecast.train_horizon == train_horizon)
             .first()
         )[0]
         # ... or start `train_horizon` weeks after the first `Order`

src/urban_meal_delivery/forecasts/timify.py

@@ -542,9 +542,9 @@ class OrderHistory:
             pixel_id=pixel_id, predict_day=predict_day, train_horizon=train_horizon,
         )
 
-        # For now, we only make forecasts with 8 weeks
+        # For now, we only make forecasts with 7 and 8 weeks
         # as the training horizon (note:4f79e8fa).
-        if train_horizon == 8:
+        if train_horizon in {7, 8}:
             if add >= 25:  # = "high demand"
                 return models.HorizontalETSModel(order_history=self)
             elif add >= 10:  # = "medium demand"

src/urban_meal_delivery/init_r.py

@@ -3,7 +3,7 @@
 The purpose of this module is to import all the R packages that are installed
 into a sub-folder (see `config.R_LIBS_PATH`) in the project's root directory.
 
-The Jupyter notebook "research/r_dependencies.ipynb" can be used to install all
+The Jupyter notebook "research/00_r_dependencies.ipynb" can be used to install all
 R dependencies on a Ubuntu/Debian based system.
 """
 
@@ -24,5 +24,5 @@ try:  # noqa:WPS229
     rpackages.importr('zoo')
 
 except rpackages.PackageNotInstalledError:  # pragma: no cover
-    msg = 'See the "research/r_dependencies.ipynb" notebook!'
+    msg = 'See the "research/00_r_dependencies.ipynb" notebook!'
     raise rpackages.PackageNotInstalledError(msg) from None