# HG changeset patch # User Stella Giannakopoulou # Date 1421948004 -7200 # Node ID d4387b73ec9aadd1fae2ea08fb3130062dfdccea # Parent 0fd5affce921a8baf6ccf8cc70ed6d680a9bdc1a added correct queries and results for the temporal functions that have a corresponding PostgreSQL function. diff -r 0fd5affce921 -r d4387b73ec9a testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/adjacent.srx --- a/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/adjacent.srx Thu Jan 22 19:28:57 2015 +0200 +++ b/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/adjacent.srx Thu Jan 22 19:33:24 2015 +0200 @@ -5,13 +5,5 @@ - - - http://example.org/item8 - - - http://example.org/item7 - - \ No newline at end of file diff -r 0fd5affce921 -r d4387b73ec9a testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/after.srx --- a/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/after.srx Thu Jan 22 19:28:57 2015 +0200 +++ b/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/after.srx Thu Jan 22 19:33:24 2015 +0200 @@ -6,76 +6,76 @@ + + http://example.org/item1 + + + http://example.org/item4 + + + + + http://example.org/item2 + + + http://example.org/item4 + + + + + http://example.org/item3 + + + http://example.org/item4 + + + + + http://example.org/item1 + + + http://example.org/item5 + + + + + http://example.org/item2 + + + http://example.org/item5 + + + + + http://example.org/item3 + + + http://example.org/item5 + + + + + http://example.org/item1 + http://example.org/item6 + + + + http://example.org/item2 + + + http://example.org/item6 + + + http://example.org/item3 - - http://example.org/item6 - - http://example.org/item1 - - - - - http://example.org/item6 - - - http://example.org/item2 - - - - - http://example.org/item4 - - - http://example.org/item3 - - - - - http://example.org/item4 - - - http://example.org/item1 - - - - - http://example.org/item4 - - - http://example.org/item2 - - - - - http://example.org/item5 - - - http://example.org/item3 - - - - - http://example.org/item5 - - - http://example.org/item1 - - - - - http://example.org/item5 - - - http://example.org/item2 - - + \ No newline at end of file diff -r 0fd5affce921 -r d4387b73ec9a testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/before.srx --- a/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/before.srx Thu Jan 22 19:28:57 2015 +0200 +++ b/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/before.srx Thu Jan 22 19:33:24 2015 +0200 @@ -6,132 +6,124 @@ + + http://example.org/item1 + - http://example.org/item8 + http://example.org/item2 + + + + http://example.org/item1 + + + http://example.org/item3 + + + http://example.org/item4 - - - http://example.org/item7 - - - http://example.org/item1 - - - - - http://example.org/item8 - - http://example.org/item5 - - http://example.org/item7 - http://example.org/item4 - - - http://example.org/item8 - - - http://example.org/item3 + http://example.org/item6 + + http://example.org/item5 + http://example.org/item6 - - http://example.org/item4 - - - http://example.org/item8 - http://example.org/item1 - - - http://example.org/item8 - - http://example.org/item7 + + http://example.org/item4 + - http://example.org/item3 + http://example.org/item7 + + + + http://example.org/item5 + + + http://example.org/item7 + + + + + http://example.org/item6 + + + http://example.org/item7 + + + http://example.org/item1 + + http://example.org/item8 + + + http://example.org/item2 + - http://example.org/item7 + http://example.org/item8 + + + + http://example.org/item3 + + + http://example.org/item8 + + + + + http://example.org/item4 + + + http://example.org/item8 + + + http://example.org/item5 - - - http://example.org/item6 - - - http://example.org/item5 + http://example.org/item8 + + http://example.org/item6 + http://example.org/item8 - - http://example.org/item2 - - - - - http://example.org/item5 - - - http://example.org/item4 - - - - - http://example.org/item7 - - - http://example.org/item6 - - - - - http://example.org/item2 - - - http://example.org/item1 - - - - - http://example.org/item8 - - - http://example.org/item6 - - + \ No newline at end of file diff -r 0fd5affce921 -r d4387b73ec9a testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/overleft.rq --- a/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/overleft.rq Thu Jan 22 19:28:57 2015 +0200 +++ b/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/overleft.rq Thu Jan 22 19:33:24 2015 +0200 @@ -1,7 +1,3 @@ -PREFIX strdf: -PREFIX xsd: -PREFIX noa: - SELECT distinct ?x1 ?x2 WHERE { ?x1 ?y1 ?z1 ?t1 . diff -r 0fd5affce921 -r d4387b73ec9a testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/overleft.srx --- a/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/overleft.srx Thu Jan 22 19:28:57 2015 +0200 +++ b/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/overleft.srx Thu Jan 22 19:33:24 2015 +0200 @@ -6,60 +6,68 @@ + + http://example.org/item1 + - http://example.org/item7 + http://example.org/item2 + + + http://example.org/item1 + + http://example.org/item3 + + http://example.org/item2 + http://example.org/item3 + + http://example.org/item1 - - http://example.org/item7 + + http://example.org/item2 + + http://example.org/item7 + - + http://example.org/item3 + + http://example.org/item7 + + + http://example.org/item2 - - - http://example.org/item7 - - - http://example.org/item1 + http://example.org/item8 + + http://example.org/item7 + http://example.org/item8 - - http://example.org/item2 - - - - - http://example.org/item2 - - - http://example.org/item1 - \ No newline at end of file diff -r 0fd5affce921 -r d4387b73ec9a testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/overright.srx --- a/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/overright.srx Thu Jan 22 19:28:57 2015 +0200 +++ b/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/overright.srx Thu Jan 22 19:33:24 2015 +0200 @@ -6,100 +6,100 @@ - - http://example.org/item6 - http://example.org/item1 - - - http://example.org/item4 - - http://example.org/item2 - - http://example.org/item4 - http://example.org/item1 - - - http://example.org/item6 - - - http://example.org/item2 - - - - - http://example.org/item6 - - http://example.org/item3 - - http://example.org/item3 - - - http://example.org/item1 - - - - - http://example.org/item3 - http://example.org/item2 - - - http://example.org/item5 - - http://example.org/item3 - - http://example.org/item2 - http://example.org/item1 - - http://example.org/item4 + + + + http://example.org/item2 + + + http://example.org/item4 + + + http://example.org/item3 + + http://example.org/item4 + + + http://example.org/item1 + http://example.org/item5 + + http://example.org/item2 - - http://example.org/item5 + + + + http://example.org/item3 + + + http://example.org/item5 + + + http://example.org/item1 + + http://example.org/item6 + + + + + http://example.org/item2 + + + http://example.org/item6 + + + + + http://example.org/item3 + + + http://example.org/item6 + \ No newline at end of file diff -r 0fd5affce921 -r d4387b73ec9a testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/periodOverlaps.rq --- a/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/periodOverlaps.rq Thu Jan 22 19:28:57 2015 +0200 +++ b/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/periodOverlaps.rq Thu Jan 22 19:33:24 2015 +0200 @@ -2,4 +2,4 @@ WHERE { ?x1 ?y1 ?z1 ?t1 . ?x2 ?y2 ?z2 ?t2 . - FILTER(strdf:periodOverlaps(?t1, ?t2) && str(?x1) < str(?x2)).} \ No newline at end of file + FILTER(strdf:PeriodOverlaps(?t1, ?t2) && str(?x1) < str(?x2)).} \ No newline at end of file diff -r 0fd5affce921 -r d4387b73ec9a testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/periodOverlaps.srx --- a/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/periodOverlaps.srx Thu Jan 22 19:28:57 2015 +0200 +++ b/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/periodOverlaps.srx Thu Jan 22 19:33:24 2015 +0200 @@ -1,8 +1,73 @@ + + + + http://example.org/item1 + + + http://example.org/item2 + + + + + http://example.org/item1 + + + http://example.org/item3 + + + + + http://example.org/item2 + + + http://example.org/item3 + + + + + http://example.org/item1 + + + http://example.org/item7 + + + + + http://example.org/item2 + + + http://example.org/item7 + + + + + http://example.org/item3 + + + http://example.org/item7 + + + + + http://example.org/item2 + + + http://example.org/item8 + + + + + http://example.org/item7 + + + http://example.org/item8 + + \ No newline at end of file diff -r 0fd5affce921 -r d4387b73ec9a testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/temporalRelations.nq --- a/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/temporalRelations.nq Thu Jan 22 19:28:57 2015 +0200 +++ b/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/temporalRelations.nq Thu Jan 22 19:33:24 2015 +0200 @@ -12,4 +12,4 @@ "20"^^ "2012-01-19T11:41:00"^^ . "20"^^ "2012-01-19T12:41:00"^^ . "7"^^ "[2012-11-19T13:41:00,2012-11-19T14:41:00]"^^. - "8"^^ "[2012-11-19T14:41:00.000001,2012-11-19T15:41:00]"^^. + "8"^^ "[2012-11-19T14:41:00,2012-11-19T15:41:00]"^^.