Strabon

changeset 1463:d4387b73ec9a temporals

added correct queries and results for the temporal functions that have a corresponding
PostgreSQL function.
author Stella Giannakopoulou <sgian@di.uoa.gr>
date Thu Jan 22 19:33:24 2015 +0200 (2015-01-22)
parents 0fd5affce921
children 31466cac9cec
files testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/adjacent.srx testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/after.srx testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/before.srx testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/overleft.rq testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/overleft.srx testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/overright.srx testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/periodOverlaps.rq testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/periodOverlaps.srx testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/temporalRelations.nq
line diff
     1.1 --- a/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/adjacent.srx	Thu Jan 22 19:28:57 2015 +0200
     1.2 +++ b/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/adjacent.srx	Thu Jan 22 19:33:24 2015 +0200
     1.3 @@ -5,13 +5,5 @@
     1.4  		<variable name='x2'/>
     1.5  	</head>
     1.6  	<results>
     1.7 -		<result>
     1.8 -			<binding name='x2'>
     1.9 -				<uri>http://example.org/item8</uri>
    1.10 -			</binding>
    1.11 -			<binding name='x1'>
    1.12 -				<uri>http://example.org/item7</uri>
    1.13 -			</binding>
    1.14 -		</result>
    1.15  	</results>
    1.16  </sparql>
    1.17 \ No newline at end of file
     2.1 --- a/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/after.srx	Thu Jan 22 19:28:57 2015 +0200
     2.2 +++ b/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/after.srx	Thu Jan 22 19:33:24 2015 +0200
     2.3 @@ -6,76 +6,76 @@
     2.4  	</head>
     2.5  	<results>
     2.6  		<result>
     2.7 +			<binding name='x1'>
     2.8 +				<uri>http://example.org/item1</uri>
     2.9 +			</binding>
    2.10 +			<binding name='x2'>
    2.11 +				<uri>http://example.org/item4</uri>
    2.12 +			</binding>
    2.13 +		</result>
    2.14 +		<result>
    2.15 +			<binding name='x1'>
    2.16 +				<uri>http://example.org/item2</uri>
    2.17 +			</binding>
    2.18 +			<binding name='x2'>
    2.19 +				<uri>http://example.org/item4</uri>
    2.20 +			</binding>
    2.21 +		</result>
    2.22 +		<result>
    2.23 +			<binding name='x1'>
    2.24 +				<uri>http://example.org/item3</uri>
    2.25 +			</binding>
    2.26 +			<binding name='x2'>
    2.27 +				<uri>http://example.org/item4</uri>
    2.28 +			</binding>
    2.29 +		</result>
    2.30 +		<result>
    2.31 +			<binding name='x1'>
    2.32 +				<uri>http://example.org/item1</uri>
    2.33 +			</binding>
    2.34 +			<binding name='x2'>
    2.35 +				<uri>http://example.org/item5</uri>
    2.36 +			</binding>
    2.37 +		</result>
    2.38 +		<result>
    2.39 +			<binding name='x1'>
    2.40 +				<uri>http://example.org/item2</uri>
    2.41 +			</binding>
    2.42 +			<binding name='x2'>
    2.43 +				<uri>http://example.org/item5</uri>
    2.44 +			</binding>
    2.45 +		</result>
    2.46 +		<result>
    2.47 +			<binding name='x1'>
    2.48 +				<uri>http://example.org/item3</uri>
    2.49 +			</binding>
    2.50 +			<binding name='x2'>
    2.51 +				<uri>http://example.org/item5</uri>
    2.52 +			</binding>
    2.53 +		</result>
    2.54 +		<result>
    2.55 +			<binding name='x1'>
    2.56 +				<uri>http://example.org/item1</uri>
    2.57 +			</binding>
    2.58  			<binding name='x2'>
    2.59  				<uri>http://example.org/item6</uri>
    2.60  			</binding>
    2.61 +		</result>
    2.62 +		<result>
    2.63 +			<binding name='x1'>
    2.64 +				<uri>http://example.org/item2</uri>
    2.65 +			</binding>
    2.66 +			<binding name='x2'>
    2.67 +				<uri>http://example.org/item6</uri>
    2.68 +			</binding>
    2.69 +		</result>
    2.70 +		<result>
    2.71  			<binding name='x1'>
    2.72  				<uri>http://example.org/item3</uri>
    2.73  			</binding>
    2.74 -		</result>
    2.75 -		<result>
    2.76  			<binding name='x2'>
    2.77  				<uri>http://example.org/item6</uri>
    2.78  			</binding>
    2.79 -			<binding name='x1'>
    2.80 -				<uri>http://example.org/item1</uri>
    2.81 -			</binding>
    2.82 -		</result>
    2.83 -		<result>
    2.84 -			<binding name='x2'>
    2.85 -				<uri>http://example.org/item6</uri>
    2.86 -			</binding>
    2.87 -			<binding name='x1'>
    2.88 -				<uri>http://example.org/item2</uri>
    2.89 -			</binding>
    2.90 -		</result>
    2.91 -		<result>
    2.92 -			<binding name='x2'>
    2.93 -				<uri>http://example.org/item4</uri>
    2.94 -			</binding>
    2.95 -			<binding name='x1'>
    2.96 -				<uri>http://example.org/item3</uri>
    2.97 -			</binding>
    2.98 -		</result>
    2.99 -		<result>
   2.100 -			<binding name='x2'>
   2.101 -				<uri>http://example.org/item4</uri>
   2.102 -			</binding>
   2.103 -			<binding name='x1'>
   2.104 -				<uri>http://example.org/item1</uri>
   2.105 -			</binding>
   2.106 -		</result>
   2.107 -		<result>
   2.108 -			<binding name='x2'>
   2.109 -				<uri>http://example.org/item4</uri>
   2.110 -			</binding>
   2.111 -			<binding name='x1'>
   2.112 -				<uri>http://example.org/item2</uri>
   2.113 -			</binding>
   2.114 -		</result>
   2.115 -		<result>
   2.116 -			<binding name='x2'>
   2.117 -				<uri>http://example.org/item5</uri>
   2.118 -			</binding>
   2.119 -			<binding name='x1'>
   2.120 -				<uri>http://example.org/item3</uri>
   2.121 -			</binding>
   2.122 -		</result>
   2.123 -		<result>
   2.124 -			<binding name='x2'>
   2.125 -				<uri>http://example.org/item5</uri>
   2.126 -			</binding>
   2.127 -			<binding name='x1'>
   2.128 -				<uri>http://example.org/item1</uri>
   2.129 -			</binding>
   2.130 -		</result>
   2.131 -		<result>
   2.132 -			<binding name='x2'>
   2.133 -				<uri>http://example.org/item5</uri>
   2.134 -			</binding>
   2.135 -			<binding name='x1'>
   2.136 -				<uri>http://example.org/item2</uri>
   2.137 -			</binding>
   2.138  		</result>
   2.139  	</results>
   2.140 -</sparql>
   2.141 +</sparql>
   2.142 \ No newline at end of file
     3.1 --- a/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/before.srx	Thu Jan 22 19:28:57 2015 +0200
     3.2 +++ b/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/before.srx	Thu Jan 22 19:33:24 2015 +0200
     3.3 @@ -6,132 +6,124 @@
     3.4  	</head>
     3.5  	<results>
     3.6  		<result>
     3.7 +			<binding name='x1'>
     3.8 +				<uri>http://example.org/item1</uri>
     3.9 +			</binding>
    3.10  			<binding name='x2'>
    3.11 -				<uri>http://example.org/item8</uri>
    3.12 +				<uri>http://example.org/item2</uri>
    3.13  			</binding>
    3.14 +		</result>
    3.15 +		<result>
    3.16 +			<binding name='x1'>
    3.17 +				<uri>http://example.org/item1</uri>
    3.18 +			</binding>
    3.19 +			<binding name='x2'>
    3.20 +				<uri>http://example.org/item3</uri>
    3.21 +			</binding>
    3.22 +		</result>
    3.23 +		<result>
    3.24  			<binding name='x1'>
    3.25  				<uri>http://example.org/item4</uri>
    3.26  			</binding>
    3.27 -		</result>
    3.28 -		<result>
    3.29  			<binding name='x2'>
    3.30 -				<uri>http://example.org/item7</uri>
    3.31 -			</binding>
    3.32 -			<binding name='x1'>
    3.33 -				<uri>http://example.org/item1</uri>
    3.34 -			</binding>
    3.35 -		</result>
    3.36 -		<result>
    3.37 -			<binding name='x2'>
    3.38 -				<uri>http://example.org/item8</uri>
    3.39 -			</binding>
    3.40 -			<binding name='x1'>
    3.41  				<uri>http://example.org/item5</uri>
    3.42  			</binding>
    3.43  		</result>
    3.44  		<result>
    3.45 -			<binding name='x2'>
    3.46 -				<uri>http://example.org/item7</uri>
    3.47 -			</binding>
    3.48  			<binding name='x1'>
    3.49  				<uri>http://example.org/item4</uri>
    3.50  			</binding>
    3.51 -		</result>
    3.52 -		<result>
    3.53  			<binding name='x2'>
    3.54 -				<uri>http://example.org/item8</uri>
    3.55 -			</binding>
    3.56 -			<binding name='x1'>
    3.57 -				<uri>http://example.org/item3</uri>
    3.58 +				<uri>http://example.org/item6</uri>
    3.59  			</binding>
    3.60  		</result>
    3.61  		<result>
    3.62 +			<binding name='x1'>
    3.63 +				<uri>http://example.org/item5</uri>
    3.64 +			</binding>
    3.65  			<binding name='x2'>
    3.66  				<uri>http://example.org/item6</uri>
    3.67  			</binding>
    3.68 -			<binding name='x1'>
    3.69 -				<uri>http://example.org/item4</uri>
    3.70 -			</binding>
    3.71  		</result>
    3.72  		<result>
    3.73 -			<binding name='x2'>
    3.74 -				<uri>http://example.org/item8</uri>
    3.75 -			</binding>
    3.76  			<binding name='x1'>
    3.77  				<uri>http://example.org/item1</uri>
    3.78  			</binding>
    3.79 -		</result>
    3.80 -		<result>
    3.81  			<binding name='x2'>
    3.82 -				<uri>http://example.org/item8</uri>
    3.83 -			</binding>
    3.84 -			<binding name='x1'>
    3.85  				<uri>http://example.org/item7</uri>
    3.86  			</binding>
    3.87  		</result>
    3.88  		<result>
    3.89 +			<binding name='x1'>
    3.90 +				<uri>http://example.org/item4</uri>
    3.91 +			</binding>
    3.92  			<binding name='x2'>
    3.93 -				<uri>http://example.org/item3</uri>
    3.94 +				<uri>http://example.org/item7</uri>
    3.95  			</binding>
    3.96 +		</result>
    3.97 +		<result>
    3.98 +			<binding name='x1'>
    3.99 +				<uri>http://example.org/item5</uri>
   3.100 +			</binding>
   3.101 +			<binding name='x2'>
   3.102 +				<uri>http://example.org/item7</uri>
   3.103 +			</binding>
   3.104 +		</result>
   3.105 +		<result>
   3.106 +			<binding name='x1'>
   3.107 +				<uri>http://example.org/item6</uri>
   3.108 +			</binding>
   3.109 +			<binding name='x2'>
   3.110 +				<uri>http://example.org/item7</uri>
   3.111 +			</binding>
   3.112 +		</result>
   3.113 +		<result>
   3.114  			<binding name='x1'>
   3.115  				<uri>http://example.org/item1</uri>
   3.116  			</binding>
   3.117 +			<binding name='x2'>
   3.118 +				<uri>http://example.org/item8</uri>
   3.119 +			</binding>
   3.120  		</result>
   3.121  		<result>
   3.122 +			<binding name='x1'>
   3.123 +				<uri>http://example.org/item2</uri>
   3.124 +			</binding>
   3.125  			<binding name='x2'>
   3.126 -				<uri>http://example.org/item7</uri>
   3.127 +				<uri>http://example.org/item8</uri>
   3.128  			</binding>
   3.129 +		</result>
   3.130 +		<result>
   3.131 +			<binding name='x1'>
   3.132 +				<uri>http://example.org/item3</uri>
   3.133 +			</binding>
   3.134 +			<binding name='x2'>
   3.135 +				<uri>http://example.org/item8</uri>
   3.136 +			</binding>
   3.137 +		</result>
   3.138 +		<result>
   3.139 +			<binding name='x1'>
   3.140 +				<uri>http://example.org/item4</uri>
   3.141 +			</binding>
   3.142 +			<binding name='x2'>
   3.143 +				<uri>http://example.org/item8</uri>
   3.144 +			</binding>
   3.145 +		</result>
   3.146 +		<result>
   3.147  			<binding name='x1'>
   3.148  				<uri>http://example.org/item5</uri>
   3.149  			</binding>
   3.150 -		</result>
   3.151 -		<result>
   3.152  			<binding name='x2'>
   3.153 -				<uri>http://example.org/item6</uri>
   3.154 -			</binding>
   3.155 -			<binding name='x1'>
   3.156 -				<uri>http://example.org/item5</uri>
   3.157 +				<uri>http://example.org/item8</uri>
   3.158  			</binding>
   3.159  		</result>
   3.160  		<result>
   3.161 +			<binding name='x1'>
   3.162 +				<uri>http://example.org/item6</uri>
   3.163 +			</binding>
   3.164  			<binding name='x2'>
   3.165  				<uri>http://example.org/item8</uri>
   3.166  			</binding>
   3.167 -			<binding name='x1'>
   3.168 -				<uri>http://example.org/item2</uri>
   3.169 -			</binding>
   3.170 -		</result>
   3.171 -		<result>
   3.172 -			<binding name='x2'>
   3.173 -				<uri>http://example.org/item5</uri>
   3.174 -			</binding>
   3.175 -			<binding name='x1'>
   3.176 -				<uri>http://example.org/item4</uri>
   3.177 -			</binding>
   3.178 -		</result>
   3.179 -		<result>
   3.180 -			<binding name='x2'>
   3.181 -				<uri>http://example.org/item7</uri>
   3.182 -			</binding>
   3.183 -			<binding name='x1'>
   3.184 -				<uri>http://example.org/item6</uri>
   3.185 -			</binding>
   3.186 -		</result>
   3.187 -		<result>
   3.188 -			<binding name='x2'>
   3.189 -				<uri>http://example.org/item2</uri>
   3.190 -			</binding>
   3.191 -			<binding name='x1'>
   3.192 -				<uri>http://example.org/item1</uri>
   3.193 -			</binding>
   3.194 -		</result>
   3.195 -		<result>
   3.196 -			<binding name='x2'>
   3.197 -				<uri>http://example.org/item8</uri>
   3.198 -			</binding>
   3.199 -			<binding name='x1'>
   3.200 -				<uri>http://example.org/item6</uri>
   3.201 -			</binding>
   3.202  		</result>
   3.203  	</results>
   3.204 -</sparql>
   3.205 +</sparql>
   3.206 \ No newline at end of file
     4.1 --- a/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/overleft.rq	Thu Jan 22 19:28:57 2015 +0200
     4.2 +++ b/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/overleft.rq	Thu Jan 22 19:33:24 2015 +0200
     4.3 @@ -1,7 +1,3 @@
     4.4 -PREFIX strdf: <http://strdf.di.uoa.gr/ontology#>
     4.5 -PREFIX xsd: <http://www.w3.org/2001/XMLSchema#> 
     4.6 -PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> 
     4.7 -
     4.8  SELECT distinct ?x1 ?x2 
     4.9  			WHERE { 
    4.10  				?x1 ?y1 ?z1 ?t1 .
     5.1 --- a/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/overleft.srx	Thu Jan 22 19:28:57 2015 +0200
     5.2 +++ b/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/overleft.srx	Thu Jan 22 19:33:24 2015 +0200
     5.3 @@ -6,60 +6,68 @@
     5.4  	</head>
     5.5  	<results>
     5.6  		<result>
     5.7 +			<binding name='x1'>
     5.8 +				<uri>http://example.org/item1</uri>
     5.9 +			</binding>
    5.10  			<binding name='x2'>
    5.11 -				<uri>http://example.org/item7</uri>
    5.12 +				<uri>http://example.org/item2</uri>
    5.13  			</binding>
    5.14 +		</result>
    5.15 +		<result>
    5.16  			<binding name='x1'>
    5.17 +				<uri>http://example.org/item1</uri>
    5.18 +			</binding>
    5.19 +			<binding name='x2'>
    5.20  				<uri>http://example.org/item3</uri>
    5.21  			</binding>
    5.22  		</result>
    5.23  		<result>
    5.24 +			<binding name='x1'>
    5.25 +				<uri>http://example.org/item2</uri>
    5.26 +			</binding>
    5.27  			<binding name='x2'>
    5.28  				<uri>http://example.org/item3</uri>
    5.29  			</binding>
    5.30 +		</result>
    5.31 +		<result>
    5.32  			<binding name='x1'>
    5.33  				<uri>http://example.org/item1</uri>
    5.34  			</binding>
    5.35 -		</result>
    5.36 -		<result>
    5.37  			<binding name='x2'>
    5.38  				<uri>http://example.org/item7</uri>
    5.39  			</binding>
    5.40 +		</result>
    5.41 +		<result>
    5.42  			<binding name='x1'>
    5.43  				<uri>http://example.org/item2</uri>
    5.44  			</binding>
    5.45 +			<binding name='x2'>
    5.46 +				<uri>http://example.org/item7</uri>
    5.47 +			</binding>
    5.48  		</result>
    5.49  		<result>
    5.50 -			<binding name='x2'>
    5.51 +			<binding name='x1'>
    5.52  				<uri>http://example.org/item3</uri>
    5.53  			</binding>
    5.54 +			<binding name='x2'>
    5.55 +				<uri>http://example.org/item7</uri>
    5.56 +			</binding>
    5.57 +		</result>
    5.58 +		<result>
    5.59  			<binding name='x1'>
    5.60  				<uri>http://example.org/item2</uri>
    5.61  			</binding>
    5.62 -		</result>
    5.63 -		<result>
    5.64  			<binding name='x2'>
    5.65 -				<uri>http://example.org/item7</uri>
    5.66 -			</binding>
    5.67 -			<binding name='x1'>
    5.68 -				<uri>http://example.org/item1</uri>
    5.69 +				<uri>http://example.org/item8</uri>
    5.70  			</binding>
    5.71  		</result>
    5.72  		<result>
    5.73 +			<binding name='x1'>
    5.74 +				<uri>http://example.org/item7</uri>
    5.75 +			</binding>
    5.76  			<binding name='x2'>
    5.77  				<uri>http://example.org/item8</uri>
    5.78  			</binding>
    5.79 -			<binding name='x1'>
    5.80 -				<uri>http://example.org/item2</uri>
    5.81 -			</binding>
    5.82 -		</result>
    5.83 -		<result>
    5.84 -			<binding name='x2'>
    5.85 -				<uri>http://example.org/item2</uri>
    5.86 -			</binding>
    5.87 -			<binding name='x1'>
    5.88 -				<uri>http://example.org/item1</uri>
    5.89 -			</binding>
    5.90  		</result>
    5.91  	</results>
    5.92  </sparql>
    5.93 \ No newline at end of file
     6.1 --- a/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/overright.srx	Thu Jan 22 19:28:57 2015 +0200
     6.2 +++ b/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/overright.srx	Thu Jan 22 19:33:24 2015 +0200
     6.3 @@ -6,100 +6,100 @@
     6.4  	</head>
     6.5  	<results>
     6.6  		<result>
     6.7 -			<binding name='x2'>
     6.8 -				<uri>http://example.org/item6</uri>
     6.9 -			</binding>
    6.10  			<binding name='x1'>
    6.11  				<uri>http://example.org/item1</uri>
    6.12  			</binding>
    6.13 -		</result>
    6.14 -		<result>
    6.15  			<binding name='x2'>
    6.16 -				<uri>http://example.org/item4</uri>
    6.17 -			</binding>
    6.18 -			<binding name='x1'>
    6.19  				<uri>http://example.org/item2</uri>
    6.20  			</binding>
    6.21  		</result>
    6.22  		<result>
    6.23 -			<binding name='x2'>
    6.24 -				<uri>http://example.org/item4</uri>
    6.25 -			</binding>
    6.26  			<binding name='x1'>
    6.27  				<uri>http://example.org/item1</uri>
    6.28  			</binding>
    6.29 -		</result>
    6.30 -		<result>
    6.31  			<binding name='x2'>
    6.32 -				<uri>http://example.org/item6</uri>
    6.33 -			</binding>
    6.34 -			<binding name='x1'>
    6.35 -				<uri>http://example.org/item2</uri>
    6.36 -			</binding>
    6.37 -		</result>
    6.38 -		<result>
    6.39 -			<binding name='x2'>
    6.40 -				<uri>http://example.org/item6</uri>
    6.41 -			</binding>
    6.42 -			<binding name='x1'>
    6.43  				<uri>http://example.org/item3</uri>
    6.44  			</binding>
    6.45  		</result>
    6.46  		<result>
    6.47 -			<binding name='x2'>
    6.48 -				<uri>http://example.org/item3</uri>
    6.49 -			</binding>
    6.50 -			<binding name='x1'>
    6.51 -				<uri>http://example.org/item1</uri>
    6.52 -			</binding>
    6.53 -		</result>
    6.54 -		<result>
    6.55 -			<binding name='x2'>
    6.56 -				<uri>http://example.org/item3</uri>
    6.57 -			</binding>
    6.58  			<binding name='x1'>
    6.59  				<uri>http://example.org/item2</uri>
    6.60  			</binding>
    6.61 -		</result>
    6.62 -		<result>
    6.63  			<binding name='x2'>
    6.64 -				<uri>http://example.org/item5</uri>
    6.65 -			</binding>
    6.66 -			<binding name='x1'>
    6.67  				<uri>http://example.org/item3</uri>
    6.68  			</binding>
    6.69  		</result>
    6.70  		<result>
    6.71 -			<binding name='x2'>
    6.72 -				<uri>http://example.org/item2</uri>
    6.73 -			</binding>
    6.74  			<binding name='x1'>
    6.75  				<uri>http://example.org/item1</uri>
    6.76  			</binding>
    6.77 -		</result>
    6.78 -		<result>
    6.79  			<binding name='x2'>
    6.80  				<uri>http://example.org/item4</uri>
    6.81  			</binding>
    6.82 +		</result>
    6.83 +		<result>
    6.84 +			<binding name='x1'>
    6.85 +				<uri>http://example.org/item2</uri>
    6.86 +			</binding>
    6.87 +			<binding name='x2'>
    6.88 +				<uri>http://example.org/item4</uri>
    6.89 +			</binding>
    6.90 +		</result>
    6.91 +		<result>
    6.92  			<binding name='x1'>
    6.93  				<uri>http://example.org/item3</uri>
    6.94  			</binding>
    6.95 +			<binding name='x2'>
    6.96 +				<uri>http://example.org/item4</uri>
    6.97 +			</binding>
    6.98  		</result>
    6.99  		<result>
   6.100 +			<binding name='x1'>
   6.101 +				<uri>http://example.org/item1</uri>
   6.102 +			</binding>
   6.103  			<binding name='x2'>
   6.104  				<uri>http://example.org/item5</uri>
   6.105  			</binding>
   6.106 +		</result>
   6.107 +		<result>
   6.108  			<binding name='x1'>
   6.109  				<uri>http://example.org/item2</uri>
   6.110  			</binding>
   6.111 -		</result>
   6.112 -		<result>
   6.113  			<binding name='x2'>
   6.114  				<uri>http://example.org/item5</uri>
   6.115  			</binding>
   6.116 +		</result>
   6.117 +		<result>
   6.118 +			<binding name='x1'>
   6.119 +				<uri>http://example.org/item3</uri>
   6.120 +			</binding>
   6.121 +			<binding name='x2'>
   6.122 +				<uri>http://example.org/item5</uri>
   6.123 +			</binding>
   6.124 +		</result>
   6.125 +		<result>
   6.126  			<binding name='x1'>
   6.127  				<uri>http://example.org/item1</uri>
   6.128  			</binding>
   6.129 +			<binding name='x2'>
   6.130 +				<uri>http://example.org/item6</uri>
   6.131 +			</binding>
   6.132 +		</result>
   6.133 +		<result>
   6.134 +			<binding name='x1'>
   6.135 +				<uri>http://example.org/item2</uri>
   6.136 +			</binding>
   6.137 +			<binding name='x2'>
   6.138 +				<uri>http://example.org/item6</uri>
   6.139 +			</binding>
   6.140 +		</result>
   6.141 +		<result>
   6.142 +			<binding name='x1'>
   6.143 +				<uri>http://example.org/item3</uri>
   6.144 +			</binding>
   6.145 +			<binding name='x2'>
   6.146 +				<uri>http://example.org/item6</uri>
   6.147 +			</binding>
   6.148  		</result>
   6.149  	</results>
   6.150  </sparql>
   6.151 \ No newline at end of file
     7.1 --- a/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/periodOverlaps.rq	Thu Jan 22 19:28:57 2015 +0200
     7.2 +++ b/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/periodOverlaps.rq	Thu Jan 22 19:33:24 2015 +0200
     7.3 @@ -2,4 +2,4 @@
     7.4  			WHERE { 
     7.5  				?x1 ?y1 ?z1 ?t1 .
     7.6  				?x2 ?y2 ?z2 ?t2 .
     7.7 -				FILTER(strdf:periodOverlaps(?t1, ?t2) && str(?x1) < str(?x2)).}
     7.8 \ No newline at end of file
     7.9 +				FILTER(strdf:PeriodOverlaps(?t1, ?t2) && str(?x1) < str(?x2)).}
    7.10 \ No newline at end of file
     8.1 --- a/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/periodOverlaps.srx	Thu Jan 22 19:28:57 2015 +0200
     8.2 +++ b/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/periodOverlaps.srx	Thu Jan 22 19:33:24 2015 +0200
     8.3 @@ -1,8 +1,73 @@
     8.4 +<?xml version='1.0' encoding='UTF-8'?>
     8.5  <sparql xmlns='http://www.w3.org/2005/sparql-results#'>
     8.6  	<head>
     8.7  		<variable name='x1'/>
     8.8  		<variable name='x2'/>
     8.9  	</head>
    8.10  	<results>
    8.11 +		<result>
    8.12 +			<binding name='x1'>
    8.13 +				<uri>http://example.org/item1</uri>
    8.14 +			</binding>
    8.15 +			<binding name='x2'>
    8.16 +				<uri>http://example.org/item2</uri>
    8.17 +			</binding>
    8.18 +		</result>
    8.19 +		<result>
    8.20 +			<binding name='x1'>
    8.21 +				<uri>http://example.org/item1</uri>
    8.22 +			</binding>
    8.23 +			<binding name='x2'>
    8.24 +				<uri>http://example.org/item3</uri>
    8.25 +			</binding>
    8.26 +		</result>
    8.27 +		<result>
    8.28 +			<binding name='x1'>
    8.29 +				<uri>http://example.org/item2</uri>
    8.30 +			</binding>
    8.31 +			<binding name='x2'>
    8.32 +				<uri>http://example.org/item3</uri>
    8.33 +			</binding>
    8.34 +		</result>
    8.35 +		<result>
    8.36 +			<binding name='x1'>
    8.37 +				<uri>http://example.org/item1</uri>
    8.38 +			</binding>
    8.39 +			<binding name='x2'>
    8.40 +				<uri>http://example.org/item7</uri>
    8.41 +			</binding>
    8.42 +		</result>
    8.43 +		<result>
    8.44 +			<binding name='x1'>
    8.45 +				<uri>http://example.org/item2</uri>
    8.46 +			</binding>
    8.47 +			<binding name='x2'>
    8.48 +				<uri>http://example.org/item7</uri>
    8.49 +			</binding>
    8.50 +		</result>
    8.51 +		<result>
    8.52 +			<binding name='x1'>
    8.53 +				<uri>http://example.org/item3</uri>
    8.54 +			</binding>
    8.55 +			<binding name='x2'>
    8.56 +				<uri>http://example.org/item7</uri>
    8.57 +			</binding>
    8.58 +		</result>
    8.59 +		<result>
    8.60 +			<binding name='x1'>
    8.61 +				<uri>http://example.org/item2</uri>
    8.62 +			</binding>
    8.63 +			<binding name='x2'>
    8.64 +				<uri>http://example.org/item8</uri>
    8.65 +			</binding>
    8.66 +		</result>
    8.67 +		<result>
    8.68 +			<binding name='x1'>
    8.69 +				<uri>http://example.org/item7</uri>
    8.70 +			</binding>
    8.71 +			<binding name='x2'>
    8.72 +				<uri>http://example.org/item8</uri>
    8.73 +			</binding>
    8.74 +		</result>
    8.75  	</results>
    8.76  </sparql>
    8.77 \ No newline at end of file
     9.1 --- a/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/temporalRelations.nq	Thu Jan 22 19:28:57 2015 +0200
     9.2 +++ b/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/temporalRelations.nq	Thu Jan 22 19:33:24 2015 +0200
     9.3 @@ -12,4 +12,4 @@
     9.4  <http://example.org/item5> <http://example.org/value> "20"^^<http://www.w3.org/2001/XMLSchema#int> "2012-01-19T11:41:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> .
     9.5  <http://example.org/item6> <http://example.org/value> "20"^^<http://www.w3.org/2001/XMLSchema#int> "2012-01-19T12:41:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> .
     9.6  <http://example.org/item7> <http://example.org/id> "7"^^<http://www.w3.org/2001/XMLSchema#int> "[2012-11-19T13:41:00,2012-11-19T14:41:00]"^^<http://strdf.di.uoa.gr/ontology#period>.
     9.7 -<http://example.org/item8> <http://example.org/id> "8"^^<http://www.w3.org/2001/XMLSchema#int> "[2012-11-19T14:41:00.000001,2012-11-19T15:41:00]"^^<http://strdf.di.uoa.gr/ontology#period>.
     9.8 +<http://example.org/item8> <http://example.org/id> "8"^^<http://www.w3.org/2001/XMLSchema#int> "[2012-11-19T14:41:00,2012-11-19T15:41:00]"^^<http://strdf.di.uoa.gr/ontology#period>.