diff options
Diffstat (limited to 'src/uk/ac/ox/cs/pagoda/query')
| -rw-r--r-- | src/uk/ac/ox/cs/pagoda/query/AnswerTuple.java | 3 | ||||
| -rw-r--r-- | src/uk/ac/ox/cs/pagoda/query/QueryRecord.java | 4 |
2 files changed, 4 insertions, 3 deletions
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 { | |||
| 156 | public AnswerTuple deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) | 156 | public AnswerTuple deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) |
| 157 | throws JsonParseException { | 157 | throws JsonParseException { |
| 158 | String tuplesString = json.getAsJsonPrimitive().getAsString(); | 158 | String tuplesString = json.getAsJsonPrimitive().getAsString(); |
| 159 | StringTokenizer tokenizer = new StringTokenizer(SEPARATOR); | 159 | // StringTokenizer tokenizer = new StringTokenizer(tuplesString, SEPARATOR); |
| 160 | StringTokenizer tokenizer = new StringTokenizer(tuplesString); | ||
| 160 | GroundTerm[] terms = new GroundTerm[tokenizer.countTokens()]; | 161 | GroundTerm[] terms = new GroundTerm[tokenizer.countTokens()]; |
| 161 | 162 | ||
| 162 | // TODO test parsing | 163 | // 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 { | |||
| 30 | double[] timer; | 30 | double[] timer; |
| 31 | int subID; | 31 | int subID; |
| 32 | DLClause queryClause = null; | 32 | DLClause queryClause = null; |
| 33 | int queryID = -1; | ||
| 34 | Set<AnswerTuple> soundAnswerTuples = new HashSet<AnswerTuple>(); | ||
| 33 | private Step difficulty; | 35 | private Step difficulty; |
| 34 | private String queryText; | 36 | private String queryText; |
| 35 | private int queryID = -1; | ||
| 36 | private String[][] answerVariables = null; | 37 | private String[][] answerVariables = null; |
| 37 | private Set<AnswerTuple> soundAnswerTuples = new HashSet<AnswerTuple>(); | ||
| 38 | private Set<AnswerTuple> gapAnswerTuples = null; | 38 | private Set<AnswerTuple> gapAnswerTuples = null; |
| 39 | private QueryManager m_manager; | 39 | private QueryManager m_manager; |
| 40 | 40 | ||
