geometallurgy 0.4.15__py3-none-any.whl → 0.4.17__py3-none-any.whl

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
 

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
 

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,9 +113,9 @@ 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
+        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
     def is_balanced(self) -> Optional[bool]:

{geometallurgy-0.4.15.dist-info → geometallurgy-0.4.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geometallurgy
-Version: 0.4.15
+Version: 0.4.17
 Summary: Tools for the geometallurgist
 Home-page: https://github.com/elphick/geometallurgy
 Author: Greg

{geometallurgy-0.4.15.dist-info → geometallurgy-0.4.17.dist-info}/RECORD

@@ -5,7 +5,7 @@ elphick/geomet/config/__init__.py,sha256=F94hbxN3KzSaljbElIGVhdEwX0FKmHxST4jJ7rN
 elphick/geomet/config/config_read.py,sha256=frRwfRwUXpgxwMNCiBVFUw1-yPbBHs3h2KjmzXImvxY,1396
 elphick/geomet/config/flowsheet_example_partition.yaml,sha256=85vrhOotQHhaKkYN-0QQA7ed03EMRkyaKZc-GtXMKro,716
 elphick/geomet/config/flowsheet_example_simple.yaml,sha256=u4sM2gkyyHXnOlqW3TvwBjRdl4x34zGeZS7YGNmdfC4,428
-elphick/geomet/config/mc_config.yml,sha256=6eUGCJlU5Aw9M5Rn6Xuezf8_bShxwxZ1g5XB8P5iLWc,913
+elphick/geomet/config/mc_config.yml,sha256=5sUQXOmXIcqEp_Thwj8yBoHWC_JMDSpYL_uIlEHWkbI,977
 elphick/geomet/data/downloader.py,sha256=x_107mTNCaG9YwEO54mBx7l3KaqOavCi93uZjPdC5GU,1621
 elphick/geomet/data/register.csv,sha256=-N3F6L0097C-I79axINi_ewFAxiqbT_SOSW3-XtPkI4,3046
 elphick/geomet/datasets/__init__.py,sha256=7CX648YFMv39FchI1_oEF28zF52v4gX0lnqomPwkcvU,59
@@ -15,9 +15,9 @@ elphick/geomet/datasets/register.csv,sha256=-N3F6L0097C-I79axINi_ewFAxiqbT_SOSW3
 elphick/geomet/datasets/sample_data.py,sha256=jt5DWxdMmPbZGDuon2s8Q2wlX3cEegB0dSmRKF4pz4I,7684
 elphick/geomet/extras.py,sha256=UMkAYp72X-30ckaZ-2ENffUUZ7k7JBTdtgsVdgxxYAk,1164
 elphick/geomet/flowsheet/__init__.py,sha256=-lxSLPZNQfiLXKZ2qqS5XbbhrZA2ABi3ppx0LaHnNEI,33
-elphick/geomet/flowsheet/flowsheet.py,sha256=__kgowBIyWfvXcdPWCFihoEUdOqTj7KszSbKGF1AkBo,52032
+elphick/geomet/flowsheet/flowsheet.py,sha256=det02WllI-Bt4ILvg5MmVCEdynhobWBh5cJsubzQnD8,52085
 elphick/geomet/flowsheet/loader.py,sha256=8nd9Vqbg1de35iuoc4mdRFxrUsIBZed0ivXIAu80jBk,4756
-elphick/geomet/flowsheet/operation.py,sha256=f8k0-Gr_Uy2SlEp8bwAaG4yeBa3DU0HoPn9wyWhYipE,9720
+elphick/geomet/flowsheet/operation.py,sha256=bsT3ZZNhOXSeONjHAzSmex2CAOOWxG7tDcxmMUaFwTg,10170
 elphick/geomet/flowsheet/stream.py,sha256=NOXcYeZLSmOSoSRFc7M36Jc8c1ARgjiCvtRuixYfuqA,1370
 elphick/geomet/interval_sample.py,sha256=fhcWBTA01TqvCBsJv7dzWZHRBpw_4W2Ahawks5SPj28,31320
 elphick/geomet/io.py,sha256=tZsX_getGxL07dPlF3Ozyzvt2tFHE5OdgPM5pc5xL68,15709
@@ -41,8 +41,8 @@ elphick/geomet/utils/size.py,sha256=EmV_sv2bOImQN3s7TWCniU_y83HNJEPtZH7fMMkYTcc,
 elphick/geomet/utils/timer.py,sha256=8WNKLFcINRsZ3IsKtOIZ77YbKtqczyOOTEWY9h9Uxxw,3112
 elphick/geomet/utils/viz.py,sha256=M0CnfDXBHtYb8aak1Sfz6XLvRSmkzX3ybIDllEmDR8A,1718
 elphick/geomet/validate.py.hide,sha256=qAWJlgq0jp19UakVV0dEU_AsqV_JctUn1QTHn8cCRw0,6738
-geometallurgy-0.4.15.dist-info/LICENSE,sha256=GrSVdcGtNbGvAYC_tIjLHBrIVPyg-Ksfe7ZGr087yCI,1069
-geometallurgy-0.4.15.dist-info/METADATA,sha256=YW9b1XuvYaxff2WQK1NcydFmPXSQf2VTNgxn0sav2Iw,4469
-geometallurgy-0.4.15.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
-geometallurgy-0.4.15.dist-info/entry_points.txt,sha256=aQI-8kmaba_c9ZGOFkJgWl0MWBke5BQLNyPSVcbS7EU,58
-geometallurgy-0.4.15.dist-info/RECORD,,
+geometallurgy-0.4.17.dist-info/LICENSE,sha256=GrSVdcGtNbGvAYC_tIjLHBrIVPyg-Ksfe7ZGr087yCI,1069
+geometallurgy-0.4.17.dist-info/METADATA,sha256=tOckk944ZdykLolkklkfOsDi9Ff0pQcdxWiLzQbZKZ4,4469
+geometallurgy-0.4.17.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
+geometallurgy-0.4.17.dist-info/entry_points.txt,sha256=aQI-8kmaba_c9ZGOFkJgWl0MWBke5BQLNyPSVcbS7EU,58
+geometallurgy-0.4.17.dist-info/RECORD,,