ripple-down-rules 0.6.20__py3-none-any.whl → 0.6.21__py3-none-any.whl

ripple_down_rules/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.6.20"
+__version__ = "0.6.21"
 
 import logging
 logger = logging.Logger("rdr")

ripple_down_rules/rdr.py

@@ -110,7 +110,7 @@ class RippleDownRules(SubclassJSONSerializer, ABC):
 
     def render_evaluated_rule_tree(self, filename: str) -> None:
         evaluated_rules = self.get_evaluated_rule_tree()
-        if len(evaluated_rules) > 0:
+        if evaluated_rules is not None and len(evaluated_rules) > 0:
             render_tree(evaluated_rules[0], use_dot_exporter=True, filename=filename,
                         only_nodes=evaluated_rules)
 
@@ -121,7 +121,8 @@ class RippleDownRules(SubclassJSONSerializer, ABC):
         :return: The evaluated rule tree.
         """
         if self.start_rule is None:
-            raise ValueError("The start rule is not set. Please set the start rule before getting the evaluated rule tree.")
+            return
+            # raise ValueError("The start rule is not set. Please set the start rule before getting the evaluated rule tree.")
         evaluated_rule_tree = [r for r in [self.start_rule] + list(self.start_rule.descendants) if r.evaluated]
         return evaluated_rule_tree
 

ripple_down_rules/rdr_decorators.py

@@ -75,6 +75,7 @@ class RDRDecorator:
         self.fitting_decorator = fitting_decorator if fitting_decorator is not None else \
             lambda f: f  # Default to no fitting decorator
         self.generate_dot_file = generate_dot_file
+        self.not_none_output_found: bool = False
         self.load()
 
     def decorator(self, func: Callable) -> Callable:
@@ -117,7 +118,11 @@ class RDRDecorator:
                 else:
                     output = self.rdr.classify(case)
                     if self.generate_dot_file:
-                        self.rdr.render_evaluated_rule_tree(self.rdr_models_dir + f'/{self.model_name}')
+                        eval_rule_tree = self.rdr.get_evaluated_rule_tree()
+                        if not self.not_none_output_found or (eval_rule_tree and len(eval_rule_tree) > 1):
+                            self.rdr.render_evaluated_rule_tree(self.rdr_models_dir + f'/{self.model_name}')
+                        if eval_rule_tree and len(eval_rule_tree) > 1:
+                            self.not_none_output_found = True
 
             if self.output_name in output:
                 return output[self.output_name]

ripple_down_rules/utils.py

@@ -1839,7 +1839,7 @@ class FilteredDotExporter(object):
                 continue
             nodeattr = nodeattrfunc(node)
             nodeattr = " [%s]" % nodeattr if nodeattr is not None else ""
-            yield '%s"%s"%s;' % (indent, DotExporter.esc(nodename), nodeattr)
+            yield '%s"%s"%s;' % (indent, FilteredDotExporter.esc(nodename), nodeattr)
 
     def __iter_edges(self, indent, nodenamefunc, edgeattrfunc, edgetypefunc):
         maxlevel = self.maxlevel - 1 if self.maxlevel else None
@@ -1854,8 +1854,8 @@ class FilteredDotExporter(object):
                 edgeattr = edgeattrfunc(node, child)
                 edgetype = edgetypefunc(node, child)
                 edgeattr = " [%s]" % edgeattr if edgeattr is not None else ""
-                yield '%s"%s" %s "%s"%s;' % (indent, DotExporter.esc(nodename), edgetype,
-                                             DotExporter.esc(childname), edgeattr)
+                yield '%s"%s" %s "%s"%s;' % (indent, FilteredDotExporter.esc(nodename), edgetype,
+                                             FilteredDotExporter.esc(childname), edgeattr)
 
     def to_dotfile(self, filename):
         """
@@ -1925,18 +1925,19 @@ def render_tree(root: Node, use_dot_exporter: bool = False,
     if not root:
         logging.warning("No rules to render")
         return
-    for pre, _, node in RenderTree(root):
-        print(f"{pre}{node.weight if hasattr(node, 'weight') and node.weight else ''} {node.__str__()}")
+    # for pre, _, node in RenderTree(root):
+    #     print(f"{pre}{node.weight if hasattr(node, 'weight') and node.weight else ''} {node.__str__()}")
     if use_dot_exporter:
         unique_node_names = get_unique_node_names_func(root)
 
         de = FilteredDotExporter(root,
                                  include_nodes=only_nodes,
                                  nodenamefunc=unique_node_names,
-                                 edgeattrfunc=edge_attr_setter
+                                 edgeattrfunc=edge_attr_setter,
+                                 nodeattrfunc=lambda node: f'style=filled, fillcolor={"green" if node.fired else "red"}'
                                  )
         de.to_dotfile(f"{filename}{'.dot'}")
-        de.to_picture(f"{filename}{'.png'}")
+        # de.to_picture(f"{filename}{'.png'}")
 
 
 def draw_tree(root: Node, fig: Figure):

{ripple_down_rules-0.6.20.dist-info → ripple_down_rules-0.6.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ripple_down_rules
-Version: 0.6.20
+Version: 0.6.21
 Summary: Implements the various versions of Ripple Down Rules (RDR) for knowledge representation and reasoning.
 Author-email: Abdelrhman Bassiouny <abassiou@uni-bremen.de>
 License:                     GNU GENERAL PUBLIC LICENSE

{ripple_down_rules-0.6.20.dist-info → ripple_down_rules-0.6.21.dist-info}/RECORD

@@ -1,11 +1,11 @@
-ripple_down_rules/__init__.py,sha256=xpB0ANrfA5A060d9mDqT8Wy9YWsSGJIlfSH6X5JBu4E,100
+ripple_down_rules/__init__.py,sha256=FE7egOk8_N_vJLm9yZ7ZIh8wz0opNbBXT1V2le4qaog,100
 ripple_down_rules/experts.py,sha256=4-dMIVeMzFXCLYl_XBG_P7_Xs4sZih9-vZxCIPri6dA,12958
 ripple_down_rules/helpers.py,sha256=RUdfiSWMZjGwCxuCy44TcEJf2UNAFlPJusgHzuAs6qI,4583
-ripple_down_rules/rdr.py,sha256=mtY_kBOjUXRZYz4QFaKN6C2O7liFpbMdnjUnFFnXbdU,57550
-ripple_down_rules/rdr_decorators.py,sha256=fxoMMAZB1HTfEsuzfIdo3b7PiPB_-AAjD8hy4L0sawQ,11389
+ripple_down_rules/rdr.py,sha256=nUPapnkz9cESaeDDZ8iYdrzmED59nIbZWB19a-lYYr4,57603
+ripple_down_rules/rdr_decorators.py,sha256=QafdWzfbjE-xYe2SyIDr7oRqq32WjKYBC2LrG2I3iy0,11758
 ripple_down_rules/rules.py,sha256=ULIHRbVfKd2L3zzPnssmaeqInWHifPvwwa16MyzakPc,23548
 ripple_down_rules/start-code-server.sh,sha256=otClk7VmDgBOX2TS_cjws6K0UwvgAUJhoA0ugkPCLqQ,949
-ripple_down_rules/utils.py,sha256=mhvwBEyGhwAYocBYjAlmFh192pEvYrx-KObnMa1aSnk,73189
+ripple_down_rules/utils.py,sha256=Pwvi51zXE2zZN1RYmsX4xUxPMHs3lXIYirPrUyOiwpk,73341
 ripple_down_rules/datastructures/__init__.py,sha256=V2aNgf5C96Y5-IGghra3n9uiefpoIm_QdT7cc_C8cxQ,111
 ripple_down_rules/datastructures/callable_expression.py,sha256=ysK-4JmZ4oSUTJC7zpo_o77g4ONxPDEcIpSWggsnx3c,13320
 ripple_down_rules/datastructures/case.py,sha256=PJ7_-AdxYic6BO5z816piFODj6nU5J6Jt1YzTFH-dds,15510
@@ -17,8 +17,8 @@ ripple_down_rules/user_interface/ipython_custom_shell.py,sha256=yp-F8YRWGhj1PLB3
 ripple_down_rules/user_interface/object_diagram.py,sha256=FEa2HaYR9QmTE6NsOwBvZ0jqmu3DKyg6mig2VE5ZP4Y,4956
 ripple_down_rules/user_interface/prompt.py,sha256=JceEUGYsd0lIvd-v2y3D3swoo96_C0lxfp3CxM7Vfts,8900
 ripple_down_rules/user_interface/template_file_creator.py,sha256=kwBbFLyN6Yx2NTIHPSwOoytWgbJDYhgrUOVFw_jkDQ4,13522
-ripple_down_rules-0.6.20.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
-ripple_down_rules-0.6.20.dist-info/METADATA,sha256=XE3l7CrRsjXZLfW5LpHoYTJbIVT9rOHKr9S3qWVqGyA,48294
-ripple_down_rules-0.6.20.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ripple_down_rules-0.6.20.dist-info/top_level.txt,sha256=VeoLhEhyK46M1OHwoPbCQLI1EifLjChqGzhQ6WEUqeM,18
-ripple_down_rules-0.6.20.dist-info/RECORD,,
+ripple_down_rules-0.6.21.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
+ripple_down_rules-0.6.21.dist-info/METADATA,sha256=Ir6V_9HK_ELD1EdVwrzu7noYUDY21VwIMC1SP0708UA,48294
+ripple_down_rules-0.6.21.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ripple_down_rules-0.6.21.dist-info/top_level.txt,sha256=VeoLhEhyK46M1OHwoPbCQLI1EifLjChqGzhQ6WEUqeM,18
+ripple_down_rules-0.6.21.dist-info/RECORD,,