ripple-down-rules 0.4.86__tar.gz → 0.4.88__tar.gz

{ripple_down_rules-0.4.86 → ripple_down_rules-0.4.88}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ripple_down_rules
-Version: 0.4.86
+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.86 → ripple_down_rules-0.4.88}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ripple_down_rules"
-dynamic = ["version", "dependencies"]
+dynamic = ["version", "dependencies", "optional-dependencies"]
 description = "Implements the various versions of Ripple Down Rules (RDR) for knowledge representation and reasoning."
 readme = "README.md"
 authors = [{ name = "Abdelrhman Bassiouny", email = "abassiou@uni-bremen.de" }]
@@ -22,22 +22,5 @@ include = ["ripple_down_rules*"]
 
 [tool.setuptools.dynamic]
 version = {attr = "ripple_down_rules.__version__"}
-dependencies = {file = "requirements.txt"}
-
-[project.optional-dependencies]
-gui = [
-    "pyqt6",
-    "qtconsole",
-]
-viz = [
-    "matplotlib",
-    "networkx",
-]
-dev = [
-    "pyqt6",
-    "qtconsole",
-    "matplotlib",
-    "networkx",
-    "pytest",
-    "ucimlrepo>=0.0.7",
-    "pdbpp"]
+dependencies = { file = ["requirements.txt"] }
+optional-dependencies = { viz = {file = ["requirements-viz.txt"]}, gui = {file = ["requirements-gui.txt"]}}

ripple_down_rules-0.4.88/pytest.ini

@@ -0,0 +1,3 @@
+[pytest]
+addopts =
+    -s

ripple_down_rules-0.4.88/src/ripple_down_rules/__init__.py

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

{ripple_down_rules-0.4.86 → ripple_down_rules-0.4.88}/src/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-0.4.86 → ripple_down_rules-0.4.88}/src/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()

{ripple_down_rules-0.4.86 → ripple_down_rules-0.4.88}/src/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.86 → ripple_down_rules-0.4.88}/src/ripple_down_rules.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ripple_down_rules
-Version: 0.4.86
+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.86 → ripple_down_rules-0.4.88}/src/ripple_down_rules.egg-info/SOURCES.txt

@@ -1,6 +1,7 @@
 LICENSE
 README.md
 pyproject.toml
+pytest.ini
 requirements-dev.txt
 requirements-gui.txt
 requirements-viz.txt

{ripple_down_rules-0.4.86 → ripple_down_rules-0.4.88}/src/ripple_down_rules.egg-info/requires.txt

@@ -11,19 +11,10 @@ pygments
 sqlalchemy
 pandas
 
-[dev]
-pyqt6
-qtconsole
-matplotlib
-networkx
-pytest
-ucimlrepo>=0.0.7
-pdbpp
-
 [gui]
 pyqt6
 qtconsole
 
 [viz]
-matplotlib
-networkx
+networkx>=3.1
+matplotlib>=3.7.5

{ripple_down_rules-0.4.86 → ripple_down_rules-0.4.88}/test/test_rdr.py

@@ -32,6 +32,7 @@ class TestRDR(TestCase):
     cache_file: str = f"{test_results_dir}/zoo_dataset.pkl"
     app: Optional[QApplication] = None
     viewer: Optional[RDRCaseViewer] = None
+    use_gui: bool = False
 
     @classmethod
     def setUpClass(cls):
@@ -42,7 +43,7 @@ class TestRDR(TestCase):
         for test_dir in [cls.test_results_dir, cls.expert_answers_dir, cls.generated_rdrs_dir]:
             if not os.path.exists(test_dir):
                 os.makedirs(test_dir)
-        if RDRCaseViewer is not None:
+        if RDRCaseViewer is not None and QApplication is not None and cls.use_gui:
             cls.app = QApplication(sys.argv)
             cls.viewer = RDRCaseViewer()
 
@@ -68,8 +69,8 @@ class TestRDR(TestCase):
                                  expert_answers_dir=self.expert_answers_dir,
                                  expert_answers_file="scrdr_expert_answers_fit",
                                  load_answers=True)
-        render_tree(scrdr.start_rule, use_dot_exporter=True,
-                    filename=self.test_results_dir + f"/scrdr")
+        # render_tree(scrdr.start_rule, use_dot_exporter=True,
+        #             filename=self.test_results_dir + f"/scrdr")
 
     def test_fit_scrdr_with_no_targets(self):
         # Test with no targets
@@ -78,8 +79,8 @@ class TestRDR(TestCase):
                                             expert_answers_file="scrdr_expert_answers_fit_no_targets",
                                             load_answers=True,
                                             save_answers=False)
-        render_tree(scrdr.start_rule, use_dot_exporter=True,
-                    filename=self.test_results_dir + f"/scrdr_no_targets")
+        # render_tree(scrdr.start_rule, use_dot_exporter=True,
+        #             filename=self.test_results_dir + f"/scrdr_no_targets")
 
     def test_write_scrdr_no_targets_to_python_file(self):
         # Test with no targets
@@ -100,8 +101,8 @@ class TestRDR(TestCase):
                               expert_answers_file="mcrdr_expert_answers_fit_no_targets",
                               load_answers=True,
                               save_answers=False)
-        render_tree(mcrdr.start_rule, use_dot_exporter=True,
-                    filename=self.test_results_dir + f"/mcrdr_no_targets")
+        # render_tree(mcrdr.start_rule, use_dot_exporter=True,
+        #             filename=self.test_results_dir + f"/mcrdr_no_targets")
         for case, target in zip(self.all_cases[:20], self.targets[:20]):
             cat = mcrdr.classify(case)
             self.assertEqual(make_set(cat), make_set(target))
@@ -157,8 +158,8 @@ class TestRDR(TestCase):
                                  expert_answers_file="scrdr_multi_line_expert_answers_fit",
                                  load_answers=True,
                                  save_answers=False)
-        render_tree(scrdr.start_rule, use_dot_exporter=True,
-                    filename=self.test_results_dir + f"/scrdr_multi_line")
+        # render_tree(scrdr.start_rule, use_dot_exporter=True,
+        #             filename=self.test_results_dir + f"/scrdr_multi_line")
 
     def test_write_multi_line_scrdr_to_python_file(self):
         n = 20
@@ -271,8 +272,8 @@ class TestRDR(TestCase):
         mcrdr = MultiClassRDR()
         case_queries = self.case_queries
         mcrdr.fit(case_queries, expert=expert, animate_tree=draw_tree)
-        render_tree(mcrdr.start_rule, use_dot_exporter=True,
-                    filename=self.test_results_dir + f"/mcrdr_stop_only")
+        # render_tree(mcrdr.start_rule, use_dot_exporter=True,
+        #             filename=self.test_results_dir + f"/mcrdr_stop_only")
         for case_query in case_queries:
             cat = mcrdr.classify(case_query.case)
             self.assertEqual(make_set(cat), make_set(case_query.target_value))
@@ -293,8 +294,8 @@ class TestRDR(TestCase):
         mcrdr = MultiClassRDR(mode=MCRDRMode.StopPlusRule)
         case_queries = self.case_queries
         mcrdr.fit(case_queries, expert=expert, animate_tree=draw_tree)
-        render_tree(mcrdr.start_rule, use_dot_exporter=True,
-                    filename=self.test_results_dir + f"/mcrdr_stop_plus_rule")
+        # render_tree(mcrdr.start_rule, use_dot_exporter=True,
+        #             filename=self.test_results_dir + f"/mcrdr_stop_plus_rule")
         for case_query in case_queries:
             cat = mcrdr.classify(case_query.case)
             self.assertEqual(make_set(cat), make_set(case_query.target_value))
@@ -315,8 +316,8 @@ class TestRDR(TestCase):
         mcrdr = MultiClassRDR(mode=MCRDRMode.StopPlusRuleCombined)
         case_queries = self.case_queries
         mcrdr.fit(case_queries, expert=expert, animate_tree=draw_tree)
-        render_tree(mcrdr.start_rule, use_dot_exporter=True,
-                    filename=self.test_results_dir + f"/mcrdr_stop_plus_rule_combined")
+        # render_tree(mcrdr.start_rule, use_dot_exporter=True,
+        #             filename=self.test_results_dir + f"/mcrdr_stop_plus_rule_combined")
         for case_query in case_queries:
             cat = mcrdr.classify(case_query.case)
             self.assertEqual(make_set(cat), make_set(case_query.target_value))
@@ -353,9 +354,9 @@ class TestRDR(TestCase):
     def test_fit_grdr(self):
         grdr, all_targets = get_fit_grdr(self.all_cases, self.targets, draw_tree=False,
                                          load_answers=True, save_answers=False)
-        for conclusion_name, rdr in grdr.start_rules_dict.items():
-            render_tree(rdr.start_rule, use_dot_exporter=True,
-                        filename=self.test_results_dir + f"/grdr_{conclusion_name}")
+        # for conclusion_name, rdr in grdr.start_rules_dict.items():
+        #     render_tree(rdr.start_rule, use_dot_exporter=True,
+        #                 filename=self.test_results_dir + f"/grdr_{conclusion_name}")
 
 
 if __name__ == "__main__":

{ripple_down_rules-0.4.86 → ripple_down_rules-0.4.88}/test/test_rdr_alchemy.py

@@ -131,9 +131,9 @@ class TestAlchemyRDR(TestCase):
                 case_queries.append(CaseQuery(case, attr, (Species,) if attr == 'species' else (HabitatTable,),
                                               True if attr == 'species' else False, _target=target))
         grdr.fit(case_queries, expert=expert, animate_tree=draw_tree)
-        for rule in grdr.start_rules:
-            render_tree(rule, use_dot_exporter=True,
-                        filename=self.test_results_dir + f"/grdr_{type(rule.conclusion).__name__}")
+        # for rule in grdr.start_rules:
+        #     render_tree(rule, use_dot_exporter=True,
+        #                 filename=self.test_results_dir + f"/grdr_{type(rule.conclusion).__name__}")
 
         for case, case_targets in zip(self.all_cases[:n], habitat_targets):
             cat = grdr.classify(case)

{ripple_down_rules-0.4.86 → ripple_down_rules-0.4.88}/test/test_rdr_world.py

@@ -112,7 +112,7 @@ class TestRDRWorld(TestCase):
                 view = Drawer(handle, container, world=world)
                 all_possible_drawers.append(view)
 
-        print(all_possible_drawers)
+        # print(all_possible_drawers)
         cls.drawer_case_queries = [CaseQuery(possible_drawer, "correct", (bool,), True, default_value=False)
                                    for possible_drawer in all_possible_drawers]
         cls.app = QApplication(sys.argv)
@@ -152,7 +152,7 @@ class TestRDRWorld(TestCase):
             expert.save_answers(filename)
 
         found_views = rdr.classify(self.world)
-        print(found_views)
+        # print(found_views)
         for view in views:
             self.assertTrue(len([v for v in found_views["views"] if isinstance(v, view)]) > 0)
 

{ripple_down_rules-0.4.86 → ripple_down_rules-0.4.88}/test/test_relational_rdr.py

@@ -56,8 +56,8 @@ class RelationalRDRTestCase(TestCase):
 
         scrdr = SingleClassRDR()
         cat = scrdr.fit_case(CaseQuery(self.robot, "contained_objects", (PhysicalObject,), False), expert=expert)
-        render_tree(scrdr.start_rule, use_dot_exporter=True,
-                    filename=self.test_results_dir + "/relational_scrdr_classify")
+        # render_tree(scrdr.start_rule, use_dot_exporter=True,
+        #             filename=self.test_results_dir + "/relational_scrdr_classify")
         self.assertEqual(cat, self.target)
 
         if save_answers:

{ripple_down_rules-0.4.86 → ripple_down_rules-0.4.88}/test/test_relational_rdr_alchemy.py

@@ -155,8 +155,8 @@ class RelationalRDRTestCase(TestCase):
 
         scrdr = SingleClassRDR()
         cat = scrdr.fit_case(CaseQuery(self.robot, "contained_objects", (PhysicalObject,), False), expert=expert)
-        render_tree(scrdr.start_rule, use_dot_exporter=True,
-                    filename=self.test_results_dir + "/relational_scrdr_classify")
+        # render_tree(scrdr.start_rule, use_dot_exporter=True,
+        #             filename=self.test_results_dir + "/relational_scrdr_classify")
         self.assertEqual(cat, self.target)
 
         if save_answers:

{ripple_down_rules-0.4.86 → ripple_down_rules-0.4.88}/test/test_results/datasets_physical_object_is_a_robot.json

@@ -27,8 +27,8 @@
                         "builtins.bool"
                     ],
                     "scope": {
-                        "Robot": "ripple_down_rules.datasets.Robot",
-                        "PhysicalObject": "ripple_down_rules.datasets.PhysicalObject"
+                        "PhysicalObject": "ripple_down_rules.datasets.PhysicalObject",
+                        "Robot": "ripple_down_rules.datasets.Robot"
                     },
                     "conclusion": {
                         "_type": "builtins.NoneType",

{ripple_down_rules-0.4.86 → ripple_down_rules-0.4.88}/test/test_results/datasets_physical_object_select_objects_that_are_parts_of_robot.json

@@ -12,9 +12,9 @@
                         "builtins.bool"
                     ],
                     "scope": {
+                        "PhysicalObject": "ripple_down_rules.datasets.PhysicalObject",
                         "Robot": "ripple_down_rules.datasets.Robot",
-                        "List": "typing.List",
-                        "PhysicalObject": "ripple_down_rules.datasets.PhysicalObject"
+                        "List": "typing.List"
                     },
                     "conclusion": {
                         "_type": "builtins.NoneType",
@@ -31,9 +31,9 @@
                         "builtins.list"
                     ],
                     "scope": {
+                        "PhysicalObject": "ripple_down_rules.datasets.PhysicalObject",
                         "Robot": "ripple_down_rules.datasets.Robot",
-                        "List": "typing.List",
-                        "PhysicalObject": "ripple_down_rules.datasets.PhysicalObject"
+                        "List": "typing.List"
                     },
                     "conclusion": {
                         "_type": "builtins.NoneType",

{ripple_down_rules-0.4.86 → ripple_down_rules-0.4.88}/test/test_sql_model.py

@@ -18,17 +18,17 @@ class TestDDL(unittest.TestCase):
         a1 = MappedAnimal(name="animal", hair=True, feathers=False, eggs=True, milk=False, airborne=False, aquatic=False, predator=False,
                           toothed=True, backbone=True, breathes=True, venomous=False, fins=False, legs=4, tail=True,
                           domestic=False, catsize=True, species=Species.mammal)
-        print(a1.habitats)
-        print(isinstance(a1.habitats, set))
+        # print(a1.habitats)
+        # print(isinstance(a1.habitats, set))
         self.session.add(a1)
         self.session.commit()
 
         animals = self.session.scalars(select(MappedAnimal)).all()
 
         a1.habitats.add(HabitatTable(Habitat.water))
-        print(a1.habitats)
+        # print(a1.habitats)
         self.session.commit()
 
         queried_a1 = self.session.scalars(select(HabitatTable)).first()
-        print(queried_a1)
+        # print(queried_a1)
 

ripple_down_rules-0.4.86/src/ripple_down_rules/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.4.86"