diff --git a/angular_frontend/src/assets/config.json b/angular_frontend/src/assets/config.json index 25131302..0c351ef2 100644 --- a/angular_frontend/src/assets/config.json +++ b/angular_frontend/src/assets/config.json @@ -1,4 +1,4 @@ { - "serverUrl":"http://localhost", - "serverPort":"8000" + "serverUrl": "http://localhost", + "serverPort": "8000" } \ No newline at end of file diff --git a/clinguin/client/presentation/frontends/angular_frontend/clinguin_angular_frontend/assets/config.json b/clinguin/client/presentation/frontends/angular_frontend/clinguin_angular_frontend/assets/config.json index b5e6ad70..4a6e729b 100644 --- a/clinguin/client/presentation/frontends/angular_frontend/clinguin_angular_frontend/assets/config.json +++ b/clinguin/client/presentation/frontends/angular_frontend/clinguin_angular_frontend/assets/config.json @@ -1 +1,4 @@ -{"serverPort": 8092, "serverUrl": "http://localhost"} \ No newline at end of file +{ + "serverPort": 8092, + "serverUrl": "http://localhost" +} \ No newline at end of file diff --git a/clinguin/server/application/backends/clingo_backend.py b/clinguin/server/application/backends/clingo_backend.py index b5345968..0ce556df 100644 --- a/clinguin/server/application/backends/clingo_backend.py +++ b/clinguin/server/application/backends/clingo_backend.py @@ -43,6 +43,7 @@ def __init__(self, args): raise RuntimeError("UI files need to be provided under --ui-files") self._ui_files = args.ui_files self._constants = [f"-c {v}" for v in args.const] if args.const else [] + self._clingo_ctl_arg = args.clingo_ctl_arg if args.clingo_ctl_arg else [] self._domain_state_constructors = [] self._backup_ds_cache = {} @@ -90,6 +91,13 @@ def register_options(cls, parser): help="Constant passed to clingo, = replaces term occurrences of with ", metavar="", ) + parser.add_argument( + "--clingo-ctl-arg", + action="append", + help="""Argument that will be passed to clingo control object for the domain. + Should have format =, for example parallel-mode=2 will become --parallel-mode=2.""", + metavar="", + ) # --------------------------------------------- # Context @@ -136,7 +144,8 @@ def _init_ctl(self): Uses the provided constants and domain files. It adds the atoms. """ - self._ctl = Control(["0"] + self._constants) + args = ["0"] + self._constants + [f"--{o}" for o in self._clingo_ctl_arg] + self._ctl = Control(args) for f in self._domain_files: path = Path(f) diff --git a/clinguin/server/application/backends/clingodl_backend.py b/clinguin/server/application/backends/clingodl_backend.py index 80f383a3..da6740a1 100644 --- a/clinguin/server/application/backends/clingodl_backend.py +++ b/clinguin/server/application/backends/clingodl_backend.py @@ -38,7 +38,8 @@ def __init__(self, args): # --------------------------------------------- def _init_ctl(self): - self._ctl = Control(["0"] + self._constants) + args = ["0"] + self._constants + [f"--{o}" for o in self._clingo_ctl_arg] + self._ctl = Control(args) self._theory = ClingoDLTheory() self._theory.register(self._ctl) diff --git a/clinguin/server/application/backends/explanation_backend.py b/clinguin/server/application/backends/explanation_backend.py index e357d197..ae3bd191 100644 --- a/clinguin/server/application/backends/explanation_backend.py +++ b/clinguin/server/application/backends/explanation_backend.py @@ -59,7 +59,7 @@ def register_options(cls, parser): "--assumption-signature", help=textwrap.dedent( """\ - Signatures that will be considered as assumtions. Must be have format name,arity""" + Signatures that will be considered as true assumptions. Must be have format name,arity""" ), nargs="+", metavar="", diff --git a/docs/conf.py b/docs/conf.py index 75e6c385..3fe8f5b4 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -34,7 +34,7 @@ author = "Susana Hahn, Alexander Beiser" # The full version, including alpha/beta/rc tags -release = "1.0.7" +release = "1.0.8" # -- General configuration --------------------------------------------------- diff --git a/setup.cfg b/setup.cfg index 33de535d..dde94435 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = clinguin -version = 1.0.7 +version = 1.0.8 author = Alexander Beiser, Susana Hahn (Potassco) author_email = alexl.id.at@gmail.com, hahnmartin@uni-potsdam.de description = An interactive visualizer for clingo diff --git a/tests/reference_json_output/health.py b/tests/reference_json_output/health.py index 9f4c8929..c7fccc2f 100644 --- a/tests/reference_json_output/health.py +++ b/tests/reference_json_output/health.py @@ -6,7 +6,7 @@ class Health: def get_reference_json(cls): json_dict = { "name": "clinguin", - "version": "1.0.7", + "version": "1.0.8", "description": "An interactive visualizer for clingo", }