Fix inconsistent rounding

src/production_planner/cells/ingredient.py

@@ -4,6 +4,7 @@
 #  file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from ._cells import Cell
+from ..core import smartround
 
 from rich.style import Style
 
@@ -27,10 +28,6 @@ def text_postprocess(self, text: str, style: Style) -> (str, Style):
     def get(self):
         if self.access_guard():
             value = self.data.node_main.ingredients[self.vispath]
-            truncated_value = int(value)
-            if value - truncated_value < 0.01:
-                return truncated_value
-            else:
-                return round(value, 2)
+            return smartround(value)
         else:
             return self.default_na

src/production_planner/cells/recipe.py

@@ -9,7 +9,8 @@
 from .. import core
 from .. core import ModuleFile
 from ..core import CONFIG, PRODUCER_NAMES, PRODUCER_MAP, Recipe, Ingredient, all_recipes_producer, Node, NodeInstance
-from .. core import MODULE_PRODUCER
+from ..core import MODULE_PRODUCER
+from ..core import smartround
 
 import os
 from enum import Enum
@@ -193,8 +194,8 @@ def ingredient_count(attr):
                         row += [ProducerCell(NodeInstance(Node(producer, Recipe.empty()))).get_styled() if producer else ""]
                     row += [recipe.name]
                     # FIXME: production per minute should somehow be included in `str(Ingredient)`, otherwise we can't filter for that
-                    inputs  = [Text(f"({round(ingr.count*rate_mult): >3}/min) {ingr.count: >3}x{ingr.name}", style="red") for ingr in recipe.inputs]
-                    outputs = [Text(f"({round(ingr.count*rate_mult): >3}/min) {ingr.count: >3}x{ingr.name}", style="green") for ingr in recipe.outputs]
+                    inputs  = [Text(f"({smartround(ingr.count*rate_mult): >3}/min) {ingr.count: >3}x{ingr.name}", style="red") for ingr in recipe.inputs]
+                    outputs = [Text(f"({smartround(ingr.count*rate_mult): >3}/min) {ingr.count: >3}x{ingr.name}", style="green") for ingr in recipe.outputs]
                     inputs += [""] * (max_input_count - len(inputs))
                     outputs += [""] * (max_output_count - len(outputs))
                     row += outputs

src/production_planner/core/__init__.py

@@ -17,6 +17,16 @@
 APP = None
 
 
+# TODO: add some ~IGNORED_AMOUNT variable to CONFIG and use that instead of hardcoded 0.01
+#       use this also for column highlighting ...
+def smartround(value: float | int):
+    truncated_value = int(value)
+    if abs(value - truncated_value) < 0.01:
+        return truncated_value
+    else:
+        return round(value, 2)
+
+
 def get_path(obj, path):
     paths = path.split(".", maxsplit=1)
     primpath = paths[0]

src/production_planner/core/node.py

@@ -94,7 +94,6 @@ def update(self):
         rate_mult = 60 / self.recipe.cycle_rate
 
         ingredient_mult = rate_mult * (self.clock_rate * self.count) / 100
-        # FIXME: use floats to improve accuracy and modify number formatting display elsewhere
         for inp in self.recipe.inputs:
             self.ingredients[inp.name] = inp.count * ingredient_mult * -1