bw-functional 0b93__tar.gz → 0b95__tar.gz

{bw_functional-0b93/bw_functional.egg-info → bw_functional-0b95}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bw-functional
-Version: 0b93
+Version: 0b95
 Summary: Code for handling multifunctional activities in Brightway
 Author-email: Chris Mutel <cmutel@gmail.com>, Marin Visscher <m.r.visscher@cml.leidenuniv.nl>
 Maintainer-email: Marin Visscher <m.r.visscher@cml.leidenuniv.nl>

{bw_functional-0b93 → bw_functional-0b95}/bw_functional/convert.py

@@ -44,6 +44,10 @@ class SQLiteToFunctionalSQLite:
             function_key, function = cls.create_function(key, ds, amount=exchange["amount"])
             ds["exchanges"].pop(index)
 
+        ds.pop("reference product", None)
+        ds.pop("product", None)
+        ds.pop("unit", None)
+
         return {key: ds, function_key: function}
 
     @staticmethod

{bw_functional-0b93 → bw_functional-0b95}/bw_functional/database.py

@@ -266,7 +266,8 @@ class Build:
         """
         consumption = Build.consumption(nodes, exchanges)
         production = Build.production(nodes, exchanges)
-        return pd.concat([consumption, production])
+        substitution = Build.substitution(nodes, exchanges)
+        return pd.concat([consumption, production, substitution])
 
     @staticmethod
     def biosphere(nodes, exchanges):
@@ -300,6 +301,22 @@ class Build:
         x["flip"] = True
         return x[["row", "col", "amount", "flip"] + UNCERTAINTY_FIELDS]
 
+    @staticmethod
+    def substitution(nodes, exchanges):
+        """
+        Constructs the consumption flows by allocating technosphere exchanges.
+
+        Args:
+            nodes (pd.DataFrame): The dataframe containing node data.
+            exchanges (pd.DataFrame): The dataframe containing exchange data.
+
+        Returns:
+            pd.DataFrame: A dataframe containing allocated consumption flows with additional metadata.
+        """
+        x = Build.allocated(nodes, exchanges, ["substitution"])
+        x["flip"] = False
+        return x[["row", "col", "amount", "flip"] + UNCERTAINTY_FIELDS]
+
     @staticmethod
     def production(nodes, exchanges):
         """
@@ -389,7 +406,7 @@ class Mutate:
         # Distributions that use the standard method
         standard = [sa.NormalUncertainty.id, sa.UniformUncertainty.id, sa.TriangularUncertainty.id,
                     sa.WeibullUncertainty.id, sa.GammaUncertainty.id, sa.GeneralizedExtremeValueUncertainty.id,
-                    sa.UndefinedUncertainty, sa.NoUncertainty]
+                    sa.UndefinedUncertainty.id, sa.NoUncertainty.id]
         # Lognormal uncertainty
         ln = [sa.LognormalUncertainty.id]
 

{bw_functional-0b93 → bw_functional-0b95/bw_functional.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bw-functional
-Version: 0b93
+Version: 0b95
 Summary: Code for handling multifunctional activities in Brightway
 Author-email: Chris Mutel <cmutel@gmail.com>, Marin Visscher <m.r.visscher@cml.leidenuniv.nl>
 Maintainer-email: Marin Visscher <m.r.visscher@cml.leidenuniv.nl>