Bug-fix in tester.

3 files changed, 15 insertions, 19 deletions

diff --git a/src/uk/ac/ox/cs/pagoda/endomorph/plan/OpenEndPlan.java b/src/uk/ac/ox/cs/pagoda/endomorph/plan/OpenEndPlan.java
index a740833..4022c1d 100644
--- a/src/uk/ac/ox/cs/pagoda/endomorph/plan/OpenEndPlan.java
+++ b/src/uk/ac/ox/cs/pagoda/endomorph/plan/OpenEndPlan.java
@@ -1,12 +1,7 @@
 package uk.ac.ox.cs.pagoda.endomorph.plan;
 
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.Set;
-
-import uk.ac.ox.cs.pagoda.endomorph.*;
+import uk.ac.ox.cs.pagoda.endomorph.Clique;
+import uk.ac.ox.cs.pagoda.endomorph.DependencyGraph;
 import uk.ac.ox.cs.pagoda.query.AnswerTuple;
 import uk.ac.ox.cs.pagoda.query.QueryRecord;
 import uk.ac.ox.cs.pagoda.query.QueryRecord.Step;
@@ -15,6 +10,8 @@ import uk.ac.ox.cs.pagoda.summary.NodeTuple;
 import uk.ac.ox.cs.pagoda.util.Timer;
 import uk.ac.ox.cs.pagoda.util.Utility;
 
+import java.util.*;
+
 public class OpenEndPlan implements CheckPlan {
         
         public static final int TIME_OUT_MIN = 1; 
@@ -23,18 +20,16 @@ public class OpenEndPlan implements CheckPlan {
         DependencyGraph dGraph; 
         QueryRecord m_record; 
         int m_answerArity; 
-
+        Set<Clique> validated = new HashSet<Clique>();
+        Set<Clique> falsified = new HashSet<Clique>();
+        Set<AnswerTuple> passedAnswers = new HashSet<AnswerTuple>();
         public OpenEndPlan(Checker checker, DependencyGraph dGraph, QueryRecord record) {
-                this.checker = checker; 
+                this.checker = checker;
                 this.dGraph = dGraph;
                 m_record = record;
                 m_answerArity = record.getAnswerVariables().length;
         }
         
-        Set<Clique> validated = new HashSet<Clique>(); 
-        Set<Clique> falsified = new HashSet<Clique>(); 
-        Set<AnswerTuple> passedAnswers = new HashSet<AnswerTuple>();
-        
         @Override
         public int check() {
                 LinkedList<Clique> topo = new LinkedList<Clique>(dGraph.getTopologicalOrder());
@@ -93,20 +88,20 @@ public class OpenEndPlan implements CheckPlan {
                         }
                 
                 m_record.addLowerBoundAnswers(validAnswers);
-                m_record.addProcessingTime(Step.FullReasoning, t.duration());
+                m_record.addProcessingTime(Step.FULL_REASONING, t.duration());
                 return count;           
         }
 
         private boolean redundant(Clique clique) {
                 for (NodeTuple nodeTuple: clique.getNodeTuples())
-                        if (!passedAnswers.contains(AnswerTuple.create(nodeTuple.getAnswerTuple(), m_answerArity))) 
+                        if (!passedAnswers.contains(AnswerTuple.getInstance(nodeTuple.getAnswerTuple(), m_answerArity)))
                                 return false; 
                 return true;
         }
 
         private void addProjections(Clique clique) {
                 for (NodeTuple nodeTuple: clique.getNodeTuples()) 
-                        passedAnswers.add(AnswerTuple.create(nodeTuple.getAnswerTuple(), m_answerArity)); 
+                        passedAnswers.add(AnswerTuple.getInstance(nodeTuple.getAnswerTuple(), m_answerArity));
         }
 
         private void setMarkCascadelyValidated(Clique clique) { 
diff --git a/src/uk/ac/ox/cs/pagoda/query/AnswerTuple.java b/src/uk/ac/ox/cs/pagoda/query/AnswerTuple.java
index 54e4837..cb2b0a3 100644
--- a/src/uk/ac/ox/cs/pagoda/query/AnswerTuple.java
+++ b/src/uk/ac/ox/cs/pagoda/query/AnswerTuple.java
@@ -156,7 +156,8 @@ public class AnswerTuple {
                 public AnswerTuple deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
                                 throws JsonParseException {
                         String tuplesString = json.getAsJsonPrimitive().getAsString();
-                        StringTokenizer tokenizer = new StringTokenizer(SEPARATOR);
+//                      StringTokenizer tokenizer = new StringTokenizer(tuplesString, SEPARATOR);
+                        StringTokenizer tokenizer = new StringTokenizer(tuplesString);
                         GroundTerm[] terms = new GroundTerm[tokenizer.countTokens()];
 
                         // TODO test parsing
diff --git a/src/uk/ac/ox/cs/pagoda/query/QueryRecord.java b/src/uk/ac/ox/cs/pagoda/query/QueryRecord.java
index fd20af1..1f81a78 100644
--- a/src/uk/ac/ox/cs/pagoda/query/QueryRecord.java
+++ b/src/uk/ac/ox/cs/pagoda/query/QueryRecord.java
@@ -30,11 +30,11 @@ public class QueryRecord {
         double[] timer;
         int subID;
         DLClause queryClause = null;
+        int queryID = -1;
+        Set<AnswerTuple> soundAnswerTuples = new HashSet<AnswerTuple>();
         private Step difficulty;
         private String queryText;
-        private int queryID = -1;
         private String[][] answerVariables = null;
-        private Set<AnswerTuple> soundAnswerTuples = new HashSet<AnswerTuple>();
         private Set<AnswerTuple> gapAnswerTuples = null;
         private QueryManager m_manager;