From 6812e5fdf2133b87efb4fac579bc446ec00ae9a6 Mon Sep 17 00:00:00 2001
From: James Oswald <jamesoswald111@gmail.com>
Date: Sat, 1 Jun 2024 01:23:50 -0400
Subject: [PATCH] Roses updates and Java 17 docs

---
 .github/workflows/build.yml                   |  2 +-
 pom.xml                                       |  4 +-
 .../planner/problems/epistemic/grapevine.clj  |  3 ++
 .../planner/problems/epistemic/roses.clj      | 52 +++++++++++++++++++
 4 files changed, 58 insertions(+), 3 deletions(-)
 create mode 100644 src/main/resources/org/rairlab/planner/problems/epistemic/roses.clj

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6b96dad..e5287b3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     
     steps:
-    - name: Set up JDK 8
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
         java-version: '17'
diff --git a/pom.xml b/pom.xml
index 52044d9..95ed201 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,8 +101,8 @@
 
     </dependencies>
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
         <maven.test.skip>true</maven.test.skip>
     </properties>
 </project>
diff --git a/src/main/resources/org/rairlab/planner/problems/epistemic/grapevine.clj b/src/main/resources/org/rairlab/planner/problems/epistemic/grapevine.clj
index 3cce961..3920d0e 100644
--- a/src/main/resources/org/rairlab/planner/problems/epistemic/grapevine.clj
+++ b/src/main/resources/org/rairlab/planner/problems/epistemic/grapevine.clj
@@ -1,3 +1,6 @@
+
+;This is Brandon's grapevine problem from the SPECTRA system description paper (https://doi.org/10.1007/s13218-024-00847-8)
+
 {:name "GrapeVine"
     :background [
         ; Type predicates
diff --git a/src/main/resources/org/rairlab/planner/problems/epistemic/roses.clj b/src/main/resources/org/rairlab/planner/problems/epistemic/roses.clj
new file mode 100644
index 0000000..8a6e7ec
--- /dev/null
+++ b/src/main/resources/org/rairlab/planner/problems/epistemic/roses.clj
@@ -0,0 +1,52 @@
+
+;This is James' roses problem from the PERI.2 symbol grounding problem paper
+
+{:name "roses"
+    :background [
+      (agent n) (agent w) (agent s) (agent w)
+      (pos p1) (pos p2) (pos p3) (pos p4) (pos p5) 
+      (pos p6) (pos p7) (pos p8) (pos p9)
+      (rose r1) (rose r2) (rose r3)
+    ]
+
+    :actions [
+      (define-action remove [?r ?p] {
+        :preconditions [
+          (at ?r ?p)
+        ]
+        :additions [
+          (forall (a) (if (agent a) (Perceives! a (not (at ?r ?p)))))
+        ]
+        :delitions [
+          (at ?r ?p)
+        ]
+      })
+    ]
+
+    :start [
+      ;Initial positions of the roses
+      (at r1 p1) (at r2 p5) (at r3 p9)
+
+      ;All agents know the initial positions of the roses
+      (Knows! n (at r1 p1)) (Knows! n (at r2 p5)) (Knows! n (at r3 p9))
+      (Knows! w (at r1 p1)) (Knows! w (at r2 p5)) (Knows! w (at r3 p9))
+      (Knows! s (at r1 p1)) (Knows! s (at r2 p5)) (Knows! s (at r3 p9))
+      (Knows! e (at r1 p1)) (Knows! e (at r2 p5)) (Knows! e (at r3 p9))
+      
+      ;Only r3 is a faded rose, the rest are not faded
+      (faded r3)
+
+      ;All agents know rose 3 is faded
+      (Knows! n (faded r3)) (Knows! w (faded r3)) (Knows! s (faded r3)) (Knows! e (faded r3))
+    ]
+
+    :goal [
+      (forall (a r p) 
+        (if (and (agent a) (rose r) (faded r) (pos p))
+          (Knows! a (not (at r p)))
+        )
+      )
+    ]
+}
+
+