ripple-down-rules 0.6.12__tar.gz → 0.6.14__tar.gz

{ripple_down_rules-0.6.12 → ripple_down_rules-0.6.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ripple_down_rules
-Version: 0.6.12
+Version: 0.6.14
 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.12 → ripple_down_rules-0.6.14}/src/ripple_down_rules/__init__.py

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

{ripple_down_rules-0.6.12 → ripple_down_rules-0.6.14}/src/ripple_down_rules/helpers.py

@@ -55,7 +55,7 @@ def general_rdr_classify(classifiers_dict: Dict[str, Union[ModuleType, RippleDow
             if attribute_name in new_conclusions:
                 temp_case_query = CaseQuery(case_cp, attribute_name, rdr.conclusion_type, rdr.mutually_exclusive)
                 update_case(temp_case_query, new_conclusions)
-        if len(new_conclusions) == 0: #or (len(classifiers_dict) == 1 and all(rdr.mutually_exclusive for rdr in classifiers_dict.values())):
+        if len(new_conclusions) == 0 or len(classifiers_dict) == 1:
             break
     return conclusions
 

{ripple_down_rules-0.6.12 → ripple_down_rules-0.6.14}/src/ripple_down_rules/rdr.py

@@ -92,8 +92,21 @@ class RippleDownRules(SubclassJSONSerializer, ABC):
         self.start_rule = start_rule
         self.fig: Optional[Figure] = None
         self.viewer: Optional[RDRCaseViewer] = viewer
-        if self.viewer is not None:
-            self.viewer.set_save_function(self.save)
+        if viewer is None:
+            if len(RDRCaseViewer.instances) > 0:
+                self.viewer = RDRCaseViewer.instances[0]
+                logger.error("No viewer was provided, but there is already an existing viewer. "
+                             "Using the existing viewer.")
+
+    @property
+    def viewer(self):
+        return self._viewer
+    
+    @viewer.setter
+    def viewer(self, value):
+        self._viewer = value
+        if value is not None:
+            value.set_save_function(self.save)
 
     def save(self, save_dir: Optional[str] = None, model_name: Optional[str] = None,
              package_name: Optional[str] = None) -> str:

{ripple_down_rules-0.6.12 → ripple_down_rules-0.6.14}/src/ripple_down_rules/rdr_decorators.py

@@ -33,7 +33,7 @@ class RDRDecorator:
                  viewer: Optional[RDRCaseViewer] = None,
                  package_name: Optional[str] = None,
                  use_generated_classifier: bool = False,
-                 ask_now: Callable[[Any, Any], bool] = lambda _,n: True,
+                 ask_now: Callable[Dict[str, Any], bool] = lambda _: True,
                  fitting_decorator: Optional[Callable] = None):
         """
         :param models_dir: The directory to save/load the RDR models.
@@ -99,7 +99,7 @@ class RDRDecorator:
                                            viewer=self.viewer)
                 return output
             
-            if self.fit and not self.use_generated_classifier and self.ask_now(case_dict, self.rdr.classify(case)):
+            if self.fit and not self.use_generated_classifier and self.ask_now(case_dict):
                 output = fit()
             else:
                 if self.use_generated_classifier:
@@ -167,6 +167,7 @@ class RDRDecorator:
         return Case(dict, id(case_dict), case_name, case_dict, **case_dict), case_dict
 
     def initialize_rdr_model_name_and_load(self, func: Callable) -> None:
+        self.viewer = RDRCaseViewer.instances[0] if len(RDRCaseViewer.instances) > 0 else self.viewer
         model_file_name = get_func_rdr_model_name(func, include_file_name=True)
         self.model_name = str_to_snake_case(model_file_name)
         self.load()
@@ -201,10 +202,8 @@ class RDRDecorator:
             model_path = os.path.join(self.rdr_models_dir, self.model_name + f"/rdr_metadata/{self.model_name}.json")
             if os.path.exists(os.path.join(self.rdr_models_dir, model_path)):
                 self.rdr = GeneralRDR.load(self.rdr_models_dir, self.model_name, package_name=self.package_name)
-                self.rdr.set_viewer(self.viewer)
         if self.rdr is None:
-            self.rdr = GeneralRDR(save_dir=self.rdr_models_dir, model_name=self.model_name,
-                                  viewer=self.viewer)
+            self.rdr = GeneralRDR(save_dir=self.rdr_models_dir, model_name=self.model_name)
 
     def update_from_python(self):
         """

{ripple_down_rules-0.6.12 → ripple_down_rules-0.6.14}/src/ripple_down_rules/user_interface/gui.py

@@ -282,11 +282,14 @@ class RDRCaseViewer(QMainWindow):
     user_input: Optional[str] = None
     attributes_widget: Optional[QWidget] = None
     save_function: Optional[Callable[str, str], None] = None
+    instances: List[RDRCaseViewer] = []
 
     def __init__(self, parent=None,
                  save_dir: Optional[str] = None,
                  save_model_name: Optional[str] = None):
         super().__init__(parent)
+        self.instances.clear()
+        self.instances.append(self)
         self.save_dir = save_dir
         self.save_model_name = save_model_name
 

{ripple_down_rules-0.6.12 → ripple_down_rules-0.6.14}/src/ripple_down_rules.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ripple_down_rules
-Version: 0.6.12
+Version: 0.6.14
 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