From 23a7967b157bb6aa7a3abebee0bc026c1f7bbd0f Mon Sep 17 00:00:00 2001 From: Claudio Scheer Date: Fri, 19 Jun 2020 16:01:15 -0300 Subject: [PATCH] Update program 4 - problem 1 --- implementation/plan.sh | 2 +- implementation/problem1-3.pddl | 14 +++---- implementation/problem1-4.pddl | 77 ++++++++++++++++++++++++++++++++-- 3 files changed, 82 insertions(+), 11 deletions(-) diff --git a/implementation/plan.sh b/implementation/plan.sh index 70c032b..8110f2a 100755 --- a/implementation/plan.sh +++ b/implementation/plan.sh @@ -1,5 +1,5 @@ #!/bin/bash rm -f dom.pddl ins.pddl output output.sas tdom.pddl tins.pddl sas_plan.* tmp_sas_plan.* -python2 ../planner/temporal-planning/bin/plan.py $1 domain.pddl $2 --no-validate --time 60 +python2 ../planner/temporal-planning/bin/plan.py $1 domain.pddl $2 --no-validate --time 30 rm -f dom.pddl ins.pddl output output.sas tdom.pddl tins.pddl #sas_plan.* tmp_sas_plan.* \ No newline at end of file diff --git a/implementation/problem1-3.pddl b/implementation/problem1-3.pddl index ea465d1..9e21873 100644 --- a/implementation/problem1-3.pddl +++ b/implementation/problem1-3.pddl @@ -2,7 +2,7 @@ (:objects id0 id1 id2 id3 id4 id5 id6 id7 id8 id9 id10 - id assignmentA assignmentA0 assignmentA1 assignmentA2 assignmentI assignmentI0 assignmentI1 - assignment - multLoop0 multLoop1 multLoop2 - operation + multip0 multip1 multip2 - operation ) (:init @@ -10,13 +10,13 @@ (assignment_id assignmentA id1) (assignment_id assignmentI id2) - (operation_id multLoop0 id3) + (operation_id multip0 id3) (assignment_id assignmentA0 id4) (assignment_id assignmentI0 id5) - (operation_id multLoop1 id6) + (operation_id multip1 id6) (assignment_id assignmentA1 id7) (assignment_id assignmentI1 id8) - (operation_id multLoop2 id9) + (operation_id multip2 id9) (assignment_id assignmentA2 id10) (dependency_tree id0 id1) @@ -37,13 +37,13 @@ (:goal (and (executed_assignment assignmentA) (executed_assignment assignmentI) - (executed_binary_operation assignmentA assignmentI multLoop0 assignmentA0) + (executed_binary_operation assignmentA assignmentI multip0 assignmentA0) (executed_assignment assignmentA0) (executed_assignment assignmentI0) - (executed_binary_operation assignmentA0 assignmentI0 multLoop1 assignmentA1) + (executed_binary_operation assignmentA0 assignmentI0 multip1 assignmentA1) (executed_assignment assignmentA1) (executed_assignment assignmentI1) - (executed_binary_operation assignmentA1 assignmentI1 multLoop2 assignmentA2) + (executed_binary_operation assignmentA1 assignmentI1 multip2 assignmentA2) (executed_assignment assignmentA2) )) ) \ No newline at end of file diff --git a/implementation/problem1-4.pddl b/implementation/problem1-4.pddl index ceebc89..499a16c 100644 --- a/implementation/problem1-4.pddl +++ b/implementation/problem1-4.pddl @@ -1,7 +1,8 @@ (define (problem problem1_4) (:domain compiler) (:objects - id0 id1 id2 id3 id4 id5 id6 - id + id0 id1 id2 id3 id4 id5 id6 id7 id8 id9 id10 id11 id12 id13 id14 - id assignmentA assignmentB assignmentC assignmentI assignmentJ assignmentK - assignment + multipSum0 multipSum1 multipSum2 multipSum3 multipSum4 multipSum5 multipSum6 multipSum7 - operation ) (:init @@ -13,15 +14,77 @@ (assignment_id assignmentI id4) (assignment_id assignmentJ id5) (assignment_id assignmentK id6) + (operation_id multipSum0 id7) + (operation_id multipSum1 id8) + (operation_id multipSum2 id9) + (operation_id multipSum3 id10) + (operation_id multipSum4 id11) + (operation_id multipSum5 id12) + (operation_id multipSum6 id13) + (operation_id multipSum7 id14) (dependency_tree id0 id1) (dependency_tree id0 id2) (dependency_tree id0 id3) - (dependency_tree id1 id4) - (dependency_tree id2 id4) (dependency_tree id3 id4) (dependency_tree id4 id5) (dependency_tree id5 id6) + + (dependency_tree id1 id7) + (dependency_tree id2 id7) + (dependency_tree id3 id7) + (dependency_tree id4 id7) + (dependency_tree id5 id7) + (dependency_tree id6 id7) + + (dependency_tree id1 id8) + (dependency_tree id2 id8) + (dependency_tree id3 id8) + (dependency_tree id4 id8) + (dependency_tree id5 id8) + (dependency_tree id6 id8) + + (dependency_tree id1 id9) + (dependency_tree id2 id9) + (dependency_tree id3 id9) + (dependency_tree id4 id9) + (dependency_tree id5 id9) + (dependency_tree id6 id9) + + (dependency_tree id1 id10) + (dependency_tree id2 id10) + (dependency_tree id3 id10) + (dependency_tree id4 id10) + (dependency_tree id5 id10) + (dependency_tree id6 id10) + + (dependency_tree id1 id11) + (dependency_tree id2 id11) + (dependency_tree id3 id11) + (dependency_tree id4 id11) + (dependency_tree id5 id11) + (dependency_tree id6 id11) + + (dependency_tree id1 id12) + (dependency_tree id2 id12) + (dependency_tree id3 id12) + (dependency_tree id4 id12) + (dependency_tree id5 id12) + (dependency_tree id6 id12) + + (dependency_tree id1 id13) + (dependency_tree id2 id13) + (dependency_tree id3 id13) + (dependency_tree id4 id13) + (dependency_tree id5 id13) + (dependency_tree id6 id13) + + (dependency_tree id1 id14) + (dependency_tree id2 id14) + (dependency_tree id3 id14) + (dependency_tree id4 id14) + (dependency_tree id5 id14) + (dependency_tree id6 id14) ) (:goal (and @@ -31,5 +94,13 @@ (executed_assignment assignmentI) (executed_assignment assignmentJ) (executed_assignment assignmentK) + (executed_binary_operation assignmentA assignmentB multipSum0 assignmentC) + (executed_binary_operation assignmentA assignmentB multipSum1 assignmentC) + (executed_binary_operation assignmentA assignmentB multipSum2 assignmentC) + (executed_binary_operation assignmentA assignmentB multipSum3 assignmentC) + (executed_binary_operation assignmentA assignmentB multipSum4 assignmentC) + (executed_binary_operation assignmentA assignmentB multipSum5 assignmentC) + (executed_binary_operation assignmentA assignmentB multipSum6 assignmentC) + (executed_binary_operation assignmentA assignmentB multipSum7 assignmentC) )) ) \ No newline at end of file -- GitLab