Generated files had not been regenerated after recent changes - doing…

… that now

astrobee/survey_manager/survey_planner/data/jem_survey_dynamic.yaml

@@ -44,7 +44,7 @@ goals:
 - {type: panorama, robot: honey, order: 2, location: jem_bay6}
 - {type: panorama, robot: honey, order: 3, location: jem_bay5}
 # This is the other objective we previously had to comment out for POPF to return a decent plan.
-- {type: stereo, robot: honey, order: 4, trajectory: jem_bay4_to_bay7}
+- {type: stereo, robot: honey, order: 4, trajectory: jem_bay7_to_bay4}
 - {type: robot_at, robot: honey, location: berth2}
 
 init:

astrobee/survey_manager/survey_planner/data/sample_output_plan.yaml

@@ -192,7 +192,7 @@
   action:
     type: stereo
     robot: honey
-    fplan: jem_stereo_mapping_bay4_to_bay7.fplan
+    fplan: ISAAC/jem_stereo_mapping_bay7_to_bay4
     base_name: jem_bay7
     bound_name: jem_bay4
   duration_seconds: '600.000'
@@ -206,7 +206,7 @@
   action:
     type: stereo
     robot: bumble
-    fplan: jem_stereo_mapping_bay1_to_bay3.fplan
+    fplan: ISAAC/jem_stereo_mapping_bay1_to_bay3
     base_name: jem_bay1
     bound_name: jem_bay4
   duration_seconds: '600.000'

astrobee/survey_manager/survey_planner/pddl/problem_jem_survey.pddl

@@ -1,5 +1,5 @@
 ;; Auto-generated by problem_generator.py. Do not edit!
-;; Command was: ./tools/problem_generator.py
+;; Command was: ./tools/survey_planner/problem_generator.py
 ;; Working directory was: /home/vagrant/isaac/astrobee/survey_manager/survey_planner
 ;; Problem template: pddl/jem_survey_template.pddl
 ;; Config 1: data/survey_static.yaml

astrobee/survey_manager/survey_planner/pddl/problem_jem_survey.ps2.pddl

@@ -16,7 +16,7 @@ set instance o1 order
 set instance o2 order
 set instance o3 order
 set instance o4 order
-set goal (and (completed-panorama bumble o0 jem_bay4) (completed-panorama bumble o1 jem_bay3) (completed-panorama bumble o2 jem_bay2) (completed-panorama bumble o3 jem_bay1) (completed-stereo bumble o4 jem_bay1 jem_bay4) (completed-panorama honey o0 jem_bay7) (completed-panorama honey o1 jem_bay6) (completed-panorama honey o2 jem_bay5) (robot-at honey berth2))
+set goal (and (completed-panorama bumble o0 jem_bay4) (completed-panorama bumble o1 jem_bay3) (completed-panorama bumble o2 jem_bay2) (completed-panorama bumble o3 jem_bay1) (completed-stereo bumble o4 jem_bay1 jem_bay4) (robot-at bumble berth1) (completed-panorama honey o1 jem_bay7) (completed-panorama honey o2 jem_bay6) (completed-panorama honey o3 jem_bay5) (completed-stereo honey o4 jem_bay7 jem_bay4) (robot-at honey berth2))
 set predicate (move-connected jem_bay0 jem_bay1)
 set predicate (move-connected jem_bay1 jem_bay0)
 set predicate (move-connected jem_bay1 jem_bay2)
@@ -130,6 +130,7 @@ set predicate (location-available jem_bay6)
 set predicate (location-available jem_bay7)
 set predicate (location-available jem_bay8)
 set predicate (need-stereo bumble o4 jem_bay1 jem_bay4)
+set predicate (need-stereo honey o4 jem_bay7 jem_bay4)
 set function (= (order-identity o0) 0)
 set function (= (order-identity o1) 1)
 set function (= (order-identity o2) 2)

astrobee/survey_manager/survey_planner/tools/survey_planner/problem_generator.py

@@ -72,8 +72,11 @@
 
 THIS_DIR = pathlib.Path(__file__).resolve().parent
 CWD = pathlib.Path.cwd()
-DATA_DIR = pathlib.Path(os.path.relpath(str((THIS_DIR / ".." / "data").resolve()), CWD))
-PDDL_DIR = pathlib.Path(os.path.relpath(str((THIS_DIR / ".." / "pddl").resolve()), CWD))
+PLANNER_DIR = pathlib.Path(
+    os.path.relpath(str((THIS_DIR / ".." / "..").resolve()), CWD)
+)
+DATA_DIR = PLANNER_DIR / "data"
+PDDL_DIR = PLANNER_DIR / "pddl"
 DEFAULT_CONFIGS = [
     DATA_DIR / "survey_static.yaml",
     DATA_DIR / "jem_survey_dynamic.yaml",