ripple-down-rules 0.0.11__tar.gz → 0.0.12__tar.gz

{ripple_down_rules-0.0.11 → ripple_down_rules-0.0.12}/PKG-INFO

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

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ripple_down_rules"
-version = "0.0.11"
+version = "0.0.12"
 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" }]

{ripple_down_rules-0.0.11 → ripple_down_rules-0.0.12}/src/ripple_down_rules/rdr.py

@@ -199,7 +199,7 @@ class RDRWithCodeWriter(RDR, ABC):
         """
         func_def = f"def classify(case: {self.case_type.__name__}) -> {self._get_conclusion_type_hint()}:\n"
         with open(file_path + f"/{self.generated_python_file_name}.py", "w") as f:
-            f.write(self._get_imports())
+            f.write(self._get_imports() + "\n\n")
             f.write(func_def)
             f.write(f"{' '*4}if not isinstance(case, Case):\n"
                     f"{' '*4}    case = create_case(case, recursion_idx=3)\n""")
@@ -222,7 +222,6 @@ class RDRWithCodeWriter(RDR, ABC):
         if self.conclusion_type.__module__ != "builtins":
             imports += f"from {self.conclusion_type.__module__} import {self.conclusion_type.__name__}\n"
         imports += "from ripple_down_rules.datastructures import Case, create_case\n"
-        imports += "\n\n"
         return imports
 
     def get_rdr_classifier_from_python_file(self, package_name) -> Callable[[Any], Any]:
@@ -452,8 +451,8 @@ class MultiClassRDR(RDRWithCodeWriter):
         return f"Set[{self.conclusion_type.__name__}]"
 
     def _get_imports(self) -> str:
-        imports = super()._get_imports().strip('\n')
-        imports += "\nfrom typing_extensions import Set\n\n"
+        imports = super()._get_imports()
+        imports += "from typing_extensions import Set\n"
         return imports
 
     def update_start_rule(self, case: Union[Case, SQLTable], target: Any, expert: Expert):

{ripple_down_rules-0.0.11 → ripple_down_rules-0.0.12}/src/ripple_down_rules.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ripple_down_rules
-Version: 0.0.11
+Version: 0.0.12
 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.0.11 → ripple_down_rules-0.0.12}/test/test_rdr.py

@@ -82,10 +82,9 @@ class TestRDR(TestCase):
         mcrdr = self.get_fit_mcrdr()
         mcrdr.write_to_python_file(self.generated_rdrs_dir)
         classify_species_mcrdr = mcrdr.get_rdr_classifier_from_python_file(self.generated_rdrs_dir)
-        for case in self.all_cases:
-            cat_1 = mcrdr.classify(case)
-            cat_2 = classify_species_mcrdr(case)
-            self.assertEqual(make_set(cat_1), make_set(cat_2))
+        for case, target in zip(self.all_cases, self.targets):
+            cat = classify_species_mcrdr(case)
+            self.assertEqual(make_set(cat), make_set(target))
 
     def test_classify_mcrdr(self):
         use_loaded_answers = True
@@ -115,7 +114,7 @@ class TestRDR(TestCase):
             expert.load_answers(filename)
         mcrdr = MultiClassRDR()
         case_queries = [CaseQuery(case, target=target) for case, target in zip(self.all_cases, self.targets)]
-        mcrdr.fit(case_queries, expert=expert, animate_tree=draw_tree, n_iter=1)
+        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")
         cats = mcrdr.classify(self.all_cases[50])
@@ -345,5 +344,5 @@ class TestRDR(TestCase):
         expert.load_answers(filename)
         mcrdr = MultiClassRDR()
         case_queries = [CaseQuery(case, target=target) for case, target in zip(self.all_cases, self.targets)]
-        mcrdr.fit(case_queries, expert=expert, animate_tree=draw_tree, n_iter=1)
+        mcrdr.fit(case_queries, expert=expert, animate_tree=draw_tree)
         return mcrdr