clingexplaid 1.3.2__tar.gz → 1.3.4__tar.gz

{clingexplaid-1.3.2 → clingexplaid-1.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clingexplaid
-Version: 1.3.2
+Version: 1.3.4
 Summary: Tools to aid the development of explanation systems using clingo
 Author-email: Hannes Weichelt <hweichelt@uni-potsdam.de>, Susana Hahn <susuhahnml@yahoo.com.mx>
 Maintainer-email: Hannes Weichelt <hweichelt@uni-potsdam.de>
@@ -123,6 +123,27 @@ print(result)
 print(ap.control)
 ```
 
+You can also use an existing control and pass it to the
+`AssumptionPreprocessor` as follows:
+
+```python
+
+FILE = "local/encoding.lp"
+
+ctl = clingo.Control("0")
+ap = AssumptionPreprocessor(
+    control=ctl,
+    filters=[
+    FilterSignature("a", 1),
+    FilterPattern("d(2)")
+])
+ap.process_files([FILE])
+
+# The transformed files are added to ctl so it can be directly used
+ctl.ground([("base", [])])
+ctl.solve()
+```
+
 Getting a single MUS:
 
 ```python

{clingexplaid-1.3.2 → clingexplaid-1.3.4}/README.md

@@ -54,6 +54,27 @@ print(result)
 print(ap.control)
 ```
 
+You can also use an existing control and pass it to the
+`AssumptionPreprocessor` as follows:
+
+```python
+
+FILE = "local/encoding.lp"
+
+ctl = clingo.Control("0")
+ap = AssumptionPreprocessor(
+    control=ctl,
+    filters=[
+    FilterSignature("a", 1),
+    FilterPattern("d(2)")
+])
+ap.process_files([FILE])
+
+# The transformed files are added to ctl so it can be directly used
+ctl.ground([("base", [])])
+ctl.solve()
+```
+
 Getting a single MUS:
 
 ```python

{clingexplaid-1.3.2 → clingexplaid-1.3.4}/src/clingexplaid/preprocessors/preprocessor_assumption.py

@@ -98,7 +98,7 @@ class AssumptionPreprocessor:
             rules.append(f"#const {constant}={value}.")
         return "\n".join(rules) + "\n"
 
-    def _unpool(self, ast_symbol: clingo.ast.ASTType.SymbolicAtom) -> Set[clingo.Symbol]:
+    def _unpool(self, ast_symbol: clingo.ast.AST) -> Set[clingo.Symbol]:
         if ".." in str(ast_symbol):
             # Case range in ast symbol (i.e. 1..10)
             # Solved using grounding, but if possible, I'd rather avoid this if possible
@@ -116,7 +116,7 @@ class AssumptionPreprocessor:
         atoms_unpooled = ast_symbol.unpool()
         return {clingo.parse_term(str(a)) for a in atoms_unpooled}
 
-    def _transform_rule(self, rule: clingo.ast.ASTType.Rule) -> List[clingo.ast.ASTType.Rule]:
+    def _transform_rule(self, rule: clingo.ast.AST) -> List[clingo.ast.AST]:
         if rule.head.ast_type != clingo.ast.ASTType.Literal:
             return [rule]
         if rule.body:
@@ -161,9 +161,6 @@ class AssumptionPreprocessor:
         if ast.ast_type == clingo.ast.ASTType.Definition:
             self._add_constant(str(ast.name), ast.value.symbol)
         self._parsed_rules.append(str(ast))
-        warnings.warn(
-            "Currently the ProgramBuilder does not fill the control. Please add the processed programm manually."
-        )
         builder.add(ast)
 
     def _process_ast_list(self, ast_list: List[clingo.ast.AST], builder: ProgramBuilder) -> None:
@@ -182,9 +179,8 @@ class AssumptionPreprocessor:
 
     def process(self, program_string: str) -> str:
         """Processes the provided program string and returns the transformed program string (control is also updated)"""
-        control = clingo.Control("0")
         ast_list: List[clingo.ast.AST] = []
-        with ProgramBuilder(control) as builder:
+        with ProgramBuilder(self.control) as builder:
             parse_string(program_string, ast_list.append)
             self._process_ast_list(ast_list, builder)
         self._processed = True
@@ -195,9 +191,8 @@ class AssumptionPreprocessor:
         if files is None:
             warnings.warn("Nothing to process, no files provided")
             return ""
-        control = clingo.Control("0")
         ast_list: List[clingo.ast.AST] = []
-        with ProgramBuilder(control) as builder:
+        with ProgramBuilder(self.control) as builder:
             parse_files(files, ast_list.append)
             self._process_ast_list(ast_list, builder)
         self._processed = True

{clingexplaid-1.3.2 → clingexplaid-1.3.4}/src/clingexplaid.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clingexplaid
-Version: 1.3.2
+Version: 1.3.4
 Summary: Tools to aid the development of explanation systems using clingo
 Author-email: Hannes Weichelt <hweichelt@uni-potsdam.de>, Susana Hahn <susuhahnml@yahoo.com.mx>
 Maintainer-email: Hannes Weichelt <hweichelt@uni-potsdam.de>
@@ -123,6 +123,27 @@ print(result)
 print(ap.control)
 ```
 
+You can also use an existing control and pass it to the
+`AssumptionPreprocessor` as follows:
+
+```python
+
+FILE = "local/encoding.lp"
+
+ctl = clingo.Control("0")
+ap = AssumptionPreprocessor(
+    control=ctl,
+    filters=[
+    FilterSignature("a", 1),
+    FilterPattern("d(2)")
+])
+ap.process_files([FILE])
+
+# The transformed files are added to ctl so it can be directly used
+ctl.ground([("base", [])])
+ctl.solve()
+```
+
 Getting a single MUS:
 
 ```python

{clingexplaid-1.3.2 → clingexplaid-1.3.4}/tests/clingexplaid/test_preprocessors.py

@@ -79,8 +79,7 @@ class TestPreprocessors(TestCase):
         program_path = TEST_DIR.joinpath("res/test_program_constants.lp")
         ap = AssumptionPreprocessor()
         with open(program_path, "r", encoding="utf-8") as file:
-            result = ap.process(file.read())
-        ap.control.add("base", [], result)
+            ap.process(file.read())
         ap.control.ground([("base", [])])
         self.assertEqual(
             ap.constants,