From 3f23b497f979a1cd6b721f47f13e72cb7b30661f Mon Sep 17 00:00:00 2001
From: Petr Hajduk <petr.hajduk@hsl.fi>
Date: Fri, 29 Nov 2024 12:58:02 +0200
Subject: [PATCH] The call to extra transformers was somehow dropped, added it
 back. Tests now work.

---
 Scripts/tests/integration/test_models.py   | 2 +-
 Scripts/tests/unit/test_logit.py           | 1 +
 Scripts/transform/impedance_transformer.py | 7 +++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Scripts/tests/integration/test_models.py b/Scripts/tests/integration/test_models.py
index 039c2e5b..5db3234a 100644
--- a/Scripts/tests/integration/test_models.py
+++ b/Scripts/tests/integration/test_models.py
@@ -56,7 +56,7 @@ def test_models(self):
         self._validate_impedances(impedance["iht"])
 
         # Check that model result does not change
-        self.assertAlmostEquals(model.mode_share[0]["car"], 0.2115956440248976)
+        self.assertAlmostEquals(model.mode_share[0]["car"], 0.1757067922429178)
         
         print("Model system test done")
     
diff --git a/Scripts/tests/unit/test_logit.py b/Scripts/tests/unit/test_logit.py
index 5746ecee..19ab58ea 100644
--- a/Scripts/tests/unit/test_logit.py
+++ b/Scripts/tests/unit/test_logit.py
@@ -39,6 +39,7 @@ class Purpose:
             },
             "bike": {
                 "dist": mtx,
+                "time": mtx,
             },
             "walk": {
                 "dist": mtx,
diff --git a/Scripts/transform/impedance_transformer.py b/Scripts/transform/impedance_transformer.py
index 3f22ff87..8d31d0df 100644
--- a/Scripts/transform/impedance_transformer.py
+++ b/Scripts/transform/impedance_transformer.py
@@ -128,6 +128,13 @@ def transform(self, purpose, impedance):
         for i in range(1, len(purpose.sub_bounds)):
             trips_per_month[purpose.sub_bounds[i], :] = trips_month[i]
         day_imp["transit"]["cost"] /= trips_per_month
+
+        # Process possible extra transformers (eg. P&R impedance)
+        for transformer in self._extra_transformers:
+            extra_results = transformer.transform(purpose, impedance)
+            for result_name, result in extra_results.items():
+                day_imp[result_name] = result
+                
         # Add parking time to car matrices
         if parking_time is not None:
             ptime = parking_time(purpose.zone_data).to_numpy()[cols]