ripple-down-rules 0.0.1__tar.gz → 0.0.3__tar.gz

{ripple_down_rules-0.0.1 → ripple_down_rules-0.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ripple_down_rules
-Version: 0.0.1
+Version: 0.0.3
 Summary: Implements the various versions of Ripple Down Rules (RDR) for knowledge representation and reasoning.
 Author-email: Abdelrhman Bassiouny <abassiou@uni-bremen.de>
 Project-URL: Homepage, https://github.com/AbdelrhmanBassiouny/ripple_down_rules
@@ -8,7 +8,6 @@ Keywords: robotics,knowledge,reasoning,representation
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-Requires-Dist: neem_pycram_interface==1.0.167
 
 # Ripple Down Rules (RDR)
 
@@ -34,6 +33,7 @@ Fit the SCRDR to the data, then classify one of the data cases to check if its c
 and render the tree to a file:
 
 ```Python
+from ripple_down_rules.datastructures import CaseQuery
 from ripple_down_rules.rdr import SingleClassRDR
 from ripple_down_rules.datasets import load_zoo_dataset
 from ripple_down_rules.utils import render_tree
@@ -43,8 +43,8 @@ all_cases, targets = load_zoo_dataset()
 scrdr = SingleClassRDR()
 
 # Fit the SCRDR to the data
-scrdr.fit(all_cases, targets,
-          animate_tree=True, n_iter=10)
+case_queries = [CaseQuery(case, target=target) for case, target in zip(all_cases, targets)]
+scrdr.fit(case_queries, animate_tree=True)
 
 # Render the tree to a file
 render_tree(scrdr.start_rule, use_dot_exporter=True, filename="scrdr")

{ripple_down_rules-0.0.1 → ripple_down_rules-0.0.3}/README.md

@@ -22,6 +22,7 @@ Fit the SCRDR to the data, then classify one of the data cases to check if its c
 and render the tree to a file:
 
 ```Python
+from ripple_down_rules.datastructures import CaseQuery
 from ripple_down_rules.rdr import SingleClassRDR
 from ripple_down_rules.datasets import load_zoo_dataset
 from ripple_down_rules.utils import render_tree
@@ -31,8 +32,8 @@ all_cases, targets = load_zoo_dataset()
 scrdr = SingleClassRDR()
 
 # Fit the SCRDR to the data
-scrdr.fit(all_cases, targets,
-          animate_tree=True, n_iter=10)
+case_queries = [CaseQuery(case, target=target) for case, target in zip(all_cases, targets)]
+scrdr.fit(case_queries, animate_tree=True)
 
 # Render the tree to a file
 render_tree(scrdr.start_rule, use_dot_exporter=True, filename="scrdr")

{ripple_down_rules-0.0.1 → ripple_down_rules-0.0.3}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ripple_down_rules"
-version = "0.0.1"
+version = "0.0.3"
 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" }]
@@ -15,8 +15,7 @@ classifiers = [
     "Programming Language :: Python :: 3",
 ]
 keywords = ["robotics", "knowledge", "reasoning", "representation"]
-dependencies = ["neem_pycram_interface==1.0.167",
-]
+dependencies = []
 requires-python = ">=3.8"
 
 [project.urls]

{ripple_down_rules-0.0.1 → ripple_down_rules-0.0.3}/src/ripple_down_rules/datasets.py

@@ -6,7 +6,7 @@ import pickle
 import sqlalchemy
 from sqlalchemy import ForeignKey
 from sqlalchemy.orm import MappedAsDataclass, Mapped, mapped_column, relationship
-from typing_extensions import Tuple, List, Set
+from typing_extensions import Tuple, List, Set, Optional
 from ucimlrepo import fetch_ucirepo
 
 from .datastructures import Case, create_rows_from_dataframe, Category, Column
@@ -38,9 +38,9 @@ def save_dataset_to_cache(dataset, cache_file):
     print("Dataset cached successfully.")
 
 
-def get_dataset(dataset_id, cache_file):
+def get_dataset(dataset_id, cache_file: Optional[str] = None):
     """Fetches dataset from cache or downloads it if not available."""
-    dataset = load_cached_dataset(cache_file)
+    dataset = load_cached_dataset(cache_file) if cache_file else None
     if dataset is None:
         print("Downloading dataset...")
         dataset = fetch_ucirepo(id=dataset_id)
@@ -50,16 +50,23 @@ def get_dataset(dataset_id, cache_file):
             print("Error: Failed to fetch dataset.")
             return None
 
-        save_dataset_to_cache(dataset, cache_file)
+        if cache_file:
+            save_dataset_to_cache(dataset, cache_file)
+
+        dataset = {
+            "features": dataset.data.features,
+            "targets": dataset.data.targets,
+            "ids": dataset.data.ids,
+        }
 
     return dataset
 
 
-def load_zoo_dataset(cache_file: str) -> Tuple[List[Case], List[Species]]:
+def load_zoo_dataset(cache_file: Optional[str] = None) -> Tuple[List[Case], List[Species]]:
     """
     Load the zoo dataset.
 
-    :param cache_file: the cache file.
+    :param cache_file: the cache file to store the dataset or load it from.
     :return: all cases and targets.
     """
     # fetch dataset

{ripple_down_rules-0.0.1 → ripple_down_rules-0.0.3}/src/ripple_down_rules.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ripple_down_rules
-Version: 0.0.1
+Version: 0.0.3
 Summary: Implements the various versions of Ripple Down Rules (RDR) for knowledge representation and reasoning.
 Author-email: Abdelrhman Bassiouny <abassiou@uni-bremen.de>
 Project-URL: Homepage, https://github.com/AbdelrhmanBassiouny/ripple_down_rules
@@ -8,7 +8,6 @@ Keywords: robotics,knowledge,reasoning,representation
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-Requires-Dist: neem_pycram_interface==1.0.167
 
 # Ripple Down Rules (RDR)
 
@@ -34,6 +33,7 @@ Fit the SCRDR to the data, then classify one of the data cases to check if its c
 and render the tree to a file:
 
 ```Python
+from ripple_down_rules.datastructures import CaseQuery
 from ripple_down_rules.rdr import SingleClassRDR
 from ripple_down_rules.datasets import load_zoo_dataset
 from ripple_down_rules.utils import render_tree
@@ -43,8 +43,8 @@ all_cases, targets = load_zoo_dataset()
 scrdr = SingleClassRDR()
 
 # Fit the SCRDR to the data
-scrdr.fit(all_cases, targets,
-          animate_tree=True, n_iter=10)
+case_queries = [CaseQuery(case, target=target) for case, target in zip(all_cases, targets)]
+scrdr.fit(case_queries, animate_tree=True)
 
 # Render the tree to a file
 render_tree(scrdr.start_rule, use_dot_exporter=True, filename="scrdr")

{ripple_down_rules-0.0.1 → ripple_down_rules-0.0.3}/src/ripple_down_rules.egg-info/SOURCES.txt

@@ -11,7 +11,6 @@ src/ripple_down_rules/utils.py
 src/ripple_down_rules.egg-info/PKG-INFO
 src/ripple_down_rules.egg-info/SOURCES.txt
 src/ripple_down_rules.egg-info/dependency_links.txt
-src/ripple_down_rules.egg-info/requires.txt
 src/ripple_down_rules.egg-info/top_level.txt
 src/ripple_down_rules/datastructures/__init__.py
 src/ripple_down_rules/datastructures/callable_expression.py

ripple_down_rules-0.0.1/src/ripple_down_rules.egg-info/requires.txt

@@ -1 +0,0 @@
-neem_pycram_interface==1.0.167