From 8ff87985f5742ed73561c715a3e858d66e799dca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20L=C3=BChne?= Date: Fri, 17 Nov 2017 15:15:20 +0100 Subject: [PATCH] Moved outdated encodings to separate directory. These encodings need to be updated to match the new output format. Until this is done, hide these files in a separate directory in order not to confuse users. --- README.md | 6 +++--- encodings/{ => outdated}/pddl-sequential-horizon-boolean.lp | 1 - .../{ => outdated}/pddl-sequential-incremental-boolean.lp | 1 - ...sequential-incremental-multivalued-axioms-condeffects.lp | 4 ++-- encodings/{ => outdated}/sequential-incremental.lp | 0 5 files changed, 5 insertions(+), 7 deletions(-) rename encodings/{ => outdated}/pddl-sequential-horizon-boolean.lp (99%) rename encodings/{ => outdated}/pddl-sequential-incremental-boolean.lp (99%) rename encodings/{ => outdated}/sas-sequential-incremental-multivalued-axioms-condeffects.lp (89%) rename encodings/{ => outdated}/sequential-incremental.lp (100%) diff --git a/README.md b/README.md index fcd6b40..f6bb7de 100644 --- a/README.md +++ b/README.md @@ -31,11 +31,11 @@ plasp translate output.sas ### Solving the Translated Instance -The translated instance can finally be solved incrementally with `clingo` and a meta encoding, for instance, [`sequential-incremental.lp`](encodings/sequential-incremental.lp): +The translated instance can finally be solved with `clingo` and a meta encoding, for instance, [`sequential-horizon.lp`](encodings/sequential-horizon.lp): ```sh plasp translate domain.pddl problem.pddl > instance.lp -clingo encodings/sequential-incremental.lp instance.lp +clingo encodings/sequential-horizon.lp -c horizon=10 instance.lp ``` ### Translator Output Format @@ -43,7 +43,7 @@ clingo encodings/sequential-incremental.lp instance.lp `plasp translate` provides a uniform output format for SAS and PDDL input problems. See [output format](doc/output-format.md) for more details. -If you want to write your own meta encoding for `plasp translate`’s output, this [simple example encoding](encodings/sequential-incremental.lp) gets you started. +If you want to write your own meta encoding for `plasp translate`’s output, this [simple example encoding](encodings/sequential-horizon.lp) gets you started. ## Provided Tools diff --git a/encodings/pddl-sequential-horizon-boolean.lp b/encodings/outdated/pddl-sequential-horizon-boolean.lp similarity index 99% rename from encodings/pddl-sequential-horizon-boolean.lp rename to encodings/outdated/pddl-sequential-horizon-boolean.lp index 03c2605..87d792d 100644 --- a/encodings/pddl-sequential-horizon-boolean.lp +++ b/encodings/outdated/pddl-sequential-horizon-boolean.lp @@ -25,4 +25,3 @@ goalAt(T) :- holds(variable(Variable),T) : goal(variable(Variable), value(Va #show occurs/2. % #show holds/2. - diff --git a/encodings/pddl-sequential-incremental-boolean.lp b/encodings/outdated/pddl-sequential-incremental-boolean.lp similarity index 99% rename from encodings/pddl-sequential-incremental-boolean.lp rename to encodings/outdated/pddl-sequential-incremental-boolean.lp index da03935..d40f08f 100644 --- a/encodings/pddl-sequential-incremental-boolean.lp +++ b/encodings/outdated/pddl-sequential-incremental-boolean.lp @@ -28,4 +28,3 @@ goalAt(t) :- holds(variable(Variable),t) : goal(variable(Variable), value(Va #show occurs/2. % #show holds/2. - diff --git a/encodings/sas-sequential-incremental-multivalued-axioms-condeffects.lp b/encodings/outdated/sas-sequential-incremental-multivalued-axioms-condeffects.lp similarity index 89% rename from encodings/sas-sequential-incremental-multivalued-axioms-condeffects.lp rename to encodings/outdated/sas-sequential-incremental-multivalued-axioms-condeffects.lp index 4870248..d03bce8 100644 --- a/encodings/sas-sequential-incremental-multivalued-axioms-condeffects.lp +++ b/encodings/outdated/sas-sequential-incremental-multivalued-axioms-condeffects.lp @@ -22,7 +22,7 @@ stateVariable(Variable) :- headVariable(_,Variable). % Apply effects caused(Variable, Value, t) :- occurs(Action, t), postcondition(Action, Effect, Variable, Value), - holds(Variable', Value', t - 1) : precondition(Effect, Variable', Value'). + holds(Variable', Value', t - 1) : precondition(Effect, Variable', Value'). changed(Variable, t) :- caused(Variable, Value, t). holds(Variable, Value, t) :- caused(Variable, Value, t). @@ -38,7 +38,7 @@ holds(Variable, Value, t) :- holds(Variable, Value, t - 1), not changed(Variable % Apply axioms derived(Variable, Value, t) :- axiomRule(Rule), postcondition(Rule,_,Variable,Value), - holds(Variable', Value', t) : precondition(Rule, Variable', Value'), not headVariable(Rule,Variable'). + holds(Variable', Value', t) : precondition(Rule, Variable', Value'), not headVariable(Rule,Variable'). modified(Variable, t) :- derived(Variable, Value, t). diff --git a/encodings/sequential-incremental.lp b/encodings/outdated/sequential-incremental.lp similarity index 100% rename from encodings/sequential-incremental.lp rename to encodings/outdated/sequential-incremental.lp