geometallurgy 0.4.14__tar.gz → 0.4.16__tar.gz

{geometallurgy-0.4.14 → geometallurgy-0.4.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geometallurgy
-Version: 0.4.14
+Version: 0.4.16
 Summary: Tools for the geometallurgist
 Home-page: https://github.com/elphick/geometallurgy
 Author: Greg
@@ -14,7 +14,7 @@ Provides-Extra: blockmodel
 Provides-Extra: spatial
 Provides-Extra: validation
 Requires-Dist: folium (>=0.16.0,<0.17.0) ; extra == "spatial"
-Requires-Dist: omfpandas (>=0.8.1,<0.9.0) ; extra == "blockmodel"
+Requires-Dist: omfpandas (>=0.8.1) ; extra == "blockmodel"
 Requires-Dist: omfvista (>=0.3.0) ; extra == "blockmodel"
 Requires-Dist: pandas (>=1.0)
 Requires-Dist: pandera[io] (>=0.19.3,<0.21.0) ; extra == "validation"

{geometallurgy-0.4.14 → geometallurgy-0.4.16}/elphick/geomet/flowsheet/flowsheet.py

@@ -264,6 +264,8 @@ class Flowsheet:
         records.columns = [f"{col[0]}_{col[1]}" for col in records.columns]
 
         result = unhealthy_data.merge(records, left_index=True, right_index=True, how='left')
+        # add stream to the index
+        result.set_index('stream', append=True, inplace=True)
         return result
 
     def unhealthy_node_records(self) -> pd.DataFrame:
@@ -278,9 +280,9 @@ class Flowsheet:
                                'mc'].is_balanced]
         unhealthy_data: pd.DataFrame = pd.concat(
             [self.graph.nodes[n]['mc'].unbalanced_records.assign(node=self.graph.nodes[n]['mc'].name) for n in
-             unhealthy_nodes], axis=1)
-        # move the last column to the front
-        unhealthy_data = unhealthy_data[[unhealthy_data.columns[-1]] + list(unhealthy_data.columns[:-1])]
+             unhealthy_nodes], axis=0)
+        # add the node to the index
+        unhealthy_data = unhealthy_data.set_index('node', append=True)
 
         # todo: append  the streams around the node
 

{geometallurgy-0.4.14 → geometallurgy-0.4.16}/elphick/geomet/flowsheet/operation.py

@@ -102,9 +102,8 @@ class Operation:
             return None
 
         input_mass, output_mass = self.get_input_mass(), self.get_output_mass()
-        is_balanced = np.all(np.isclose(input_mass.fillna(0.0), output_mass.fillna(0.0)))
-        self._unbalanced_records = (input_mass - output_mass).loc[~np.isclose(input_mass, output_mass).any(axis=1)]
-        self._is_balanced = is_balanced
+        self._unbalanced_records = (input_mass - output_mass).loc[(~np.isclose(input_mass, output_mass)).any(axis=1)]
+        self._is_balanced = self._unbalanced_records.shape[0] == 0
 
     @property
     def is_balanced(self) -> Optional[bool]:

{geometallurgy-0.4.14 → geometallurgy-0.4.16}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "geometallurgy"
 packages = [{ include = "elphick/geomet" }]
-version = "0.4.14"
+version = "0.4.16"
 description = "Tools for the geometallurgist"
 authors = ["Greg <11791585+elphick@users.noreply.github.com>"]
 repository = "https://github.com/elphick/geometallurgy"
@@ -45,7 +45,7 @@ pyarrow = ">=16.1.0,<18.0.0"
 folium = { version = "^0.16.0", optional = true }
 rioxarray = { version = "^0.18.2", optional = true }
 pandera = { version = ">=0.19.3,<0.21.0", extras = ['io'], optional = true }
-omfpandas = { version = "^0.8.1", optional = true }
+omfpandas = { version = ">=0.8.1", optional = true }
 #omf = { version = "<2.0" }
 
 omfvista = { version = ">=0.3.0", optional = true }