13 files changed, 183 insertions, 99 deletions

diff --git a/config/log4j.properties b/config/log4j.properties
index 25da4d4..95d64a0 100644
--- a/config/log4j.properties
+++ b/config/log4j.properties
@@ -16,3 +16,4 @@ log4j.appender.FILE.MaxBackupIndex=3
 log4j.appender.FILE.layout=org.apache.log4j.PatternLayout
 log4j.appender.FILE.layout.conversionPattern=%m%n
 log4j.appender.FILE.append=false
+log4j.appender.FILE.Threshold=DEBUG
diff --git a/src/uk/ac/ox/cs/pagoda/query/AnswerTuple.java b/src/uk/ac/ox/cs/pagoda/query/AnswerTuple.java
index 183cbe1..cd86282 100644
--- a/src/uk/ac/ox/cs/pagoda/query/AnswerTuple.java
+++ b/src/uk/ac/ox/cs/pagoda/query/AnswerTuple.java
@@ -15,6 +15,9 @@ import uk.ac.ox.cs.pagoda.util.Namespace;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.StringTokenizer;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class AnswerTuple {
         
@@ -42,31 +45,31 @@ public class AnswerTuple {
                 for (int i = 0; i < arity; ++i) m_tuple[i] = sup.m_tuple[i]; 
         }
 
-        private AnswerTuple(String m_str) {
-                this.m_str = m_str;
-        }
+//      private AnswerTuple(String m_str) {
+//              this.m_str = m_str;
+//      }
         
         public int getArity() {
                 return m_tuple.length; 
         }
 
         public int hashCode() {
-                return toString().hashCode();
-//              int code = 0;
-//              for (int i = 0; i < m_tuple.length; ++i)
-//                      code = code * 1997 + m_tuple[i].hashCode();
-//              return code;
+//              return toString().hashCode();
+                int code = 0;
+                for (int i = 0; i < m_tuple.length; ++i)
+                        code = code * 1997 + m_tuple[i].hashCode();
+                return code;
         }
         
         public boolean equals(Object obj) {
                 if (!(obj instanceof AnswerTuple)) return false;
-                AnswerTuple that = (AnswerTuple) obj; 
-                if (m_tuple.length != that.m_tuple.length) return false; 
+                AnswerTuple that = (AnswerTuple) obj;
+                if (m_tuple.length != that.m_tuple.length) return false;
                 for (int i = 0; i < m_tuple.length; ++i)
                         if (!m_tuple[i].equals(that.m_tuple[i]))
-                                return false; 
-                return true; 
-//              return toString().equals(obj.toString()); 
+                                return false;
+                return true;
+//              return toString().equals(obj.toString());
         }
         
         public String toString() {
@@ -77,7 +80,7 @@ public class AnswerTuple {
                         if (m_tuple[i] instanceof uk.ac.ox.cs.JRDFox.model.Individual)
                                 sb.append("<").append(((uk.ac.ox.cs.JRDFox.model.Individual) m_tuple[i]).getIRI()).append(">");
                         else if (m_tuple[i] instanceof uk.ac.ox.cs.JRDFox.model.BlankNode) {
-                                sb.append(((uk.ac.ox.cs.JRDFox.model.BlankNode) m_tuple[i]).toString()); 
+                                sb.append(m_tuple[i].toString());
                         }
                         else {
                                 Literal l = (Literal) m_tuple[i]; 
@@ -146,10 +149,40 @@ public class AnswerTuple {
 
         }
 
-        public class AnswerTupleDeserializer implements JsonDeserializer<AnswerTuple> {
+        static final Pattern owlLiteralRegex = Pattern.compile("^\"(?<lexicalForm>[^@]+(@(?<langTag>.+))?)\"(^^<(?<dataType>.+)>)?$");
+
+        public static class AnswerTupleDeserializer implements JsonDeserializer<AnswerTuple> {
                 public AnswerTuple deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
                                 throws JsonParseException {
-                        return new AnswerTuple(json.getAsJsonPrimitive().getAsString());
+                        String tuplesString = json.getAsJsonPrimitive().getAsString();
+                        StringTokenizer tokenizer = new StringTokenizer(SEPARATOR);
+                        GroundTerm[] terms = new GroundTerm[tokenizer.countTokens()];
+
+                        // TODO test parsing
+                        for (int i = 0; i < tokenizer.countTokens(); i++) {
+                                String token = tokenizer.nextToken();
+                                if (token.charAt(0) == '<') {
+                                        terms[i] = uk.ac.ox.cs.JRDFox.model.Individual.create(token.substring(1,token.length()-1));
+                                }
+                                else if (token.charAt(0) == '"') {
+                                        Matcher matcher = owlLiteralRegex.matcher(token);
+                                        if(matcher.matches()) {
+                                                String lexicalForm = matcher.group("lexicalForm");
+                                                String dataTypeIRI = matcher.group("dataType");
+                                                Datatype dataType;
+                                                if (dataTypeIRI.isEmpty()) dataType = Datatype.RDF_PLAIN_LITERAL;
+                                                else dataType = uk.ac.ox.cs.JRDFox.model.Datatype.value(dataTypeIRI);
+                                                terms[i] = uk.ac.ox.cs.JRDFox.model.Literal.create(lexicalForm, dataType);
+                                        }
+                                        else {
+                                                throw new IllegalArgumentException("The given json does not represent a valid AnswerTuple");
+                                        }
+                                }
+                                else {
+                                        terms[i] = uk.ac.ox.cs.JRDFox.model.BlankNode.create(token);
+                                }
+                        }
+                        return new AnswerTuple(terms);
                 }
         }
 
diff --git a/src/uk/ac/ox/cs/pagoda/query/DeserializedQueryRecord.java b/src/uk/ac/ox/cs/pagoda/query/DeserializedQueryRecord.java
new file mode 100644
index 0000000..3d25eaf
--- /dev/null
+++ b/src/uk/ac/ox/cs/pagoda/query/DeserializedQueryRecord.java
@@ -0,0 +1,9 @@
+package uk.ac.ox.cs.pagoda.query;
+
+/*
+* A light version of QueryRecord,
+* which can be obtained easily from the Json serialization of QueryRecord.
+* */
+public class DeserializedQueryRecord {
+    // TODO implement
+}
diff --git a/src/uk/ac/ox/cs/pagoda/query/QueryRecord.java b/src/uk/ac/ox/cs/pagoda/query/QueryRecord.java
index 4b55046..6c87eb5 100644
--- a/src/uk/ac/ox/cs/pagoda/query/QueryRecord.java
+++ b/src/uk/ac/ox/cs/pagoda/query/QueryRecord.java
@@ -19,7 +19,7 @@ public class QueryRecord {
         
         public static final String botQueryText = "SELECT ?X WHERE { ?X <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#Nothing> }";
 
-        private Step diffculty;
+        private Step difficulty;
         
         private String queryText; 
         private int queryID = -1; 
@@ -90,7 +90,7 @@ public class QueryRecord {
         }
         
         public boolean updateUpperBoundAnswers(AnswerTuples answerTuples, boolean toCheckAux) {
-                RDFoxAnswerTuples rdfAnswerTuples; 
+                RDFoxAnswerTuples rdfAnswerTuples;
                 if (answerTuples instanceof RDFoxAnswerTuples)
                         rdfAnswerTuples = (RDFoxAnswerTuples) answerTuples; 
                 else {
@@ -125,7 +125,7 @@ public class QueryRecord {
                                 if ((!toCheckAux || !tuple.hasAuxPredicate()) && !soundAnswerTuples.contains(tuple)) {
                                         if (!toCheckAux && justCheck) return false; 
                                         tupleSet.add(extendedTuple);
-                        }
+                                }
                         }
                 }
                 
@@ -146,7 +146,7 @@ public class QueryRecord {
                 }
                 
                 Utility.logInfo("The number of answers in the upper bound: " + (soundAnswerTuples.size() + gapAnswerTuples.size()));
-                
+
                 return update; 
         }
         
@@ -292,11 +292,11 @@ public class QueryRecord {
         }
         
         public void setDifficulty(Step step) {
-                this.diffculty = step;   
+                this.difficulty = step;
         }
 
         public Step getDifficulty() {
-                return diffculty; 
+                return difficulty;
         }
 
         OWLOntology relevantOntology = null;
@@ -567,14 +567,16 @@ public class QueryRecord {
                 return answerVariables[1].length > answerVariables[0].length;
         }
 
+        /**
+         * A Json serializer, which considers the main attributes.
+         */
         public static class QueryRecordSerializer implements JsonSerializer<QueryRecord> {
-
                 public JsonElement serialize(QueryRecord src, Type typeOfSrc, JsonSerializationContext context) {
                         Gson gson = new GsonBuilder().setPrettyPrinting().create();
                         JsonObject object = new JsonObject();
                         object.addProperty("queryID", src.queryID);
                         object.addProperty("queryText", src.queryText);
-                        object.addProperty("difficulty", src.diffculty.toString());
+                        object.addProperty("difficulty", src.difficulty != null ? src.difficulty.toString() : "");
 
                         object.add("answerVariables", context.serialize(src.getAnswerVariables()));
                         object.add("answers", context.serialize(src.soundAnswerTuples));
@@ -586,8 +588,10 @@ public class QueryRecord {
 
         private QueryRecord() { }
 
-        public class QueryRecordDeserializer implements JsonDeserializer<QueryRecord> {
-
+        /**
+         * A Json deserializer, compliant to the output of the serializer defined above.
+         */
+        public static class QueryRecordDeserializer implements JsonDeserializer<QueryRecord> {
                 public QueryRecord deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
                                 throws JsonParseException {
 
@@ -595,6 +599,7 @@ public class QueryRecord {
                         JsonObject object = json.getAsJsonObject();
                         record.queryID = object.getAsJsonPrimitive("queryID").getAsInt();
                         record.queryText = object.getAsJsonPrimitive("queryText").getAsString();
+                        record.difficulty = Step.valueOf(object.getAsJsonPrimitive("difficulty").getAsString());
 
                         JsonArray answerVariablesJson = object.getAsJsonArray("answerVariables");
                         record.answerVariables = new String[2][];
@@ -602,52 +607,63 @@ public class QueryRecord {
                         for(int i = 0; i < answerVariablesJson.size(); i++)
                                 record.answerVariables[0][i] = answerVariablesJson.get(i).getAsString();
 
-                        record.soundAnswerTuples = context.deserialize(object.getAsJsonObject("answers"),
-                                                                                                                   new TypeToken<Set<AnswerTuple>>() {}.getType());
+                        record.soundAnswerTuples = new HashSet<>();
+                        record.gapAnswerTuples = new HashSet<>();
+                        Type type = new TypeToken<AnswerTuple>() { }.getType();
+                        for (JsonElement answer : object.getAsJsonArray("answers")) {
+                                record.soundAnswerTuples.add(context.deserialize(answer, type));
+                        }
+                        for (JsonElement answer : object.getAsJsonArray("gapAnswers")) {
+                                record.soundAnswerTuples.add(context.deserialize(answer, type));
+                        }
 
-                        record.gapAnswerTuples = context.deserialize(object.getAsJsonObject("gapAnswers"),
-                                                                                                                 new TypeToken<Set<AnswerTuple>>() {}.getType());
-                        return null;
+                        return record;
                 }
         }
 
-        /*
-         * Two QueryRecords are equal iff
-         * they have the same queryText and
-         * their AnswerTuples have the same string representation
+        /**
+         * Two <tt>QueryRecords</tt> are equal iff
+         * they have the same <tt>queryText</tt>,
+         * <tt>soundAnswerTuples</tt>
+         * and <tt>gapAnswerTuples</tt>.
          * */
         @Override
         public boolean equals(Object o) {
                 if(!o.getClass().equals(getClass())) return false;
                 QueryRecord that = (QueryRecord) o;
+                return this.queryText.equals(that.queryText)
+                                && soundAnswerTuples.equals(that.soundAnswerTuples)
+                                && gapAnswerTuples.equals(that.gapAnswerTuples);
+        }
 
-                if(!this.queryText.equals(that.queryText)) return false;
-
-                if(soundAnswerTuples.size() != that.soundAnswerTuples.size()) return false;
-                if(gapAnswerTuples.size() != that.gapAnswerTuples.size()) return false;
-
-                ArrayList<AnswerTuple> thisSoundAnswers = new ArrayList<>(soundAnswerTuples);
-                Collections.sort(thisSoundAnswers, (AnswerTuple t1, AnswerTuple t2) -> t1.m_str.compareTo(t2.m_str));
+        @Override
+        public int hashCode() {
+                return Objects.hash(queryText, soundAnswerTuples, gapAnswerTuples);
+        }
 
-                ArrayList<AnswerTuple> thatSoundAnswers = new ArrayList<>(that.soundAnswerTuples);
-                Collections.sort(thatSoundAnswers, (AnswerTuple t1, AnswerTuple t2) -> t1.m_str.compareTo(t2.m_str));
+        public static class GsonCreator {
 
-                Iterator<AnswerTuple> soundIt1 = this.soundAnswerTuples.iterator();
-                Iterator<AnswerTuple> soundIt2 = that.soundAnswerTuples.iterator();
-                while(soundIt1.hasNext() && soundIt2.hasNext())
-                        if(!soundIt1.next().m_str.equals(soundIt2.next().m_str)) return false;
+                private static Gson gson;
 
-                ArrayList<AnswerTuple> thisGapAnswers = new ArrayList<>(gapAnswerTuples);
-                Collections.sort(thisGapAnswers, (AnswerTuple t1, AnswerTuple t2) -> t1.m_str.compareTo(t2.m_str));
+                private GsonCreator() {}
 
-                ArrayList<AnswerTuple> thatGapAnswers = new ArrayList<>(that.gapAnswerTuples);
-                Collections.sort(thatGapAnswers, (AnswerTuple t1, AnswerTuple t2) -> t1.m_str.compareTo(t2.m_str));
+                public static Gson getInstance() {
+                        if(gson == null) {
+                                gson = new GsonBuilder()
+                                                .registerTypeAdapter(AnswerTuple.class, new AnswerTuple.AnswerTupleSerializer())
+                                                .registerTypeAdapter(QueryRecord.class, new QueryRecord.QueryRecordSerializer())
+                                                .registerTypeAdapter(QueryRecord.class, new QueryRecord.QueryRecordDeserializer())
+                                                .registerTypeAdapter(AnswerTuple.class, new AnswerTuple.AnswerTupleDeserializer())
+                                                .disableHtmlEscaping()
+                                                .setPrettyPrinting()
+                                                .create();
+                        }
+                        return gson;
+                }
 
-                Iterator<AnswerTuple> gapIt1 = this.gapAnswerTuples.iterator();
-                Iterator<AnswerTuple> gapIt2 = that.gapAnswerTuples.iterator();
-                while(gapIt1.hasNext() && gapIt2.hasNext())
-                        if(!gapIt1.next().m_str.equals(gapIt2.next().m_str)) return false;
+//              public static void dispose() {
+//                      gson = null;
+//              }
 
-                return true;
         }
 }
diff --git a/src/uk/ac/ox/cs/pagoda/reasoner/MyQueryReasoner.java b/src/uk/ac/ox/cs/pagoda/reasoner/MyQueryReasoner.java
index 17838ae..4465764 100644
--- a/src/uk/ac/ox/cs/pagoda/reasoner/MyQueryReasoner.java
+++ b/src/uk/ac/ox/cs/pagoda/reasoner/MyQueryReasoner.java
@@ -1,24 +1,29 @@
 package uk.ac.ox.cs.pagoda.reasoner;
 
-import java.util.Collection;
-
 import org.semanticweb.karma2.profile.ELHOProfile;
 import org.semanticweb.owlapi.model.OWLOntology;
-
-import uk.ac.ox.cs.pagoda.multistage.*; 
+import uk.ac.ox.cs.pagoda.multistage.MultiStageQueryEngine;
 import uk.ac.ox.cs.pagoda.owl.EqualitiesEliminator;
 import uk.ac.ox.cs.pagoda.owl.OWLHelper;
-import uk.ac.ox.cs.pagoda.query.*;
+import uk.ac.ox.cs.pagoda.query.AnswerTuples;
+import uk.ac.ox.cs.pagoda.query.GapByStore4ID;
+import uk.ac.ox.cs.pagoda.query.QueryRecord;
 import uk.ac.ox.cs.pagoda.query.QueryRecord.Step;
 import uk.ac.ox.cs.pagoda.reasoner.full.Checker;
 import uk.ac.ox.cs.pagoda.reasoner.light.BasicQueryEngine;
 import uk.ac.ox.cs.pagoda.reasoner.light.KarmaQueryEngine;
 import uk.ac.ox.cs.pagoda.rules.DatalogProgram;
 import uk.ac.ox.cs.pagoda.summary.HermitSummaryFilter;
-import uk.ac.ox.cs.pagoda.tracking.*;
+import uk.ac.ox.cs.pagoda.tracking.QueryTracker;
+import uk.ac.ox.cs.pagoda.tracking.TrackingRuleEncoder;
+import uk.ac.ox.cs.pagoda.tracking.TrackingRuleEncoderDisjVar1;
+import uk.ac.ox.cs.pagoda.tracking.TrackingRuleEncoderWithGap;
 import uk.ac.ox.cs.pagoda.util.Timer;
 import uk.ac.ox.cs.pagoda.util.Utility;
 
+import java.util.Collection;
+import java.util.HashMap;
+
 public class MyQueryReasoner extends QueryReasoner {
 
         OWLOntology ontology; 
@@ -203,10 +208,17 @@ public class MyQueryReasoner extends QueryReasoner {
                 String[] extendedQuery = queryRecord.getExtendedQueryText(); 
                 
                 queryUpperBound(upperStore, queryRecord, queryRecord.getQueryText(), queryRecord.getAnswerVariables());
-                if (!queryRecord.processed() && !queryRecord.getQueryText().equals(extendedQuery[0]))
+
+                // TODO log correct partial answers
+                Utility.logDebug(toJson("upperBound1", queryRecord));
+                if (!queryRecord.processed() && !queryRecord.getQueryText().equals(extendedQuery[0])) {
                         queryUpperBound(upperStore, queryRecord, extendedQuery[0], queryRecord.getAnswerVariables());
-                if (!queryRecord.processed() && queryRecord.hasNonAnsDistinguishedVariables()) 
+                        Utility.logDebug(toJson("upperBound2", queryRecord));
+                }
+                if (!queryRecord.processed() && queryRecord.hasNonAnsDistinguishedVariables()) {
                         queryUpperBound(upperStore, queryRecord, extendedQuery[1], queryRecord.getDistinguishedVariables());
+                        Utility.logDebug(toJson("upperBound3", queryRecord));
+                }
                         
                 queryRecord.addProcessingTime(Step.UpperBound, t.duration());
                 if (queryRecord.processed()) {
@@ -268,13 +280,19 @@ public class MyQueryReasoner extends QueryReasoner {
 
 //      int counter = 0; 
 
+        private String toJson(String key, Object value) {
+                HashMap<String, Object> map = new HashMap<>();
+                map.put(key, value);
+                return QueryRecord.GsonCreator.getInstance().toJson(map);
+        }
+
         private void queryUpperBound(BasicQueryEngine upperStore, QueryRecord queryRecord, String queryText, String[] answerVariables) {
                 AnswerTuples rlAnswer = null; 
                 try {
                         Utility.logDebug(queryText);
                         rlAnswer = upperStore.evaluate(queryText, answerVariables);
                         Utility.logDebug(t.duration());
-                        queryRecord.updateUpperBoundAnswers(rlAnswer); 
+                        queryRecord.updateUpperBoundAnswers(rlAnswer);
                 } finally {
                         if (rlAnswer != null) rlAnswer.dispose();
                         rlAnswer = null;
diff --git a/src/uk/ac/ox/cs/pagoda/reasoner/QueryReasoner.java b/src/uk/ac/ox/cs/pagoda/reasoner/QueryReasoner.java
index 1f08fdf..326bf7e 100644
--- a/src/uk/ac/ox/cs/pagoda/reasoner/QueryReasoner.java
+++ b/src/uk/ac/ox/cs/pagoda/reasoner/QueryReasoner.java
@@ -1,10 +1,8 @@
 package uk.ac.ox.cs.pagoda.reasoner;
 
 import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
 import org.semanticweb.owlapi.model.OWLOntology;
 import uk.ac.ox.cs.pagoda.owl.OWLHelper;
-import uk.ac.ox.cs.pagoda.query.AnswerTuple;
 import uk.ac.ox.cs.pagoda.query.AnswerTuples;
 import uk.ac.ox.cs.pagoda.query.QueryManager;
 import uk.ac.ox.cs.pagoda.query.QueryRecord;
@@ -202,11 +200,7 @@ public abstract class QueryReasoner {
                 }
                 
                 Timer t = new Timer();
-                Gson gson = new GsonBuilder()
-                                .registerTypeAdapter(AnswerTuple.class, new AnswerTuple.AnswerTupleSerializer())
-                                .registerTypeAdapter(QueryRecord.class, new QueryRecord.QueryRecordSerializer())
-                                .setPrettyPrinting()
-                                .create();
+                Gson gson = QueryRecord.GsonCreator.getInstance();
                 for (QueryRecord record: queryRecords) {
 //                      if (Integer.parseInt(record.getQueryID()) != 218) continue; 
                         Utility.logInfo("---------- start evaluating Query " + record.getQueryID() + " ----------", 
@@ -226,7 +220,7 @@ public abstract class QueryReasoner {
                 }
                 // TODO it can handle one call only
                 // if you call twice, you will end up with a json file with multiple roots
-                gson.toJson(queryRecords, answerWriter);
+                if(answerWriter != null) gson.toJson(queryRecords, answerWriter);
                 queryRecords.stream().forEach(record -> record.dispose());
         }
         
@@ -251,5 +245,5 @@ public abstract class QueryReasoner {
         public static QueryReasoner getHermiTReasoner(boolean toCheckSatisfiability) {
                 return new HermiTReasoner(toCheckSatisfiability);
         }
-        
+
 }
diff --git a/src/uk/ac/ox/cs/pagoda/util/Utility.java b/src/uk/ac/ox/cs/pagoda/util/Utility.java
index 6d50ee0..b3a4df1 100644
--- a/src/uk/ac/ox/cs/pagoda/util/Utility.java
+++ b/src/uk/ac/ox/cs/pagoda/util/Utility.java
@@ -1,5 +1,6 @@
 package uk.ac.ox.cs.pagoda.util;

 

+import org.apache.log4j.Level;

 import org.apache.log4j.Logger;

 import org.semanticweb.HermiT.model.Atom;

 

@@ -11,7 +12,11 @@ import java.util.*;
 

 public class Utility {

         

-        private static final Logger LOGS = Logger.getLogger("PAGOdA");

+        private static Logger LOGS;

+        static {

+                LOGS = Logger.getLogger("PAGOdA");

+                LOGS.setLevel(Level.INFO);

+        }

         

         public static final String JAVA_FILE_SEPARATOR = "/";

         public static final String FILE_SEPARATOR = System.getProperty("file.separator");

@@ -184,7 +189,7 @@ public class Utility {
         }

 

         private static StringBuilder logMessage = new StringBuilder();

-        

+

         private static String getLogMessage(Object[] messages) {

                 if (messages.length == 1) return messages[0].toString(); 

                 else {

@@ -198,7 +203,11 @@ public class Utility {
                 }

 

         }

-        

+

+        public static void setLogLevel(Level level) {

+                LOGS.setLevel(level);

+        }

+

         public static void logInfo(Object... messages) {

                 if (LOGS != null)

                         LOGS.info(getLogMessage(messages)); 

diff --git a/test/AllTests.xml b/test/AllTests.xml
index 8ce5fcf..cb8a0e3 100644
--- a/test/AllTests.xml
+++ b/test/AllTests.xml
@@ -9,4 +9,10 @@
         </classes>
     </test>
 
+    <test name="PagodaLUBM">
+        <classes>
+            <class name="uk.ac.ox.cs.pagoda.test_units.PagodaLUBM" />
+        </classes>
+    </test>
+
 </suite>
\ No newline at end of file
diff --git a/test/uk/ac/ox/cs/pagoda/test_units/PagodaLUBM.java b/test/uk/ac/ox/cs/pagoda/test_units/PagodaLUBM.java
index 29abc87..1aded5b 100644
--- a/test/uk/ac/ox/cs/pagoda/test_units/PagodaLUBM.java
+++ b/test/uk/ac/ox/cs/pagoda/test_units/PagodaLUBM.java
@@ -13,7 +13,7 @@ public class PagodaLUBM {
                 TestGlobalCorrectness.test(Paths.get(ontoDir, "lubm/univ-bench.owl"),
                                                                    Paths.get(ontoDir, "lubm/data/lubm" + number + ".ttl"),
                                                                    Paths.get(ontoDir, "lubm/queries/test.sparql"),
-                                                                   Paths.get(ontoDir, "lubm/lubm" + number + ".ans"));
+                                                                   Paths.get(ontoDir, "lubm/lubm" + number + ".json"));
         }
 
         @Test
diff --git a/test/uk/ac/ox/cs/pagoda/test_units/PagodaUOBM.java b/test/uk/ac/ox/cs/pagoda/test_units/PagodaUOBM.java
index f53ed7e..ee9cf13 100644
--- a/test/uk/ac/ox/cs/pagoda/test_units/PagodaUOBM.java
+++ b/test/uk/ac/ox/cs/pagoda/test_units/PagodaUOBM.java
@@ -13,7 +13,7 @@ public class PagodaUOBM {
                 TestGlobalCorrectness.test(Paths.get(ontoDir, "uobm/univ-bench-dl.owl"),
                                                           Paths.get(ontoDir, "uobm/data/uobm" + number + ".ttl"),
                                                           Paths.get(ontoDir, "uobm/queries/test.sparql"),
-                                                          Paths.get(ontoDir, "uobm/uobm" + number + ".ans"));
+                                                          Paths.get(ontoDir, "uobm/uobm" + number + ".json"));
         }
 
         @Test
diff --git a/test/uk/ac/ox/cs/pagoda/test_units/TestGlobalCorrectness.java b/test/uk/ac/ox/cs/pagoda/test_units/TestGlobalCorrectness.java
index 34ec8cd..ffaf8fc 100644
--- a/test/uk/ac/ox/cs/pagoda/test_units/TestGlobalCorrectness.java
+++ b/test/uk/ac/ox/cs/pagoda/test_units/TestGlobalCorrectness.java
@@ -1,13 +1,12 @@
 package uk.ac.ox.cs.pagoda.test_units;
 
 import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
-import org.apache.log4j.Logger;
+import org.apache.log4j.Level;
 import org.testng.Assert;
-import uk.ac.ox.cs.pagoda.query.AnswerTuple;
 import uk.ac.ox.cs.pagoda.query.QueryRecord;
 import uk.ac.ox.cs.pagoda.tester.PagodaTester;
+import uk.ac.ox.cs.pagoda.util.Utility;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -16,39 +15,37 @@ import java.lang.reflect.Type;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Collection;
 import java.util.Set;
 
-/*
+/**
  * This is a unit test for TestNG.
  * <p>
  * It tests the correctness on the final output.
  * */
 public class TestGlobalCorrectness {
 
-    public static final Logger logger = Logger.getLogger(TestGlobalCorrectness.class);
-
     public static void test(Path ontology, Path data, Path queries, Path givenAnswers) {
         try {
-            Path computedAnswers = Paths.get(File.createTempFile("answers", ".tmp").getAbsolutePath());
+            Utility.setLogLevel(Level.DEBUG);
+            Path computedAnswers = Paths.get(File.createTempFile("answers", ".json").getAbsolutePath());
             PagodaTester.main(ontology.toString(), data.toString(), queries.toString(), computedAnswers.toString());
-            Assert.assertTrue(checkSameContent(computedAnswers, givenAnswers));
+            assertSameContent(computedAnswers, givenAnswers);
         } catch (IOException e) {
             e.printStackTrace();
         }
     }
 
-    private static boolean checkSameContent(Path computedAnswersFile, Path givenAnswersFile) throws IOException {
+    private static void assertSameContent(Path computedAnswersFile, Path givenAnswersFile) throws IOException {
         BufferedReader computedReader = Files.newBufferedReader(computedAnswersFile);
         BufferedReader givenReader = Files.newBufferedReader(givenAnswersFile);
 
-        Gson gson = new GsonBuilder().create();
+        Gson gson = QueryRecord.GsonCreator.getInstance();
 
-        Type cqType = new TypeToken<Set<AnswerTuple>>() {}.getType();
-        Collection<QueryRecord> computedAnswers = gson.fromJson(computedReader, cqType);
-        Collection<QueryRecord> givenAnswers = gson.fromJson(givenReader, cqType);
+        Type cqType = new TypeToken<Set<QueryRecord>>() {}.getType();
+        Set<QueryRecord> computedAnswers = gson.fromJson(computedReader, cqType);
+        Set<QueryRecord> givenAnswers = gson.fromJson(givenReader, cqType);
 
-        return computedAnswers.equals(givenAnswers);
+        Assert.assertEquals(computedAnswers, givenAnswers);
     }
 
 
diff --git a/test/uk/ac/ox/cs/pagoda/tester/PagodaTester.java b/test/uk/ac/ox/cs/pagoda/tester/PagodaTester.java
index 7dacdac..5e49f79 100644
--- a/test/uk/ac/ox/cs/pagoda/tester/PagodaTester.java
+++ b/test/uk/ac/ox/cs/pagoda/tester/PagodaTester.java
@@ -37,7 +37,7 @@ public class PagodaTester {
         public static final int uobm_number = 1;
         public static final String uobm_tbox = onto_dir + "uobm/univ-bench-dl.owl";
         public static final String uobm_abox = onto_dir + "uobm/data/uobm" + uobm_number + ".ttl";
-        public static final String uobm_query = onto_dir + "uobm/queries/standard.sparql";
+        public static final String uobm_query = onto_dir + "uobm/queries/test.sparql";
         public static final String uobm_query_temp = onto_dir + "uobm/queries/temp.sparql";
         public static final String uobm_query2 = onto_dir + "uobm/queries/standard_q2.sparql";
         public static final String uobm_query9 = onto_dir + "uobm/queries/standard_q9.sparql";
@@ -93,8 +93,8 @@ public class PagodaTester {
         public static void main(String... args) {
                 if (args.length == 0) {
 //                      args = new String[] {test_tbox, test_abox, test_query};
-                        args = new String[] {lubm_tbox, lubm_abox, lubm_query, "/home/alessandro/Desktop/lubm1.ans"};
-//                      args = new String[] {uobm_tbox, uobm_abox, uobm_query.replace(".sparql", "_all_pagoda.sparql")};
+//                      args = new String[] {lubm_tbox, lubm_abox, lubm_query};
+                        args = new String[] {uobm_tbox, uobm_abox, uobm_query, "/home/alessandro/Desktop/uobm1.ans"};
 //                      args = new String[] {fly, "null", fly_query.replace(".sparql", "_pellet.sparql") };
 //                      args = new String[] {dbpedia_tbox, dbpedia_abox, dbpedia_query};
 //                      args = new String[] {travel_tbox, null, dbpedia_query274};
diff --git a/test/uk/ac/ox/cs/pagoda/util/TestUtil.java b/test/uk/ac/ox/cs/pagoda/util/TestUtil.java
index 227398b..06d391a 100644
--- a/test/uk/ac/ox/cs/pagoda/util/TestUtil.java
+++ b/test/uk/ac/ox/cs/pagoda/util/TestUtil.java
@@ -48,7 +48,7 @@ public class TestUtil {
         Files.copy(Paths.get(src), Paths.get(dst), REPLACE_EXISTING);
     }
 
-    /*
+    /**
      * Get the log file, which is assumed unique.
      * */
     public static String getLogFileName() {
@@ -61,4 +61,5 @@ public class TestUtil {
         }
         return null;
     }
+
 }