Adding new experiments (from latent space) and a refactoring to remov…

…e files from goal recognition problems.
ramonpereira · Jan 16, 2018 · 7fc4699 · 7fc4699
1 parent d0f9e42
commit 7fc4699
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 2 deletions.
diff --git a/experiments/lodigital/pb06_lodigital_inittrue_out_100.tar.bz2 b/experiments/lodigital/pb06_lodigital_inittrue_out_100.tar.bz2
diff --git a/experiments/lodigital/pb06_lodigital_out_100.tar.bz2 b/experiments/lodigital/pb06_lodigital_out_100.tar.bz2
diff --git a/goalrecognizer1.1.jar b/goalrecognizer1.1.jar
diff --git a/src/heuristic/GoalCompletionHeuristic.java b/src/heuristic/GoalCompletionHeuristic.java
@@ -80,6 +80,8 @@ public boolean recognize() throws IOException, InterruptedException{
 		boolean correctGoalRecognized = recognizedGoals.contains(this.realGoal);
 		System.out.println("\n<?> Correct goal: " + this.realGoal);
 		System.out.println("<?> Was the correct goal recognized correctly? " + correctGoalRecognized);
+		Process p = Runtime.getRuntime().exec("rm -rf domain.pddl template.pddl templateInitial.pddl obs.dat hyps.dat plan.png real_hyp.dat");
+		p.waitFor();
 		return correctGoalRecognized;
 	}
 

diff --git a/src/heuristic/LandmarkUniquenessHeuristic.java b/src/heuristic/LandmarkUniquenessHeuristic.java
@@ -90,6 +90,8 @@ public boolean recognize() throws IOException, InterruptedException {
 		boolean correctGoalRecognized = recognizedGoals.contains(this.realGoal);
 		System.out.println("\n<?> Correct goal: " + this.realGoal);
 		System.out.println("<?> Was the correct goal recognized correctly? " + correctGoalRecognized);
+		Process p = Runtime.getRuntime().exec("rm -rf domain.pddl template.pddl templateInitial.pddl obs.dat hyps.dat plan.png real_hyp.dat");
+		p.waitFor();
 		return correctGoalRecognized;
 	}
 

diff --git a/src/recognizer/Recognizer.java b/src/recognizer/Recognizer.java
@@ -54,8 +54,10 @@ public Recognizer(String fileName, float threshold){
 				throw new IOException(fileName + " not found.");
 
 			System.out.println("rm -rf domain.pddl template.pddl templateInitial.pddl obs.dat hyps.dat plan.png real_hyp.dat");
+			Process p = Runtime.getRuntime().exec("rm -rf domain.pddl template.pddl templateInitial.pddl obs.dat hyps.dat plan.png real_hyp.dat");
+			p.waitFor();
 			System.out.println("tar -jxvf " + this.planRecognitionFile);
-			Process p = Runtime.getRuntime().exec("tar -jxvf " + this.planRecognitionFile);
+			p = Runtime.getRuntime().exec("tar -jxvf " + this.planRecognitionFile);
 			p.waitFor();
 			String domainFilePath = "domain.pddl";
 			Path path = Paths.get(domainFilePath);

diff --git a/test/heuristic/GoalCompletionHeuristicTest.java b/test/heuristic/GoalCompletionHeuristicTest.java
@@ -37,7 +37,7 @@ public void testGoalCompletionHeuristicBlocksWorldCompactedFile(){
 
 	@Test
 	public void testGoalCompletionHeuristic(){
-		GoalCompletionHeuristic gcHeuristic = new GoalCompletionHeuristic("experiments/spider/pb03_spider_out_100.tar.bz2", 0.0f);
+		GoalCompletionHeuristic gcHeuristic = new GoalCompletionHeuristic("experiments/lodigital/pb06_lodigital_out_100.tar.bz2", 0.0f);
 		try {
 			boolean recognized = gcHeuristic.recognize();
 			assertEquals(true, recognized);