lca-algebraic 1.4.1.dev2__tar.gz → 1.4.1.dev3__tar.gz

{lca_algebraic-1.4.1.dev2 → lca_algebraic-1.4.1.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lca_algebraic
-Version: 1.4.1.dev2
+Version: 1.4.1.dev3
 Summary: This library provides a layer above Brightway for defining parametric models and running super fast LCA for monte carlo analysis.
 Author-email: OIE - Mines ParisTech <raphael.jolivet@mines-paristech.fr>
 License: BSD

{lca_algebraic-1.4.1.dev2 → lca_algebraic-1.4.1.dev3}/lca_algebraic/lca.py

@@ -658,6 +658,7 @@ def compute_inventory(
     impact_method=None,
     fields=["database", "name", "location", "unit"],
     scenario: Union[str, list[str], None] = None,
+    filter_zeros=True,
     **params,
 ):
     """
@@ -696,6 +697,8 @@ def compute_inventory(
     if impact_method is None:
         impact_method = UNITY_METHOD
 
+    zeros = np.full(len(scenario), 0.0)
+
     with temp_settings(factorize_static_bg=False):
         # Compute once the generic lambda expression
         lambda_exprs = _preMultiLCAAlgebric(model=model, methods=[impact_method], alpha=1 / functional_unit, scenarios=scenario)
@@ -708,7 +711,7 @@ def compute_inventory(
             impacts = lambda_expr.impacts_dict()
 
             # Build temp lambda with only a single act activated, the other impacts being set to Zero
-            filtered_impacts = {act: impacts[act] if act == bg_act else 0.0 for act in lambda_expr.background_activities}
+            filtered_impacts = {act: impacts[act] if act == bg_act else zeros for act in lambda_expr.background_activities}
 
             single_bg_expr = lambda_expr.with_impacts(filtered_impacts)
 
@@ -722,6 +725,9 @@ def compute_inventory(
         # Transform to dataframe
         items = []
         for act, values in val_by_act.items():
+            if filter_zeros and np.all(values == 0.0):
+                continue
+
             item = dict()
 
             for field in fields:
@@ -733,7 +739,7 @@ def compute_inventory(
                 item["value"] = values[0]
             else:
                 for i in range(0, len(values)):
-                    item[str(i + 1)] = values[i]
+                    item[scenario[i]] = values[i]
             items.append(item)
 
     return DataFrame(items)

{lca_algebraic-1.4.1.dev2 → lca_algebraic-1.4.1.dev3}/lca_algebraic.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lca_algebraic
-Version: 1.4.1.dev2
+Version: 1.4.1.dev3
 Summary: This library provides a layer above Brightway for defining parametric models and running super fast LCA for monte carlo analysis.
 Author-email: OIE - Mines ParisTech <raphael.jolivet@mines-paristech.fr>
 License: BSD

{lca_algebraic-1.4.1.dev2 → lca_algebraic-1.4.1.dev3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "lca_algebraic"
-version = "1.4.1.dev2"
+version = "1.4.1.dev3"
 
 description = "This library provides a layer above Brightway for defining parametric models and running super fast LCA for monte carlo analysis."
 readme = "README.md"

{lca_algebraic-1.4.1.dev2 → lca_algebraic-1.4.1.dev3}/test/test_premise.py

@@ -84,16 +84,18 @@ def test_compute_inventories_with_several_scenarios(data: DataFixture):
     resetDb(BG_DB1, foreground=False)
     resetDb(BG_DB2, foreground=False)
 
-    # Add twin BG activities
-    bg_act = newActivity(BG_DB1, name="bg_act", unit="kg", exchanges={data.bio1: 1.0})
+    # Add twin BG activities with two different values
+    bga = newActivity(BG_DB1, name="bg_a", unit="kg", exchanges={data.bio1: 1.0})
+    bga_ = newActivity(BG_DB2, name="bg_a", unit="kg", exchanges={data.bio1: 2.0})
 
-    # Same activitiy with different exchange in scenario 2
-    bg_act2 = newActivity(BG_DB2, name="bg_act", unit="kg", exchanges={data.bio1: 2.0})
+    # Add twin BG activities with two different values ibio2
+    bgb = newActivity(BG_DB1, name="bg_b", unit="kg", exchanges={data.bio2: 1.0})
+    bgb_ = newActivity(BG_DB2, name="bg_b", unit="kg", exchanges={data.bio2: 2.0})
 
     # Build parametrized model on BG1
     p1 = newFloatParam("p1", default=1, min=0, max=1)
 
-    fg_act = newActivity(USER_DB, "fg", "kg", {bg_act: p1})
+    fg_act = newActivity(USER_DB, "fg", "kg", {bga: p1, bgb: 1.0})
 
     # Raw impacts without scenario : targeting scen1
     res = compute_inventory(model=fg_act, impact_method=data.ibio1, p1=[1.0, 2.0], scenario=["scen1", "scen2"])
@@ -101,7 +103,7 @@ def test_compute_inventories_with_several_scenarios(data: DataFixture):
     assert_frame_equal(
         rtol=1e-03,
         left=res,
-        right=DataFrame([{"database": "bg#scen1", "name": "bg_act", "location": "GLO", "unit": "kg", "1": 1.0, "2": 4.0}]),
+        right=DataFrame([{"database": "bg#scen1", "name": "bg_a", "location": "GLO", "unit": "kg", "scen1": 1.0, "scen2": 4.0}]),
     )