solving coflicts

HyperTensioN/examples/basic/basic.jshop.rb

 # Generated by Hype
-require '/home/tgateau/git/saclab/ssa/intro-htn/HyperTensioN/Hypertension'
+require '/home/harak/git/saclab/intro-htn/HyperTensioN/Hypertension'
 
 module Basic
   include Hypertension

TP01/readme.md

@@ -4,6 +4,11 @@
 - [First HDDL](#first-hddl)
   - [Resources](#resources)
   - [Set-up project environment](#set-up-project-environment)
+    - [On SI computers](#on-si-computers)
+  - [Testing Set-up](#testing-set-up)
+  - [Adding shortcuts](#adding-shortcuts)
+    - [Option 1: sourcing env](#option-1-sourcing-env)
+    - [Option 2: manually](#option-2-manually)
   - [First plan](#first-plan)
   - [Writing some tasks, methods and literals](#writing-some-tasks-methods-and-literals)
   - [Adding cost](#adding-cost)
@@ -35,6 +40,9 @@ cd intro-htn
 HTN_PATH=$(pwd)
 ```
 
+
+### On SI computers
+
 - [ ] load SI environment
 
 ```
@@ -43,6 +51,9 @@ module load julia/1.9.3
 module load anaconda3/2023
 ```
 
+
+## Testing Set-up 
+
 - [ ] Test HyperTensioN planner
 
 ```
@@ -61,10 +72,21 @@ ruby examples/basic/pb1.jshop.rb
 #1: pickup(banjo)
 ```
 
+## Adding shortcuts 
+
 - [ ] add some macros for easy execution
 
 
 
+### Option 1: sourcing env
+
+```
+cd $HTN_PATH
+source loadEnv.bash
+```
+
+
+### Option 2: manually
 
 ```
 #HyperTensioN execution command: 
@@ -100,7 +122,7 @@ Have a look to the __domain HDDL file__ <travelWalkTaxi.hddl> and the __problem
 In this dummy example, we want to travel from home to the park, corresponding to the goal __Task__ in <gotoPark_problem.hddl>: *(travel home park)*
 
 ```
-plan travelWalkTaxi.hddl  gotoPark_problem.hddl debug
+plan travelWalkTaxi.hddl gotoPark_problem.hddl debug
 ```
 You should get a dummy plan.
 

TP02/readme.md

+
 # TP02 - Cooking simulation
 

TP03/doors-keys-gems/example.jl

@@ -2,7 +2,8 @@
 
 # include("/home/tgateau/git/t.gateau/biblio/HTN/exercices/doors-keys-gems/testTG.jl")
 
-using PDDL, SymbolicPlanners, PlanningDomains,GLMakie
+using PDDL, SymbolicPlanners, PlanningDomains
+using GLMakie
 using PDDLViz
 
 #import PDDLViz
@@ -48,15 +49,18 @@ canvas = renderer(domain, state)
 save("gridModif.png",canvas)
 
 
+plan = @pddl("(down)", "(down)")
+renderer(canvas, domain, state, plan)
+trajectory = PDDL.simulate(domain, state, plan)
+canvas = renderer(domain, trajectory)
 #=
 # Render plan
-plan = @pddl("(right)", "(right)", "(right)", "(up)", "(up)")
-#renderer(canvas, domain, state, plan)
+#plan = @pddl("(right)", "(right)", "(right)", "(up)", "(up)")
 
+renderer(canvas, domain, state, plan)
 # Render trajectory
 trajectory = PDDL.simulate(domain, state, plan)
 
-
 canvas = renderer(domain, trajectory)
 
 
@@ -141,18 +145,24 @@ controller = KeyboardController(
 )
 add_controller!(canvas, controller, domain, state; show_controls=true)
 
+
 #remove_controller!(canvas, controller)
 
+canvas = renderer(domain, state)
+state = execute(domain, state, pddl"down")
+canvas = renderer(domain, state)
+state = execute(domain, state, pddl"down")
+canvas = renderer(domain, state)
+state = execute(domain, state, pddl"up")
+canvas = renderer(domain, state)
+
+state = execute(domain, state, pddl"pickup")
+canvas = renderer(domain, state)
 
 #iterative mode
 
 #=
-canvas = renderer(domain, state)
-
 state = execute(domain, state, pddl"right")
-
-canvas = renderer(domain, state)
-
 state = execute(domain, state, pddl"right")
 state = execute(domain, state, pddl"right")
 state = execute(domain, state, pddl"right")