diff --git a/planutils/packages/kstar-legacy/install b/planutils/packages/kstar-legacy/install new file mode 100755 index 0000000..b0c3a17 --- /dev/null +++ b/planutils/packages/kstar-legacy/install @@ -0,0 +1,3 @@ +#!/bin/bash + +singularity pull --name kstar.sif shub://ctpelok77/kstar diff --git a/planutils/packages/kstar-legacy/manifest.json b/planutils/packages/kstar-legacy/manifest.json new file mode 100644 index 0000000..3940e70 --- /dev/null +++ b/planutils/packages/kstar-legacy/manifest.json @@ -0,0 +1,38 @@ +{ + "name": "K* planner: integrating the K* algorithm into Fast Downward", + "description": "The first K∗ based solver for PDDL planning tasks; it is best suited for problems with very large solution set-size requirements (>1,000).", + "homepage": "https://github.com/ctpelok77/kstar", + "install-size": "36M", + "dependencies": [], + "endpoint": { + "services": { + "solve": { + "template": "planner", + "args":[ + { + "name": "search_algorithm", + "type": "categorical", + "description": "Search Algorithm", + "choices":[ + { + "display_value":"Kstar Blind k=1", + "value":"kstar(blind(),k=1)" + }, + { + "display_value":"Kstar Blind k=2", + "value":"kstar(blind(),k=2)" + } + ], + "default":"kstar(blind(),k=1)" + } + ], + "call":"{package_name} {domain} {problem} --search '{search_algorithm}'", + "return": { + "type": "generic", + "files": "found_plans/sas_plan.*" + } + } + + } + } +} diff --git a/planutils/packages/kstar-legacy/run b/planutils/packages/kstar-legacy/run new file mode 100755 index 0000000..b68b336 --- /dev/null +++ b/planutils/packages/kstar-legacy/run @@ -0,0 +1,3 @@ +#!/bin/bash + +singularity run -e $(dirname $0)/kstar.sif $@ diff --git a/planutils/packages/kstar-legacy/uninstall b/planutils/packages/kstar-legacy/uninstall new file mode 100755 index 0000000..2f104a5 --- /dev/null +++ b/planutils/packages/kstar-legacy/uninstall @@ -0,0 +1,3 @@ +#!/bin/bash + +rm kstar.sif diff --git a/planutils/packages/kstar/install b/planutils/packages/kstar/install index b0c3a17..f7d5d81 100755 --- a/planutils/packages/kstar/install +++ b/planutils/packages/kstar/install @@ -1,3 +1,3 @@ #!/bin/bash -singularity pull --name kstar.sif shub://ctpelok77/kstar +python3 -m pip install kstar-planner==1.4.6 diff --git a/planutils/packages/kstar/manifest.json b/planutils/packages/kstar/manifest.json index 3940e70..0210aac 100644 --- a/planutils/packages/kstar/manifest.json +++ b/planutils/packages/kstar/manifest.json @@ -1,8 +1,8 @@ { - "name": "K* planner: integrating the K* algorithm into Fast Downward", - "description": "The first K∗ based solver for PDDL planning tasks; it is best suited for problems with very large solution set-size requirements (>1,000).", - "homepage": "https://github.com/ctpelok77/kstar", - "install-size": "36M", + "name": "K* planner", + "description": "New implementation of K* search based on Fast Downward.", + "homepage": "https://github.com/ibm/kstar", + "install-size": "203M", "dependencies": [], "endpoint": { "services": { @@ -10,29 +10,41 @@ "template": "planner", "args":[ { - "name": "search_algorithm", + "name": "number_of_plans", + "type": "int", + "description": "Number of Plans", + "default": 10 + }, + { + "name": "quality", + "type": "string", + "description": "Quality bound", + "default": "1.0" + }, + { + "name": "unordered", "type": "categorical", - "description": "Search Algorithm", + "description": "Unordered top-quality", "choices":[ { - "display_value":"Kstar Blind k=1", - "value":"kstar(blind(),k=1)" + "display_value":"Unordered top-quality planner", + "value":"--unordered" }, { - "display_value":"Kstar Blind k=2", - "value":"kstar(blind(),k=2)" + "display_value":"Top-quality planner", + "value":"" } ], - "default":"kstar(blind(),k=1)" + "default":"--unordered" } + ], - "call":"{package_name} {domain} {problem} --search '{search_algorithm}'", + "call":"{package_name} -k {number_of_plans} -q {quality} -H lmcut {unordered} {domain} {problem} >> plan", "return": { - "type": "generic", - "files": "found_plans/sas_plan.*" + "type": "log", + "files": "*plan*" } } - } } -} +} \ No newline at end of file diff --git a/planutils/packages/kstar/run b/planutils/packages/kstar/run index b68b336..f2e172b 100755 --- a/planutils/packages/kstar/run +++ b/planutils/packages/kstar/run @@ -1,3 +1,3 @@ #!/bin/bash -singularity run -e $(dirname $0)/kstar.sif $@ +kstar_planner $@ diff --git a/planutils/packages/kstar/uninstall b/planutils/packages/kstar/uninstall index 2f104a5..4876c00 100755 --- a/planutils/packages/kstar/uninstall +++ b/planutils/packages/kstar/uninstall @@ -1,3 +1,3 @@ #!/bin/bash -rm kstar.sif +python3 -m pip uninstall kstar-planner