geometallurgy 0.4.16__tar.gz → 0.4.18__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geometallurgy
-Version: 0.4.16
+Version: 0.4.18
 Summary: Tools for the geometallurgist
 Home-page: https://github.com/elphick/geometallurgy
 Author: Greg
@@ -14,13 +14,13 @@ 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) ; extra == "blockmodel"
+Requires-Dist: omfpandas (>=0.9.3) ; 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"
 Requires-Dist: periodictable (>=1.7.0,<2.0.0)
 Requires-Dist: plotly (>=5.22.0,<6.0.0)
-Requires-Dist: pyarrow (>=16.1.0,<18.0.0)
+Requires-Dist: pyarrow (>=16.1.0)
 Requires-Dist: rioxarray (>=0.18.2,<0.19.0) ; extra == "spatial"
 Project-URL: Documentation, https://elphick.github.io/geometallurgy
 Project-URL: Repository, https://github.com/elphick/geometallurgy

{geometallurgy-0.4.16 → geometallurgy-0.4.18}/elphick/geomet/config/mc_config.yml

@@ -32,4 +32,8 @@ MC:
     recovery: 'rec'
     difference: 'diff'
     divide: 'ur'
+flowsheet:
+  operation:
+    tol_abs: 1.0e-4
+    tol_rel: 1.0e-6
 

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

@@ -1,10 +1,12 @@
 from copy import copy
 from enum import Enum
 from functools import reduce
+from pathlib import Path
 from typing import Optional, TypeVar, TYPE_CHECKING
 
 import numpy as np
 import pandas as pd
+import yaml
 
 from elphick.geomet.base import MC
 from elphick.geomet.flowsheet.stream import Stream
@@ -25,13 +27,22 @@ class NodeType(Enum):
 
 
 class Operation:
-    def __init__(self, name):
+    def __init__(self, name, config_file: Optional[Path] = None):
         self.name = name
         self._inputs = []
         self._outputs = []
         self._is_balanced: Optional[bool] = None
         self._unbalanced_records: Optional[pd.DataFrame] = None
 
+        # Load configuration
+        if config_file is None:
+            config_file = Path(__file__).parent / '.././config/mc_config.yml'
+
+        with open(config_file, 'r') as file:
+            config = yaml.safe_load(file)
+        self.tol_abs = config['flowsheet']['operation'].get('tol_abs', 1e-6)
+        self.tol_rel = config['flowsheet']['operation'].get('tol_rel', 1e-6)
+
     @property
     def has_empty_input(self) -> bool:
         return None in self.inputs
@@ -102,7 +113,8 @@ class Operation:
             return None
 
         input_mass, output_mass = self.get_input_mass(), self.get_output_mass()
-        self._unbalanced_records = (input_mass - output_mass).loc[(~np.isclose(input_mass, output_mass)).any(axis=1)]
+        mask = ~np.isclose(input_mass, output_mass, atol=self.tol_abs, rtol=self.tol_rel)
+        self._unbalanced_records = (input_mass - output_mass).loc[mask.any(axis=1)]
         self._is_balanced = self._unbalanced_records.shape[0] == 0
 
     @property

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

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "geometallurgy"
 packages = [{ include = "elphick/geomet" }]
-version = "0.4.16"
+version = "0.4.18"
 description = "Tools for the geometallurgist"
 authors = ["Greg <11791585+elphick@users.noreply.github.com>"]
 repository = "https://github.com/elphick/geometallurgy"
@@ -41,13 +41,12 @@ plotly = "^5.22.0"
 pandas = ">=1.0"
 periodictable = "^1.7.0"
 #geoh5py = ">=0.8.0,<10.0.0"
-pyarrow = ">=16.1.0,<18.0.0"
+pyarrow = ">=16.1.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.9.3", optional = true }
 #omf = { version = "<2.0" }
-
 omfvista = { version = ">=0.3.0", optional = true }
 
 [tool.poetry.extras]
@@ -70,6 +69,8 @@ sphinx-autodoc-typehints = "^2.1.1"
 pytest-xdist = "^3.6.1"
 pytest-cov = "^5.0.0"
 toml = "^0.10.2"
+dash = "^3.2.0"
+sympy = "^1.14.0"
 
 [build-system]
 requires = ["poetry-core"]