bonesis-attractors: add scope option

Author: pauleve

bonesis/cli.py

@@ -90,19 +90,23 @@ def main_attractors():
     _setup_argument_domain(ap)
     ap.add_argument("--fixpoints-only", action="store_true",
             help="Enumerate only fixed points")
+    ap.add_argument("--scope", default=None,
+            help="List of nodes to display - JSON format")
     ap.add_argument("--limit", type=int,
             help="Maximum number of solutions")
     args = ap.parse_args()
 
     bonesis.settings["quiet"] = True
 
+    scope = json.loads(args.scope) if args.scope else None
+
     dom = _load_domain(args)
 
     bo = bonesis.BoNesis(dom)
     x = bo.cfg() if args.fixpoints_only else bo.hypercube()
     bo.fixed(x)
 
-    it = x.assignments()
+    it = x.assignments(scope=scope)
     if args.limit:
         it = islice(it, args.limit)
 

bonesis/views.py

@@ -340,29 +340,31 @@ def __iter__(self):
 
 class ConfigurationView(BonesisView):
     project = True
-    def __init__(self, cfg, *args, **kwargs):
+    _pred_name = "cfg"
+    def __init__(self, cfg, *args, scope=None, **kwargs):
         super().__init__(*args, **kwargs)
         self.cfg = cfg
+        self.scope = scope
     def configure_show(self):
         name = symbol_of_py(self.cfg.name)
-        self.control.add("base", [],
-            "#show."
-            f"#show cfg(X,N,V) : cfg(X,N,V), X={name}.")
+        self.control.add("base", [], "#show.")
+        if self.scope is not None:
+            for n in self.scope:
+                n = symbol_of_py(n)
+                self.control.add("base", [], f"show_scope({self._pred_name}({name},{n})).")
+            self.control.add("base", [], f"#show {self._pred_name}(X,N,V) : "
+                             f"{self._pred_name}(X,N,V), X={name},"
+                             f"show_scope({self._pred_name}(X,N)).")
+        else:
+            self.control.add("base", [], f"#show {self._pred_name}(X,N,V) :"
+                            f"{self._pred_name}(X,N,V), X={name}.")
     def format_model(self, model):
         atoms = model.symbols(shown=True)
         x = self.cfg.name
         return configurations_of_facts(atoms, keys=[x])[x]
 
-class HypercubeView(BonesisView):
-    project = True
-    def __init__(self, h, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.h = h
-    def configure_show(self):
-        name = symbol_of_py(self.h.name)
-        self.control.add("base", [],
-            "#show."
-            f"#show hypercube(X,N,V) : hypercube(X,N,V), X={name}.")
+class HypercubeView(ConfigurationView):
+    _pred_name = "hypercube"
     def format_model(self, model):
         pairs = []
         for a in model.symbols(shown=True):

tests/hypercubes.py

@@ -28,3 +28,5 @@
 
 for i, sol in enumerate(h.assignments()):
     print(i, sol)
+for i, sol in enumerate(h.assignments(scope=["a"])):
+    print(i, sol)

tests/in_attractor.py

@@ -12,3 +12,5 @@
 
 for v in x.assignments():
     print(v)
+for v in x.assignments(scope=["a","b"]):
+    print(v)