weights added to the simple version of the costing algorithm

cads_adaptors/adaptors/cds.py

@@ -90,7 +90,9 @@ def estimate_costs(self, request: Request, **kwargs: Any) -> dict[str, int]:
                 **costing_kwargs,
             )
         # size is a fast and rough estimate of the number of fields
-        costs["size"] = costing.estimate_number_of_fields(self.form, mapped_request)
+        costs["size"] = costing.estimate_number_of_fields(
+            self.form, mapped_request, **costing_kwargs
+        )
         # Safety net for integration tests:
         costs["number_of_fields"] = costs["size"]
         return costs

cads_adaptors/costing.py

@@ -193,17 +193,27 @@ def get_excluded_keys(
 def estimate_number_of_fields(
     form: list[dict[str, Any]] | dict[str, Any] | None,
     request: dict[str, Any],
+    **kwargs,
 ) -> int:
+    weighted_values = kwargs.get("weighted_values", {})
+    weighted_keys = kwargs.get("weighted_keys", {})
     excluded_variables = get_excluded_keys(form)
     number_of_values = []
     for variable_id, variable_value in request.items():
+        weights_v = weighted_values.get(variable_id, {})
+        weight_k = weighted_keys.get(variable_id, 1)
         if isinstance(variable_value, set):
             variable_value = list(variable_value)
         if not isinstance(variable_value, (list, tuple)):
             variable_value = [
                 variable_value,
             ]
         if variable_id not in excluded_variables:
-            number_of_values.append(len(variable_value))
+            # Extend values according to weights
+            for val, weight in weights_v.items():
+                if val in variable_value:
+                    variable_value.extend([val] * (weight - 1))
+            # Append number of values, multiplied by weight
+            number_of_values.append(len(variable_value) * weight_k)
     number_of_fields = math.prod(number_of_values)
     return number_of_fields

tests/test_10_costing.py

@@ -746,7 +746,7 @@ def test_estimate_costs_2() -> None:
     )
     costs = weighted_adaptor.estimate_costs(request)
     assert costs["precise_size"] == 8
-    assert costs["size"] == 2
+    assert costs["size"] == 8
 
     request = {
         "variable": "maximum_temperature",
@@ -762,4 +762,4 @@ def test_estimate_costs_2() -> None:
     }
     costs = weighted_adaptor.estimate_costs(request)
     assert costs["precise_size"] == 10
-    assert costs["size"] == 2
+    assert costs["size"] == 10