Wed Aug 12 18:49:43 UTC 2009 Ben Podgursky <bpodgursky@gmail.com>

4 files changed, 55 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index dbce2e812af..d33149b68ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Wed Aug 12 18:49:43 UTC 2009  Ben Podgursky  <bpodgursky@gmail.com>
+
+        * utils/PDDLtoSANetTranslator/PDDLParser/ferry-example.pddl:
+        * utils/PDDLtoSANetTranslator/PDDLParser/ferry-problem-example.pddl:
+
+        * utils/PDDLtoSANetTranslator/PDDLParser/src/PDDLtoSAN.java:
+
+		Domain files
+		
 Wed Aug 12 17:49:43 UTC 2009  Ben Podgursky  <bpodgursky@gmail.com>
 
         * utils:
@@ -191,9 +200,9 @@ Wed Aug 12 17:49:43 UTC 2009  Ben Podgursky  <bpodgursky@gmail.com>
         * utils/PDDLtoSANetTranslator/PDDLParser/src/pddl4j/tests/Test.java:
         * utils/PDDLtoSANetTranslator/PDDLParser/src/pddl4j/tests/TestCNF.java:
 
-		The PDDL to SANet translator.  Also includes the library PDDL4J which does the inital pddl parsing.  I've made some
-		bug fixes to this library, so the source needs to be here.
-		
+                The PDDL to SANet translator.  Also includes the library PDDL4J which does the inital pddl parsing.  I've made some
+                bug fixes to this library, so the source needs to be here.
+
 Tue Aug  4 22:14:56 UTC 2009  Ben Podgursky  <bpodgursky@gmail.com>
 
         * SANet/SANetFileIn.cpp:
diff --git a/utils/PDDLtoSANetTranslator/PDDLParser/ferry-example.pddl b/utils/PDDLtoSANetTranslator/PDDLParser/ferry-example.pddl
new file mode 100644
index 00000000000..6ec6d060530
--- /dev/null
+++ b/utils/PDDLtoSANetTranslator/PDDLParser/ferry-example.pddl
@@ -0,0 +1,30 @@
+(define (domain ferry)
+  (:requirements :strips :equality :typing)
+
+  (:types auto place ferry)
+  (:constants the-ferry - ferry)
+  (:predicates (at-ferry ?l - place)
+	       (at ?x - auto
+		   ?y - place)
+	       (empty-ferry)
+	       (on ?x - auto
+		   ?f - ferry))
+
+  (:action board
+	     :parameters (?x - auto ?y - place)
+	     :precondition (and (at ?x ?y)(at-ferry ?y)(empty-ferry))
+	     :effect 
+	     (and (on ?x the-ferry)
+		   (not (at ?x ?y))
+		   (not (empty-ferry))))
+  (:action sail
+	     :parameters (?x ?y - place)
+	     :precondition (and (at-ferry ?x) (not (= ?x ?y)))
+	     :effect (and (at-ferry ?y)
+			   (not (at-ferry ?x))))
+  (:action debark
+	     :parameters (?x - auto ?y - place)
+	     :precondition (and (on ?x the-ferry)(at-ferry ?y))
+	     :effect (and (not (on ?x the-ferry))
+			   (at ?x ?y)
+			   (empty-ferry))))
\ No newline at end of file
diff --git a/utils/PDDLtoSANetTranslator/PDDLParser/ferry-problem-example.pddl b/utils/PDDLtoSANetTranslator/PDDLParser/ferry-problem-example.pddl
new file mode 100644
index 00000000000..75bda9230b2
--- /dev/null
+++ b/utils/PDDLtoSANetTranslator/PDDLParser/ferry-problem-example.pddl
@@ -0,0 +1,11 @@
+(define (problem ferry1) 
+	(:domain ferry)
+	(:requirements :strips :equality :typing)
+	(:objects a b  - place 
+		c1 c2 - auto)
+    (:init (at c1 a)
+	   (at c2 a)
+	   (at-ferry a)
+	   (empty-ferry))  
+  (:goal (and (at c1 b) (at c2 b)))
+)
\ No newline at end of file
diff --git a/utils/PDDLtoSANetTranslator/PDDLParser/src/PDDLtoSAN.java b/utils/PDDLtoSANetTranslator/PDDLParser/src/PDDLtoSAN.java
index 65081b0bbee..2d1184192f8 100644
--- a/utils/PDDLtoSANetTranslator/PDDLParser/src/PDDLtoSAN.java
+++ b/utils/PDDLtoSANetTranslator/PDDLParser/src/PDDLtoSAN.java
@@ -31,8 +31,8 @@ public class PDDLtoSAN {
 		int cond_combine = new Integer(args[3]);
 		String output_name = args[4];
 		
-//		String domain_path = "travel.pddl";
-//		String problem_path = "pb1.pddl";
+//		String domain_path = "ferry.pddl";
+//		String problem_path = "pb1ferry.pddl";
 //		boolean include_init = false;
 //		int cond_combine = 3;
 //		String output_name = "ferry";