Merge pull request #147 from AI-Planning/kstar-legacy

Update to K*

Author: haz

planutils/packages/kstar-legacy/install

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+singularity pull --name kstar.sif shub://ctpelok77/kstar

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.*"
+        }
+      }
+
+    }
+  }
+}

planutils/packages/kstar-legacy/run

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+singularity run -e $(dirname $0)/kstar.sif $@

planutils/packages/kstar-legacy/uninstall

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+rm kstar.sif

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

planutils/packages/kstar/manifest.json

@@ -1,38 +1,50 @@
 {
-  "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": {
       "solve": {
         "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*"
         }
       }
-
     }
   }
-}
+}

planutils/packages/kstar/run

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-singularity run -e $(dirname $0)/kstar.sif $@
+kstar_planner $@

planutils/packages/kstar/uninstall

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-rm kstar.sif
+python3 -m pip uninstall kstar-planner