ripple-down-rules 0.4.85__py3-none-any.whl → 0.4.88__py3-none-any.whl

ripple_down_rules/__init__.py

@@ -1 +1,5 @@
-__version__ = "0.4.85"
+__version__ = "0.4.88"
+
+import logging
+logger = logging.Logger("rdr")
+logger.setLevel(logging.INFO)

ripple_down_rules/datastructures/case.py

@@ -354,11 +354,13 @@ def show_current_and_corner_cases(case: Any, targets: Optional[Dict[str, Any]] =
         if last_evaluated_rule and last_evaluated_rule.fired:
             corner_row_dict = copy_case(corner_case)
 
+    case_dict.update(targets)
+    case_dict.update(current_conclusions)
+    all_table_rows = [case_dict]
     if corner_row_dict:
         corner_conclusion = last_evaluated_rule.conclusion(case)
         corner_row_dict.update({corner_conclusion.__class__.__name__: corner_conclusion})
-        print(table_rows_as_str(corner_row_dict))
-    print("=" * 50)
-    case_dict.update(targets)
-    case_dict.update(current_conclusions)
-    print(table_rows_as_str(case_dict))
+        all_table_rows.append(corner_row_dict)
+        # print(table_rows_as_str(corner_row_dict))
+    print("\n" + "=" * 50)
+    print(table_rows_as_str(all_table_rows))

ripple_down_rules/rdr.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import copyreg
 import importlib
-import logging
+from . import logger
 import sys
 from abc import ABC, abstractmethod
 from copy import copy
@@ -13,7 +13,7 @@ try:
     from matplotlib import pyplot as plt
     Figure = plt.Figure
 except ImportError as e:
-    logging.debug(f"{e}: matplotlib is not installed")
+    logger.debug(f"{e}: matplotlib is not installed")
     matplotlib = None
     Figure = None
     plt = None
@@ -122,13 +122,13 @@ class RippleDownRules(SubclassJSONSerializer, ABC):
             all_predictions = [1 if is_matching(self.classify, case_query) else 0 for case_query in case_queries
                                if case_query.target is not None]
             all_pred = sum(all_predictions)
-            print(f"Accuracy: {all_pred}/{len(targets)}")
+            logger.info(f"Accuracy: {all_pred}/{len(targets)}")
             all_predicted = targets and all_pred == len(targets)
             num_iter_reached = n_iter and i >= n_iter
             stop_iterating = all_predicted or num_iter_reached
             if stop_iterating:
                 break
-        print(f"Finished training in {i} iterations")
+        logger.info(f"Finished training in {i} iterations")
         if animate_tree:
             plt.ioff()
             plt.show()
@@ -360,15 +360,13 @@ class RDRWithCodeWriter(RippleDownRules, ABC):
         return importlib.import_module(name).classify
 
     @property
-    def _default_generated_python_file_name(self) -> str:
+    def _default_generated_python_file_name(self) -> Optional[str]:
         """
         :return: The default generated python file name.
         """
-        if isinstance(self.start_rule.corner_case, Case):
-            name = self.start_rule.corner_case._name
-        else:
-            name = self.start_rule.corner_case.__class__.__name__
-        return f"{name.lower()}_{self.attribute_name}_{self.acronym.lower()}"
+        if self.start_rule is None or self.start_rule.conclusion is None:
+            return None
+        return f"{self.case_type.__name__.lower()}_{self.attribute_name}_{self.acronym.lower()}"
 
     @property
     def generated_python_defs_file_name(self) -> str:
@@ -958,11 +956,7 @@ class GeneralRDR(RippleDownRules):
         """
         if self.start_rule is None or self.start_rule.conclusion is None:
             return None
-        if isinstance(self.start_rule.corner_case, Case):
-            name = self.start_rule.corner_case._name
-        else:
-            name = self.start_rule.corner_case.__class__.__name__
-        return f"{name}_rdr".lower()
+        return f"{self.case_type.__name__.lower()}_rdr".lower()
 
     @property
     def conclusion_type_hint(self) -> str:

ripple_down_rules/utils.py

@@ -1098,24 +1098,29 @@ def get_origin_and_args_from_type_hint(type_hint: Type) -> Tuple[Optional[Type],
         return origin, args
 
 
-def table_rows_as_str(row_dict: Dict[str, Any], columns_per_row: int = 9):
+def table_rows_as_str(row_dicts: List[Dict[str, Any]], columns_per_row: int = 20):
     """
     Print a table row.
 
-    :param row_dict: The row to print.
+    :param row_dicts: The rows to print.
     :param columns_per_row: The maximum number of columns per row.
     """
-    all_items = list(row_dict.items())
+    all_row_dicts_items = [list(row_dict.items()) for row_dict in row_dicts]
     # make items a list of n rows such that each row has a max size of 4
-    all_items = [all_items[i:i + columns_per_row] for i in range(0, len(all_items), columns_per_row)]
+    all_items = [all_items[i:i + columns_per_row] for all_items in all_row_dicts_items
+                 for i in range(0, len(all_items), columns_per_row)]
     keys = [list(map(lambda i: i[0], row)) for row in all_items]
     values = [list(map(lambda i: i[1], row)) for row in all_items]
+    zipped_keys = list(zip(*keys))
+    zipped_values = list(zip(*values))
+    keys_values = [list(zip(zipped_keys[i], zipped_values[i])) for i in range(len(zipped_keys))]
+    keys_values = [list(r[0]) + list(r[1]) if len(r) > 1 else r[0] for r in keys_values]
     all_table_rows = []
-    for row_keys, row_values in zip(keys, values):
-        row_values = [str(v) if v is not None else "" for v in row_values]
-        row_values = [v.lower() if v in ["True", "False"] else v for v in row_values]
-        table = tabulate([row_values], headers=row_keys, tablefmt='plain', maxcolwidths=[20] * len(row_keys))
-        all_table_rows.append(table)
+    row_values = [list(map(lambda v: str(v) if v is not None else "", row)) for row in keys_values]
+    row_values = [list(map(lambda v: v[:150] + '...' if len(v) > 150 else v, row)) for row in row_values]
+    row_values = [list(map(lambda v: v.lower() if v in ["True", "False"] else v, row)) for row in row_values]
+    table = tabulate(row_values, tablefmt='simple_grid', maxcolwidths=[150] * 2)
+    all_table_rows.append(table)
     return "\n".join(all_table_rows)
 
 

{ripple_down_rules-0.4.85.dist-info → ripple_down_rules-0.4.88.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ripple_down_rules
-Version: 0.4.85
+Version: 0.4.88
 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
@@ -693,20 +693,12 @@ Requires-Dist: colorama
 Requires-Dist: pygments
 Requires-Dist: sqlalchemy
 Requires-Dist: pandas
+Provides-Extra: viz
+Requires-Dist: networkx>=3.1; extra == "viz"
+Requires-Dist: matplotlib>=3.7.5; extra == "viz"
 Provides-Extra: gui
 Requires-Dist: pyqt6; extra == "gui"
 Requires-Dist: qtconsole; extra == "gui"
-Provides-Extra: viz
-Requires-Dist: matplotlib; extra == "viz"
-Requires-Dist: networkx; extra == "viz"
-Provides-Extra: dev
-Requires-Dist: pyqt6; extra == "dev"
-Requires-Dist: qtconsole; extra == "dev"
-Requires-Dist: matplotlib; extra == "dev"
-Requires-Dist: networkx; extra == "dev"
-Requires-Dist: pytest; extra == "dev"
-Requires-Dist: ucimlrepo>=0.0.7; extra == "dev"
-Requires-Dist: pdbpp; extra == "dev"
 Dynamic: license-file
 
 # Ripple Down Rules (RDR)

{ripple_down_rules-0.4.85.dist-info → ripple_down_rules-0.4.88.dist-info}/RECORD

@@ -1,16 +1,16 @@
-ripple_down_rules/__init__.py,sha256=BOEwGNbbzGrJYVxU-YvP8hmmJwQ3P8zGs6QDgP4yccA,22
+ripple_down_rules/__init__.py,sha256=gvXUS_xmUCsWcUwVy5Sd8tyjdLhlPGbjfDrfDImrt7o,100
 ripple_down_rules/datasets.py,sha256=fJbZ7V-UUYTu5XVVpFinTbuzN3YePCnUB01L3AyZVM8,6837
 ripple_down_rules/experts.py,sha256=RWDR-xxbeFIrUQiMYLEDr_PLQFdpPZ-hOXo4dpeiUpI,6630
 ripple_down_rules/failures.py,sha256=E6ajDUsw3Blom8eVLbA7d_Qnov2conhtZ0UmpQ9ZtSE,302
 ripple_down_rules/helpers.py,sha256=TvTJU0BA3dPcAyzvZFvAu7jZqsp8Lu0HAAwvuizlGjg,2018
-ripple_down_rules/rdr.py,sha256=qELIEEokGTWj-VBZZeEM_TiHxaWrlvaKRt2qShuxfvo,45739
+ripple_down_rules/rdr.py,sha256=a7sSxvJewzG5FZvbUW_Ss7VVYQtBnH-H--hni8-pWC4,45528
 ripple_down_rules/rdr_decorators.py,sha256=VdmE0JrE8j89b6Af1R1tLZiKfy3h1VCvhAUefN_FLLQ,6753
 ripple_down_rules/rules.py,sha256=7NB8qWW7XEB45tmJRYsKJqBG8DN3v02fzAFYmOkX8ow,17458
 ripple_down_rules/start-code-server.sh,sha256=otClk7VmDgBOX2TS_cjws6K0UwvgAUJhoA0ugkPCLqQ,949
-ripple_down_rules/utils.py,sha256=iM2bYRYanuWTnq7dflRar8tMwRxL88B__hWkayGLVz4,50675
+ripple_down_rules/utils.py,sha256=t_yutgZvrOOGb6Wa-uAuoTafLicwovSFRiUa746ALOw,51108
 ripple_down_rules/datastructures/__init__.py,sha256=V2aNgf5C96Y5-IGghra3n9uiefpoIm_QdT7cc_C8cxQ,111
 ripple_down_rules/datastructures/callable_expression.py,sha256=jA7424_mWPbOoPICW3eLMX0-ypxnsW6gOqxrJ7JpDbE,11610
-ripple_down_rules/datastructures/case.py,sha256=3nGeTv9JYpnRSmsHCt61qo1QT4d9Dfkl9KrZ7I6E2kk,15164
+ripple_down_rules/datastructures/case.py,sha256=r8kjL9xP_wk84ThXusspgPMrAoed2bGQmKi54fzhmH8,15258
 ripple_down_rules/datastructures/dataclasses.py,sha256=GWnUF4h4zfNHSsyBIz3L9y8sLkrXRv0FK_OxzzLc8L8,8183
 ripple_down_rules/datastructures/enums.py,sha256=ce7tqS0otfSTNAOwsnXlhsvIn4iW_Y_N3TNebF3YoZs,5700
 ripple_down_rules/user_interface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -19,8 +19,8 @@ ripple_down_rules/user_interface/ipython_custom_shell.py,sha256=24MIFwqnAhC6ofOb
 ripple_down_rules/user_interface/object_diagram.py,sha256=tsB6iuLNEbHxp5lR2WjyejjWbnAX_nHF9xS8jNPOQVk,4548
 ripple_down_rules/user_interface/prompt.py,sha256=AkkltdDIaioN43lkRKDPKSjJcmdSSGZDMYz7AL7X9lE,8082
 ripple_down_rules/user_interface/template_file_creator.py,sha256=J_bBOJltc1fsrIYeHdrSUA_jep2DhDbTK5NYRbL6QyY,13831
-ripple_down_rules-0.4.85.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
-ripple_down_rules-0.4.85.dist-info/METADATA,sha256=aNYxUv8mZ4KV4guZL6pJ2WiNXHi6Vfh4T_YRWbmMU_A,43598
-ripple_down_rules-0.4.85.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-ripple_down_rules-0.4.85.dist-info/top_level.txt,sha256=VeoLhEhyK46M1OHwoPbCQLI1EifLjChqGzhQ6WEUqeM,18
-ripple_down_rules-0.4.85.dist-info/RECORD,,
+ripple_down_rules-0.4.88.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
+ripple_down_rules-0.4.88.dist-info/METADATA,sha256=ytWRoIfcAHeBfJMqT1KtQJPsAEGDqXZZegjDaq6YcuM,43307
+ripple_down_rules-0.4.88.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+ripple_down_rules-0.4.88.dist-info/top_level.txt,sha256=VeoLhEhyK46M1OHwoPbCQLI1EifLjChqGzhQ6WEUqeM,18
+ripple_down_rules-0.4.88.dist-info/RECORD,,