From c9c8d03e957fa56df5dc1304f7a81dfa61b7b70e Mon Sep 17 00:00:00 2001 From: RncLsn Date: Thu, 21 May 2015 14:46:44 +0100 Subject: Removed extended queries (involving classes MyQueryReasoner and QueryRecord). Executed LightTests successfully. --- .../ac/ox/cs/pagoda/reasoner/MyQueryReasoner.java | 27 ++++++++-------------- 1 file changed, 9 insertions(+), 18 deletions(-) (limited to 'src/uk/ac/ox/cs/pagoda/reasoner/MyQueryReasoner.java') diff --git a/src/uk/ac/ox/cs/pagoda/reasoner/MyQueryReasoner.java b/src/uk/ac/ox/cs/pagoda/reasoner/MyQueryReasoner.java index 2a49e24..cc0e647 100644 --- a/src/uk/ac/ox/cs/pagoda/reasoner/MyQueryReasoner.java +++ b/src/uk/ac/ox/cs/pagoda/reasoner/MyQueryReasoner.java @@ -208,14 +208,10 @@ class MyQueryReasoner extends QueryReasoner { private boolean queryUpperStore(BasicQueryEngine upperStore, QueryRecord queryRecord, Tuple extendedQuery, Step step) { - queryUpperBound(upperStore, queryRecord, queryRecord.getQueryText(), queryRecord.getAnswerVariables()); - - if(queryRecord.hasNonAnsDistinguishedVariables()) { - if(!queryRecord.processed()) - queryUpperBound(upperStore, queryRecord, extendedQuery.get(0), queryRecord.getAnswerVariables()); - if(!queryRecord.processed()) - queryUpperBound(upperStore, queryRecord, extendedQuery.get(1), queryRecord.getDistinguishedVariables()); - } + if(queryRecord.hasNonAnsDistinguishedVariables()) + queryUpperBound(upperStore, queryRecord, extendedQuery.get(0), queryRecord.getAnswerVariables()); + else + queryUpperBound(upperStore, queryRecord, queryRecord.getQueryText(), queryRecord.getAnswerVariables()); queryRecord.addProcessingTime(step, t.duration()); if(queryRecord.processed()) { @@ -245,28 +241,23 @@ class MyQueryReasoner extends QueryReasoner { Tuple extendedQueryTexts = queryRecord.getExtendedQueryText(); -// BasicQueryEngine upperStore; -// if(queryRecord.isBottom()) upperStore = trackingStore; -// upperStore = queryRecord.isBottom() || lazyUpperStore == null ? trackingStore : lazyUpperStore; - - // TODO -// if(queryRecord.isBottom() || (lazyUpperStore == null && limitedSkolemUpperStore == null)) -// queryUpperStore(trackingStore, queryRecord, extendedQueryTexts); -// else { - + Utility.logDebug("Tracking store"); if(queryUpperStore(trackingStore, queryRecord, extendedQueryTexts, Step.SIMPLE_UPPER_BOUND)) return null; if(!queryRecord.isBottom()) { + Utility.logDebug("Lazy store"); if(lazyUpperStore != null && queryUpperStore(lazyUpperStore, queryRecord, extendedQueryTexts, Step.LAZY_UPPER_BOUND)) return null; + Utility.logDebug("Skolem store"); if(limitedSkolemUpperStore != null && queryUpperStore(limitedSkolemUpperStore, queryRecord, extendedQueryTexts, Step.L_SKOLEM_UPPER_BOUND)) return null; } t.reset(); try { - elAnswer = elLowerStore.evaluate(extendedQueryTexts.get(0), queryRecord.getAnswerVariables(), + elAnswer = elLowerStore.evaluate(extendedQueryTexts.get(0), + queryRecord.getAnswerVariables(), queryRecord.getLowerBoundAnswers()); Utility.logDebug(t.duration()); queryRecord.updateLowerBoundAnswers(elAnswer); -- cgit v1.2.3