uses new parameter format for non-demographic growth

Author: tomjemmett

model/activity_resampling.py

@@ -213,7 +213,12 @@ def non_demographic_adjustment(self):
         ):
             return self
 
-        year_exponent = self.run_params["year"] - self.params["start_year"]
+        match self.params["non-demographic_adjustment"]["value-type"]:
+            case "year-on-year-growth":
+                year_exponent = self.run_params["year"] - self.params["start_year"]
+            case x:
+                raise ValueError(f"invalid value-type: {x}")
+
         factor = pd.Series(params).rename("non-demographic_adjustment") ** year_exponent
         factor.index.names = ["ndggrp"]
         return self._update(factor)

model/model.py

@@ -240,6 +240,10 @@ def generate_param_values(prm, valid_range):
                 rng,
                 model_runs - 1,
             ),
+            "non-demographic_adjustment": {
+                k: generate_param_values(v, inrange_0_5)
+                for k, v in params["non-demographic_adjustment"]["values"].items()
+            },
             # generate param values for the different items in params: this will traverse the dicts
             # until a value is reached that isn't a dict. Then it will generate the required amount
             # of values for that parameter
@@ -252,7 +256,6 @@ def generate_param_values(prm, valid_range):
                     ("repat_local", inrange_1_5),
                     ("repat_nonlocal", inrange_1_5),
                     ("baseline_adjustment", inrange_0_5),
-                    ("non-demographic_adjustment", inrange_0_5),
                     ("activity_avoidance", inrange_0_1),
                     ("efficiencies", inrange_0_1),
                 ]

queue/sample_params.json

@@ -825,43 +825,47 @@
     }
   },
   "non-demographic_adjustment": {
-    "ip": {
-      "elective": [
-        1,
-        1.02
-      ],
-      "non-elective": [
-        1,
-        1.02
-      ],
-      "maternity": [
-        1,
-        1.02
-      ]
-    },
-    "op": {
-      "first": [
-        1,
-        1.02
-      ],
-      "followup": [
-        1,
-        1.02
-      ],
-      "procedure": [
-        1,
-        1.02
-      ]
-    },
-    "aae": {
-      "ambulance": [
-        1,
-        1.02
-      ],
-      "walk-in": [
-        1,
-        1.02
-      ]
+    "variant": "ndg-test",
+    "value-type": "year-on-year-growth",
+    "values": {
+      "ip": {
+        "elective": [
+          1,
+          1.02
+        ],
+        "non-elective": [
+          1,
+          1.02
+        ],
+        "maternity": [
+          1,
+          1.02
+        ]
+      },
+      "op": {
+        "first": [
+          1,
+          1.02
+        ],
+        "followup": [
+          1,
+          1.02
+        ],
+        "procedure": [
+          1,
+          1.02
+        ]
+      },
+      "aae": {
+        "ambulance": [
+          1,
+          1.02
+        ],
+        "walk-in": [
+          1,
+          1.02
+        ]
+      }
     }
   },
   "activity_avoidance": {

tests/test_activity_resampling.py

@@ -491,7 +491,13 @@ def test_non_demographic_adjustment(
             "aae": {"ambulance": 5, "walk-in": 6},
         },
     }
-    aa_mock._model_iteration.params = {"start_year": 2020}
+    aa_mock._model_iteration.params = {
+        "start_year": 2020,
+        "non-demographic_adjustment": {
+            "variant": "ndg-test",
+            "value-type": "year-on-year-growth",
+        },
+    }
 
     u_mock = mocker.patch(
         "model.activity_resampling.ActivityResampling._update", return_value="update"
@@ -505,6 +511,29 @@ def test_non_demographic_adjustment(
     assert u_mock.call_args[0][0].to_dict() == expected
 
 
+def test_non_demographic_adjustment_invalid_value_type(mock_activity_resampling):
+    # arrange
+    aa_mock = mock_activity_resampling
+    aa_mock._model_iteration.model.model_type = "ip"
+    aa_mock._model_iteration.run_params = {
+        "year": 2021,
+        "non-demographic_adjustment": {
+            "ip": {"elective": 1, "non-elective": 2},
+        },
+    }
+    aa_mock._model_iteration.params = {
+        "start_year": 2020,
+        "non-demographic_adjustment": {
+            "variant": "ndg-test",
+            "value-type": "invalid",
+        },
+    }
+
+    # act
+    with pytest.raises(ValueError, match="invalid value-type: invalid"):
+        aa_mock.non_demographic_adjustment()
+
+
 def test_apply_resampling(mock_activity_resampling):
     # arrange
     aa_mock = mock_activity_resampling

tests/test_model.py

@@ -40,8 +40,12 @@ def mock_model():
         "repat_nonlocal": {"ip": {"elective": {"Other": [1.3, 1.5]}}},
         "baseline_adjustment": {"ip": {"elective": {"Other": [1.5, 1.7]}}},
         "non-demographic_adjustment": {
-            "a": {"a_a": [1, 1.2], "a_b": [1, 1.2]},
-            "b": {"b_a": [1, 1.2], "b_b": [1, 1.2]},
+            "variant": "ndg-test",
+            "variant-type": "year-on-year-growth",
+            "values": {
+                "a": {"a_a": [1, 1.2], "a_b": [1, 1.2]},
+                "b": {"b_a": [1, 1.2], "b_b": [1, 1.2]},
+            },
         },
         "activity_avoidance": {
             "ip": {
@@ -79,19 +83,19 @@ def mock_run_params():
         "variant": ["a", "a", "b", "a"],
         "seeds": [1, 2, 3, 4],
         "health_status_adjustment": [1, 2, 3, 4, 5],
-        "covid_adjustment": [1, 1, 2, 3],
-        "waiting_list_adjustment": {
-            "ip": {"100": [1] * 4, "120": [2] * 4},
-            "op": {"100": [3] * 4, "120": [4] * 4},
-        },
-        "expat": {"ip": {"elective": {"Other": [1, 4, 5, 6]}}},
-        "repat_local": {"ip": {"elective": {"Other": [1, 7, 8, 9]}}},
-        "repat_nonlocal": {"ip": {"elective": {"Other": [1, 10, 11, 12]}}},
-        "baseline_adjustment": {"ip": {"elective": {"Other": [1, 13, 14, 15]}}},
         "non-demographic_adjustment": {
-            "a": {"a_a": [1, 16, 17, 18], "a_b": [1, 19, 20, 21]},
-            "b": {"b_a": [1, 22, 23, 24], "b_b": [1, 25, 26, 27]},
+            "a": {"a_a": [1, 1, 2, 3], "a_b": [1, 4, 5, 6]},
+            "b": {"b_a": [1, 7, 8, 9], "b_b": [1, 10, 11, 12]},
         },
+        "covid_adjustment": [1, 13, 14, 15],
+        "waiting_list_adjustment": {
+            "ip": {"100": [1, 1, 1, 1], "120": [2, 2, 2, 2]},
+            "op": {"100": [3, 3, 3, 3], "120": [4, 4, 4, 4]},
+        },
+        "expat": {"ip": {"elective": {"Other": [1, 16, 17, 18]}}},
+        "repat_local": {"ip": {"elective": {"Other": [1, 19, 20, 21]}}},
+        "repat_nonlocal": {"ip": {"elective": {"Other": [1, 22, 23, 24]}}},
+        "baseline_adjustment": {"ip": {"elective": {"Other": [1, 25, 26, 27]}}},
         "activity_avoidance": {
             "ip": {"a_a": [1, 28, 29, 30], "a_b": [1, 31, 32, 33]},
             "op": {"a_a": [1, 34, 35, 36], "a_b": [1, 37, 38, 39]},
@@ -467,15 +471,19 @@ def get_next_n(*args):  # pylint: disable=unused-argument
                 "variant": "b",
                 "seed": 3,
                 "health_status_adjustment": 3,
-                "covid_adjustment": 2,
                 "non-demographic_adjustment": {
-                    "a": {"a_a": 17, "a_b": 20},
-                    "b": {"b_a": 23, "b_b": 26},
+                    "a": {"a_a": 2, "a_b": 5},
+                    "b": {"b_a": 8, "b_b": 11},
                 },
-                "expat": {"ip": {"elective": {"Other": 5}}},
-                "repat_local": {"ip": {"elective": {"Other": 8}}},
-                "repat_nonlocal": {"ip": {"elective": {"Other": 11}}},
-                "baseline_adjustment": {"ip": {"elective": {"Other": 14}}},
+                "covid_adjustment": 14,
+                "waiting_list_adjustment": {
+                    "ip": {"100": 1, "120": 2},
+                    "op": {"100": 3, "120": 4},
+                },
+                "expat": {"ip": {"elective": {"Other": 17}}},
+                "repat_local": {"ip": {"elective": {"Other": 20}}},
+                "repat_nonlocal": {"ip": {"elective": {"Other": 23}}},
+                "baseline_adjustment": {"ip": {"elective": {"Other": 26}}},
                 "activity_avoidance": {
                     "ip": {"a_a": 29, "a_b": 32},
                     "op": {"a_a": 35, "a_b": 38},
@@ -485,10 +493,6 @@ def get_next_n(*args):  # pylint: disable=unused-argument
                     "ip": {"b_a": 47, "b_b": 50},
                     "op": {"b_a": 53, "b_b": 56},
                 },
-                "waiting_list_adjustment": {
-                    "ip": {"100": 1, "120": 2},
-                    "op": {"100": 3, "120": 4},
-                },
                 "year": 2020,
             },
         ),