Merge remote-tracking branch 'origin/pathways' into pathways

polca · Aug 12, 2024 · ae9e6a4 · ae9e6a4
2 parents 1c88c22 + f715012
commit ae9e6a4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/premise/data/metals/activities_mapping.xlsx b/premise/data/metals/activities_mapping.xlsx
diff --git a/premise/transformation.py b/premise/transformation.py
@@ -67,7 +67,11 @@ def redefine_uncertainty_params(old_exc, new_exc):
 
         elif old_exc.get("uncertainty type") == 2:
             return (
-                math.log(new_exc["amount"] * -1) if new_exc["amount"] < 0 else math.log(new_exc["amount"]),
+                (
+                    math.log(new_exc["amount"] * -1)
+                    if new_exc["amount"] < 0
+                    else math.log(new_exc["amount"])
+                ),
                 old_exc.get("scale"),
                 None,
                 None,

diff --git a/premise/validation.py b/premise/validation.py
@@ -223,8 +223,6 @@ def check_uncertainty(self):
                     if exc.get("uncertainty type", 0) == 5 and "loc" not in exc:
                         exc["loc"] = exc["amount"]
 
-
-
     def check_datasets_integrity(self):
         # Verify no unintended loss of datasets
         original_activities = [