cleanup before tests

Output/Output.txt

@@ -0,0 +1 @@
+bridges_v3_2_1.0_1.pddl	bridges_problem.pddl	pode1	4	65	15strict	anytime	bridges_v3_2_1.0_1.pddl	bridges_problem.pddl	pode1	4	300833	23159strict	anytime	bridges_v3_2_1.0_1.pddl	bridges_problem.pddl	pode1	5	300207	38210strict	first	bridges_v3_2_1.0_1.pddl	bridges_problem.pddl	jdd	4	228	15flexible	first	bridges_v3_2_1.0_1.pddl	bridges_problem.pddl	jdd	4	59	15flexible	first	bridges_v3_2_1.0_1.pddl	bridges_problem.pddl	jdd	4	88	15flexible	first	bridges_v3_2_1.0_1.pddl	bridges_problem.pddl	jdd	4	87	15flexible	first	bridges_v3_2_1.0_1.pddl	bridges_problem.pddl	jdd	4	81	15flexible	first	bridges_v3_2_1.0_1.pddl	bridges_problem.pddl	jdd	4	86	15flexible	first	bridges_v3_2_1.0_1.pddl	bridges_problem.pddl	jdd	4	82	15flexible	first	bridges_v3_2_1.0_1.pddl	bridges_problem.pddl	jdd	4	77	15flexible	first	bridges_v3_2_1.0_1.pddl	bridges_problem.pddl	jdd	4	76	15flexible	first	bridges_v3_2_1.0_1.pddl	bridges_problem.pddl	jdd	7	156	49flexible	first	bridges_v3_2_1.0_1.pddl	bridges_problem.pddl	jdd	7	123	49flexible	anytime	bridges_v3_2_1.0_1.pddl	bridges_problem.pddl	jdd	14	300360	31448flexible	anytime	bridges_v3_2_1.0_1.pddl	bridges_problem.pddl	pode2	4	302348	7527flexible	first	bridges_v3_2_1.0_1.pddl	bridges_problem.pddl	pode20	5	93	17flexible	first	bridges_v3_2_1.0_1.pddl	bridges_problem.pddl	jdd	7	191	49flexible	first	bridges_v3_2_1.0_1.pddl	bridges_problem.pddl	jdd	7	115	49flexible	first	domain.pddl	p1.pddl	jdd	5	69811	45flexible	first	domain.pddl	p1.pddl	jdd	4	4601	9flexible	anytime	domain.pddl	p1.pddl	jdd	6	60049	15892strict	anytime	domain.pddl	p1.pddl	jdd	4	75	11strict	anytime	domain.pddl	p1.pddl	pode1	4	60226	9046strict	anytime	domain.pddl	p1.pddl	pode5	2	60194	2549strict	anytime	domain.pddl	p1.pddl	pode5	2	89964	2549strict	anytime	domain.pddl	p1.pddl	pode5	2	60043	14465flexible	anytime	domain.pddl	p1.pddl	pode5	7	60271	263flexible	anytime	domain.pddl	p1.pddl	pode5	7	75769	225flexible	anytime	domain.pddl	p1.pddl	pode5	7	75455	225flexible	anytime	domain.pddl	p1.pddl	pode5	7	77575	73flexible	anytime	domain.pddl	p1.pddl	pode5	7	80485	53flexible	anytime	domain.pddl	p1.pddl	pode9	4	166111	21flexible	anytime	domain.pddl	p1.pddl	pode19	4	122900	21flexible	anytime	domain.pddl	p1.pddl	pode19	4	139177	21flexible	anytime	domain.pddl	p1.pddl	pode19	4	229025	25flexible	anytime	domain.pddl	p1.pddl	trie19	2	60089	8897flexible	anytime	domain.pddl	p1.pddl	trie19	2	60066	17565flexible	anytime	domain.pddl	p1.pddl	trie1	4	119	9strict	anytime	domain.pddl	p1.pddl	trie2	4	60058	19179strict	anytime	domain.pddl	p1.pddl	trie3	4	60933	14441strict	anytime	domain.pddl	p1.pddl	trie5	4	60198	10825strict	anytime	domain.pddl	p1.pddl	trie5	4	60431	6603strict	anytime	domain.pddl	p1.pddl	trie5	4	61439	25723strict	anytime	domain.pddl	p1.pddl	trie5	4	60170	61435flexible	anytime	domain.pddl	p1.pddl	pode5	2	60986	32452flexible	anytime	domain.pddl	p1.pddl	pode5	2	60071	13668flexible	anytime	gripper-domain.pddl	gripper-2.pddl	pode5	3	60233	13988flexible	anytime	gripper-domain.pddl	gripper-10.pddl	pode5	15	61858	2273flexible	anytime	gripper-domain.pddl	gripper-10.pddl	pode5	15	4203	3077

log4j.properties

@@ -0,0 +1,23 @@
+log4j.threshold=DEBUG
+
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+//log4j.appender.A1.layout.ConversionPattern=%d{HH:mm:ss.SSS} %-5p %-14c - %m%n
+//log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
+log4j.appender.A1.layout.ConversionPattern=%m%n
+
+log4j.rootLogger=TRACE, A1
+log4j.logger=DEBUG, A1
+
+log4j.logger.edu.usu.cs.heuristic=OFF
+log4j.logger.edu.usu.cs.heuristic.StanPlanningGraph=ON
+
+log4j.logger.edu.usu.cs.planner=OFF
+log4j.logger.edu.usu.cs.planner.util.FaultCounter=ON
+log4j.logger.edu.usu.cs.planner.PICoveringSolver=ON
+log4j.logger.edu.usu.cs.pddl.parser=OFF
+log4j.logger.edu.usu.cs.search=ON
+log4j.logger.edu.usu.cs.Default=ON
+log4j.logger.edu.usu.cs.planner.ffrisky.util=ON
+
+log4j.logger.edu.usu.cs.search.astar.AStarSearch=ON

manifest.mf

@@ -1,3 +1,2 @@
 Manifest-Version: 1.0
-Class-Path: . resources ./ slf4j-log4j12-1.5.3.jar antlr-runtime-3.1.1.jar log4j-1.2.15.jar mail-1.4.jar antlr-2.7.7.jar slf4j-api-1.5.3.jar stringtemplate-3.2.jar jdd.jar activation-1.1.jar jul-to-slf4j-1.5.3.jar
-Main-Class: edu.usu.cs.Default
+Class-Path: . resources ./ lib/slf4j-log4j12-1.5.3.jar lib/antlr-runtime-3.1.1.jar lib/log4j-1.2.15.jar lib/mail-1.4.jar lib/antlr-2.7.7.jar lib/slf4j-api-1.5.3.jar lib/stringtemplate-3.2.jar lib/jdd.jar lib/activation-1.1.jar lib/jul-to-slf4j-1.5.3.jar

resources/edu/usu/cs/scripts/make-domains.sh

@@ -1,3 +1,5 @@
 #!/bin/bash
 
-java 
+java -cp default.jar edu.cs.incomplete.bridges.BridgesTest
+java -cp default.jar edu.cs.incomplete.bridges.HoboNavTest
+java -cp default.jar edu.cs.incomplete.bridges.TranslateParcPrinter

src/edu/usu/cs/pddl/domain/incomplete/FalseTrieNode.java

@@ -0,0 +1,16 @@
+package edu.usu.cs.pddl.domain.incomplete;
+
+public class FalseTrieNode extends DefaultTrieNode {
+
+	public String toString(){
+		return "F";
+	}
+	public String toString(int indent){
+		StringBuilder b = new StringBuilder();
+//		for(int i = 0; i < indent; i++)
+//			b.append(" ");
+		b.append("F");
+		return b.toString();
+	}
+
+}

target/generated-sources/antlr/edu/usu/cs/pddl/antlr/Pddl.tokens

@@ -0,0 +1,189 @@
+REQUIRE_KEY=47
+FUNCTIONS=10
+LETTER=50
+PRED_INST=43
+TYPES=7
+EXISTS_GD=28
+COMPARISON_GD=30
+ACTION=12
+T__93=93
+ANY_CHAR=51
+T__94=94
+NOT_EFFECT=35
+T__91=91
+NAME=46
+T__92=92
+T__90=90
+PROBLEM_DOMAIN=16
+OBJECTS=17
+ASSIGN_EFFECT=34
+POSSPRECONDITION=21
+T__99=99
+T__98=98
+T__97=97
+T__96=96
+T__95=95
+T__80=80
+T__81=81
+T__82=82
+T__83=83
+LINE_COMMENT=53
+PROBLEM=14
+NUMBER=49
+WHITESPACE=54
+UNARY_MINUS=39
+OR_GD=25
+T__85=85
+T__84=84
+T__87=87
+T__86=86
+T__89=89
+T__88=88
+DOMAIN_NAME=5
+PRED_HEAD=36
+T__71=71
+T__72=72
+PREDICATES=11
+VARIABLE=48
+T__70=70
+INIT_AT=41
+T__76=76
+T__75=75
+T__74=74
+INIT=18
+T__73=73
+T__79=79
+T__78=78
+AND_GD=24
+T__77=77
+T__68=68
+T__69=69
+T__66=66
+T__67=67
+T__64=64
+FUNC_HEAD=19
+T__65=65
+T__62=62
+T__63=63
+NOT_GD=26
+PROBLEM_NAME=15
+T__118=118
+DURATIVE_ACTION=13
+T__119=119
+T__116=116
+T__117=117
+T__114=114
+T__115=115
+PROBLEM_METRIC=45
+T__123=123
+T__122=122
+T__121=121
+T__120=120
+CONSTANTS=9
+T__61=61
+T__60=60
+T__55=55
+T__56=56
+T__57=57
+T__58=58
+IMPLY_GD=27
+T__107=107
+T__108=108
+T__109=109
+T__59=59
+T__103=103
+T__104=104
+T__105=105
+T__106=106
+T__111=111
+T__110=110
+T__113=113
+T__112=112
+INIT_EQ=40
+DIGIT=52
+NOT_PRED_INIT=42
+BINARY_OP=38
+GOAL=37
+FORALL_GD=29
+T__102=102
+T__101=101
+T__100=100
+POSSEFFECT=23
+DOMAIN=4
+WHEN_EFFECT=33
+PRECONDITION=20
+EFFECT=22
+PROBLEM_CONSTRAINT=44
+AND_EFFECT=31
+EITHER_TYPE=8
+FORALL_EFFECT=32
+REQUIREMENTS=6
+':domain'=106
+':types'=60
+'end'=87
+'>='=97
+'/'=93
+'total-time'=113
+'exists'=78
+'>'=94
+'number'=64
+':precondition'=70
+'start'=86
+'problem'=105
+'forall'=79
+':constants'=65
+'define'=56
+'+'=92
+'scale-down'=101
+'imply'=77
+':action'=68
+'increase'=102
+':poss-precondition'=71
+'hold-during'=122
+'and'=74
+':derived'=89
+'all'=88
+':requirements'=59
+':condition'=82
+'domain'=58
+'scale-up'=100
+':init'=108
+':durative-action'=80
+'not'=76
+'('=55
+'-'=61
+'minimize'=111
+':predicates'=66
+':poss-effect'=73
+':functions'=63
+'when'=90
+':effect'=72
+'at'=84
+'either'=62
+'within'=117
+'maximize'=112
+'at-most-once'=118
+'preference'=83
+'='=96
+'is-violated'=114
+'always'=115
+':duration'=81
+')'=57
+':goal'=109
+'assign'=99
+'hold-after'=123
+'sometime-after'=119
+':metric'=110
+':parameters'=69
+'decrease'=103
+'over'=85
+':constraints'=67
+'sometime-before'=120
+'<='=98
+'always-within'=121
+'<'=95
+'or'=75
+'*'=91
+':objects'=107
+'?duration'=104
+'sometime'=116

test/edu/usu/cs/incomplete/bridges/BridgesTest.java

@@ -27,10 +27,10 @@ public static void CreateBridges()
 		//v3 is all                    => args[3] && args[4] == .5
 
 		String outputFileLocation = "testfiles/incomplete/bridges";
-		int maxGridSize = 2;
+		int maxGridSize = 32;
 		// Create Bridges
 
-		for (int v = 3; v <=3; v++){
+		for (int v = 1; v <=3; v++){
 
 			String[] args = new String[6];
 			//args[0] = Integer.toString(gridSize);
@@ -50,7 +50,7 @@ else if(v == 3){
 			args[5] = Integer.toString(numFiles);
 			for(int gs = 2; gs <= maxGridSize; gs *= 2) 
 			{
-				for(double bridgeDensity = 1.0; bridgeDensity <= 1.0; bridgeDensity += 0.25) 
+				for(double bridgeDensity = 0.0; bridgeDensity <= 1.0; bridgeDensity += 0.25) 
 				{
 					args[0] = Integer.toString(gs);
 					args[2] = Double.toString(bridgeDensity);

test/edu/usu/cs/incomplete/hobonav/HoboNavTest.java

@@ -19,10 +19,10 @@ public void CreateHoboNavDomainsTest() {
 		String domainDir = "testfiles/incomplete/hobonav/";
 		String problemDir = "testfiles/incomplete/hobonav/";
 		String extension = ".pddl";
-		//int[] gridSizes = { 2, 4, 6, 8, 16 };
-		int[] gridSizes = {2};
-		//int[] itemCounts = { 1, 2, 4 };
-		int[] itemCounts = { 4 };
+		int[] gridSizes = { 2, 4, 6, 8, 16 };
+		//int[] gridSizes = {2};
+		int[] itemCounts = { 1, 2, 4 };
+		//int[] itemCounts = { 4 };
 		double[] tollDensities = { 0.0, 0.25, 0.5, 0.75, 1.0 }; // The densities are all incremented together
 		double[] gambleDensities = { 0.0, 0.25, 0.5, 0.75, 1.0 }; // The densities are all incremented together
 		double[] easyMarkDensities = { 0.0, 0.1, 0.1, 0.1, 0.1 }; // The densities are all incremented together

testfiles/incomplete/bridges/bridges_problem.pddl

@@ -5,7 +5,6 @@
 
     (:goal
      (and
-     ;(at_x0) (at_y0)
       (holding_treasure_1)
       (holding_treasure_2)
       (holding_treasure_3)