Imported upstream version '0.1.10' of 'upstream'

jsk_planning/CHANGELOG.rst

@@ -2,6 +2,9 @@
 Changelog for package jsk_planning
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.1.10 (2017-03-03)
+-------------------
+
 0.1.9 (2017-03-01)
 ------------------
 

jsk_planning/package.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <name>jsk_planning</name>
-  <version>0.1.9</version>
+  <version>0.1.10</version>
   <description>
    <p>Metapackage that contains planning package for jsk-ros-pkg</p>
   </description>

pddl/pddl_msgs/CHANGELOG.rst

@@ -2,6 +2,9 @@
 Changelog for package pddl_msgs
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.1.10 (2017-03-03)
+-------------------
+
 0.1.9 (2017-03-01)
 ------------------
 

pddl/pddl_msgs/package.xml

@@ -1,6 +1,6 @@
 <package>
   <name>pddl_msgs</name>
-  <version>0.1.9</version>
+  <version>0.1.10</version>
   <description>message for pddl planner</description>
 
   <maintainer email="[email protected]">Ryohei Ueda</maintainer>

pddl/pddl_planner/CHANGELOG.rst

@@ -2,6 +2,11 @@
 Changelog for package pddl_planner
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.1.10 (2017-03-03)
+-------------------
+* [task_compiler] fix: symbol is compared with string (`#60 <https://github.com/jsk-ros-pkg/jsk_planning/issues/60>`_)
+* Contributors: Yuki Furuta
+
 0.1.9 (2017-03-01)
 ------------------
 

pddl/pddl_planner/package.xml

@@ -1,6 +1,6 @@
 <package>
   <name>pddl_planner</name>
-  <version>0.1.9</version>
+  <version>0.1.10</version>
   <description>pddl planner wrappers</description>
 
   <maintainer email="[email protected]">Ryohei Ueda</maintainer>

pddl/pddl_planner/test/dummy-action.l

@@ -11,13 +11,16 @@
   (ros::publish "look"
                 (instance std_msgs::String :init
                           :data (format nil "(look ~A)" obj)))
-  (setq *look-success?* (null *look-success?*)))
+  (setq *look-success?* (null *look-success?*))
+  (if *look-success?*
+      t :fail))
 
 (defun push-button (obj)
   (ros::publish "push_button"
                 (instance std_msgs::String :init
                           :data (format nil "(push-button ~A)" obj)))
-  (setq *push-success?* (null *push-success?*)))
+  (setq *push-success?* (null *push-success?*))
+  (if *push-success?* t :fail))
 
 (defun task-compiler/after-init-hook ()
   ;; this function is called when task_compiler is initialized

pddl/pddl_planner_viewer/CHANGELOG.rst

@@ -2,6 +2,9 @@
 Changelog for package pddl_planner_viewer
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.1.10 (2017-03-03)
+-------------------
+
 0.1.9 (2017-03-01)
 ------------------
 

pddl/pddl_planner_viewer/package.xml

@@ -1,6 +1,6 @@
 <package>
   <name>pddl_planner_viewer</name>
-  <version>0.1.9</version>
+  <version>0.1.10</version>
   <description>a viewer of pddl_planner.</description>
 
   <maintainer email="[email protected]">Ryohei Ueda</maintainer>

task_compiler/CHANGELOG.rst

@@ -2,6 +2,11 @@
 Changelog for package task_compiler
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.1.10 (2017-03-03)
+-------------------
+* [task_compiler] fix: symbol is compared with string (`#60 <https://github.com/jsk-ros-pkg/jsk_planning/issues/60>`_)
+* Contributors: Yuki Furuta
+
 0.1.9 (2017-03-01)
 ------------------
 * Fix `#55 <https://github.com/jsk-ros-pkg/jsk_pr2eus/issues/55>`_  execute-pddd.launch: remove require from tc_core (`#58 <https://github.com/jsk-ros-pkg/jsk_pr2eus/issues/58>`_ )

task_compiler/euslisp/execute-pddl.l

@@ -5,9 +5,11 @@
 (ros::roseus "execute_pddl")
 (require :execute-pddl-core "package://task_compiler/euslisp/execute-pddl-core.l")
 
-(defmacro load-param (sym pname &optional required defval)
+(defmacro load-param (sym pname &optional required defval eval)
   `(progn
      (setq ,sym (ros::get-param ,pname ,defval))
+     (when (and ,eval (stringp ,sym))
+       (setq ,sym (read-from-string ,sym)))
      (when (and ,required (null ,sym))
        (ros::ros-error "param ~A must be set" ,pname)
        (exit 1))
@@ -17,8 +19,8 @@
 (load-param *action-file* "~action_file" t)
 (load-param *description-file* "~description_file" t)
 (load-param *pddl-debug* "~debug" nil nil)
-(load-param *return-success* "~return_success" nil :success)
-(load-param *return-fail* "~return_fail" nil :fail)
+(load-param *return-success* "~return_success" nil :success t)
+(load-param *return-fail* "~return_fail" nil :fail t)
 (load-param *self-return-failure* "~self_return_failre" nil t)
 (load-param *display-graph* "~display_graph" nil nil)
 (load-param *iterate* "~iterate" nil nil)

task_compiler/package.xml

@@ -1,6 +1,6 @@
 <package>
   <name>task_compiler</name>
-  <version>0.1.9</version>
+  <version>0.1.10</version>
   <description>task_compiler
 
      Compiler that translate task description in PDDL (Planning Domain Description Language) to SMACH (state machine based execution and coordination system) description.</description>

task_compiler/test/test-task-compiler.l

@@ -20,6 +20,7 @@
   (dotimes (i 30)
     (when (eq (length *msg*) 7)
       (return))
+    (ros::ros-info "waiting task finish ~A / 7 (timeout: ~A / 30)" (length *msg*) i)
     (ros::spin-once)
     (ros::sleep))
   (warn "~% (length *msg*) is ~A" (length *msg*))

task_compiler/test/test_task_compiler.test

@@ -4,7 +4,7 @@
     <arg name="description" value="$(find pddl_planner)/demos/simple_failure_torelant/solve-simple-failure-torelant.l"/>
     <arg name="planner" value="downward" />
     <arg name="return_success" value="true" />
-    <arg name="return_fail" value="false" />
+    <arg name="return_fail" value=":fail" />
     <arg name="debug" value="true" />
     <arg name="iterate" value="false" />
     <arg name="gui" value="false" />