diff options
| author | RncLsn <rnc.lsn@gmail.com> | 2015-05-28 17:24:00 +0100 |
|---|---|---|
| committer | RncLsn <rnc.lsn@gmail.com> | 2015-05-28 17:24:00 +0100 |
| commit | 1055e67727b1aca80ae7ffaceabce3aacb00b6d2 (patch) | |
| tree | 71632dfc0fdf596d0286a4912245cacedfd2b534 /external/uk/ac/ox/cs/data/Comparator.java | |
| parent | de3749532d060f26c966a81c03f9a5d846c33d06 (diff) | |
| parent | 4f98cb7df7f2921808d825cdcd82f95a0899640e (diff) | |
| download | ACQuA-1055e67727b1aca80ae7ffaceabce3aacb00b6d2.tar.gz ACQuA-1055e67727b1aca80ae7ffaceabce3aacb00b6d2.zip | |
Merge branch 'upstream' into Query-dependent-skolemisation
Conflicts:
src/uk/ac/ox/cs/pagoda/approx/RLPlusOntology.java
src/uk/ac/ox/cs/pagoda/endomorph/plan/OpenEndMultiThreadPlan.java
src/uk/ac/ox/cs/pagoda/endomorph/plan/OpenEndPlan.java
src/uk/ac/ox/cs/pagoda/query/GapByStore4ID.java
src/uk/ac/ox/cs/pagoda/query/GapByStore4ID2.java
src/uk/ac/ox/cs/pagoda/reasoner/MyQueryReasoner.java
src/uk/ac/ox/cs/pagoda/reasoner/light/BasicQueryEngine.java
src/uk/ac/ox/cs/pagoda/tracking/TrackingRuleEncoderWithGap.java
src/uk/ac/ox/cs/pagoda/util/Utility.java
test/uk/ac/ox/cs/pagoda/junit/ClauseTester.java
test/uk/ac/ox/cs/pagoda/junit/TestGapMappedToLower.java
Diffstat (limited to 'external/uk/ac/ox/cs/data/Comparator.java')
0 files changed, 0 insertions, 0 deletions