Merge pull request #1437 from mrvisscher/fix-paramter-mc

Fixed parameter manager for Monte Carlo runs

Author: marc-vdm

activity_browser/bwutils/manager.py

@@ -300,13 +300,8 @@ class MonteCarloParameterManager(ParameterManager, Iterator):
 
     def __init__(self, seed: Optional[int] = None):
         super().__init__()
-        parameters = itertools.chain(
-            ProjectParameter.select(),
-            DatabaseParameter.select(),
-            ActivityParameter.select(),
-        )
         self.uncertainties = UncertaintyBase.from_dicts(
-            *[getattr(p, "data", {}) for p in parameters]
+            *[p.data for p in self.parameters]
         )
         self.mc_generator = MCRandomNumberGenerator(self.uncertainties, seed=seed)
 
@@ -340,7 +335,8 @@ def next(self) -> np.ndarray:
         recalculation.
         """
         values = self.mc_generator.next()
-        self.parameters.update(values)
+        keys = [(p.group, p.name) for p in self.parameters]
+        self.parameters.update({key: value for key, value in zip(keys, values)})
         data = self.calculate()
         return self.indices.mock_params(data)
 

activity_browser/bwutils/utils.py

@@ -3,6 +3,7 @@
 from typing import Iterable, List, NamedTuple, Optional
 
 import numpy as np
+from stats_arrays import UncertaintyBase
 
 from activity_browser.mod import bw2data as bd
 from activity_browser.mod.bw2data.backends import (ActivityDataset,
@@ -26,6 +27,7 @@ class Parameter(NamedTuple):
     name: str
     group: str
     amount: float = 1.0
+    data: dict = {}
     param_type: Optional[str] = None
 
     def as_gsa_tuple(self) -> tuple:
@@ -131,15 +133,15 @@ def from_bw_parameters(cls) -> "Parameters":
         return cls(
             chain(
                 (
-                    Parameter(p.name, "project", p.amount, "project")
+                    Parameter(p.name, "project", p.amount, p.data, "project")
                     for p in ProjectParameter.select()
                 ),
                 (
-                    Parameter(p.name, p.database, p.amount, "database")
+                    Parameter(p.name, p.database, p.amount, p.data, "database")
                     for p in DatabaseParameter.select()
                 ),
                 (
-                    Parameter(p.name, p.group, p.amount, "activity")
+                    Parameter(p.name, p.group, p.amount, p.data, "activity")
                     for p in ActivityParameter.select()
                 ),
             )
@@ -159,7 +161,7 @@ def static(data: dict, needed: set) -> dict:
         """
         return {k: data[k] for k in data.keys() & needed}
 
-    def update(self, new_values: dict[str, float]) -> None:
+    def update(self, new_values: dict[tuple[str, str], float]) -> None:
         """Replace parameters in the list if their linked value is not
         NaN.
         """