geometallurgy 0.4.15__tar.gz → 0.4.17__tar.gz

{geometallurgy-0.4.15 → geometallurgy-0.4.17}/PKG-INFO

@@ -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 → geometallurgy-0.4.17}/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.15 → geometallurgy-0.4.17}/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.15 → geometallurgy-0.4.17}/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 → geometallurgy-0.4.17}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "geometallurgy"
 packages = [{ include = "elphick/geomet" }]
-version = "0.4.15"
+version = "0.4.17"
 description = "Tools for the geometallurgist"
 authors = ["Greg <11791585+elphick@users.noreply.github.com>"]
 repository = "https://github.com/elphick/geometallurgy"