diff options
| author | RncLsn <rnc.lsn@gmail.com> | 2015-05-28 10:29:11 +0100 |
|---|---|---|
| committer | RncLsn <rnc.lsn@gmail.com> | 2015-05-28 10:29:11 +0100 |
| commit | 2e069a4966e6305194c4168d6fc5c406123d7f64 (patch) | |
| tree | dc70e541b78494ac13f899db2831422b28fc5f72 /src/uk/ac/ox/cs/pagoda/reasoner/QueryReasoner.java | |
| parent | c9c8d03e957fa56df5dc1304f7a81dfa61b7b70e (diff) | |
| download | ACQuA-2e069a4966e6305194c4168d6fc5c406123d7f64.tar.gz ACQuA-2e069a4966e6305194c4168d6fc5c406123d7f64.zip | |
NOT-WORKING: trying to add query-dependent Skolemisation.
Diffstat (limited to 'src/uk/ac/ox/cs/pagoda/reasoner/QueryReasoner.java')
| -rw-r--r-- | src/uk/ac/ox/cs/pagoda/reasoner/QueryReasoner.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/uk/ac/ox/cs/pagoda/reasoner/QueryReasoner.java b/src/uk/ac/ox/cs/pagoda/reasoner/QueryReasoner.java index 64945e8..118c1b2 100644 --- a/src/uk/ac/ox/cs/pagoda/reasoner/QueryReasoner.java +++ b/src/uk/ac/ox/cs/pagoda/reasoner/QueryReasoner.java | |||
| @@ -147,7 +147,7 @@ PagodaProperties properties; | |||
| 147 | if (forFacetGeneration) { | 147 | if (forFacetGeneration) { |
| 148 | QueryRecord record = m_queryManager.create(queryText); | 148 | QueryRecord record = m_queryManager.create(queryText); |
| 149 | Utility.logInfo("---------- start evaluating upper bound for Query " + record.getQueryID() + " ----------", queryText); | 149 | Utility.logInfo("---------- start evaluating upper bound for Query " + record.getQueryID() + " ----------", queryText); |
| 150 | if(!record.processed()) | 150 | if(!record.isProcessed()) |
| 151 | evaluateUpper(record); | 151 | evaluateUpper(record); |
| 152 | // AnswerTuples tuples = record.getUpperBoundAnswers(); | 152 | // AnswerTuples tuples = record.getUpperBoundAnswers(); |
| 153 | // for (AnswerTuple tuple; tuples.isValid(); tuples.moveNext()) { | 153 | // for (AnswerTuple tuple; tuples.isValid(); tuples.moveNext()) { |
| @@ -167,7 +167,7 @@ PagodaProperties properties; | |||
| 167 | public AnswerTuples evaluate(String queryText) { | 167 | public AnswerTuples evaluate(String queryText) { |
| 168 | QueryRecord record = m_queryManager.create(queryText); | 168 | QueryRecord record = m_queryManager.create(queryText); |
| 169 | Utility.logInfo("---------- start evaluating Query " + record.getQueryID() + " ----------", queryText); | 169 | Utility.logInfo("---------- start evaluating Query " + record.getQueryID() + " ----------", queryText); |
| 170 | if(!record.processed()) | 170 | if(!record.isProcessed()) |
| 171 | evaluate(record); | 171 | evaluate(record); |
| 172 | AnswerTuples answer = record.getAnswers(); | 172 | AnswerTuples answer = record.getAnswers(); |
| 173 | record.dispose(); | 173 | record.dispose(); |
| @@ -178,7 +178,7 @@ PagodaProperties properties; | |||
| 178 | public void evaluate_shell(String queryText) { | 178 | public void evaluate_shell(String queryText) { |
| 179 | QueryRecord record = m_queryManager.create(queryText); | 179 | QueryRecord record = m_queryManager.create(queryText); |
| 180 | Utility.logInfo("---------- start evaluating Query " + record.getQueryID() + " ----------", queryText); | 180 | Utility.logInfo("---------- start evaluating Query " + record.getQueryID() + " ----------", queryText); |
| 181 | if(!record.processed()) | 181 | if(!record.isProcessed()) |
| 182 | evaluate(record); | 182 | evaluate(record); |
| 183 | Utility.logInfo("Answers to this query: ", record.outputSoundAnswerTuple()); | 183 | Utility.logInfo("Answers to this query: ", record.outputSoundAnswerTuple()); |
| 184 | record.dispose(); | 184 | record.dispose(); |
| @@ -206,12 +206,12 @@ PagodaProperties properties; | |||
| 206 | // if (Integer.parseInt(record.getQueryID()) != 218) continue; | 206 | // if (Integer.parseInt(record.getQueryID()) != 218) continue; |
| 207 | Utility.logInfo("---------- start evaluating Query " + record.getQueryID() + " ----------", | 207 | Utility.logInfo("---------- start evaluating Query " + record.getQueryID() + " ----------", |
| 208 | record.getQueryText()); | 208 | record.getQueryText()); |
| 209 | if (!record.processed()) { | 209 | if(!record.isProcessed()) { |
| 210 | t.reset(); | 210 | t.reset(); |
| 211 | if (!record.processed()) | 211 | if(!record.isProcessed()) |
| 212 | evaluate(record); | 212 | evaluate(record); |
| 213 | Utility.logInfo("Total time to answer this query: " + t.duration()); | 213 | Utility.logInfo("Total time to answer this query: " + t.duration()); |
| 214 | if (!fullReasoner && !record.processed()) { | 214 | if(!fullReasoner && !record.isProcessed()) { |
| 215 | Utility.logInfo("The query has not been fully answered in " + t.duration() + " seconds."); | 215 | Utility.logInfo("The query has not been fully answered in " + t.duration() + " seconds."); |
| 216 | continue; | 216 | continue; |
| 217 | } | 217 | } |
