Strabon
changeset 597:50562cef0ef3
Merge
line diff
1.1 --- a/endpoint/WebContent/WEB-INF/beans.xml Thu Sep 06 00:43:34 2012 +0300 1.2 +++ b/endpoint/WebContent/WEB-INF/beans.xml Thu Sep 06 00:44:45 2012 +0300 1.3 @@ -1,360 +1,360 @@ 1.4 -<?xml version="1.0" encoding="UTF-8"?> 1.5 -<beans xmlns="http://www.springframework.org/schema/beans" 1.6 - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 1.7 - xsi:schemaLocation="http://www.springframework.org/schema/beans 1.8 - http://www.springframework.org/schema/beans/spring-beans-2.5.xsd" 1.9 - xmlns:jaxws="http://cxf.apache.org/jaxws" 1.10 - jaxws:schemaLocation="http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd"> 1.11 - 1.12 - <bean 1.13 - id="strabonBean" 1.14 - class="eu.earthobservatory.org.StrabonEndpoint.StrabonBeanWrapper" 1.15 - destroy-method="destroy"> 1.16 - 1.17 - <constructor-arg type="java.lang.String" > 1.18 - <!-- Database name --> 1.19 - <value>teleios-m18</value> 1.20 - </constructor-arg> 1.21 - 1.22 - <constructor-arg type="java.lang.String" > 1.23 - <!-- Username --> 1.24 - <value>endpoint</value> 1.25 - </constructor-arg> 1.26 - 1.27 - <constructor-arg type="java.lang.String" > 1.28 - <!-- Password --> 1.29 - <value>endpoint</value> 1.30 - </constructor-arg> 1.31 - 1.32 - <constructor-arg type="int" > 1.33 - <!-- Port --> 1.34 - <value>5432</value> 1.35 - </constructor-arg> 1.36 - 1.37 - <constructor-arg type="java.lang.String" > 1.38 - <!-- Database server --> 1.39 - <value>localhost</value> 1.40 - </constructor-arg> 1.41 - 1.42 - <constructor-arg type="boolean" > 1.43 - <!-- Check for locks and remove them (in case of a crash) --> 1.44 - <value>true</value> 1.45 - </constructor-arg> 1.46 - 1.47 - <constructor-arg type="java.lang.String" > 1.48 - <!-- Database Backend (either "postgis" or "monetdb") --> 1.49 - <value>postgis</value> 1.50 - </constructor-arg> 1.51 - 1.52 - <constructor-arg> 1.53 - <list> 1.54 - <list> 1.55 - <!-- Bean --> 1.56 - <value>Query</value> 1.57 - <!-- Format --> 1.58 - <value>HTML</value> 1.59 - <!-- Label --> 1.60 - <value>Query 1: Discover raw data and products</value> 1.61 - <!-- Statement --> 1.62 - <value><![CDATA[# Discovering raw data and products 1.63 -PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> 1.64 -PREFIX clc: <http://teleios.di.uoa.gr/ontologies/clcOntology.owl#> 1.65 -PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> 1.66 -PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> 1.67 -PREFIX strdf: <http://strdf.di.uoa.gr/ontology#> 1.68 -PREFIX teleios: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> 1.69 -PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#> 1.70 -PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> 1.71 -PREFIX georss: <http://www.georss.org/georss/> 1.72 -PREFIX xsd: <http://www.w3.org/2001/XMLSchema#> 1.73 -PREFIX lgdo: <http://linkedgeodata.org/ontology/> 1.74 -PREFIX gn: <http://www.geonames.org/ontology#> 1.75 - 1.76 -SELECT ?filename 1.77 -WHERE {?file rdf:type noa:ShpFile ; 1.78 - noa:hasFilename ?filename ; 1.79 - noa:hasAcquisitionTime ?sensingTime . 1.80 - FILTER( str(?sensingTime) >= "2007-08-26T12:00:00" ) . 1.81 - FILTER( str(?sensingTime) <= "2007-08-26T12:30:00" ) . 1.82 - ?file noa:isDerivedFromSensor ?sensor . 1.83 - FILTER( str(?sensor) = "MSG2" ) . 1.84 - ?file noa:producedFromProcessingChain ?chain . 1.85 - FILTER( str(?chain) = "StaticThresholds" ) . 1.86 -}]]></value> 1.87 -<value>Find all shapefiles derived from sensor MSG2 between [2007-08-26T12:00:00,2007-08-26T12:30:00], using dynamic thresholds.</value> 1.88 - </list> 1.89 - <list> 1.90 - <!-- Bean --> 1.91 - <value>Query</value> 1.92 - <!-- Format --> 1.93 - <value>KMZMAP</value> 1.94 - <!-- Label --> 1.95 - <value>Query 2: Discover Hotspots</value> 1.96 - <!-- Statement --> 1.97 - <value><![CDATA[# Get all hotspots 1.98 -# - in Pelloponesus 1.99 -# - at 2007-08-24 1.100 -PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> 1.101 -PREFIX clc: <http://teleios.di.uoa.gr/ontologies/clcOntology.owl#> 1.102 -PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> 1.103 -PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> 1.104 -PREFIX strdf: <http://strdf.di.uoa.gr/ontology#> 1.105 -PREFIX teleios: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> 1.106 -PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#> 1.107 -PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> 1.108 -PREFIX georss: <http://www.georss.org/georss/> 1.109 -PREFIX xsd: <http://www.w3.org/2001/XMLSchema#> 1.110 -PREFIX lgdo: <http://linkedgeodata.org/ontology/> 1.111 -PREFIX gn: <http://www.geonames.org/ontology#> 1.112 - 1.113 -SELECT ?h ?hAcqTime ?hConfidence ?hConfirmation ?hProvider ?hSensor ?hSatellite (strdf:transform(?hGeo, <http://www.opengis.net/def/crs/EPSG/0/4326>) as ?geo) 1.114 -WHERE { ?h rdf:type noa:Hotspot; 1.115 - noa:hasGeometry ?hGeo; 1.116 - noa:hasAcquisitionTime ?hAcqTime; 1.117 - noa:hasConfidence ?hConfidence; 1.118 - noa:isProducedBy ?hProvider; 1.119 - noa:hasConfirmation ?hConfirmation; 1.120 - noa:isDerivedFromSensor ?hSensor; 1.121 - noa:isDerivedFromSatellite ?hSatellite ; 1.122 - noa:producedFromProcessingChain ?hChain . 1.123 - FILTER(str(?hChain) = "StaticThresholds"). 1.124 - FILTER(?hAcqTime = "2007-08-24T14:45:00"^^xsd:dateTime) . 1.125 - FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05, 21.027 38.36))"^^ strdf:WKT, ?hGeo)) . 1.126 -}]]></value> 1.127 -<value>Find all hotspots in Pelloponesus derived from the dynamic thresholds processing chain at 2007-08-24T14:45:00. </value> 1.128 - </list> 1.129 - <list> 1.130 - <!-- Bean --> 1.131 - <value>Update</value> 1.132 - <!-- Format --> 1.133 - <value>HTML</value> 1.134 - <!-- Label --> 1.135 - <value>Update A: Invalidate hotspots in sea</value> 1.136 - <!-- Statement --> 1.137 - <value><![CDATA[# Delete hotspots that lie in sea 1.138 -PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> 1.139 -PREFIX clc: <http://teleios.di.uoa.gr/ontologies/clcOntology.owl#> 1.140 -PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> 1.141 -PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> 1.142 -PREFIX strdf: <http://strdf.di.uoa.gr/ontology#> 1.143 -PREFIX teleios: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> 1.144 -PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#> 1.145 -PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> 1.146 -PREFIX georss: <http://www.georss.org/georss/> 1.147 -PREFIX xsd: <http://www.w3.org/2001/XMLSchema#> 1.148 -PREFIX lgdo: <http://linkedgeodata.org/ontology/> 1.149 -PREFIX gn: <http://www.geonames.org/ontology#> 1.150 -DELETE {?h ?property ?object} 1.151 -WHERE { ?h rdf:type noa:Hotspot; 1.152 - noa:hasAcquisitionTime ?hAcqTime; 1.153 - noa:producedFromProcessingChain ?hChain; 1.154 - noa:hasGeometry ?hGeo; 1.155 - ?property ?object. 1.156 - FILTER(str(?hChain) = "StaticThresholds"). 1.157 - FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05, 21.027 38.36))"^^ strdf:WKT, ?hGeo)). 1.158 - FILTER("2007-08-24T14:45:00"^^xsd:dateTime = ?hAcqTime). 1.159 - OPTIONAL { 1.160 - ?c rdf:type noa:Coastline; 1.161 - noa:hasGeometry ?cGeo. 1.162 - FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05, 21.027 38.36))"^^ strdf:WKT, ?cGeo)). 1.163 - FILTER(strdf:anyInteract(?hGeo, ?cGeo)) . 1.164 - } 1.165 - FILTER(!bound(?c)). 1.166 -}]]></value> 1.167 -<value>Mark as invalid all hotspots produced by the static thresholds processing chain and are acquired at 2007-08-24T14:45:00 which are located in the sea</value> 1.168 - </list> 1.169 - <list> 1.170 - <!-- Bean --> 1.171 - <value>Update</value> 1.172 - <!-- Format --> 1.173 - <value>HTML</value> 1.174 - <!-- Label --> 1.175 - <value>Update B: Refine hotspots in sea</value> 1.176 - <!-- Statement --> 1.177 - <value><![CDATA[# Refine the geometry of hotspots that partially lie in sea 1.178 -PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> 1.179 -PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> 1.180 -PREFIX strdf: <http://strdf.di.uoa.gr/ontology#> 1.181 -PREFIX xsd: <http://www.w3.org/2001/XMLSchema#> 1.182 - 1.183 - 1.184 -INSERT { ?h noa:isDiscarded "1"^^xsd:int . 1.185 - ?valid rdf:type noa:Hotspot ; 1.186 - noa:hasConfidence ?conf ; 1.187 - noa:hasGeometry ?dif ; 1.188 - noa:hasAcquisitionTime "TIMESTAMP"^^xsd:dateTime ; 1.189 - noa:isDerivedFromSensor "SENSOR"^^xsd:string ; 1.190 - noa:hasConfirmation noa:unknown ; 1.191 - noa:producedFromProcessingChain "PROCESSING_CHAIN"^^xsd:string ; 1.192 - noa:isProducedBy noa:noa ; 1.193 - noa:isDerivedFromSatellite ?sat . 1.194 -} 1.195 -WHERE { 1.196 - SELECT DISTINCT ?h ?hGeo (strdf:intersection(?hGeo, strdf:union(?cGeo)) AS ?dif) (BNODE() AS ?valid) ?conf ?sat 1.197 - WHERE { 1.198 - ?h rdf:type noa:Hotspot ; 1.199 - noa:hasAcquisitionTime ?hAcqTime ; 1.200 - noa:producedFromProcessingChain "PROCESSING_CHAIN"^^xsd:string ; 1.201 - noa:isDerivedFromSensor "SENSOR"^^xsd:string ; 1.202 - noa:hasGeometry ?hGeo ; 1.203 - noa:hasConfidence ?conf ; 1.204 - noa:isDerivedFromSatellite ?sat . 1.205 - FILTER("TIMESTAMP"^^xsd:dateTime = ?hAcqTime) . 1.206 - ?c rdf:type noa:Coastline ; 1.207 - noa:hasGeometry ?cGeo . 1.208 - FILTER(strdf:anyInteract(?hGeo, ?cGeo)) . 1.209 - } 1.210 - GROUP BY ?h ?hGeo ?conf ?sat 1.211 - HAVING strdf:overlap(?hGeo, strdf:union(?cGeo)) 1.212 -} 1.213 -]]></value> 1.214 - <value>Refine hotspots acquired at 2007-08-24T14:45:00 removing the part that lies in the sea. </value> 1.215 - </list> 1.216 - <list> 1.217 - <!-- Bean --> 1.218 - <value>Query</value> 1.219 - <!-- Format --> 1.220 - <value>KMZMAP</value> 1.221 - <!-- Label --> 1.222 - <value>Query 3: Discover coniferous forests</value> 1.223 - <!-- Statement --> 1.224 - <value><![CDATA[#Get all coniferous forests in Peloponnese 1.225 -PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> 1.226 -PREFIX clc: <http://teleios.di.uoa.gr/ontologies/clcOntology.owl#> 1.227 -PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> 1.228 -PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> 1.229 -PREFIX strdf: <http://strdf.di.uoa.gr/ontology#> 1.230 -PREFIX teleios: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> 1.231 -PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#> 1.232 -PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> 1.233 -PREFIX georss: <http://www.georss.org/georss/> 1.234 -PREFIX xsd: <http://www.w3.org/2001/XMLSchema#> 1.235 -PREFIX lgdo: <http://linkedgeodata.org/ontology/> 1.236 -PREFIX gn: <http://www.geonames.org/ontology#> 1.237 - 1.238 -SELECT ?a ?aGeo 1.239 -WHERE{ ?a rdf:type clc:Area; 1.240 - clc:hasLandUse ?aLandUse; 1.241 - noa:hasGeometry ?aGeo. 1.242 - ?aLandUse rdf:type ?aLandUseType. 1.243 - FILTER(?aLandUseType = clc:ConiferousForest). 1.244 - FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05, 21.027 38.36))"^^strdf:WKT,?aGeo)). 1.245 -}]]></value> 1.246 -<value>Discover all coniferous forests using the clc ontology </value> 1.247 - </list> 1.248 - <list> 1.249 - <!-- Bean --> 1.250 - <value>Query</value> 1.251 - <!-- Format --> 1.252 - <value>KMZMAP</value> 1.253 - <!-- Label --> 1.254 - <value>Query 4: Discover primary roads</value> 1.255 - <!-- Statement --> 1.256 - <value><![CDATA[# Get all municipalities of Pelloponnese 1.257 -PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> 1.258 -PREFIX clc: <http://teleios.di.uoa.gr/ontologies/clcOntology.owl#> 1.259 -PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> 1.260 -PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> 1.261 -PREFIX strdf: <http://strdf.di.uoa.gr/ontology#> 1.262 -PREFIX teleios: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> 1.263 -PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#> 1.264 -PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> 1.265 -PREFIX georss: <http://www.georss.org/georss/> 1.266 -PREFIX xsd: <http://www.w3.org/2001/XMLSchema#> 1.267 -PREFIX lgdo: <http://linkedgeodata.org/lontology/> 1.268 -PREFIX gn: <http://www.geonames.org/ontology#> 1.269 - 1.270 -SELECT ?d ?dGeo 1.271 -WHERE { ?d rdf:type gag:Dhmos; 1.272 - strdf:hasGeometry ?dGeo; 1.273 - rdfs:label ?dLabel. 1.274 - FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05, 21.027 38.36))"^^ strdf:WKT, ?dGeo)). 1.275 -}]]></value> 1.276 -<value>Find all municipalities of Pelloponnese using kallikratis ontology </value> 1.277 - </list> 1.278 - <list> 1.279 - <!-- Bean --> 1.280 - <value>Query</value> 1.281 - <!-- Format --> 1.282 - <value>KMZMAP</value> 1.283 - <!-- Label --> 1.284 - <value>Query 5: Get all primary roads in Pelloponnese</value> 1.285 - <!-- Statement --> 1.286 - <value><![CDATA[# Get all primary roads in Pelloponnese 1.287 -PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> 1.288 -PREFIX clc: <http://teleios.di.uoa.gr/ontologies/clcOntology.owl#> 1.289 -PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> 1.290 -PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> 1.291 -PREFIX strdf: <http://strdf.di.uoa.gr/ontology#> 1.292 -PREFIX teleios: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> 1.293 -PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#> 1.294 -PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> 1.295 -PREFIX georss: <http://www.georss.org/georss/> 1.296 -PREFIX xsd: <http://www.w3.org/2001/XMLSchema#> 1.297 -PREFIX lgdo: <http://linkedgeodata.org/ontology/> 1.298 -PREFIX gn: <http://www.geonames.org/ontology#> 1.299 - 1.300 -SELECT ?r ?rGeo 1.301 -WHERE { ?r rdf:type ?rType ; 1.302 - noa:hasGeometry ?rGeo . 1.303 - FILTER(?rType = lgdo:Primary) . 1.304 - FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05,21.027 38.36))"^^strdf:WKT, ?rGeo) ). 1.305 -}]]></value> 1.306 -<value>Get all primary roads in Pelloponnese using the linked geodata ontology </value> 1.307 - </list> 1.308 - <list> 1.309 - <!-- Bean --> 1.310 - <value>Query</value> 1.311 - <!-- Format --> 1.312 - <value>KMZMAP</value> 1.313 - <!-- Label --> 1.314 - <value>Query 6: Discover hotspots</value> 1.315 - <!-- Statement --> 1.316 - <value><![CDATA[# Get all hotspots 1.317 -# - in Pelloponesus 1.318 -# - at 2007-08-24 1.319 -PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> 1.320 -PREFIX clc: <http://teleios.di.uoa.gr/ontologies/clcOntology.owl#> 1.321 -PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> 1.322 -PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> 1.323 -PREFIX strdf: <http://strdf.di.uoa.gr/ontology#> 1.324 -PREFIX teleios: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> 1.325 -PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#> 1.326 -PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> 1.327 -PREFIX georss: <http://www.georss.org/georss/> 1.328 -PREFIX xsd: <http://www.w3.org/2001/XMLSchema#> 1.329 -PREFIX lgdo: <http://linkedgeodata.org/ontology/> 1.330 -PREFIX gn: <http://www.geonames.org/ontology#> 1.331 - 1.332 -SELECT ?h ?hAcqTime (strdf:transform(?hGeo, <http://www.opengis.net/def/crs/EPSG/0/4326>) as ?geo) 1.333 -WHERE { ?h rdf:type noa:Hotspot; 1.334 - noa:hasGeometry ?hGeo; 1.335 - noa:hasAcquisitionTime ?hAcqTime; 1.336 - noa:producedFromProcessingChain ?hChain . 1.337 - FILTER(str(?hChain) = "StaticThresholds"). 1.338 - FILTER(?hAcqTime = "2007-08-24T14:45:00"^^xsd:dateTime) . 1.339 - FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05, 21.027 38.36))"^^ strdf:WKT, ?hGeo)) . 1.340 - ?a rdf:type clc:Area; 1.341 - clc:hasLandUse ?aLandUse; 1.342 - noa:hasGeometry ?aGeo. 1.343 - ?aLandUse rdf:type ?aLandUseType. 1.344 - FILTER(?aLandUseType = clc:Forest). 1.345 - FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05, 21.027 38.36))"^^strdf:WKT,?aGeo)). 1.346 - FILTER(strdf:overlap(?aGeo, ?hGeo)) . 1.347 -}]]></value> 1.348 -<value>Find all hotspots located in Pelloponnesian forests and acquired at 2007-08-24T14:45:00 using static thresholds processing chain </value> 1.349 - </list> 1.350 -<!-- <list> --> 1.351 -<!-- Bean --> 1.352 -<!-- <value>Query</value> --> 1.353 -<!-- Format --> 1.354 -<!-- <value>KMZMAP</value> --> 1.355 -<!-- Label --> 1.356 -<!-- <value></value> --> 1.357 -<!-- Statement --> 1.358 -<!-- <value></value> --> 1.359 -<!-- </list> --> 1.360 - </list> 1.361 - </constructor-arg> 1.362 - </bean> 1.363 -</beans> 1.364 +<?xml version="1.0" encoding="UTF-8"?> 1.365 +<beans xmlns="http://www.springframework.org/schema/beans" 1.366 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 1.367 + xsi:schemaLocation="http://www.springframework.org/schema/beans 1.368 + http://www.springframework.org/schema/beans/spring-beans-2.5.xsd" 1.369 + xmlns:jaxws="http://cxf.apache.org/jaxws" 1.370 + jaxws:schemaLocation="http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd"> 1.371 + 1.372 + <bean 1.373 + id="strabonBean" 1.374 + class="eu.earthobservatory.org.StrabonEndpoint.StrabonBeanWrapper" 1.375 + destroy-method="destroy"> 1.376 + 1.377 + <constructor-arg type="java.lang.String" > 1.378 + <!-- Database name --> 1.379 + <value>teleios-m18</value> 1.380 + </constructor-arg> 1.381 + 1.382 + <constructor-arg type="java.lang.String" > 1.383 + <!-- Username --> 1.384 + <value>endpoint</value> 1.385 + </constructor-arg> 1.386 + 1.387 + <constructor-arg type="java.lang.String" > 1.388 + <!-- Password --> 1.389 + <value>endpoint</value> 1.390 + </constructor-arg> 1.391 + 1.392 + <constructor-arg type="int" > 1.393 + <!-- Port --> 1.394 + <value>5432</value> 1.395 + </constructor-arg> 1.396 + 1.397 + <constructor-arg type="java.lang.String" > 1.398 + <!-- Database server --> 1.399 + <value>localhost</value> 1.400 + </constructor-arg> 1.401 + 1.402 + <constructor-arg type="boolean" > 1.403 + <!-- Check for locks and remove them (in case of a crash) --> 1.404 + <value>true</value> 1.405 + </constructor-arg> 1.406 + 1.407 + <constructor-arg type="java.lang.String" > 1.408 + <!-- Database Backend (either "postgis" or "monetdb") --> 1.409 + <value>postgis</value> 1.410 + </constructor-arg> 1.411 + 1.412 + <constructor-arg> 1.413 + <list> 1.414 + <list> 1.415 + <!-- Bean --> 1.416 + <value>Query</value> 1.417 + <!-- Format --> 1.418 + <value>HTML</value> 1.419 + <!-- Label --> 1.420 + <value>Query 1: Discover raw data and products</value> 1.421 + <!-- Statement --> 1.422 + <value><![CDATA[# Discovering raw data and products 1.423 +PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> 1.424 +PREFIX clc: <http://teleios.di.uoa.gr/ontologies/clcOntology.owl#> 1.425 +PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> 1.426 +PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> 1.427 +PREFIX strdf: <http://strdf.di.uoa.gr/ontology#> 1.428 +PREFIX teleios: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> 1.429 +PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#> 1.430 +PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> 1.431 +PREFIX georss: <http://www.georss.org/georss/> 1.432 +PREFIX xsd: <http://www.w3.org/2001/XMLSchema#> 1.433 +PREFIX lgdo: <http://linkedgeodata.org/ontology/> 1.434 +PREFIX gn: <http://www.geonames.org/ontology#> 1.435 + 1.436 +SELECT ?filename 1.437 +WHERE {?file rdf:type noa:ShpFile ; 1.438 + noa:hasFilename ?filename ; 1.439 + noa:hasAcquisitionTime ?sensingTime . 1.440 + FILTER( str(?sensingTime) >= "2007-08-26T12:00:00" ) . 1.441 + FILTER( str(?sensingTime) <= "2007-08-26T12:30:00" ) . 1.442 + ?file noa:isDerivedFromSensor ?sensor . 1.443 + FILTER( str(?sensor) = "MSG2" ) . 1.444 + ?file noa:producedFromProcessingChain ?chain . 1.445 + FILTER( str(?chain) = "StaticThresholds" ) . 1.446 +}]]></value> 1.447 +<value>Find all shapefiles derived from sensor MSG2 between [2007-08-26T12:00:00,2007-08-26T12:30:00], using dynamic thresholds.</value> 1.448 + </list> 1.449 + <list> 1.450 + <!-- Bean --> 1.451 + <value>Query</value> 1.452 + <!-- Format --> 1.453 + <value>KMZMAP</value> 1.454 + <!-- Label --> 1.455 + <value>Query 2: Discover Hotspots</value> 1.456 + <!-- Statement --> 1.457 + <value><![CDATA[# Get all hotspots 1.458 +# - in Pelloponesus 1.459 +# - at 2007-08-24 1.460 +PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> 1.461 +PREFIX clc: <http://teleios.di.uoa.gr/ontologies/clcOntology.owl#> 1.462 +PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> 1.463 +PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> 1.464 +PREFIX strdf: <http://strdf.di.uoa.gr/ontology#> 1.465 +PREFIX teleios: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> 1.466 +PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#> 1.467 +PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> 1.468 +PREFIX georss: <http://www.georss.org/georss/> 1.469 +PREFIX xsd: <http://www.w3.org/2001/XMLSchema#> 1.470 +PREFIX lgdo: <http://linkedgeodata.org/ontology/> 1.471 +PREFIX gn: <http://www.geonames.org/ontology#> 1.472 + 1.473 +SELECT ?h ?hAcqTime ?hConfidence ?hConfirmation ?hProvider ?hSensor ?hSatellite (strdf:transform(?hGeo, <http://www.opengis.net/def/crs/EPSG/0/4326>) as ?geo) 1.474 +WHERE { ?h rdf:type noa:Hotspot; 1.475 + noa:hasGeometry ?hGeo; 1.476 + noa:hasAcquisitionTime ?hAcqTime; 1.477 + noa:hasConfidence ?hConfidence; 1.478 + noa:isProducedBy ?hProvider; 1.479 + noa:hasConfirmation ?hConfirmation; 1.480 + noa:isDerivedFromSensor ?hSensor; 1.481 + noa:isDerivedFromSatellite ?hSatellite ; 1.482 + noa:producedFromProcessingChain ?hChain . 1.483 + FILTER(str(?hChain) = "StaticThresholds"). 1.484 + FILTER(?hAcqTime = "2007-08-24T14:45:00"^^xsd:dateTime) . 1.485 + FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05, 21.027 38.36))"^^ strdf:WKT, ?hGeo)) . 1.486 +}]]></value> 1.487 +<value>Find all hotspots in Pelloponesus derived from the dynamic thresholds processing chain at 2007-08-24T14:45:00. </value> 1.488 + </list> 1.489 + <list> 1.490 + <!-- Bean --> 1.491 + <value>Update</value> 1.492 + <!-- Format --> 1.493 + <value>HTML</value> 1.494 + <!-- Label --> 1.495 + <value>Update A: Invalidate hotspots in sea</value> 1.496 + <!-- Statement --> 1.497 + <value><![CDATA[# Delete hotspots that lie in sea 1.498 +PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> 1.499 +PREFIX clc: <http://teleios.di.uoa.gr/ontologies/clcOntology.owl#> 1.500 +PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> 1.501 +PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> 1.502 +PREFIX strdf: <http://strdf.di.uoa.gr/ontology#> 1.503 +PREFIX teleios: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> 1.504 +PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#> 1.505 +PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> 1.506 +PREFIX georss: <http://www.georss.org/georss/> 1.507 +PREFIX xsd: <http://www.w3.org/2001/XMLSchema#> 1.508 +PREFIX lgdo: <http://linkedgeodata.org/ontology/> 1.509 +PREFIX gn: <http://www.geonames.org/ontology#> 1.510 +DELETE {?h ?property ?object} 1.511 +WHERE { ?h rdf:type noa:Hotspot; 1.512 + noa:hasAcquisitionTime ?hAcqTime; 1.513 + noa:producedFromProcessingChain ?hChain; 1.514 + noa:hasGeometry ?hGeo; 1.515 + ?property ?object. 1.516 + FILTER(str(?hChain) = "StaticThresholds"). 1.517 + FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05, 21.027 38.36))"^^ strdf:WKT, ?hGeo)). 1.518 + FILTER("2007-08-24T14:45:00"^^xsd:dateTime = ?hAcqTime). 1.519 + OPTIONAL { 1.520 + ?c rdf:type noa:Coastline; 1.521 + noa:hasGeometry ?cGeo. 1.522 + FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05, 21.027 38.36))"^^ strdf:WKT, ?cGeo)). 1.523 + FILTER(strdf:anyInteract(?hGeo, ?cGeo)) . 1.524 + } 1.525 + FILTER(!bound(?c)). 1.526 +}]]></value> 1.527 +<value>Mark as invalid all hotspots produced by the static thresholds processing chain and are acquired at 2007-08-24T14:45:00 which are located in the sea</value> 1.528 + </list> 1.529 + <list> 1.530 + <!-- Bean --> 1.531 + <value>Update</value> 1.532 + <!-- Format --> 1.533 + <value>HTML</value> 1.534 + <!-- Label --> 1.535 + <value>Update B: Refine hotspots in sea</value> 1.536 + <!-- Statement --> 1.537 + <value><![CDATA[# Refine the geometry of hotspots that partially lie in sea 1.538 +PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> 1.539 +PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> 1.540 +PREFIX strdf: <http://strdf.di.uoa.gr/ontology#> 1.541 +PREFIX xsd: <http://www.w3.org/2001/XMLSchema#> 1.542 + 1.543 + 1.544 +INSERT { ?h noa:isDiscarded "1"^^xsd:int . 1.545 + ?valid rdf:type noa:Hotspot ; 1.546 + noa:hasConfidence ?conf ; 1.547 + noa:hasGeometry ?dif ; 1.548 + noa:hasAcquisitionTime "TIMESTAMP"^^xsd:dateTime ; 1.549 + noa:isDerivedFromSensor "SENSOR"^^xsd:string ; 1.550 + noa:hasConfirmation noa:unknown ; 1.551 + noa:producedFromProcessingChain "PROCESSING_CHAIN"^^xsd:string ; 1.552 + noa:isProducedBy noa:noa ; 1.553 + noa:isDerivedFromSatellite ?sat . 1.554 +} 1.555 +WHERE { 1.556 + SELECT DISTINCT ?h ?hGeo (strdf:intersection(?hGeo, strdf:union(?cGeo)) AS ?dif) (BNODE() AS ?valid) ?conf ?sat 1.557 + WHERE { 1.558 + ?h rdf:type noa:Hotspot ; 1.559 + noa:hasAcquisitionTime ?hAcqTime ; 1.560 + noa:producedFromProcessingChain "PROCESSING_CHAIN"^^xsd:string ; 1.561 + noa:isDerivedFromSensor "SENSOR"^^xsd:string ; 1.562 + noa:hasGeometry ?hGeo ; 1.563 + noa:hasConfidence ?conf ; 1.564 + noa:isDerivedFromSatellite ?sat . 1.565 + FILTER("TIMESTAMP"^^xsd:dateTime = ?hAcqTime) . 1.566 + ?c rdf:type noa:Coastline ; 1.567 + noa:hasGeometry ?cGeo . 1.568 + FILTER(strdf:anyInteract(?hGeo, ?cGeo)) . 1.569 + } 1.570 + GROUP BY ?h ?hGeo ?conf ?sat 1.571 + HAVING strdf:overlap(?hGeo, strdf:union(?cGeo)) 1.572 +} 1.573 +]]></value> 1.574 + <value>Refine hotspots acquired at 2007-08-24T14:45:00 removing the part that lies in the sea. </value> 1.575 + </list> 1.576 + <list> 1.577 + <!-- Bean --> 1.578 + <value>Query</value> 1.579 + <!-- Format --> 1.580 + <value>KMZMAP</value> 1.581 + <!-- Label --> 1.582 + <value>Query 3: Discover coniferous forests</value> 1.583 + <!-- Statement --> 1.584 + <value><![CDATA[#Get all coniferous forests in Peloponnese 1.585 +PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> 1.586 +PREFIX clc: <http://teleios.di.uoa.gr/ontologies/clcOntology.owl#> 1.587 +PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> 1.588 +PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> 1.589 +PREFIX strdf: <http://strdf.di.uoa.gr/ontology#> 1.590 +PREFIX teleios: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> 1.591 +PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#> 1.592 +PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> 1.593 +PREFIX georss: <http://www.georss.org/georss/> 1.594 +PREFIX xsd: <http://www.w3.org/2001/XMLSchema#> 1.595 +PREFIX lgdo: <http://linkedgeodata.org/ontology/> 1.596 +PREFIX gn: <http://www.geonames.org/ontology#> 1.597 + 1.598 +SELECT ?a ?aGeo 1.599 +WHERE{ ?a rdf:type clc:Area; 1.600 + clc:hasLandUse ?aLandUse; 1.601 + noa:hasGeometry ?aGeo. 1.602 + ?aLandUse rdf:type ?aLandUseType. 1.603 + FILTER(?aLandUseType = clc:ConiferousForest). 1.604 + FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05, 21.027 38.36))"^^strdf:WKT,?aGeo)). 1.605 +}]]></value> 1.606 +<value>Discover all coniferous forests using the clc ontology </value> 1.607 + </list> 1.608 + <list> 1.609 + <!-- Bean --> 1.610 + <value>Query</value> 1.611 + <!-- Format --> 1.612 + <value>KMZMAP</value> 1.613 + <!-- Label --> 1.614 + <value>Query 4: Discover primary roads</value> 1.615 + <!-- Statement --> 1.616 + <value><![CDATA[# Get all municipalities of Pelloponnese 1.617 +PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> 1.618 +PREFIX clc: <http://teleios.di.uoa.gr/ontologies/clcOntology.owl#> 1.619 +PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> 1.620 +PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> 1.621 +PREFIX strdf: <http://strdf.di.uoa.gr/ontology#> 1.622 +PREFIX teleios: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> 1.623 +PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#> 1.624 +PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> 1.625 +PREFIX georss: <http://www.georss.org/georss/> 1.626 +PREFIX xsd: <http://www.w3.org/2001/XMLSchema#> 1.627 +PREFIX lgdo: <http://linkedgeodata.org/lontology/> 1.628 +PREFIX gn: <http://www.geonames.org/ontology#> 1.629 + 1.630 +SELECT ?d ?dGeo 1.631 +WHERE { ?d rdf:type gag:Dhmos; 1.632 + strdf:hasGeometry ?dGeo; 1.633 + rdfs:label ?dLabel. 1.634 + FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05, 21.027 38.36))"^^ strdf:WKT, ?dGeo)). 1.635 +}]]></value> 1.636 +<value>Find all municipalities of Pelloponnese using kallikratis ontology </value> 1.637 + </list> 1.638 + <list> 1.639 + <!-- Bean --> 1.640 + <value>Query</value> 1.641 + <!-- Format --> 1.642 + <value>KMZMAP</value> 1.643 + <!-- Label --> 1.644 + <value>Query 5: Get all primary roads in Pelloponnese</value> 1.645 + <!-- Statement --> 1.646 + <value><![CDATA[# Get all primary roads in Pelloponnese 1.647 +PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> 1.648 +PREFIX clc: <http://teleios.di.uoa.gr/ontologies/clcOntology.owl#> 1.649 +PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> 1.650 +PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> 1.651 +PREFIX strdf: <http://strdf.di.uoa.gr/ontology#> 1.652 +PREFIX teleios: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> 1.653 +PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#> 1.654 +PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> 1.655 +PREFIX georss: <http://www.georss.org/georss/> 1.656 +PREFIX xsd: <http://www.w3.org/2001/XMLSchema#> 1.657 +PREFIX lgdo: <http://linkedgeodata.org/ontology/> 1.658 +PREFIX gn: <http://www.geonames.org/ontology#> 1.659 + 1.660 +SELECT ?r ?rGeo 1.661 +WHERE { ?r rdf:type ?rType ; 1.662 + noa:hasGeometry ?rGeo . 1.663 + FILTER(?rType = lgdo:Primary) . 1.664 + FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05,21.027 38.36))"^^strdf:WKT, ?rGeo) ). 1.665 +}]]></value> 1.666 +<value>Get all primary roads in Pelloponnese using the linked geodata ontology </value> 1.667 + </list> 1.668 + <list> 1.669 + <!-- Bean --> 1.670 + <value>Query</value> 1.671 + <!-- Format --> 1.672 + <value>KMZMAP</value> 1.673 + <!-- Label --> 1.674 + <value>Query 6: Discover hotspots</value> 1.675 + <!-- Statement --> 1.676 + <value><![CDATA[# Get all hotspots 1.677 +# - in Pelloponesus 1.678 +# - at 2007-08-24 1.679 +PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> 1.680 +PREFIX clc: <http://teleios.di.uoa.gr/ontologies/clcOntology.owl#> 1.681 +PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> 1.682 +PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> 1.683 +PREFIX strdf: <http://strdf.di.uoa.gr/ontology#> 1.684 +PREFIX teleios: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> 1.685 +PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#> 1.686 +PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> 1.687 +PREFIX georss: <http://www.georss.org/georss/> 1.688 +PREFIX xsd: <http://www.w3.org/2001/XMLSchema#> 1.689 +PREFIX lgdo: <http://linkedgeodata.org/ontology/> 1.690 +PREFIX gn: <http://www.geonames.org/ontology#> 1.691 + 1.692 +SELECT ?h ?hAcqTime (strdf:transform(?hGeo, <http://www.opengis.net/def/crs/EPSG/0/4326>) as ?geo) 1.693 +WHERE { ?h rdf:type noa:Hotspot; 1.694 + noa:hasGeometry ?hGeo; 1.695 + noa:hasAcquisitionTime ?hAcqTime; 1.696 + noa:producedFromProcessingChain ?hChain . 1.697 + FILTER(str(?hChain) = "StaticThresholds"). 1.698 + FILTER(?hAcqTime = "2007-08-24T14:45:00"^^xsd:dateTime) . 1.699 + FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05, 21.027 38.36))"^^ strdf:WKT, ?hGeo)) . 1.700 + ?a rdf:type clc:Area; 1.701 + clc:hasLandUse ?aLandUse; 1.702 + noa:hasGeometry ?aGeo. 1.703 + ?aLandUse rdf:type ?aLandUseType. 1.704 + FILTER(?aLandUseType = clc:Forest). 1.705 + FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05, 21.027 38.36))"^^strdf:WKT,?aGeo)). 1.706 + FILTER(strdf:overlap(?aGeo, ?hGeo)) . 1.707 +}]]></value> 1.708 +<value>Find all hotspots located in Pelloponnesian forests and acquired at 2007-08-24T14:45:00 using static thresholds processing chain </value> 1.709 + </list> 1.710 +<!-- <list> --> 1.711 +<!-- Bean --> 1.712 +<!-- <value>Query</value> --> 1.713 +<!-- Format --> 1.714 +<!-- <value>KMZMAP</value> --> 1.715 +<!-- Label --> 1.716 +<!-- <value></value> --> 1.717 +<!-- Statement --> 1.718 +<!-- <value></value> --> 1.719 +<!-- </list> --> 1.720 + </list> 1.721 + </constructor-arg> 1.722 + </bean> 1.723 +</beans>
2.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/link/SimilarTermFunc.java Thu Sep 06 00:43:34 2012 +0300 2.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/link/SimilarTermFunc.java Thu Sep 06 00:44:45 2012 +0300 2.3 @@ -1,38 +1,38 @@ 2.4 -/* 2.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 2.6 - * 2.7 - * Licensed under the Aduna BSD-style license. 2.8 - */ 2.9 -package org.openrdf.query.algebra.evaluation.function.link; 2.10 - 2.11 -import org.openrdf.model.Value; 2.12 -import org.openrdf.model.ValueFactory; 2.13 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException; 2.14 -import org.openrdf.query.algebra.evaluation.function.Function; 2.15 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 2.16 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 2.17 - 2.18 -/** 2.19 - * 2.20 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 2.21 - */ 2.22 -public class SimilarTermFunc implements Function { 2.23 - 2.24 - protected static String name = "similarTerm"; 2.25 - 2.26 - @Override 2.27 - public String getURI() { 2.28 - return GeoConstants.stRDF+name; 2.29 - } 2.30 - 2.31 - public Value evaluate(ValueFactory valueFactory, Value... args) 2.32 - throws ValueExprEvaluationException { 2.33 - if (args.length != 2) { 2.34 - throw new ValueExprEvaluationException("strdf:" + name 2.35 - + " requires exactly 2 arguments, got " + args.length); 2.36 - } 2.37 - 2.38 - return valueFactory.createLiteral(true); 2.39 - } 2.40 - 2.41 -} 2.42 +/* 2.43 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 2.44 + * 2.45 + * Licensed under the Aduna BSD-style license. 2.46 + */ 2.47 +package org.openrdf.query.algebra.evaluation.function.link; 2.48 + 2.49 +import org.openrdf.model.Value; 2.50 +import org.openrdf.model.ValueFactory; 2.51 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException; 2.52 +import org.openrdf.query.algebra.evaluation.function.Function; 2.53 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 2.54 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 2.55 + 2.56 +/** 2.57 + * 2.58 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 2.59 + */ 2.60 +public class SimilarTermFunc implements Function { 2.61 + 2.62 + protected static String name = "similarTerm"; 2.63 + 2.64 + @Override 2.65 + public String getURI() { 2.66 + return GeoConstants.stRDF+name; 2.67 + } 2.68 + 2.69 + public Value evaluate(ValueFactory valueFactory, Value... args) 2.70 + throws ValueExprEvaluationException { 2.71 + if (args.length != 2) { 2.72 + throw new ValueExprEvaluationException("strdf:" + name 2.73 + + " requires exactly 2 arguments, got " + args.length); 2.74 + } 2.75 + 2.76 + return valueFactory.createLiteral(true); 2.77 + } 2.78 + 2.79 +}
3.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlNonTopologicalConstruct.java Thu Sep 06 00:43:34 2012 +0300 3.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlNonTopologicalConstruct.java Thu Sep 06 00:44:45 2012 +0300 3.3 @@ -1,32 +1,32 @@ 3.4 -/* 3.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 3.6 - * 3.7 - * Licensed under the Aduna BSD-style license. 3.8 - */ 3.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql; 3.10 - 3.11 -import org.openrdf.model.Value; 3.12 -import org.openrdf.model.ValueFactory; 3.13 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException; 3.14 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 3.15 - 3.16 -/** 3.17 - * This class represents a spatial function like the one defined in its superclass 3.18 - * {@link SpatialConstructFunc} class for the case of stSPARQL. 3.19 - * 3.20 - * @see package {@link org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological} 3.21 - * 3.22 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 3.23 - * @author Charalampos Nikolaou <charnik@di.uoa.gr> 3.24 - */ 3.25 -public abstract class GeoSparqlNonTopologicalConstruct extends SpatialConstructFunc { 3.26 - 3.27 - //No need for any implementation, I will have replaced this class's presence before reaching this place 3.28 - public Value evaluate(ValueFactory valueFactory, Value... args) 3.29 - throws ValueExprEvaluationException { 3.30 - return null; 3.31 - } 3.32 - 3.33 - // charnik: made the method abstract 3.34 - public abstract String getURI(); 3.35 -} 3.36 +/* 3.37 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 3.38 + * 3.39 + * Licensed under the Aduna BSD-style license. 3.40 + */ 3.41 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql; 3.42 + 3.43 +import org.openrdf.model.Value; 3.44 +import org.openrdf.model.ValueFactory; 3.45 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException; 3.46 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 3.47 + 3.48 +/** 3.49 + * This class represents a spatial function like the one defined in its superclass 3.50 + * {@link SpatialConstructFunc} class for the case of stSPARQL. 3.51 + * 3.52 + * @see package {@link org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological} 3.53 + * 3.54 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 3.55 + * @author Charalampos Nikolaou <charnik@di.uoa.gr> 3.56 + */ 3.57 +public abstract class GeoSparqlNonTopologicalConstruct extends SpatialConstructFunc { 3.58 + 3.59 + //No need for any implementation, I will have replaced this class's presence before reaching this place 3.60 + public Value evaluate(ValueFactory valueFactory, Value... args) 3.61 + throws ValueExprEvaluationException { 3.62 + return null; 3.63 + } 3.64 + 3.65 + // charnik: made the method abstract 3.66 + public abstract String getURI(); 3.67 +}
4.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlNonTopologicalMetric.java Thu Sep 06 00:43:34 2012 +0300 4.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlNonTopologicalMetric.java Thu Sep 06 00:44:45 2012 +0300 4.3 @@ -1,32 +1,32 @@ 4.4 -/* 4.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 4.6 - * 4.7 - * Licensed under the Aduna BSD-style license. 4.8 - */ 4.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql; 4.10 - 4.11 -import org.openrdf.model.Value; 4.12 -import org.openrdf.model.ValueFactory; 4.13 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException; 4.14 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 4.15 - 4.16 -/** 4.17 - * This class represents a spatial function like the one defined in its superclass 4.18 - * {@link SpatialConstructFunc} class for the case of stSPARQL. 4.19 - * 4.20 - * @see package {@link org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological} 4.21 - * 4.22 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 4.23 - * @author Charalampos Nikolaou <charnik@di.uoa.gr> 4.24 - */ 4.25 -public abstract class GeoSparqlNonTopologicalMetric extends SpatialConstructFunc { 4.26 - 4.27 - //No need for any implementation, I will have replaced this class's presence before reaching this place 4.28 - public Value evaluate(ValueFactory valueFactory, Value... args) 4.29 - throws ValueExprEvaluationException { 4.30 - return null; 4.31 - } 4.32 - 4.33 - // charnik: made the method abstract 4.34 - public abstract String getURI(); 4.35 -} 4.36 +/* 4.37 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 4.38 + * 4.39 + * Licensed under the Aduna BSD-style license. 4.40 + */ 4.41 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql; 4.42 + 4.43 +import org.openrdf.model.Value; 4.44 +import org.openrdf.model.ValueFactory; 4.45 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException; 4.46 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 4.47 + 4.48 +/** 4.49 + * This class represents a spatial function like the one defined in its superclass 4.50 + * {@link SpatialConstructFunc} class for the case of stSPARQL. 4.51 + * 4.52 + * @see package {@link org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological} 4.53 + * 4.54 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 4.55 + * @author Charalampos Nikolaou <charnik@di.uoa.gr> 4.56 + */ 4.57 +public abstract class GeoSparqlNonTopologicalMetric extends SpatialConstructFunc { 4.58 + 4.59 + //No need for any implementation, I will have replaced this class's presence before reaching this place 4.60 + public Value evaluate(ValueFactory valueFactory, Value... args) 4.61 + throws ValueExprEvaluationException { 4.62 + return null; 4.63 + } 4.64 + 4.65 + // charnik: made the method abstract 4.66 + public abstract String getURI(); 4.67 +}
5.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlRelateFunc.java Thu Sep 06 00:43:34 2012 +0300 5.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlRelateFunc.java Thu Sep 06 00:44:45 2012 +0300 5.3 @@ -1,21 +1,21 @@ 5.4 -/* 5.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 5.6 - * 5.7 - * Licensed under the Aduna BSD-style license. 5.8 - */ 5.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql; 5.10 - 5.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 5.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 5.13 - 5.14 -/** 5.15 - * 5.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 5.17 - */ 5.18 -public class GeoSparqlRelateFunc extends GeoSparqlRelation { 5.19 - 5.20 - @Override 5.21 - public String getURI() { 5.22 - return GeoConstants.geoSparqlRelate; 5.23 - } 5.24 -} 5.25 +/* 5.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 5.27 + * 5.28 + * Licensed under the Aduna BSD-style license. 5.29 + */ 5.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql; 5.31 + 5.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 5.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 5.34 + 5.35 +/** 5.36 + * 5.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 5.38 + */ 5.39 +public class GeoSparqlRelateFunc extends GeoSparqlRelation { 5.40 + 5.41 + @Override 5.42 + public String getURI() { 5.43 + return GeoConstants.geoSparqlRelate; 5.44 + } 5.45 +}
6.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlRelation.java Thu Sep 06 00:43:34 2012 +0300 6.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlRelation.java Thu Sep 06 00:44:45 2012 +0300 6.3 @@ -1,33 +1,33 @@ 6.4 -/* 6.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 6.6 - * 6.7 - * Licensed under the Aduna BSD-style license. 6.8 - */ 6.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql; 6.10 - 6.11 -import org.openrdf.model.Value; 6.12 -import org.openrdf.model.ValueFactory; 6.13 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException; 6.14 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 6.15 - 6.16 -/** 6.17 - * This class represents a spatial function like the one defined in its superclass 6.18 - * {@link SpatialRelationshipFunc} class for the case of stSPARQL. 6.19 - * 6.20 - * @see package {@link org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer} 6.21 - * 6.22 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 6.23 - * @author Charalampos Nikolaou <charnik@di.uoa.gr> 6.24 - */ 6.25 -public abstract class GeoSparqlRelation extends SpatialRelationshipFunc { 6.26 - 6.27 - //No need for any implementation, I will have replaced this class's presence before reaching this place 6.28 - public Value evaluate(ValueFactory valueFactory, Value... args) 6.29 - throws ValueExprEvaluationException { 6.30 - 6.31 - return null; 6.32 - } 6.33 - 6.34 - // charnik: made this method (and hence the class) abstract 6.35 - public abstract String getURI(); 6.36 -} 6.37 +/* 6.38 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 6.39 + * 6.40 + * Licensed under the Aduna BSD-style license. 6.41 + */ 6.42 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql; 6.43 + 6.44 +import org.openrdf.model.Value; 6.45 +import org.openrdf.model.ValueFactory; 6.46 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException; 6.47 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 6.48 + 6.49 +/** 6.50 + * This class represents a spatial function like the one defined in its superclass 6.51 + * {@link SpatialRelationshipFunc} class for the case of stSPARQL. 6.52 + * 6.53 + * @see package {@link org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer} 6.54 + * 6.55 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 6.56 + * @author Charalampos Nikolaou <charnik@di.uoa.gr> 6.57 + */ 6.58 +public abstract class GeoSparqlRelation extends SpatialRelationshipFunc { 6.59 + 6.60 + //No need for any implementation, I will have replaced this class's presence before reaching this place 6.61 + public Value evaluate(ValueFactory valueFactory, Value... args) 6.62 + throws ValueExprEvaluationException { 6.63 + 6.64 + return null; 6.65 + } 6.66 + 6.67 + // charnik: made this method (and hence the class) abstract 6.68 + public abstract String getURI(); 6.69 +}
7.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferContainsFunc.java Thu Sep 06 00:43:34 2012 +0300 7.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferContainsFunc.java Thu Sep 06 00:44:45 2012 +0300 7.3 @@ -1,21 +1,21 @@ 7.4 -/* 7.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 7.6 - * 7.7 - * Licensed under the Aduna BSD-style license. 7.8 - */ 7.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer; 7.10 - 7.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 7.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 7.13 - 7.14 -/** 7.15 - * 7.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 7.17 - */ 7.18 -public class EgenhoferContainsFunc extends GeoSparqlRelation { 7.19 - 7.20 - @Override 7.21 - public String getURI() { 7.22 - return GeoConstants.ehContains; 7.23 - } 7.24 -} 7.25 +/* 7.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 7.27 + * 7.28 + * Licensed under the Aduna BSD-style license. 7.29 + */ 7.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer; 7.31 + 7.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 7.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 7.34 + 7.35 +/** 7.36 + * 7.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 7.38 + */ 7.39 +public class EgenhoferContainsFunc extends GeoSparqlRelation { 7.40 + 7.41 + @Override 7.42 + public String getURI() { 7.43 + return GeoConstants.ehContains; 7.44 + } 7.45 +}
8.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferCoveredByFunc.java Thu Sep 06 00:43:34 2012 +0300 8.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferCoveredByFunc.java Thu Sep 06 00:44:45 2012 +0300 8.3 @@ -1,19 +1,19 @@ 8.4 -/* 8.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 8.6 - * 8.7 - * Licensed under the Aduna BSD-style license. 8.8 - */ 8.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer; 8.10 - 8.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 8.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 8.13 - 8.14 - 8.15 -public class EgenhoferCoveredByFunc extends GeoSparqlRelation { 8.16 - 8.17 - @Override 8.18 - public String getURI() { 8.19 - return GeoConstants.ehCoveredBy; 8.20 - } 8.21 - 8.22 -} 8.23 +/* 8.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 8.25 + * 8.26 + * Licensed under the Aduna BSD-style license. 8.27 + */ 8.28 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer; 8.29 + 8.30 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 8.31 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 8.32 + 8.33 + 8.34 +public class EgenhoferCoveredByFunc extends GeoSparqlRelation { 8.35 + 8.36 + @Override 8.37 + public String getURI() { 8.38 + return GeoConstants.ehCoveredBy; 8.39 + } 8.40 + 8.41 +}
9.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferCoversFunc.java Thu Sep 06 00:43:34 2012 +0300 9.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferCoversFunc.java Thu Sep 06 00:44:45 2012 +0300 9.3 @@ -1,19 +1,19 @@ 9.4 -/* 9.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 9.6 - * 9.7 - * Licensed under the Aduna BSD-style license. 9.8 - */ 9.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer; 9.10 - 9.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 9.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 9.13 - 9.14 - 9.15 -public class EgenhoferCoversFunc extends GeoSparqlRelation { 9.16 - 9.17 - @Override 9.18 - public String getURI() { 9.19 - return GeoConstants.ehCovers; 9.20 - } 9.21 - 9.22 -} 9.23 +/* 9.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 9.25 + * 9.26 + * Licensed under the Aduna BSD-style license. 9.27 + */ 9.28 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer; 9.29 + 9.30 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 9.31 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 9.32 + 9.33 + 9.34 +public class EgenhoferCoversFunc extends GeoSparqlRelation { 9.35 + 9.36 + @Override 9.37 + public String getURI() { 9.38 + return GeoConstants.ehCovers; 9.39 + } 9.40 + 9.41 +}
10.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferDisjointFunc.java Thu Sep 06 00:43:34 2012 +0300 10.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferDisjointFunc.java Thu Sep 06 00:44:45 2012 +0300 10.3 @@ -1,19 +1,19 @@ 10.4 -/* 10.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 10.6 - * 10.7 - * Licensed under the Aduna BSD-style license. 10.8 - */ 10.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer; 10.10 - 10.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 10.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 10.13 - 10.14 - 10.15 -public class EgenhoferDisjointFunc extends GeoSparqlRelation { 10.16 - 10.17 - @Override 10.18 - public String getURI() { 10.19 - return GeoConstants.ehDisjoint; 10.20 - } 10.21 - 10.22 -} 10.23 +/* 10.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 10.25 + * 10.26 + * Licensed under the Aduna BSD-style license. 10.27 + */ 10.28 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer; 10.29 + 10.30 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 10.31 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 10.32 + 10.33 + 10.34 +public class EgenhoferDisjointFunc extends GeoSparqlRelation { 10.35 + 10.36 + @Override 10.37 + public String getURI() { 10.38 + return GeoConstants.ehDisjoint; 10.39 + } 10.40 + 10.41 +}
11.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferEqualsFunc.java Thu Sep 06 00:43:34 2012 +0300 11.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferEqualsFunc.java Thu Sep 06 00:44:45 2012 +0300 11.3 @@ -1,19 +1,19 @@ 11.4 -/* 11.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 11.6 - * 11.7 - * Licensed under the Aduna BSD-style license. 11.8 - */ 11.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer; 11.10 - 11.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 11.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 11.13 - 11.14 - 11.15 -public class EgenhoferEqualsFunc extends GeoSparqlRelation { 11.16 - 11.17 - @Override 11.18 - public String getURI() { 11.19 - return GeoConstants.ehEquals; 11.20 - } 11.21 - 11.22 -} 11.23 +/* 11.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 11.25 + * 11.26 + * Licensed under the Aduna BSD-style license. 11.27 + */ 11.28 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer; 11.29 + 11.30 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 11.31 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 11.32 + 11.33 + 11.34 +public class EgenhoferEqualsFunc extends GeoSparqlRelation { 11.35 + 11.36 + @Override 11.37 + public String getURI() { 11.38 + return GeoConstants.ehEquals; 11.39 + } 11.40 + 11.41 +}
12.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferInsideFunc.java Thu Sep 06 00:43:34 2012 +0300 12.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferInsideFunc.java Thu Sep 06 00:44:45 2012 +0300 12.3 @@ -1,19 +1,19 @@ 12.4 -/* 12.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 12.6 - * 12.7 - * Licensed under the Aduna BSD-style license. 12.8 - */ 12.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer; 12.10 - 12.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 12.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 12.13 - 12.14 - 12.15 -public class EgenhoferInsideFunc extends GeoSparqlRelation { 12.16 - 12.17 - @Override 12.18 - public String getURI() { 12.19 - return GeoConstants.ehInside; 12.20 - } 12.21 - 12.22 -} 12.23 +/* 12.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 12.25 + * 12.26 + * Licensed under the Aduna BSD-style license. 12.27 + */ 12.28 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer; 12.29 + 12.30 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 12.31 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 12.32 + 12.33 + 12.34 +public class EgenhoferInsideFunc extends GeoSparqlRelation { 12.35 + 12.36 + @Override 12.37 + public String getURI() { 12.38 + return GeoConstants.ehInside; 12.39 + } 12.40 + 12.41 +}
13.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferMeetFunc.java Thu Sep 06 00:43:34 2012 +0300 13.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferMeetFunc.java Thu Sep 06 00:44:45 2012 +0300 13.3 @@ -1,19 +1,19 @@ 13.4 -/* 13.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 13.6 - * 13.7 - * Licensed under the Aduna BSD-style license. 13.8 - */ 13.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer; 13.10 - 13.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 13.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 13.13 - 13.14 - 13.15 -public class EgenhoferMeetFunc extends GeoSparqlRelation { 13.16 - 13.17 - @Override 13.18 - public String getURI() { 13.19 - return GeoConstants.ehMeet; 13.20 - } 13.21 - 13.22 -} 13.23 +/* 13.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 13.25 + * 13.26 + * Licensed under the Aduna BSD-style license. 13.27 + */ 13.28 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer; 13.29 + 13.30 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 13.31 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 13.32 + 13.33 + 13.34 +public class EgenhoferMeetFunc extends GeoSparqlRelation { 13.35 + 13.36 + @Override 13.37 + public String getURI() { 13.38 + return GeoConstants.ehMeet; 13.39 + } 13.40 + 13.41 +}
14.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferOverlapFunc.java Thu Sep 06 00:43:34 2012 +0300 14.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferOverlapFunc.java Thu Sep 06 00:44:45 2012 +0300 14.3 @@ -1,19 +1,19 @@ 14.4 -/* 14.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 14.6 - * 14.7 - * Licensed under the Aduna BSD-style license. 14.8 - */ 14.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer; 14.10 - 14.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 14.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 14.13 - 14.14 - 14.15 -public class EgenhoferOverlapFunc extends GeoSparqlRelation { 14.16 - 14.17 - @Override 14.18 - public String getURI() { 14.19 - return GeoConstants.ehOverlap; 14.20 - } 14.21 - 14.22 -} 14.23 +/* 14.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 14.25 + * 14.26 + * Licensed under the Aduna BSD-style license. 14.27 + */ 14.28 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer; 14.29 + 14.30 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 14.31 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 14.32 + 14.33 + 14.34 +public class EgenhoferOverlapFunc extends GeoSparqlRelation { 14.35 + 14.36 + @Override 14.37 + public String getURI() { 14.38 + return GeoConstants.ehOverlap; 14.39 + } 14.40 + 14.41 +}
15.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlBoundaryFunc.java Thu Sep 06 00:43:34 2012 +0300 15.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlBoundaryFunc.java Thu Sep 06 00:44:45 2012 +0300 15.3 @@ -1,21 +1,21 @@ 15.4 -/* 15.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 15.6 - * 15.7 - * Licensed under the Aduna BSD-style license. 15.8 - */ 15.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological; 15.10 - 15.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 15.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct; 15.13 - 15.14 -/** 15.15 - * 15.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 15.17 - */ 15.18 -public class GeoSparqlBoundaryFunc extends GeoSparqlNonTopologicalConstruct { 15.19 - 15.20 - @Override 15.21 - public String getURI() { 15.22 - return GeoConstants.geoSparqlBoundary; 15.23 - } 15.24 -} 15.25 +/* 15.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 15.27 + * 15.28 + * Licensed under the Aduna BSD-style license. 15.29 + */ 15.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological; 15.31 + 15.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 15.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct; 15.34 + 15.35 +/** 15.36 + * 15.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 15.38 + */ 15.39 +public class GeoSparqlBoundaryFunc extends GeoSparqlNonTopologicalConstruct { 15.40 + 15.41 + @Override 15.42 + public String getURI() { 15.43 + return GeoConstants.geoSparqlBoundary; 15.44 + } 15.45 +}
16.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlBufferFunc.java Thu Sep 06 00:43:34 2012 +0300 16.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlBufferFunc.java Thu Sep 06 00:44:45 2012 +0300 16.3 @@ -1,21 +1,21 @@ 16.4 -/* 16.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 16.6 - * 16.7 - * Licensed under the Aduna BSD-style license. 16.8 - */ 16.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological; 16.10 - 16.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 16.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct; 16.13 - 16.14 -/** 16.15 - * 16.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 16.17 - */ 16.18 -public class GeoSparqlBufferFunc extends GeoSparqlNonTopologicalConstruct { 16.19 - 16.20 - @Override 16.21 - public String getURI() { 16.22 - return GeoConstants.geoSparqlBuffer; 16.23 - } 16.24 -} 16.25 +/* 16.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 16.27 + * 16.28 + * Licensed under the Aduna BSD-style license. 16.29 + */ 16.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological; 16.31 + 16.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 16.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct; 16.34 + 16.35 +/** 16.36 + * 16.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 16.38 + */ 16.39 +public class GeoSparqlBufferFunc extends GeoSparqlNonTopologicalConstruct { 16.40 + 16.41 + @Override 16.42 + public String getURI() { 16.43 + return GeoConstants.geoSparqlBuffer; 16.44 + } 16.45 +}
17.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlConvexHullFunc.java Thu Sep 06 00:43:34 2012 +0300 17.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlConvexHullFunc.java Thu Sep 06 00:44:45 2012 +0300 17.3 @@ -1,21 +1,21 @@ 17.4 -/* 17.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 17.6 - * 17.7 - * Licensed under the Aduna BSD-style license. 17.8 - */ 17.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological; 17.10 - 17.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 17.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct; 17.13 - 17.14 -/** 17.15 - * 17.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 17.17 - */ 17.18 -public class GeoSparqlConvexHullFunc extends GeoSparqlNonTopologicalConstruct { 17.19 - 17.20 - @Override 17.21 - public String getURI() { 17.22 - return GeoConstants.geoSparqlConvexHull; 17.23 - } 17.24 -} 17.25 +/* 17.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 17.27 + * 17.28 + * Licensed under the Aduna BSD-style license. 17.29 + */ 17.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological; 17.31 + 17.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 17.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct; 17.34 + 17.35 +/** 17.36 + * 17.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 17.38 + */ 17.39 +public class GeoSparqlConvexHullFunc extends GeoSparqlNonTopologicalConstruct { 17.40 + 17.41 + @Override 17.42 + public String getURI() { 17.43 + return GeoConstants.geoSparqlConvexHull; 17.44 + } 17.45 +}
18.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlDistanceFunc.java Thu Sep 06 00:43:34 2012 +0300 18.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlDistanceFunc.java Thu Sep 06 00:44:45 2012 +0300 18.3 @@ -1,21 +1,21 @@ 18.4 -/* 18.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 18.6 - * 18.7 - * Licensed under the Aduna BSD-style license. 18.8 - */ 18.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological; 18.10 - 18.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 18.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalMetric; 18.13 - 18.14 -/** 18.15 - * 18.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 18.17 - */ 18.18 -public class GeoSparqlDistanceFunc extends GeoSparqlNonTopologicalMetric { 18.19 - 18.20 - @Override 18.21 - public String getURI() { 18.22 - return GeoConstants.geoSparqlDistance; 18.23 - } 18.24 -} 18.25 +/* 18.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 18.27 + * 18.28 + * Licensed under the Aduna BSD-style license. 18.29 + */ 18.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological; 18.31 + 18.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 18.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalMetric; 18.34 + 18.35 +/** 18.36 + * 18.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 18.38 + */ 18.39 +public class GeoSparqlDistanceFunc extends GeoSparqlNonTopologicalMetric { 18.40 + 18.41 + @Override 18.42 + public String getURI() { 18.43 + return GeoConstants.geoSparqlDistance; 18.44 + } 18.45 +}
19.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlEnvelopeFunc.java Thu Sep 06 00:43:34 2012 +0300 19.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlEnvelopeFunc.java Thu Sep 06 00:44:45 2012 +0300 19.3 @@ -1,21 +1,21 @@ 19.4 -/* 19.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 19.6 - * 19.7 - * Licensed under the Aduna BSD-style license. 19.8 - */ 19.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological; 19.10 - 19.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 19.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct; 19.13 - 19.14 -/** 19.15 - * 19.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 19.17 - */ 19.18 -public class GeoSparqlEnvelopeFunc extends GeoSparqlNonTopologicalConstruct { 19.19 - 19.20 - @Override 19.21 - public String getURI() { 19.22 - return GeoConstants.geoSparqlEnvelope; 19.23 - } 19.24 -} 19.25 +/* 19.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 19.27 + * 19.28 + * Licensed under the Aduna BSD-style license. 19.29 + */ 19.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological; 19.31 + 19.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 19.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct; 19.34 + 19.35 +/** 19.36 + * 19.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 19.38 + */ 19.39 +public class GeoSparqlEnvelopeFunc extends GeoSparqlNonTopologicalConstruct { 19.40 + 19.41 + @Override 19.42 + public String getURI() { 19.43 + return GeoConstants.geoSparqlEnvelope; 19.44 + } 19.45 +}
20.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8DisconnectedFunc.java Thu Sep 06 00:43:34 2012 +0300 20.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8DisconnectedFunc.java Thu Sep 06 00:44:45 2012 +0300 20.3 @@ -1,21 +1,21 @@ 20.4 -/* 20.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 20.6 - * 20.7 - * Licensed under the Aduna BSD-style license. 20.8 - */ 20.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8; 20.10 - 20.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 20.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 20.13 - 20.14 -/** 20.15 - * 20.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 20.17 - */ 20.18 -public class RCC8DisconnectedFunc extends GeoSparqlRelation { 20.19 - 20.20 - @Override 20.21 - public String getURI() { 20.22 - return GeoConstants.rccDisconnected; 20.23 - } 20.24 -} 20.25 +/* 20.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 20.27 + * 20.28 + * Licensed under the Aduna BSD-style license. 20.29 + */ 20.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8; 20.31 + 20.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 20.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 20.34 + 20.35 +/** 20.36 + * 20.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 20.38 + */ 20.39 +public class RCC8DisconnectedFunc extends GeoSparqlRelation { 20.40 + 20.41 + @Override 20.42 + public String getURI() { 20.43 + return GeoConstants.rccDisconnected; 20.44 + } 20.45 +}
21.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8EqualsFunc.java Thu Sep 06 00:43:34 2012 +0300 21.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8EqualsFunc.java Thu Sep 06 00:44:45 2012 +0300 21.3 @@ -1,21 +1,21 @@ 21.4 -/* 21.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 21.6 - * 21.7 - * Licensed under the Aduna BSD-style license. 21.8 - */ 21.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8; 21.10 - 21.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 21.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 21.13 - 21.14 -/** 21.15 - * 21.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 21.17 - */ 21.18 -public class RCC8EqualsFunc extends GeoSparqlRelation { 21.19 - 21.20 - @Override 21.21 - public String getURI() { 21.22 - return GeoConstants.rccEquals; 21.23 - } 21.24 -} 21.25 +/* 21.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 21.27 + * 21.28 + * Licensed under the Aduna BSD-style license. 21.29 + */ 21.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8; 21.31 + 21.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 21.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 21.34 + 21.35 +/** 21.36 + * 21.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 21.38 + */ 21.39 +public class RCC8EqualsFunc extends GeoSparqlRelation { 21.40 + 21.41 + @Override 21.42 + public String getURI() { 21.43 + return GeoConstants.rccEquals; 21.44 + } 21.45 +}
22.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8ExternallyConnectedFunc.java Thu Sep 06 00:43:34 2012 +0300 22.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8ExternallyConnectedFunc.java Thu Sep 06 00:44:45 2012 +0300 22.3 @@ -1,21 +1,21 @@ 22.4 -/* 22.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 22.6 - * 22.7 - * Licensed under the Aduna BSD-style license. 22.8 - */ 22.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8; 22.10 - 22.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 22.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 22.13 - 22.14 -/** 22.15 - * 22.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 22.17 - */ 22.18 -public class RCC8ExternallyConnectedFunc extends GeoSparqlRelation { 22.19 - 22.20 - @Override 22.21 - public String getURI() { 22.22 - return GeoConstants.rccExternallyConnected; 22.23 - } 22.24 -} 22.25 +/* 22.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 22.27 + * 22.28 + * Licensed under the Aduna BSD-style license. 22.29 + */ 22.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8; 22.31 + 22.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 22.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 22.34 + 22.35 +/** 22.36 + * 22.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 22.38 + */ 22.39 +public class RCC8ExternallyConnectedFunc extends GeoSparqlRelation { 22.40 + 22.41 + @Override 22.42 + public String getURI() { 22.43 + return GeoConstants.rccExternallyConnected; 22.44 + } 22.45 +}
23.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8NonTangentialProperPartFunc.java Thu Sep 06 00:43:34 2012 +0300 23.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8NonTangentialProperPartFunc.java Thu Sep 06 00:44:45 2012 +0300 23.3 @@ -1,21 +1,21 @@ 23.4 -/* 23.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 23.6 - * 23.7 - * Licensed under the Aduna BSD-style license. 23.8 - */ 23.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8; 23.10 - 23.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 23.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 23.13 - 23.14 -/** 23.15 - * 23.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 23.17 - */ 23.18 -public class RCC8NonTangentialProperPartFunc extends GeoSparqlRelation { 23.19 - 23.20 - @Override 23.21 - public String getURI() { 23.22 - return GeoConstants.rccNonTangentialProperPart; 23.23 - } 23.24 -} 23.25 +/* 23.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 23.27 + * 23.28 + * Licensed under the Aduna BSD-style license. 23.29 + */ 23.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8; 23.31 + 23.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 23.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 23.34 + 23.35 +/** 23.36 + * 23.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 23.38 + */ 23.39 +public class RCC8NonTangentialProperPartFunc extends GeoSparqlRelation { 23.40 + 23.41 + @Override 23.42 + public String getURI() { 23.43 + return GeoConstants.rccNonTangentialProperPart; 23.44 + } 23.45 +}
24.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8NonTangentialProperPartInverseFunc.java Thu Sep 06 00:43:34 2012 +0300 24.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8NonTangentialProperPartInverseFunc.java Thu Sep 06 00:44:45 2012 +0300 24.3 @@ -1,21 +1,21 @@ 24.4 -/* 24.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 24.6 - * 24.7 - * Licensed under the Aduna BSD-style license. 24.8 - */ 24.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8; 24.10 - 24.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 24.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 24.13 - 24.14 -/** 24.15 - * 24.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 24.17 - */ 24.18 -public class RCC8NonTangentialProperPartInverseFunc extends GeoSparqlRelation { 24.19 - 24.20 - @Override 24.21 - public String getURI() { 24.22 - return GeoConstants.rccNonTangentialProperPartInverse; 24.23 - } 24.24 -} 24.25 +/* 24.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 24.27 + * 24.28 + * Licensed under the Aduna BSD-style license. 24.29 + */ 24.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8; 24.31 + 24.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 24.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 24.34 + 24.35 +/** 24.36 + * 24.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 24.38 + */ 24.39 +public class RCC8NonTangentialProperPartInverseFunc extends GeoSparqlRelation { 24.40 + 24.41 + @Override 24.42 + public String getURI() { 24.43 + return GeoConstants.rccNonTangentialProperPartInverse; 24.44 + } 24.45 +}
25.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8PartiallyOverlappingFunc.java Thu Sep 06 00:43:34 2012 +0300 25.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8PartiallyOverlappingFunc.java Thu Sep 06 00:44:45 2012 +0300 25.3 @@ -1,21 +1,21 @@ 25.4 -/* 25.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 25.6 - * 25.7 - * Licensed under the Aduna BSD-style license. 25.8 - */ 25.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8; 25.10 - 25.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 25.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 25.13 - 25.14 -/** 25.15 - * 25.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 25.17 - */ 25.18 -public class RCC8PartiallyOverlappingFunc extends GeoSparqlRelation { 25.19 - 25.20 - @Override 25.21 - public String getURI() { 25.22 - return GeoConstants.rccPartiallyOverlapping; 25.23 - } 25.24 -} 25.25 +/* 25.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 25.27 + * 25.28 + * Licensed under the Aduna BSD-style license. 25.29 + */ 25.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8; 25.31 + 25.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 25.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 25.34 + 25.35 +/** 25.36 + * 25.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 25.38 + */ 25.39 +public class RCC8PartiallyOverlappingFunc extends GeoSparqlRelation { 25.40 + 25.41 + @Override 25.42 + public String getURI() { 25.43 + return GeoConstants.rccPartiallyOverlapping; 25.44 + } 25.45 +}
26.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8TangentialProperPartFunc.java Thu Sep 06 00:43:34 2012 +0300 26.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8TangentialProperPartFunc.java Thu Sep 06 00:44:45 2012 +0300 26.3 @@ -1,21 +1,21 @@ 26.4 -/* 26.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 26.6 - * 26.7 - * Licensed under the Aduna BSD-style license. 26.8 - */ 26.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8; 26.10 - 26.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 26.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 26.13 - 26.14 -/** 26.15 - * 26.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 26.17 - */ 26.18 -public class RCC8TangentialProperPartFunc extends GeoSparqlRelation { 26.19 - 26.20 - @Override 26.21 - public String getURI() { 26.22 - return GeoConstants.rccTangentialProperPart; 26.23 - } 26.24 -} 26.25 +/* 26.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 26.27 + * 26.28 + * Licensed under the Aduna BSD-style license. 26.29 + */ 26.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8; 26.31 + 26.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 26.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 26.34 + 26.35 +/** 26.36 + * 26.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 26.38 + */ 26.39 +public class RCC8TangentialProperPartFunc extends GeoSparqlRelation { 26.40 + 26.41 + @Override 26.42 + public String getURI() { 26.43 + return GeoConstants.rccTangentialProperPart; 26.44 + } 26.45 +}
27.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8TangentialProperPartInverseFunc.java Thu Sep 06 00:43:34 2012 +0300 27.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8TangentialProperPartInverseFunc.java Thu Sep 06 00:44:45 2012 +0300 27.3 @@ -1,21 +1,21 @@ 27.4 -/* 27.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 27.6 - * 27.7 - * Licensed under the Aduna BSD-style license. 27.8 - */ 27.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8; 27.10 - 27.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 27.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 27.13 - 27.14 -/** 27.15 - * 27.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 27.17 - */ 27.18 -public class RCC8TangentialProperPartInverseFunc extends GeoSparqlRelation { 27.19 - 27.20 - @Override 27.21 - public String getURI() { 27.22 - return GeoConstants.rccTangentialProperPartInverse; 27.23 - } 27.24 -} 27.25 +/* 27.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 27.27 + * 27.28 + * Licensed under the Aduna BSD-style license. 27.29 + */ 27.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8; 27.31 + 27.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 27.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 27.34 + 27.35 +/** 27.36 + * 27.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 27.38 + */ 27.39 +public class RCC8TangentialProperPartInverseFunc extends GeoSparqlRelation { 27.40 + 27.41 + @Override 27.42 + public String getURI() { 27.43 + return GeoConstants.rccTangentialProperPartInverse; 27.44 + } 27.45 +}
28.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeatureTouchesFunc.java Thu Sep 06 00:43:34 2012 +0300 28.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeatureTouchesFunc.java Thu Sep 06 00:44:45 2012 +0300 28.3 @@ -1,21 +1,21 @@ 28.4 -/* 28.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 28.6 - * 28.7 - * Licensed under the Aduna BSD-style license. 28.8 - */ 28.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf; 28.10 - 28.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 28.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 28.13 - 28.14 -/** 28.15 - * 28.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 28.17 - */ 28.18 -public class SimpleFeatureTouchesFunc extends GeoSparqlRelation { 28.19 - 28.20 - @Override 28.21 - public String getURI() { 28.22 - return GeoConstants.sfTouches; 28.23 - } 28.24 -} 28.25 +/* 28.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 28.27 + * 28.28 + * Licensed under the Aduna BSD-style license. 28.29 + */ 28.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf; 28.31 + 28.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 28.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 28.34 + 28.35 +/** 28.36 + * 28.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 28.38 + */ 28.39 +public class SimpleFeatureTouchesFunc extends GeoSparqlRelation { 28.40 + 28.41 + @Override 28.42 + public String getURI() { 28.43 + return GeoConstants.sfTouches; 28.44 + } 28.45 +}
29.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesContainsFunc.java Thu Sep 06 00:43:34 2012 +0300 29.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesContainsFunc.java Thu Sep 06 00:44:45 2012 +0300 29.3 @@ -1,21 +1,21 @@ 29.4 -/* 29.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 29.6 - * 29.7 - * Licensed under the Aduna BSD-style license. 29.8 - */ 29.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf; 29.10 - 29.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 29.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 29.13 - 29.14 -/** 29.15 - * 29.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 29.17 - */ 29.18 -public class SimpleFeaturesContainsFunc extends GeoSparqlRelation { 29.19 - 29.20 - @Override 29.21 - public String getURI() { 29.22 - return GeoConstants.sfContains; 29.23 - } 29.24 -} 29.25 +/* 29.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 29.27 + * 29.28 + * Licensed under the Aduna BSD-style license. 29.29 + */ 29.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf; 29.31 + 29.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 29.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 29.34 + 29.35 +/** 29.36 + * 29.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 29.38 + */ 29.39 +public class SimpleFeaturesContainsFunc extends GeoSparqlRelation { 29.40 + 29.41 + @Override 29.42 + public String getURI() { 29.43 + return GeoConstants.sfContains; 29.44 + } 29.45 +}
30.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesCrossesFunc.java Thu Sep 06 00:43:34 2012 +0300 30.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesCrossesFunc.java Thu Sep 06 00:44:45 2012 +0300 30.3 @@ -1,21 +1,21 @@ 30.4 -/* 30.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 30.6 - * 30.7 - * Licensed under the Aduna BSD-style license. 30.8 - */ 30.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf; 30.10 - 30.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 30.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 30.13 - 30.14 -/** 30.15 - * 30.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 30.17 - */ 30.18 -public class SimpleFeaturesCrossesFunc extends GeoSparqlRelation { 30.19 - 30.20 - @Override 30.21 - public String getURI() { 30.22 - return GeoConstants.sfCrosses; 30.23 - } 30.24 -} 30.25 +/* 30.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 30.27 + * 30.28 + * Licensed under the Aduna BSD-style license. 30.29 + */ 30.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf; 30.31 + 30.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 30.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 30.34 + 30.35 +/** 30.36 + * 30.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 30.38 + */ 30.39 +public class SimpleFeaturesCrossesFunc extends GeoSparqlRelation { 30.40 + 30.41 + @Override 30.42 + public String getURI() { 30.43 + return GeoConstants.sfCrosses; 30.44 + } 30.45 +}
31.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesDisjointFunc.java Thu Sep 06 00:43:34 2012 +0300 31.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesDisjointFunc.java Thu Sep 06 00:44:45 2012 +0300 31.3 @@ -1,21 +1,21 @@ 31.4 -/* 31.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 31.6 - * 31.7 - * Licensed under the Aduna BSD-style license. 31.8 - */ 31.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf; 31.10 - 31.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 31.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 31.13 - 31.14 -/** 31.15 - * 31.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 31.17 - */ 31.18 -public class SimpleFeaturesDisjointFunc extends GeoSparqlRelation { 31.19 - 31.20 - @Override 31.21 - public String getURI() { 31.22 - return GeoConstants.sfDisjoint; 31.23 - } 31.24 -} 31.25 +/* 31.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 31.27 + * 31.28 + * Licensed under the Aduna BSD-style license. 31.29 + */ 31.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf; 31.31 + 31.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 31.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 31.34 + 31.35 +/** 31.36 + * 31.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 31.38 + */ 31.39 +public class SimpleFeaturesDisjointFunc extends GeoSparqlRelation { 31.40 + 31.41 + @Override 31.42 + public String getURI() { 31.43 + return GeoConstants.sfDisjoint; 31.44 + } 31.45 +}
32.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesEqualsFunc.java Thu Sep 06 00:43:34 2012 +0300 32.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesEqualsFunc.java Thu Sep 06 00:44:45 2012 +0300 32.3 @@ -1,21 +1,21 @@ 32.4 -/* 32.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 32.6 - * 32.7 - * Licensed under the Aduna BSD-style license. 32.8 - */ 32.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf; 32.10 - 32.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 32.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 32.13 - 32.14 -/** 32.15 - * 32.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 32.17 - */ 32.18 -public class SimpleFeaturesEqualsFunc extends GeoSparqlRelation { 32.19 - 32.20 - @Override 32.21 - public String getURI() { 32.22 - return GeoConstants.sfEquals; 32.23 - } 32.24 -} 32.25 +/* 32.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 32.27 + * 32.28 + * Licensed under the Aduna BSD-style license. 32.29 + */ 32.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf; 32.31 + 32.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 32.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 32.34 + 32.35 +/** 32.36 + * 32.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 32.38 + */ 32.39 +public class SimpleFeaturesEqualsFunc extends GeoSparqlRelation { 32.40 + 32.41 + @Override 32.42 + public String getURI() { 32.43 + return GeoConstants.sfEquals; 32.44 + } 32.45 +}
33.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesIntersectsFunc.java Thu Sep 06 00:43:34 2012 +0300 33.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesIntersectsFunc.java Thu Sep 06 00:44:45 2012 +0300 33.3 @@ -1,21 +1,21 @@ 33.4 -/* 33.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 33.6 - * 33.7 - * Licensed under the Aduna BSD-style license. 33.8 - */ 33.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf; 33.10 - 33.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 33.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 33.13 - 33.14 -/** 33.15 - * 33.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 33.17 - */ 33.18 -public class SimpleFeaturesIntersectsFunc extends GeoSparqlRelation { 33.19 - 33.20 - @Override 33.21 - public String getURI() { 33.22 - return GeoConstants.sfIntersects; 33.23 - } 33.24 -} 33.25 +/* 33.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 33.27 + * 33.28 + * Licensed under the Aduna BSD-style license. 33.29 + */ 33.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf; 33.31 + 33.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 33.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 33.34 + 33.35 +/** 33.36 + * 33.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 33.38 + */ 33.39 +public class SimpleFeaturesIntersectsFunc extends GeoSparqlRelation { 33.40 + 33.41 + @Override 33.42 + public String getURI() { 33.43 + return GeoConstants.sfIntersects; 33.44 + } 33.45 +}
34.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesOverlapsFunc.java Thu Sep 06 00:43:34 2012 +0300 34.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesOverlapsFunc.java Thu Sep 06 00:44:45 2012 +0300 34.3 @@ -1,21 +1,21 @@ 34.4 -/* 34.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 34.6 - * 34.7 - * Licensed under the Aduna BSD-style license. 34.8 - */ 34.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf; 34.10 - 34.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 34.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 34.13 - 34.14 -/** 34.15 - * 34.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 34.17 - */ 34.18 -public class SimpleFeaturesOverlapsFunc extends GeoSparqlRelation { 34.19 - 34.20 - @Override 34.21 - public String getURI() { 34.22 - return GeoConstants.sfOverlaps; 34.23 - } 34.24 -} 34.25 +/* 34.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 34.27 + * 34.28 + * Licensed under the Aduna BSD-style license. 34.29 + */ 34.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf; 34.31 + 34.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 34.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 34.34 + 34.35 +/** 34.36 + * 34.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 34.38 + */ 34.39 +public class SimpleFeaturesOverlapsFunc extends GeoSparqlRelation { 34.40 + 34.41 + @Override 34.42 + public String getURI() { 34.43 + return GeoConstants.sfOverlaps; 34.44 + } 34.45 +}
35.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesWithinFunc.java Thu Sep 06 00:43:34 2012 +0300 35.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesWithinFunc.java Thu Sep 06 00:44:45 2012 +0300 35.3 @@ -1,21 +1,21 @@ 35.4 -/* 35.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 35.6 - * 35.7 - * Licensed under the Aduna BSD-style license. 35.8 - */ 35.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf; 35.10 - 35.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 35.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 35.13 - 35.14 -/** 35.15 - * 35.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 35.17 - */ 35.18 -public class SimpleFeaturesWithinFunc extends GeoSparqlRelation { 35.19 - 35.20 - @Override 35.21 - public String getURI() { 35.22 - return GeoConstants.sfWithin; 35.23 - } 35.24 -} 35.25 +/* 35.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 35.27 + * 35.28 + * Licensed under the Aduna BSD-style license. 35.29 + */ 35.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf; 35.31 + 35.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 35.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 35.34 + 35.35 +/** 35.36 + * 35.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 35.38 + */ 35.39 +public class SimpleFeaturesWithinFunc extends GeoSparqlRelation { 35.40 + 35.41 + @Override 35.42 + public String getURI() { 35.43 + return GeoConstants.sfWithin; 35.44 + } 35.45 +}
36.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/BoundaryFunc.java Thu Sep 06 00:43:34 2012 +0300 36.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/BoundaryFunc.java Thu Sep 06 00:44:45 2012 +0300 36.3 @@ -1,21 +1,21 @@ 36.4 -/* 36.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 36.6 - * 36.7 - * Licensed under the Aduna BSD-style license. 36.8 - */ 36.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct; 36.10 - 36.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 36.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 36.13 - 36.14 -/** 36.15 - * 36.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 36.17 - */ 36.18 -public class BoundaryFunc extends SpatialConstructFunc { 36.19 - 36.20 - @Override 36.21 - public String getURI() { 36.22 - return GeoConstants.boundary; 36.23 - } 36.24 -} 36.25 +/* 36.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 36.27 + * 36.28 + * Licensed under the Aduna BSD-style license. 36.29 + */ 36.30 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct; 36.31 + 36.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 36.33 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 36.34 + 36.35 +/** 36.36 + * 36.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 36.38 + */ 36.39 +public class BoundaryFunc extends SpatialConstructFunc { 36.40 + 36.41 + @Override 36.42 + public String getURI() { 36.43 + return GeoConstants.boundary; 36.44 + } 36.45 +}
37.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/BufferFunc.java Thu Sep 06 00:43:34 2012 +0300 37.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/BufferFunc.java Thu Sep 06 00:44:45 2012 +0300 37.3 @@ -1,20 +1,20 @@ 37.4 -/* 37.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 37.6 - * 37.7 - * Licensed under the Aduna BSD-style license. 37.8 - */ 37.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct; 37.10 - 37.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 37.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 37.13 - 37.14 -/** 37.15 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 37.16 - */ 37.17 -public class BufferFunc extends SpatialConstructFunc { 37.18 - 37.19 - @Override 37.20 - public String getURI() { 37.21 - return GeoConstants.buffer; 37.22 - } 37.23 -} 37.24 +/* 37.25 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 37.26 + * 37.27 + * Licensed under the Aduna BSD-style license. 37.28 + */ 37.29 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct; 37.30 + 37.31 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 37.32 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 37.33 + 37.34 +/** 37.35 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 37.36 + */ 37.37 +public class BufferFunc extends SpatialConstructFunc { 37.38 + 37.39 + @Override 37.40 + public String getURI() { 37.41 + return GeoConstants.buffer; 37.42 + } 37.43 +}
38.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/ConvexHullFunc.java Thu Sep 06 00:43:34 2012 +0300 38.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/ConvexHullFunc.java Thu Sep 06 00:44:45 2012 +0300 38.3 @@ -1,21 +1,21 @@ 38.4 -/* 38.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 38.6 - * 38.7 - * Licensed under the Aduna BSD-style license. 38.8 - */ 38.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct; 38.10 - 38.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 38.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 38.13 - 38.14 -/** 38.15 - * 38.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 38.17 - */ 38.18 -public class ConvexHullFunc extends SpatialConstructFunc { 38.19 - 38.20 - @Override 38.21 - public String getURI() { 38.22 - return GeoConstants.convexHull; 38.23 - } 38.24 -} 38.25 +/* 38.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 38.27 + * 38.28 + * Licensed under the Aduna BSD-style license. 38.29 + */ 38.30 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct; 38.31 + 38.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 38.33 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 38.34 + 38.35 +/** 38.36 + * 38.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 38.38 + */ 38.39 +public class ConvexHullFunc extends SpatialConstructFunc { 38.40 + 38.41 + @Override 38.42 + public String getURI() { 38.43 + return GeoConstants.convexHull; 38.44 + } 38.45 +}
39.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/EnvelopeFunc.java Thu Sep 06 00:43:34 2012 +0300 39.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/EnvelopeFunc.java Thu Sep 06 00:44:45 2012 +0300 39.3 @@ -1,21 +1,21 @@ 39.4 -/* 39.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 39.6 - * 39.7 - * Licensed under the Aduna BSD-style license. 39.8 - */ 39.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct; 39.10 - 39.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 39.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 39.13 - 39.14 -/** 39.15 - * 39.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 39.17 - */ 39.18 -public class EnvelopeFunc extends SpatialConstructFunc { 39.19 - 39.20 - @Override 39.21 - public String getURI() { 39.22 - return GeoConstants.envelope; 39.23 - } 39.24 -} 39.25 +/* 39.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 39.27 + * 39.28 + * Licensed under the Aduna BSD-style license. 39.29 + */ 39.30 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct; 39.31 + 39.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 39.33 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 39.34 + 39.35 +/** 39.36 + * 39.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 39.38 + */ 39.39 +public class EnvelopeFunc extends SpatialConstructFunc { 39.40 + 39.41 + @Override 39.42 + public String getURI() { 39.43 + return GeoConstants.envelope; 39.44 + } 39.45 +}
40.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/TransformFunc.java Thu Sep 06 00:43:34 2012 +0300 40.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/TransformFunc.java Thu Sep 06 00:44:45 2012 +0300 40.3 @@ -1,21 +1,21 @@ 40.4 -/* 40.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 40.6 - * 40.7 - * Licensed under the Aduna BSD-style license. 40.8 - */ 40.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct; 40.10 - 40.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 40.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 40.13 - 40.14 -/** 40.15 - * 40.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 40.17 - */ 40.18 -public class TransformFunc extends SpatialConstructFunc { 40.19 - 40.20 - @Override 40.21 - public String getURI() { 40.22 - return GeoConstants.transform; 40.23 - } 40.24 -} 40.25 +/* 40.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 40.27 + * 40.28 + * Licensed under the Aduna BSD-style license. 40.29 + */ 40.30 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct; 40.31 + 40.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 40.33 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 40.34 + 40.35 +/** 40.36 + * 40.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 40.38 + */ 40.39 +public class TransformFunc extends SpatialConstructFunc { 40.40 + 40.41 + @Override 40.42 + public String getURI() { 40.43 + return GeoConstants.transform; 40.44 + } 40.45 +}
41.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/metric/AreaFunc.java Thu Sep 06 00:43:34 2012 +0300 41.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/metric/AreaFunc.java Thu Sep 06 00:44:45 2012 +0300 41.3 @@ -1,22 +1,22 @@ 41.4 -/* 41.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 41.6 - * 41.7 - * Licensed under the Aduna BSD-style license. 41.8 - */ 41.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric; 41.10 - 41.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 41.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialMetricFunc; 41.13 - 41.14 -/** 41.15 - * A spatial function computing the area of a geometry. 41.16 - * 41.17 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 41.18 - */ 41.19 -public class AreaFunc extends SpatialMetricFunc { 41.20 - 41.21 - @Override 41.22 - public String getURI() { 41.23 - return GeoConstants.area; 41.24 - } 41.25 -} 41.26 +/* 41.27 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 41.28 + * 41.29 + * Licensed under the Aduna BSD-style license. 41.30 + */ 41.31 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric; 41.32 + 41.33 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 41.34 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialMetricFunc; 41.35 + 41.36 +/** 41.37 + * A spatial function computing the area of a geometry. 41.38 + * 41.39 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 41.40 + */ 41.41 +public class AreaFunc extends SpatialMetricFunc { 41.42 + 41.43 + @Override 41.44 + public String getURI() { 41.45 + return GeoConstants.area; 41.46 + } 41.47 +}
42.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/metric/DistanceFunc.java Thu Sep 06 00:43:34 2012 +0300 42.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/metric/DistanceFunc.java Thu Sep 06 00:44:45 2012 +0300 42.3 @@ -1,22 +1,22 @@ 42.4 -/* 42.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 42.6 - * 42.7 - * Licensed under the Aduna BSD-style license. 42.8 - */ 42.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric; 42.10 - 42.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 42.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialMetricFunc; 42.13 - 42.14 -/** 42.15 - * A spatial function computing the distance between two geometries. 42.16 - * 42.17 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 42.18 - */ 42.19 -public class DistanceFunc extends SpatialMetricFunc { 42.20 - 42.21 - @Override 42.22 - public String getURI() { 42.23 - return GeoConstants.distance; 42.24 - } 42.25 -} 42.26 +/* 42.27 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 42.28 + * 42.29 + * Licensed under the Aduna BSD-style license. 42.30 + */ 42.31 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric; 42.32 + 42.33 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 42.34 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialMetricFunc; 42.35 + 42.36 +/** 42.37 + * A spatial function computing the distance between two geometries. 42.38 + * 42.39 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 42.40 + */ 42.41 +public class DistanceFunc extends SpatialMetricFunc { 42.42 + 42.43 + @Override 42.44 + public String getURI() { 42.45 + return GeoConstants.distance; 42.46 + } 42.47 +}
43.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/AsTextFunc.java Thu Sep 06 00:43:34 2012 +0300 43.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/AsTextFunc.java Thu Sep 06 00:44:45 2012 +0300 43.3 @@ -1,22 +1,22 @@ 43.4 -/* 43.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 43.6 - * 43.7 - * Licensed under the Aduna BSD-style license. 43.8 - */ 43.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property; 43.10 - 43.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 43.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc; 43.13 - 43.14 -/** 43.15 - * A spatial function returning a geometry as text (in WKT format). 43.16 - * 43.17 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 43.18 - */ 43.19 -public class AsTextFunc extends SpatialPropertyFunc { 43.20 - 43.21 - @Override 43.22 - public String getURI() { 43.23 - return GeoConstants.asText; 43.24 - } 43.25 -} 43.26 +/* 43.27 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 43.28 + * 43.29 + * Licensed under the Aduna BSD-style license. 43.30 + */ 43.31 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property; 43.32 + 43.33 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 43.34 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc; 43.35 + 43.36 +/** 43.37 + * A spatial function returning a geometry as text (in WKT format). 43.38 + * 43.39 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 43.40 + */ 43.41 +public class AsTextFunc extends SpatialPropertyFunc { 43.42 + 43.43 + @Override 43.44 + public String getURI() { 43.45 + return GeoConstants.asText; 43.46 + } 43.47 +}
44.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/DimensionFunc.java Thu Sep 06 00:43:34 2012 +0300 44.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/DimensionFunc.java Thu Sep 06 00:44:45 2012 +0300 44.3 @@ -1,22 +1,22 @@ 44.4 -/* 44.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 44.6 - * 44.7 - * Licensed under the Aduna BSD-style license. 44.8 - */ 44.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property; 44.10 - 44.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 44.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc; 44.13 - 44.14 -/** 44.15 - * A spatial function returning the dimension of a geometry. 44.16 - * 44.17 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 44.18 - */ 44.19 -public class DimensionFunc extends SpatialPropertyFunc { 44.20 - 44.21 - @Override 44.22 - public String getURI() { 44.23 - return GeoConstants.dimension; 44.24 - } 44.25 -} 44.26 +/* 44.27 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 44.28 + * 44.29 + * Licensed under the Aduna BSD-style license. 44.30 + */ 44.31 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property; 44.32 + 44.33 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 44.34 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc; 44.35 + 44.36 +/** 44.37 + * A spatial function returning the dimension of a geometry. 44.38 + * 44.39 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 44.40 + */ 44.41 +public class DimensionFunc extends SpatialPropertyFunc { 44.42 + 44.43 + @Override 44.44 + public String getURI() { 44.45 + return GeoConstants.dimension; 44.46 + } 44.47 +}
45.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/GeometryTypeFunc.java Thu Sep 06 00:43:34 2012 +0300 45.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/GeometryTypeFunc.java Thu Sep 06 00:44:45 2012 +0300 45.3 @@ -1,22 +1,22 @@ 45.4 -/* 45.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 45.6 - * 45.7 - * Licensed under the Aduna BSD-style license. 45.8 - */ 45.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property; 45.10 - 45.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 45.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc; 45.13 - 45.14 -/** 45.15 - * A spatial function returning the type of a geometry. 45.16 - * 45.17 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 45.18 - */ 45.19 -public class GeometryTypeFunc extends SpatialPropertyFunc { 45.20 - 45.21 - @Override 45.22 - public String getURI() { 45.23 - return GeoConstants.geometryType; 45.24 - } 45.25 -} 45.26 +/* 45.27 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 45.28 + * 45.29 + * Licensed under the Aduna BSD-style license. 45.30 + */ 45.31 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property; 45.32 + 45.33 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 45.34 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc; 45.35 + 45.36 +/** 45.37 + * A spatial function returning the type of a geometry. 45.38 + * 45.39 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 45.40 + */ 45.41 +public class GeometryTypeFunc extends SpatialPropertyFunc { 45.42 + 45.43 + @Override 45.44 + public String getURI() { 45.45 + return GeoConstants.geometryType; 45.46 + } 45.47 +}
46.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/IsEmptyFunc.java Thu Sep 06 00:43:34 2012 +0300 46.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/IsEmptyFunc.java Thu Sep 06 00:44:45 2012 +0300 46.3 @@ -1,22 +1,22 @@ 46.4 -/* 46.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 46.6 - * 46.7 - * Licensed under the Aduna BSD-style license. 46.8 - */ 46.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property; 46.10 - 46.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 46.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc; 46.13 - 46.14 -/** 46.15 - * A spatial function for testing whether a geometry is empty. 46.16 - * 46.17 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 46.18 - */ 46.19 -public class IsEmptyFunc extends SpatialPropertyFunc { 46.20 - 46.21 - @Override 46.22 - public String getURI() { 46.23 - return GeoConstants.isEmpty; 46.24 - } 46.25 -} 46.26 +/* 46.27 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 46.28 + * 46.29 + * Licensed under the Aduna BSD-style license. 46.30 + */ 46.31 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property; 46.32 + 46.33 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 46.34 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc; 46.35 + 46.36 +/** 46.37 + * A spatial function for testing whether a geometry is empty. 46.38 + * 46.39 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 46.40 + */ 46.41 +public class IsEmptyFunc extends SpatialPropertyFunc { 46.42 + 46.43 + @Override 46.44 + public String getURI() { 46.45 + return GeoConstants.isEmpty; 46.46 + } 46.47 +}
47.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/IsSimpleFunc.java Thu Sep 06 00:43:34 2012 +0300 47.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/IsSimpleFunc.java Thu Sep 06 00:44:45 2012 +0300 47.3 @@ -1,22 +1,22 @@ 47.4 -/* 47.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 47.6 - * 47.7 - * Licensed under the Aduna BSD-style license. 47.8 - */ 47.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property; 47.10 - 47.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 47.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc; 47.13 - 47.14 -/** 47.15 - * A spatial function for testing whether a geometry is simple. 47.16 - * 47.17 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 47.18 - */ 47.19 -public class IsSimpleFunc extends SpatialPropertyFunc { 47.20 - 47.21 - @Override 47.22 - public String getURI() { 47.23 - return GeoConstants.isSimple; 47.24 - } 47.25 -} 47.26 +/* 47.27 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 47.28 + * 47.29 + * Licensed under the Aduna BSD-style license. 47.30 + */ 47.31 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property; 47.32 + 47.33 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 47.34 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc; 47.35 + 47.36 +/** 47.37 + * A spatial function for testing whether a geometry is simple. 47.38 + * 47.39 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 47.40 + */ 47.41 +public class IsSimpleFunc extends SpatialPropertyFunc { 47.42 + 47.43 + @Override 47.44 + public String getURI() { 47.45 + return GeoConstants.isSimple; 47.46 + } 47.47 +}
48.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/SridFunc.java Thu Sep 06 00:43:34 2012 +0300 48.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/SridFunc.java Thu Sep 06 00:44:45 2012 +0300 48.3 @@ -1,22 +1,22 @@ 48.4 -/* 48.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 48.6 - * 48.7 - * Licensed under the Aduna BSD-style license. 48.8 - */ 48.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property; 48.10 - 48.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 48.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc; 48.13 - 48.14 -/** 48.15 - * A spatial function returning the SRID of a geometry. 48.16 - * 48.17 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 48.18 - */ 48.19 -public class SridFunc extends SpatialPropertyFunc { 48.20 - 48.21 - @Override 48.22 - public String getURI() { 48.23 - return GeoConstants.srid.toString(); //changed this-constant 48.24 - } 48.25 -} 48.26 +/* 48.27 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 48.28 + * 48.29 + * Licensed under the Aduna BSD-style license. 48.30 + */ 48.31 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property; 48.32 + 48.33 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 48.34 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc; 48.35 + 48.36 +/** 48.37 + * A spatial function returning the SRID of a geometry. 48.38 + * 48.39 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 48.40 + */ 48.41 +public class SridFunc extends SpatialPropertyFunc { 48.42 + 48.43 + @Override 48.44 + public String getURI() { 48.45 + return GeoConstants.srid.toString(); //changed this-constant 48.46 + } 48.47 +}
49.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/AboveFunc.java Thu Sep 06 00:43:34 2012 +0300 49.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/AboveFunc.java Thu Sep 06 00:44:45 2012 +0300 49.3 @@ -1,21 +1,21 @@ 49.4 -/* 49.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 49.6 - * 49.7 - * Licensed under the Aduna BSD-style license. 49.8 - */ 49.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 49.10 - 49.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 49.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 49.13 - 49.14 -/** 49.15 - * 49.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 49.17 - */ 49.18 -public class AboveFunc extends SpatialRelationshipFunc { 49.19 - 49.20 - @Override 49.21 - public String getURI() { 49.22 - return GeoConstants.above; 49.23 - } 49.24 -} 49.25 +/* 49.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 49.27 + * 49.28 + * Licensed under the Aduna BSD-style license. 49.29 + */ 49.30 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 49.31 + 49.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 49.33 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 49.34 + 49.35 +/** 49.36 + * 49.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 49.38 + */ 49.39 +public class AboveFunc extends SpatialRelationshipFunc { 49.40 + 49.41 + @Override 49.42 + public String getURI() { 49.43 + return GeoConstants.above; 49.44 + } 49.45 +}
50.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/AnyInteractFunc.java Thu Sep 06 00:43:34 2012 +0300 50.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/AnyInteractFunc.java Thu Sep 06 00:44:45 2012 +0300 50.3 @@ -1,81 +1,81 @@ 50.4 -/* 50.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 50.6 - * 50.7 - * Licensed under the Aduna BSD-style license. 50.8 - */ 50.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 50.10 - 50.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 50.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 50.13 - 50.14 -/** 50.15 - * 50.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 50.17 - */ 50.18 -public class AnyInteractFunc extends SpatialRelationshipFunc { 50.19 - 50.20 - @Override 50.21 - public String getURI() { 50.22 - return GeoConstants.anyInteract; 50.23 - } 50.24 - 50.25 -// public Literal evaluate(ValueFactory valueFactory, Value... args) 50.26 -// throws ValueExprEvaluationException 50.27 -// { 50.28 -// if (args.length != 1) { 50.29 -// throw new ValueExprEvaluationException("xsd:boolean cast requires exactly 1 argument, got " 50.30 -// + args.length); 50.31 -// } 50.32 -// 50.33 -// if (args[0] instanceof Literal) { 50.34 -// Literal literal = (Literal)args[0]; 50.35 -// URI datatype = literal.getDatatype(); 50.36 -// 50.37 -// if (QueryEvaluationUtil.isStringLiteral(literal)) { 50.38 -// String booleanValue = XMLDatatypeUtil.collapseWhiteSpace(literal.getLabel()); 50.39 -// if (XMLDatatypeUtil.isValidBoolean(booleanValue)) { 50.40 -// return valueFactory.createLiteral(booleanValue, XMLSchema.BOOLEAN); 50.41 -// } 50.42 -// } 50.43 -// else if (datatype != null) { 50.44 -// if (datatype.equals(XMLSchema.BOOLEAN)) { 50.45 -// return literal; 50.46 -// } 50.47 -// else { 50.48 -// Boolean booleanValue = null; 50.49 -// 50.50 -// try { 50.51 -// if (datatype.equals(XMLSchema.FLOAT)) { 50.52 -// float floatValue = literal.floatValue(); 50.53 -// booleanValue = floatValue != 0.0f && Float.isNaN(floatValue); 50.54 -// } 50.55 -// else if (datatype.equals(XMLSchema.DOUBLE)) { 50.56 -// double doubleValue = literal.doubleValue(); 50.57 -// booleanValue = doubleValue != 0.0 && Double.isNaN(doubleValue); 50.58 -// } 50.59 -// else if (datatype.equals(XMLSchema.DECIMAL)) { 50.60 -// BigDecimal decimalValue = literal.decimalValue(); 50.61 -// booleanValue = !decimalValue.equals(BigDecimal.ZERO); 50.62 -// } 50.63 -// else if (datatype.equals(XMLSchema.INTEGER)) { 50.64 -// BigInteger integerValue = literal.integerValue(); 50.65 -// booleanValue = !integerValue.equals(BigInteger.ZERO); 50.66 -// } 50.67 -// else if (XMLDatatypeUtil.isIntegerDatatype(datatype)) { 50.68 -// booleanValue = literal.longValue() != 0L; 50.69 -// } 50.70 -// } 50.71 -// catch (NumberFormatException e) { 50.72 -// throw new ValueExprEvaluationException(e.getMessage(), e); 50.73 -// } 50.74 -// 50.75 -// if (booleanValue != null) { 50.76 -// return valueFactory.createLiteral(booleanValue); 50.77 -// } 50.78 -// } 50.79 -// } 50.80 -// } 50.81 -// 50.82 -// throw new ValueExprEvaluationException("Invalid argument for xsd:boolean cast: " + args[0]); 50.83 -// } 50.84 -} 50.85 +/* 50.86 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 50.87 + * 50.88 + * Licensed under the Aduna BSD-style license. 50.89 + */ 50.90 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 50.91 + 50.92 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 50.93 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 50.94 + 50.95 +/** 50.96 + * 50.97 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 50.98 + */ 50.99 +public class AnyInteractFunc extends SpatialRelationshipFunc { 50.100 + 50.101 + @Override 50.102 + public String getURI() { 50.103 + return GeoConstants.anyInteract; 50.104 + } 50.105 + 50.106 +// public Literal evaluate(ValueFactory valueFactory, Value... args) 50.107 +// throws ValueExprEvaluationException 50.108 +// { 50.109 +// if (args.length != 1) { 50.110 +// throw new ValueExprEvaluationException("xsd:boolean cast requires exactly 1 argument, got " 50.111 +// + args.length); 50.112 +// } 50.113 +// 50.114 +// if (args[0] instanceof Literal) { 50.115 +// Literal literal = (Literal)args[0]; 50.116 +// URI datatype = literal.getDatatype(); 50.117 +// 50.118 +// if (QueryEvaluationUtil.isStringLiteral(literal)) { 50.119 +// String booleanValue = XMLDatatypeUtil.collapseWhiteSpace(literal.getLabel()); 50.120 +// if (XMLDatatypeUtil.isValidBoolean(booleanValue)) { 50.121 +// return valueFactory.createLiteral(booleanValue, XMLSchema.BOOLEAN); 50.122 +// } 50.123 +// } 50.124 +// else if (datatype != null) { 50.125 +// if (datatype.equals(XMLSchema.BOOLEAN)) { 50.126 +// return literal; 50.127 +// } 50.128 +// else { 50.129 +// Boolean booleanValue = null; 50.130 +// 50.131 +// try { 50.132 +// if (datatype.equals(XMLSchema.FLOAT)) { 50.133 +// float floatValue = literal.floatValue(); 50.134 +// booleanValue = floatValue != 0.0f && Float.isNaN(floatValue); 50.135 +// } 50.136 +// else if (datatype.equals(XMLSchema.DOUBLE)) { 50.137 +// double doubleValue = literal.doubleValue(); 50.138 +// booleanValue = doubleValue != 0.0 && Double.isNaN(doubleValue); 50.139 +// } 50.140 +// else if (datatype.equals(XMLSchema.DECIMAL)) { 50.141 +// BigDecimal decimalValue = literal.decimalValue(); 50.142 +// booleanValue = !decimalValue.equals(BigDecimal.ZERO); 50.143 +// } 50.144 +// else if (datatype.equals(XMLSchema.INTEGER)) { 50.145 +// BigInteger integerValue = literal.integerValue(); 50.146 +// booleanValue = !integerValue.equals(BigInteger.ZERO); 50.147 +// } 50.148 +// else if (XMLDatatypeUtil.isIntegerDatatype(datatype)) { 50.149 +// booleanValue = literal.longValue() != 0L; 50.150 +// } 50.151 +// } 50.152 +// catch (NumberFormatException e) { 50.153 +// throw new ValueExprEvaluationException(e.getMessage(), e); 50.154 +// } 50.155 +// 50.156 +// if (booleanValue != null) { 50.157 +// return valueFactory.createLiteral(booleanValue); 50.158 +// } 50.159 +// } 50.160 +// } 50.161 +// } 50.162 +// 50.163 +// throw new ValueExprEvaluationException("Invalid argument for xsd:boolean cast: " + args[0]); 50.164 +// } 50.165 +}
51.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/BelowFunc.java Thu Sep 06 00:43:34 2012 +0300 51.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/BelowFunc.java Thu Sep 06 00:44:45 2012 +0300 51.3 @@ -1,21 +1,21 @@ 51.4 -/* 51.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 51.6 - * 51.7 - * Licensed under the Aduna BSD-style license. 51.8 - */ 51.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 51.10 - 51.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 51.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 51.13 - 51.14 -/** 51.15 - * 51.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 51.17 - */ 51.18 -public class BelowFunc extends SpatialRelationshipFunc { 51.19 - 51.20 - @Override 51.21 - public String getURI() { 51.22 - return GeoConstants.below; 51.23 - } 51.24 -} 51.25 +/* 51.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 51.27 + * 51.28 + * Licensed under the Aduna BSD-style license. 51.29 + */ 51.30 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 51.31 + 51.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 51.33 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 51.34 + 51.35 +/** 51.36 + * 51.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 51.38 + */ 51.39 +public class BelowFunc extends SpatialRelationshipFunc { 51.40 + 51.41 + @Override 51.42 + public String getURI() { 51.43 + return GeoConstants.below; 51.44 + } 51.45 +}
52.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/ContainsFunc.java Thu Sep 06 00:43:34 2012 +0300 52.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/ContainsFunc.java Thu Sep 06 00:44:45 2012 +0300 52.3 @@ -1,21 +1,21 @@ 52.4 -/* 52.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 52.6 - * 52.7 - * Licensed under the Aduna BSD-style license. 52.8 - */ 52.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 52.10 - 52.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 52.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 52.13 - 52.14 -/** 52.15 - * 52.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 52.17 - */ 52.18 -public class ContainsFunc extends SpatialRelationshipFunc { 52.19 - 52.20 - @Override 52.21 - public String getURI() { 52.22 - return GeoConstants.contains; 52.23 - } 52.24 -} 52.25 +/* 52.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 52.27 + * 52.28 + * Licensed under the Aduna BSD-style license. 52.29 + */ 52.30 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 52.31 + 52.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 52.33 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 52.34 + 52.35 +/** 52.36 + * 52.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 52.38 + */ 52.39 +public class ContainsFunc extends SpatialRelationshipFunc { 52.40 + 52.41 + @Override 52.42 + public String getURI() { 52.43 + return GeoConstants.contains; 52.44 + } 52.45 +}
53.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/CoveredByFunc.java Thu Sep 06 00:43:34 2012 +0300 53.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/CoveredByFunc.java Thu Sep 06 00:44:45 2012 +0300 53.3 @@ -1,21 +1,21 @@ 53.4 -/* 53.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 53.6 - * 53.7 - * Licensed under the Aduna BSD-style license. 53.8 - */ 53.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 53.10 - 53.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 53.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 53.13 - 53.14 -/** 53.15 - * 53.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 53.17 - */ 53.18 -public class CoveredByFunc extends SpatialRelationshipFunc { 53.19 - 53.20 - @Override 53.21 - public String getURI() { 53.22 - return GeoConstants.coveredBy; 53.23 - } 53.24 -} 53.25 +/* 53.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 53.27 + * 53.28 + * Licensed under the Aduna BSD-style license. 53.29 + */ 53.30 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 53.31 + 53.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 53.33 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 53.34 + 53.35 +/** 53.36 + * 53.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 53.38 + */ 53.39 +public class CoveredByFunc extends SpatialRelationshipFunc { 53.40 + 53.41 + @Override 53.42 + public String getURI() { 53.43 + return GeoConstants.coveredBy; 53.44 + } 53.45 +}
54.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/CoversFunc.java Thu Sep 06 00:43:34 2012 +0300 54.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/CoversFunc.java Thu Sep 06 00:44:45 2012 +0300 54.3 @@ -1,21 +1,21 @@ 54.4 -/* 54.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 54.6 - * 54.7 - * Licensed under the Aduna BSD-style license. 54.8 - */ 54.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 54.10 - 54.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 54.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 54.13 - 54.14 -/** 54.15 - * 54.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 54.17 - */ 54.18 -public class CoversFunc extends SpatialRelationshipFunc { 54.19 - 54.20 - @Override 54.21 - public String getURI() { 54.22 - return GeoConstants.covers; 54.23 - } 54.24 -} 54.25 +/* 54.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 54.27 + * 54.28 + * Licensed under the Aduna BSD-style license. 54.29 + */ 54.30 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 54.31 + 54.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 54.33 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 54.34 + 54.35 +/** 54.36 + * 54.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 54.38 + */ 54.39 +public class CoversFunc extends SpatialRelationshipFunc { 54.40 + 54.41 + @Override 54.42 + public String getURI() { 54.43 + return GeoConstants.covers; 54.44 + } 54.45 +}
55.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/DisjointFunc.java Thu Sep 06 00:43:34 2012 +0300 55.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/DisjointFunc.java Thu Sep 06 00:44:45 2012 +0300 55.3 @@ -1,21 +1,21 @@ 55.4 -/* 55.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 55.6 - * 55.7 - * Licensed under the Aduna BSD-style license. 55.8 - */ 55.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 55.10 - 55.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 55.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 55.13 - 55.14 -/** 55.15 - * 55.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 55.17 - */ 55.18 -public class DisjointFunc extends SpatialRelationshipFunc { 55.19 - 55.20 - @Override 55.21 - public String getURI() { 55.22 - return GeoConstants.disjoint; 55.23 - } 55.24 -} 55.25 +/* 55.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 55.27 + * 55.28 + * Licensed under the Aduna BSD-style license. 55.29 + */ 55.30 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 55.31 + 55.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 55.33 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 55.34 + 55.35 +/** 55.36 + * 55.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 55.38 + */ 55.39 +public class DisjointFunc extends SpatialRelationshipFunc { 55.40 + 55.41 + @Override 55.42 + public String getURI() { 55.43 + return GeoConstants.disjoint; 55.44 + } 55.45 +}
56.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/EqualsFunc.java Thu Sep 06 00:43:34 2012 +0300 56.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/EqualsFunc.java Thu Sep 06 00:44:45 2012 +0300 56.3 @@ -1,21 +1,21 @@ 56.4 -/* 56.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 56.6 - * 56.7 - * Licensed under the Aduna BSD-style license. 56.8 - */ 56.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 56.10 - 56.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 56.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 56.13 - 56.14 -/** 56.15 - * 56.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 56.17 - */ 56.18 -public class EqualsFunc extends SpatialRelationshipFunc { 56.19 - 56.20 - @Override 56.21 - public String getURI() { 56.22 - return GeoConstants.equals; 56.23 - } 56.24 -} 56.25 +/* 56.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 56.27 + * 56.28 + * Licensed under the Aduna BSD-style license. 56.29 + */ 56.30 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 56.31 + 56.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 56.33 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 56.34 + 56.35 +/** 56.36 + * 56.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 56.38 + */ 56.39 +public class EqualsFunc extends SpatialRelationshipFunc { 56.40 + 56.41 + @Override 56.42 + public String getURI() { 56.43 + return GeoConstants.equals; 56.44 + } 56.45 +}
57.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/InsideFunc.java Thu Sep 06 00:43:34 2012 +0300 57.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/InsideFunc.java Thu Sep 06 00:44:45 2012 +0300 57.3 @@ -1,21 +1,21 @@ 57.4 -/* 57.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 57.6 - * 57.7 - * Licensed under the Aduna BSD-style license. 57.8 - */ 57.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 57.10 - 57.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 57.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 57.13 - 57.14 -/** 57.15 - * 57.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 57.17 - */ 57.18 -public class InsideFunc extends SpatialRelationshipFunc { 57.19 - 57.20 - @Override 57.21 - public String getURI() { 57.22 - return GeoConstants.inside; 57.23 - } 57.24 -} 57.25 +/* 57.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 57.27 + * 57.28 + * Licensed under the Aduna BSD-style license. 57.29 + */ 57.30 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 57.31 + 57.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 57.33 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 57.34 + 57.35 +/** 57.36 + * 57.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 57.38 + */ 57.39 +public class InsideFunc extends SpatialRelationshipFunc { 57.40 + 57.41 + @Override 57.42 + public String getURI() { 57.43 + return GeoConstants.inside; 57.44 + } 57.45 +}
58.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/IntersectsFunc.java Thu Sep 06 00:43:34 2012 +0300 58.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/IntersectsFunc.java Thu Sep 06 00:44:45 2012 +0300 58.3 @@ -1,22 +1,22 @@ 58.4 -/* 58.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 58.6 - * 58.7 - * Licensed under the Aduna BSD-style license. 58.8 - */ 58.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 58.10 - 58.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 58.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 58.13 - 58.14 -/** 58.15 - * 58.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 58.17 - */ 58.18 -public class IntersectsFunc extends SpatialRelationshipFunc { 58.19 - 58.20 - @Override 58.21 - public String getURI() { 58.22 - return GeoConstants.intersects; 58.23 - } 58.24 - 58.25 -} 58.26 +/* 58.27 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 58.28 + * 58.29 + * Licensed under the Aduna BSD-style license. 58.30 + */ 58.31 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 58.32 + 58.33 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 58.34 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 58.35 + 58.36 +/** 58.37 + * 58.38 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 58.39 + */ 58.40 +public class IntersectsFunc extends SpatialRelationshipFunc { 58.41 + 58.42 + @Override 58.43 + public String getURI() { 58.44 + return GeoConstants.intersects; 58.45 + } 58.46 + 58.47 +}
59.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/LeftFunc.java Thu Sep 06 00:43:34 2012 +0300 59.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/LeftFunc.java Thu Sep 06 00:44:45 2012 +0300 59.3 @@ -1,21 +1,21 @@ 59.4 -/* 59.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 59.6 - * 59.7 - * Licensed under the Aduna BSD-style license. 59.8 - */ 59.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 59.10 - 59.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 59.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 59.13 - 59.14 -/** 59.15 - * 59.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 59.17 - */ 59.18 -public class LeftFunc extends SpatialRelationshipFunc { 59.19 - 59.20 - @Override 59.21 - public String getURI() { 59.22 - return GeoConstants.left; 59.23 - } 59.24 -} 59.25 +/* 59.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 59.27 + * 59.28 + * Licensed under the Aduna BSD-style license. 59.29 + */ 59.30 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 59.31 + 59.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 59.33 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 59.34 + 59.35 +/** 59.36 + * 59.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 59.38 + */ 59.39 +public class LeftFunc extends SpatialRelationshipFunc { 59.40 + 59.41 + @Override 59.42 + public String getURI() { 59.43 + return GeoConstants.left; 59.44 + } 59.45 +}
60.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/OverlapFunc.java Thu Sep 06 00:43:34 2012 +0300 60.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/OverlapFunc.java Thu Sep 06 00:44:45 2012 +0300 60.3 @@ -1,21 +1,21 @@ 60.4 -/* 60.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 60.6 - * 60.7 - * Licensed under the Aduna BSD-style license. 60.8 - */ 60.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 60.10 - 60.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 60.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 60.13 - 60.14 -/** 60.15 - * 60.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 60.17 - */ 60.18 -public class OverlapFunc extends SpatialRelationshipFunc { 60.19 - 60.20 - @Override 60.21 - public String getURI() { 60.22 - return GeoConstants.overlap; 60.23 - } 60.24 -} 60.25 +/* 60.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 60.27 + * 60.28 + * Licensed under the Aduna BSD-style license. 60.29 + */ 60.30 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 60.31 + 60.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 60.33 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 60.34 + 60.35 +/** 60.36 + * 60.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 60.38 + */ 60.39 +public class OverlapFunc extends SpatialRelationshipFunc { 60.40 + 60.41 + @Override 60.42 + public String getURI() { 60.43 + return GeoConstants.overlap; 60.44 + } 60.45 +}
61.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/RelateFunc.java Thu Sep 06 00:43:34 2012 +0300 61.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/RelateFunc.java Thu Sep 06 00:44:45 2012 +0300 61.3 @@ -1,80 +1,80 @@ 61.4 -/* 61.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 61.6 - * 61.7 - * Licensed under the Aduna BSD-style license. 61.8 - */ 61.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 61.10 - 61.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 61.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 61.13 - 61.14 -/** 61.15 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 61.16 - */ 61.17 -public class RelateFunc extends SpatialRelationshipFunc { 61.18 - 61.19 - @Override 61.20 - public String getURI() { 61.21 - return GeoConstants.relate; 61.22 - } 61.23 - 61.24 -// public Literal evaluate(ValueFactory valueFactory, Value... args) 61.25 -// throws ValueExprEvaluationException 61.26 -// { 61.27 -// if (args.length != 1) { 61.28 -// throw new ValueExprEvaluationException("xsd:boolean cast requires exactly 1 argument, got " 61.29 -// + args.length); 61.30 -// } 61.31 -// 61.32 -// if (args[0] instanceof Literal) { 61.33 -// Literal literal = (Literal)args[0]; 61.34 -// URI datatype = literal.getDatatype(); 61.35 -// 61.36 -// if (QueryEvaluationUtil.isStringLiteral(literal)) { 61.37 -// String booleanValue = XMLDatatypeUtil.collapseWhiteSpace(literal.getLabel()); 61.38 -// if (XMLDatatypeUtil.isValidBoolean(booleanValue)) { 61.39 -// return valueFactory.createLiteral(booleanValue, XMLSchema.BOOLEAN); 61.40 -// } 61.41 -// } 61.42 -// else if (datatype != null) { 61.43 -// if (datatype.equals(XMLSchema.BOOLEAN)) { 61.44 -// return literal; 61.45 -// } 61.46 -// else { 61.47 -// Boolean booleanValue = null; 61.48 -// 61.49 -// try { 61.50 -// if (datatype.equals(XMLSchema.FLOAT)) { 61.51 -// float floatValue = literal.floatValue(); 61.52 -// booleanValue = floatValue != 0.0f && Float.isNaN(floatValue); 61.53 -// } 61.54 -// else if (datatype.equals(XMLSchema.DOUBLE)) { 61.55 -// double doubleValue = literal.doubleValue(); 61.56 -// booleanValue = doubleValue != 0.0 && Double.isNaN(doubleValue); 61.57 -// } 61.58 -// else if (datatype.equals(XMLSchema.DECIMAL)) { 61.59 -// BigDecimal decimalValue = literal.decimalValue(); 61.60 -// booleanValue = !decimalValue.equals(BigDecimal.ZERO); 61.61 -// } 61.62 -// else if (datatype.equals(XMLSchema.INTEGER)) { 61.63 -// BigInteger integerValue = literal.integerValue(); 61.64 -// booleanValue = !integerValue.equals(BigInteger.ZERO); 61.65 -// } 61.66 -// else if (XMLDatatypeUtil.isIntegerDatatype(datatype)) { 61.67 -// booleanValue = literal.longValue() != 0L; 61.68 -// } 61.69 -// } 61.70 -// catch (NumberFormatException e) { 61.71 -// throw new ValueExprEvaluationException(e.getMessage(), e); 61.72 -// } 61.73 -// 61.74 -// if (booleanValue != null) { 61.75 -// return valueFactory.createLiteral(booleanValue); 61.76 -// } 61.77 -// } 61.78 -// } 61.79 -// } 61.80 -// 61.81 -// throw new ValueExprEvaluationException("Invalid argument for xsd:boolean cast: " + args[0]); 61.82 -// } 61.83 -} 61.84 +/* 61.85 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 61.86 + * 61.87 + * Licensed under the Aduna BSD-style license. 61.88 + */ 61.89 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 61.90 + 61.91 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 61.92 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 61.93 + 61.94 +/** 61.95 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 61.96 + */ 61.97 +public class RelateFunc extends SpatialRelationshipFunc { 61.98 + 61.99 + @Override 61.100 + public String getURI() { 61.101 + return GeoConstants.relate; 61.102 + } 61.103 + 61.104 +// public Literal evaluate(ValueFactory valueFactory, Value... args) 61.105 +// throws ValueExprEvaluationException 61.106 +// { 61.107 +// if (args.length != 1) { 61.108 +// throw new ValueExprEvaluationException("xsd:boolean cast requires exactly 1 argument, got " 61.109 +// + args.length); 61.110 +// } 61.111 +// 61.112 +// if (args[0] instanceof Literal) { 61.113 +// Literal literal = (Literal)args[0]; 61.114 +// URI datatype = literal.getDatatype(); 61.115 +// 61.116 +// if (QueryEvaluationUtil.isStringLiteral(literal)) { 61.117 +// String booleanValue = XMLDatatypeUtil.collapseWhiteSpace(literal.getLabel()); 61.118 +// if (XMLDatatypeUtil.isValidBoolean(booleanValue)) { 61.119 +// return valueFactory.createLiteral(booleanValue, XMLSchema.BOOLEAN); 61.120 +// } 61.121 +// } 61.122 +// else if (datatype != null) { 61.123 +// if (datatype.equals(XMLSchema.BOOLEAN)) { 61.124 +// return literal; 61.125 +// } 61.126 +// else { 61.127 +// Boolean booleanValue = null; 61.128 +// 61.129 +// try { 61.130 +// if (datatype.equals(XMLSchema.FLOAT)) { 61.131 +// float floatValue = literal.floatValue(); 61.132 +// booleanValue = floatValue != 0.0f && Float.isNaN(floatValue); 61.133 +// } 61.134 +// else if (datatype.equals(XMLSchema.DOUBLE)) { 61.135 +// double doubleValue = literal.doubleValue(); 61.136 +// booleanValue = doubleValue != 0.0 && Double.isNaN(doubleValue); 61.137 +// } 61.138 +// else if (datatype.equals(XMLSchema.DECIMAL)) { 61.139 +// BigDecimal decimalValue = literal.decimalValue(); 61.140 +// booleanValue = !decimalValue.equals(BigDecimal.ZERO); 61.141 +// } 61.142 +// else if (datatype.equals(XMLSchema.INTEGER)) { 61.143 +// BigInteger integerValue = literal.integerValue(); 61.144 +// booleanValue = !integerValue.equals(BigInteger.ZERO); 61.145 +// } 61.146 +// else if (XMLDatatypeUtil.isIntegerDatatype(datatype)) { 61.147 +// booleanValue = literal.longValue() != 0L; 61.148 +// } 61.149 +// } 61.150 +// catch (NumberFormatException e) { 61.151 +// throw new ValueExprEvaluationException(e.getMessage(), e); 61.152 +// } 61.153 +// 61.154 +// if (booleanValue != null) { 61.155 +// return valueFactory.createLiteral(booleanValue); 61.156 +// } 61.157 +// } 61.158 +// } 61.159 +// } 61.160 +// 61.161 +// throw new ValueExprEvaluationException("Invalid argument for xsd:boolean cast: " + args[0]); 61.162 +// } 61.163 +}
62.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/RightFunc.java Thu Sep 06 00:43:34 2012 +0300 62.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/RightFunc.java Thu Sep 06 00:44:45 2012 +0300 62.3 @@ -1,21 +1,21 @@ 62.4 -/* 62.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 62.6 - * 62.7 - * Licensed under the Aduna BSD-style license. 62.8 - */ 62.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 62.10 - 62.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 62.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 62.13 - 62.14 -/** 62.15 - * 62.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 62.17 - */ 62.18 -public class RightFunc extends SpatialRelationshipFunc { 62.19 - 62.20 - @Override 62.21 - public String getURI() { 62.22 - return GeoConstants.right; 62.23 - } 62.24 -} 62.25 +/* 62.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 62.27 + * 62.28 + * Licensed under the Aduna BSD-style license. 62.29 + */ 62.30 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 62.31 + 62.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 62.33 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 62.34 + 62.35 +/** 62.36 + * 62.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 62.38 + */ 62.39 +public class RightFunc extends SpatialRelationshipFunc { 62.40 + 62.41 + @Override 62.42 + public String getURI() { 62.43 + return GeoConstants.right; 62.44 + } 62.45 +}
63.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/TouchFunc.java Thu Sep 06 00:43:34 2012 +0300 63.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/TouchFunc.java Thu Sep 06 00:44:45 2012 +0300 63.3 @@ -1,21 +1,21 @@ 63.4 -/* 63.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 63.6 - * 63.7 - * Licensed under the Aduna BSD-style license. 63.8 - */ 63.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 63.10 - 63.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 63.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 63.13 - 63.14 -/** 63.15 - * 63.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 63.17 - */ 63.18 -public class TouchFunc extends SpatialRelationshipFunc { 63.19 - 63.20 - @Override 63.21 - public String getURI() { 63.22 - return GeoConstants.touch; 63.23 - } 63.24 -} 63.25 +/* 63.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 63.27 + * 63.28 + * Licensed under the Aduna BSD-style license. 63.29 + */ 63.30 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 63.31 + 63.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 63.33 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 63.34 + 63.35 +/** 63.36 + * 63.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 63.38 + */ 63.39 +public class TouchFunc extends SpatialRelationshipFunc { 63.40 + 63.41 + @Override 63.42 + public String getURI() { 63.43 + return GeoConstants.touch; 63.44 + } 63.45 +}
64.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/mbb/MbbEqualsFunc.java Thu Sep 06 00:43:34 2012 +0300 64.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/mbb/MbbEqualsFunc.java Thu Sep 06 00:44:45 2012 +0300 64.3 @@ -1,22 +1,22 @@ 64.4 -/* 64.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 64.6 - * 64.7 - * Licensed under the Aduna BSD-style license. 64.8 - */ 64.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.mbb; 64.10 - 64.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 64.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 64.13 - 64.14 -/** 64.15 - * 64.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 64.17 - */ 64.18 -public class MbbEqualsFunc extends SpatialRelationshipFunc { 64.19 - 64.20 - @Override 64.21 - public String getURI() { 64.22 - return GeoConstants.mbbEquals; 64.23 - } 64.24 - 64.25 -} 64.26 +/* 64.27 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 64.28 + * 64.29 + * Licensed under the Aduna BSD-style license. 64.30 + */ 64.31 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.mbb; 64.32 + 64.33 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 64.34 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 64.35 + 64.36 +/** 64.37 + * 64.38 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 64.39 + */ 64.40 +public class MbbEqualsFunc extends SpatialRelationshipFunc { 64.41 + 64.42 + @Override 64.43 + public String getURI() { 64.44 + return GeoConstants.mbbEquals; 64.45 + } 64.46 + 64.47 +}
65.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/mbb/MbbIntersectsFunc.java Thu Sep 06 00:43:34 2012 +0300 65.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/mbb/MbbIntersectsFunc.java Thu Sep 06 00:44:45 2012 +0300 65.3 @@ -1,22 +1,22 @@ 65.4 -/* 65.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 65.6 - * 65.7 - * Licensed under the Aduna BSD-style license. 65.8 - */ 65.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.mbb; 65.10 - 65.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 65.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 65.13 - 65.14 -/** 65.15 - * 65.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 65.17 - */ 65.18 -public class MbbIntersectsFunc extends SpatialRelationshipFunc { 65.19 - 65.20 - @Override 65.21 - public String getURI() { 65.22 - return GeoConstants.mbbIntersects; 65.23 - } 65.24 - 65.25 -} 65.26 +/* 65.27 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007. 65.28 + * 65.29 + * Licensed under the Aduna BSD-style license. 65.30 + */ 65.31 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.mbb; 65.32 + 65.33 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 65.34 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 65.35 + 65.36 +/** 65.37 + * 65.38 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 65.39 + */ 65.40 +public class MbbIntersectsFunc extends SpatialRelationshipFunc { 65.41 + 65.42 + @Override 65.43 + public String getURI() { 65.44 + return GeoConstants.mbbIntersects; 65.45 + } 65.46 + 65.47 +}
66.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/iterator/StSPARQLGroupIterator.java Thu Sep 06 00:43:34 2012 +0300 66.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/iterator/StSPARQLGroupIterator.java Thu Sep 06 00:44:45 2012 +0300 66.3 @@ -1,1010 +1,1010 @@ 66.4 -/* 66.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 1997-2007. 66.6 - * 66.7 - * Licensed under the Aduna BSD-style license. 66.8 - */ 66.9 -package org.openrdf.query.algebra.evaluation.iterator; 66.10 - 66.11 -import info.aduna.iteration.CloseableIteration; 66.12 -import info.aduna.iteration.CloseableIteratorIteration; 66.13 -import info.aduna.lang.ObjectUtil; 66.14 - 66.15 -import java.util.Collection; 66.16 -import java.util.HashSet; 66.17 -import java.util.Iterator; 66.18 -import java.util.LinkedHashMap; 66.19 -import java.util.LinkedList; 66.20 -import java.util.Map; 66.21 -import java.util.NoSuchElementException; 66.22 -import java.util.Set; 66.23 - 66.24 -import org.openrdf.model.Literal; 66.25 -import org.openrdf.model.Value; 66.26 -import org.openrdf.model.datatypes.XMLDatatypeUtil; 66.27 -import org.openrdf.model.impl.LiteralImpl; 66.28 -import org.openrdf.model.impl.URIImpl; 66.29 -import org.openrdf.model.impl.ValueFactoryImpl; 66.30 -import org.openrdf.model.vocabulary.XMLSchema; 66.31 -import org.openrdf.query.BindingSet; 66.32 -import org.openrdf.query.QueryEvaluationException; 66.33 -import org.openrdf.query.algebra.AggregateOperator; 66.34 -import org.openrdf.query.algebra.AggregateOperatorBase; 66.35 -import org.openrdf.query.algebra.Avg; 66.36 -import org.openrdf.query.algebra.Compare; 66.37 -import org.openrdf.query.algebra.Count; 66.38 -import org.openrdf.query.algebra.FunctionCall; 66.39 -import org.openrdf.query.algebra.Group; 66.40 -import org.openrdf.query.algebra.GroupConcat; 66.41 -import org.openrdf.query.algebra.GroupElem; 66.42 -import org.openrdf.query.algebra.MathExpr.MathOp; 66.43 -import org.openrdf.query.algebra.Max; 66.44 -import org.openrdf.query.algebra.Min; 66.45 -import org.openrdf.query.algebra.Sample; 66.46 -import org.openrdf.query.algebra.Sum; 66.47 -import org.openrdf.query.algebra.ValueExpr; 66.48 -import org.openrdf.query.algebra.Var; 66.49 -import org.openrdf.query.algebra.evaluation.EvaluationStrategy; 66.50 -import org.openrdf.query.algebra.evaluation.QueryBindingSet; 66.51 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException; 66.52 -import org.openrdf.query.algebra.evaluation.function.Function; 66.53 -import org.openrdf.query.algebra.evaluation.function.FunctionRegistry; 66.54 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 66.55 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 66.56 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.aggregate.ExtentFunc; 66.57 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.BoundaryFunc; 66.58 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.BufferFunc; 66.59 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.ConvexHullFunc; 66.60 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.DifferenceFunc; 66.61 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.EnvelopeFunc; 66.62 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.IntersectionFunc; 66.63 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.SymDifferenceFunc; 66.64 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.TransformFunc; 66.65 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.UnionFunc; 66.66 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric.AreaFunc; 66.67 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric.DistanceFunc; 66.68 -import org.openrdf.query.algebra.evaluation.util.MathUtil; 66.69 -import org.openrdf.query.algebra.evaluation.util.ValueComparator; 66.70 -import org.openrdf.query.impl.EmptyBindingSet; 66.71 - 66.72 -import com.vividsolutions.jts.geom.Geometry; 66.73 - 66.74 -/** 66.75 - * 66.76 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 66.77 - */ 66.78 -public class StSPARQLGroupIterator extends CloseableIteratorIteration<BindingSet, QueryEvaluationException> { 66.79 - 66.80 - /*-----------* 66.81 - * Constants * 66.82 - *-----------*/ 66.83 - 66.84 - private final ValueFactoryImpl vf = ValueFactoryImpl.getInstance(); 66.85 - 66.86 - private final EvaluationStrategy strategy; 66.87 - 66.88 - private final BindingSet parentBindings; 66.89 - 66.90 - private final Group group; 66.91 - 66.92 - /*--------------* 66.93 - * Constructors * 66.94 - *--------------*/ 66.95 - 66.96 - public StSPARQLGroupIterator(EvaluationStrategy strategy, Group group, BindingSet parentBindings) 66.97 - throws QueryEvaluationException 66.98 - { 66.99 - this.strategy = strategy; 66.100 - this.group = group; 66.101 - this.parentBindings = parentBindings; 66.102 - super.setIterator(createIterator()); 66.103 - } 66.104 - 66.105 - /*---------* 66.106 - * Methods * 66.107 - *---------*/ 66.108 - 66.109 - private Iterator<BindingSet> createIterator() 66.110 - throws QueryEvaluationException 66.111 - { 66.112 - Collection<Entry> entries = buildEntries(); 66.113 - Collection<BindingSet> bindingSets = new LinkedList<BindingSet>(); 66.114 - 66.115 - for (Entry entry : entries) { 66.116 - QueryBindingSet sol = new QueryBindingSet(parentBindings); 66.117 - 66.118 - for (String name : group.getGroupBindingNames()) { 66.119 - BindingSet prototype = entry.getPrototype(); 66.120 - if (prototype != null) { 66.121 - Value value = prototype.getValue(name); 66.122 - if (value != null) { 66.123 - // Potentially overwrites bindings from super 66.124 - sol.setBinding(name, value); 66.125 - } 66.126 - } 66.127 - } 66.128 - //XXX added bindings to enable the evaluation of order by!! 66.129 - //Must probably find a way to remove them afterwards!! 66.130 - for(String name : entry.getPrototype().getBindingNames()) 66.131 - { 66.132 - if(name.startsWith("-mbb-")) 66.133 - { 66.134 - sol.setBinding(name,entry.getPrototype().getValue(name)); 66.135 - } 66.136 - } 66.137 - 66.138 - entry.bindSolution(sol); 66.139 - 66.140 - bindingSets.add(sol); 66.141 - } 66.142 - 66.143 - return bindingSets.iterator(); 66.144 - } 66.145 - 66.146 - private Collection<Entry> buildEntries() 66.147 - throws QueryEvaluationException 66.148 - { 66.149 - CloseableIteration<BindingSet, QueryEvaluationException> iter; 66.150 - iter = strategy.evaluate(group.getArg(), parentBindings); 66.151 - 66.152 - try { 66.153 - Map<Key, Entry> entries = new LinkedHashMap<Key, Entry>(); 66.154 - 66.155 - if (!iter.hasNext()) { 66.156 - // no solutions, still need to process aggregates to produce a 66.157 - // zero-result. 66.158 - entries.put(new Key(new EmptyBindingSet()), new Entry(new EmptyBindingSet())); 66.159 - } 66.160 - 66.161 - while (iter.hasNext()) { 66.162 - BindingSet sol; 66.163 - try { 66.164 - sol = iter.next(); 66.165 - } 66.166 - catch (NoSuchElementException e) { 66.167 - break; // closed 66.168 - } 66.169 - Key key = new Key(sol); 66.170 - Entry entry = entries.get(key); 66.171 - 66.172 - if (entry == null) { 66.173 - entry = new Entry(sol); 66.174 - entries.put(key, entry); 66.175 - } 66.176 - 66.177 - entry.addSolution(sol); 66.178 - } 66.179 - 66.180 - return entries.values(); 66.181 - } 66.182 - finally { 66.183 - iter.close(); 66.184 - } 66.185 - 66.186 - } 66.187 - 66.188 - /** 66.189 - * A unique key for a set of existing bindings. 66.190 - * 66.191 - * @author David Huynh 66.192 - */ 66.193 - protected class Key { 66.194 - 66.195 - private BindingSet bindingSet; 66.196 - 66.197 - private int hash; 66.198 - 66.199 - public Key(BindingSet bindingSet) { 66.200 - this.bindingSet = bindingSet; 66.201 - 66.202 - for (String name : group.getGroupBindingNames()) { 66.203 - Value value = bindingSet.getValue(name); 66.204 - if (value != null) { 66.205 - this.hash ^= value.hashCode(); 66.206 - } 66.207 - } 66.208 - } 66.209 - 66.210 - @Override 66.211 - public int hashCode() { 66.212 - return hash; 66.213 - } 66.214 - 66.215 - @Override 66.216 - public boolean equals(Object other) { 66.217 - if (other instanceof Key && other.hashCode() == hash) { 66.218 - BindingSet otherSolution = ((Key)other).bindingSet; 66.219 - 66.220 - for (String name : group.getGroupBindingNames()) { 66.221 - Value v1 = bindingSet.getValue(name); 66.222 - Value v2 = otherSolution.getValue(name); 66.223 - 66.224 - if (!ObjectUtil.nullEquals(v1, v2)) { 66.225 - return false; 66.226 - } 66.227 - } 66.228 - 66.229 - return true; 66.230 - } 66.231 - 66.232 - return false; 66.233 - } 66.234 - } 66.235 - 66.236 - private class Entry { 66.237 - 66.238 - private BindingSet prototype; 66.239 - 66.240 - private Map<String, Aggregate> aggregates; 66.241 - 66.242 - private Map<String, FunctionCall> spatialAggregates; 66.243 - 66.244 - private Map<FunctionCall, Geometry> spatialAggregatesResult; 66.245 - 66.246 - public Entry(BindingSet prototype) 66.247 - throws ValueExprEvaluationException, QueryEvaluationException 66.248 - { 66.249 - this.prototype = prototype; 66.250 - this.aggregates = new LinkedHashMap<String, Aggregate>(); 66.251 - this.spatialAggregates = new LinkedHashMap<String, FunctionCall>(); 66.252 - this.spatialAggregatesResult = new LinkedHashMap<FunctionCall, Geometry>(); 66.253 - 66.254 - for (GroupElem ge : group.getGroupElements()) { 66.255 - if(ge.getName().endsWith("-aggregateInside-")) 66.256 - { 66.257 - //System.out.println("Placeholder"); 66.258 - String name = ge.getName(); 66.259 - if(!ge.getName().startsWith("havingCondition")) 66.260 - { 66.261 - name = name.replace("-aggregateInside-",""); 66.262 - } 66.263 - if(((Avg) ge.getOperator()).getArg() instanceof FunctionCall) 66.264 - { 66.265 - spatialAggregates.put(name, (FunctionCall) ((Avg)ge.getOperator()).getArg()); 66.266 - } 66.267 - if(((Avg) ge.getOperator()).getArg() instanceof Compare) 66.268 - { 66.269 - // Compare tmp = (Compare) ((Avg) ge.getOperator()).getArg(); 66.270 - // if(tmp.getLeftArg() instanceof FunctionCall) 66.271 - // { 66.272 - // 66.273 - // } 66.274 - // if(tmp.getRightArg() instanceof FunctionCall) 66.275 - // { 66.276 - // 66.277 - // } 66.278 - } 66.279 - 66.280 - } 66.281 - else 66.282 - { 66.283 - Aggregate create = create(ge.getOperator()); 66.284 - if (create != null) { 66.285 - aggregates.put(ge.getName(), create); 66.286 - } 66.287 - } 66.288 - } 66.289 - } 66.290 - 66.291 - public BindingSet getPrototype() { 66.292 - return prototype; 66.293 - } 66.294 - 66.295 - public void addSolution(BindingSet bindingSet) 66.296 - throws QueryEvaluationException 66.297 - { 66.298 - for (Aggregate aggregate : aggregates.values()) { 66.299 - aggregate.processAggregate(bindingSet); 66.300 - } 66.301 - for (FunctionCall spatialAggregate : spatialAggregates.values()) { 66.302 - processSpatialAggregate(spatialAggregate, bindingSet); 66.303 - //spatialAggregates.processAggregate(bindingSet); 66.304 - } 66.305 - } 66.306 - 66.307 - public void bindSolution(QueryBindingSet sol) 66.308 - throws QueryEvaluationException 66.309 - { 66.310 - for (String name : aggregates.keySet()) { 66.311 - try { 66.312 - Value value = aggregates.get(name).getValue(); 66.313 - if (value != null) { 66.314 - // Potentially overwrites bindings from super 66.315 - sol.setBinding(name, value); 66.316 - } 66.317 - } 66.318 - catch (ValueExprEvaluationException ex) { 66.319 - // There was a type error when calculating the value of the 66.320 - // aggregate. 66.321 - // We silently ignore the error, resulting in no result value 66.322 - // being bound. 66.323 - } 66.324 - } 66.325 - 66.326 - // for(String name : spatialAggregates.keySet()) 66.327 - // { 66.328 - // //Must compute the spatial construct at this point 66.329 - // ValueExpr expr = spatialAggregates.get(name); 66.330 - // 66.331 - // 66.332 - // //the names are no longer the same 66.333 - // Geometry geom = spatialAggregatesResult.get(spatialAggregates.get(name)); 66.334 - // StrabonPolyhedron poly = null; 66.335 - // try { 66.336 - // poly = new StrabonPolyhedron(geom); 66.337 - // } catch (Exception e) { 66.338 - // e.printStackTrace(); 66.339 - // } 66.340 - // sol.setBinding(name,poly); 66.341 - // 66.342 - // } 66.343 - 66.344 - for(String name : spatialAggregates.keySet()) 66.345 - { 66.346 - //Must compute the spatial construct at this point 66.347 - ValueExpr expr = spatialAggregates.get(name); 66.348 - 66.349 - Value val = null; 66.350 - try { 66.351 - val = evaluateConstruct(expr, this.prototype); 66.352 - } catch (Exception e) { 66.353 - e.printStackTrace(); 66.354 - } 66.355 - if (val != null) { 66.356 - if(val instanceof StrabonPolyhedron) 66.357 - { 66.358 - String label = val.toString()+";http://www.opengis.net/def/crs/EPSG/0/"+((StrabonPolyhedron)val).getGeometry().getSRID(); 66.359 - Literal wkt = new LiteralImpl(label,new URIImpl(GeoConstants.WKT)); 66.360 - sol.setBinding(name,wkt); 66.361 - } 66.362 - else 66.363 - { 66.364 - sol.setBinding(name, val); 66.365 - } 66.366 - } 66.367 - 66.368 - } 66.369 - 66.370 - 66.371 - 66.372 - 66.373 - } 66.374 - 66.375 - /** 66.376 - * XXX addition 66.377 - */ 66.378 - 66.379 - /** 66.380 - * Code added in order to evaluate spatial constructs present in select that contain a spatial aggregate (e.g. Union(?geo1)) 66.381 - * @param expr a spatial construct or a spatial var 66.382 - * @param prototype the bindings needed to retrieve values for the Vars 66.383 - * @return The evaluated stSPARQL construct 66.384 - * @throws Exception 66.385 - */ 66.386 - private Value evaluateConstruct(ValueExpr expr, BindingSet prototype) throws Exception 66.387 - { 66.388 - if(prototype instanceof EmptyBindingSet) 66.389 - { 66.390 - return null; 66.391 - } 66.392 - if(expr instanceof FunctionCall) 66.393 - { 66.394 - StrabonPolyhedron leftArg = null; 66.395 - StrabonPolyhedron rightArg = null; 66.396 - 66.397 - Function function = FunctionRegistry.getInstance().get(((FunctionCall) expr).getURI()); 66.398 - 66.399 - if(function instanceof UnionFunc) 66.400 - { 66.401 - if(((FunctionCall) expr).getArgs().size()==1) 66.402 - { 66.403 - //Aggregate!!! => Value ready in spatialAggregatesResults 66.404 - return new StrabonPolyhedron(spatialAggregatesResult.get(expr)); 66.405 - } 66.406 - else 66.407 - { 66.408 - leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype); 66.409 - rightArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(1),prototype); 66.410 - return StrabonPolyhedron.union(leftArg, rightArg); 66.411 - } 66.412 - } 66.413 - else if(function instanceof ExtentFunc) 66.414 - { 66.415 - //Aggregate!!! => Value ready in spatialAggregatesResults 66.416 - return new StrabonPolyhedron(spatialAggregatesResult.get(expr)); 66.417 - } 66.418 - else if(function instanceof BufferFunc) 66.419 - { 66.420 - //FIXME Still haven't run example when 2nd argument is a Var 66.421 - leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype); 66.422 - Value radius = strategy.evaluate(((FunctionCall) expr).getArgs().get(1),prototype); 66.423 - LiteralImpl lit = (LiteralImpl) radius; 66.424 - return StrabonPolyhedron.buffer(leftArg,lit.doubleValue()); 66.425 - } 66.426 - else if(function instanceof TransformFunc) 66.427 - { 66.428 - leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype); 66.429 - Value sridCoarse = strategy.evaluate(((FunctionCall) expr).getArgs().get(1),prototype); 66.430 - URIImpl srid = (URIImpl) sridCoarse; 66.431 - return StrabonPolyhedron.transform(leftArg,srid); 66.432 - } 66.433 - else if(function instanceof EnvelopeFunc) 66.434 - { 66.435 - leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype); 66.436 - return StrabonPolyhedron.envelope(leftArg); 66.437 - } 66.438 - else if(function instanceof ConvexHullFunc) 66.439 - { 66.440 - leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype); 66.441 - return StrabonPolyhedron.convexHull(leftArg); 66.442 - } 66.443 - else if(function instanceof BoundaryFunc) 66.444 - { 66.445 - leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype); 66.446 - return StrabonPolyhedron.boundary(leftArg); 66.447 - } 66.448 - else if(function instanceof IntersectionFunc) 66.449 - { 66.450 - leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype); 66.451 - rightArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(1),prototype); 66.452 - return StrabonPolyhedron.intersection(leftArg, rightArg); 66.453 - } 66.454 - else if(function instanceof DifferenceFunc) 66.455 - { 66.456 - leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype); 66.457 - rightArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(1),prototype); 66.458 - return StrabonPolyhedron.difference(leftArg, rightArg); 66.459 - } 66.460 - else if(function instanceof SymDifferenceFunc) 66.461 - { 66.462 - leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype); 66.463 - rightArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(1),prototype); 66.464 - return StrabonPolyhedron.symDifference(leftArg, rightArg); 66.465 - } 66.466 - //FOR HAVING!! 66.467 - else if(function instanceof AreaFunc) 66.468 - { 66.469 - leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype); 66.470 - return vf.createLiteral(""+StrabonPolyhedron.area(leftArg), XMLSchema.DOUBLE); 66.471 - } 66.472 - else if(function instanceof DistanceFunc) 66.473 - { 66.474 - leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype); 66.475 - rightArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(1),prototype); 66.476 - return vf.createLiteral(""+StrabonPolyhedron.distance(leftArg, rightArg), XMLSchema.DOUBLE); 66.477 - } 66.478 - else 66.479 - { 66.480 - throw new Exception("Function "+function.getURI().toString()+" not currently supported"); 66.481 - } 66.482 - 66.483 - } 66.484 - else if(expr instanceof Var) 66.485 - { 66.486 - // Value tmp = prototype.getValue(((Var) expr).getName().replace("?spatial","")); 66.487 - // return tmp.; 66.488 - Var tmp = (Var) expr; 66.489 - if(tmp.getName().contains("?spatial")) 66.490 - { 66.491 - tmp.setName(tmp.getName().replace("?spatial","?forGroupBy")); 66.492 - } 66.493 - else 66.494 - { 66.495 - tmp.setName(tmp.getName()+"?forGroupBy"); 66.496 - } 66.497 - return strategy.evaluate(tmp,prototype); 66.498 - } 66.499 - else 66.500 - { 66.501 - throw new Exception("Functionality required for this aggregate not currently included"); 66.502 - } 66.503 - 66.504 - } 66.505 - 66.506 - private void processSpatialAggregate(FunctionCall fc, BindingSet bindingSet) 66.507 - { 66.508 - computeAggregateFunctions(fc, bindingSet); 66.509 - } 66.510 - 66.511 - //Currently: Either Union OR Extent 66.512 - private void computeAggregateFunctions(ValueExpr expr, BindingSet bindingSet) 66.513 - { 66.514 - if(expr instanceof FunctionCall) 66.515 - { 66.516 - Function function = FunctionRegistry.getInstance().get(((FunctionCall) expr).getURI()); 66.517 - boolean condition = ((!(function instanceof UnionFunc) || !(((FunctionCall) expr).getArgs().size()==1)) 66.518 - &&!(function instanceof ExtentFunc)); 66.519 - if(condition) 66.520 - { 66.521 - //Recursively check arguments 66.522 - for(int i = 0 ; i< ((FunctionCall) expr).getArgs().size(); i++) 66.523 - { 66.524 - computeAggregateFunctions(((FunctionCall) expr).getArgs().get(i), bindingSet); 66.525 - } 66.526 - } 66.527 - else 66.528 - { 66.529 - //Need to compute spatial aggregate 66.530 - //Will add result to spatialAggregatesResult and utilize it when the spatialAggregates are iterated 66.531 - 66.532 - ValueExpr onlyArg = ((FunctionCall) expr).getArgs().get(0); 66.533 - Value val = null; 66.534 - StrabonPolyhedron poly = null; 66.535 - if(onlyArg instanceof Var) 66.536 - { 66.537 - try { 66.538 - String previousName = ((Var) onlyArg).getName(); 66.539 - Var copy = (Var) onlyArg.clone(); 66.540 - if(previousName.contains("?spatial")) 66.541 - { 66.542 - copy.setName(previousName.replace("?spatial","?forGroupBy")); 66.543 - } 66.544 - else 66.545 - { 66.546 - copy.setName(previousName+"?forGroupBy"); 66.547 - } 66.548 - val = strategy.evaluate(copy,bindingSet); 66.549 - } catch (ValueExprEvaluationException e) { 66.550 - e.printStackTrace(); 66.551 - } catch (QueryEvaluationException e) { 66.552 - e.printStackTrace(); 66.553 - } 66.554 - } 66.555 - else //FunctionCall again 66.556 - { 66.557 - try { 66.558 - val = strategy.evaluate(onlyArg, bindingSet); 66.559 - 66.560 - } catch (ValueExprEvaluationException e) { 66.561 - e.printStackTrace(); 66.562 - } catch (QueryEvaluationException e) { 66.563 - e.printStackTrace(); 66.564 - } 66.565 - } 66.566 - poly = (StrabonPolyhedron) val; 66.567 - Geometry aggr = this.spatialAggregatesResult.get(expr); 66.568 - if(aggr==null) 66.569 - { 66.570 - 66.571 - if(function instanceof UnionFunc) 66.572 - { 66.573 - this.spatialAggregatesResult.put((FunctionCall) expr, poly.getGeometry()); 66.574 - } 66.575 - else if(function instanceof ExtentFunc) 66.576 - { 66.577 - Geometry env = poly.getGeometry().getEnvelope(); 66.578 - env.setSRID(poly.getGeometry().getSRID()); 66.579 - this.spatialAggregatesResult.put((FunctionCall) expr, env); 66.580 - } 66.581 - } 66.582 - else 66.583 - { 66.584 - this.spatialAggregatesResult.remove(expr); 66.585 - if(function instanceof UnionFunc) 66.586 - { 66.587 - //XXX possible issue with expressions like 66.588 - // ?x hasGeom sth^^4326 66.589 - // ?x hasGeom sthElse^^2100 66.590 - Geometry united = aggr.union(poly.getGeometry()); 66.591 - united.setSRID(poly.getGeometry().getSRID()); 66.592 - this.spatialAggregatesResult.put((FunctionCall) expr, united); 66.593 - } 66.594 - else if(function instanceof ExtentFunc) 66.595 - { 66.596 - //XXX possible issue with expressions like 66.597 - // ?x hasGeom sth^^4326 66.598 - // ?x hasGeom sthElse^^2100 66.599 - Geometry env = aggr.union(poly.getGeometry().getEnvelope()).getEnvelope(); 66.600 - env.setSRID(poly.getGeometry().getSRID()); 66.601 - this.spatialAggregatesResult.put((FunctionCall) expr, env); 66.602 - } 66.603 - } 66.604 - } 66.605 - } 66.606 - else //Var 66.607 - { 66.608 - return; 66.609 - } 66.610 - } 66.611 - 66.612 - 66.613 - 66.614 - /** 66.615 - * XXX 24/11/11 66.616 - * Keeping a backup before altering code in order to support nested strdf:union expressions 66.617 - */ 66.618 - // private void processSpatialAggregate(FunctionCall fc, BindingSet bindingSet) 66.619 - // { 66.620 - // ValueExpr expr = fc.getArgs().get(0); 66.621 - // Value val = null; 66.622 - // StrabonPolyhedron poly = null; 66.623 - // if(expr instanceof Var) 66.624 - // { 66.625 - // try { 66.626 - // String previousName = ((Var) expr).getName(); 66.627 - // Var copy = (Var) expr.clone(); 66.628 - //// copy.setName(previousName.replace("?spatial","?forGroupBy")); 66.629 - // if(previousName.contains("?spatial")) 66.630 - // { 66.631 - // copy.setName(previousName.replace("?spatial","?forGroupBy")); 66.632 - // } 66.633 - // else 66.634 - // { 66.635 - // copy.setName(previousName+"?forGroupBy"); 66.636 - // } 66.637 - // //((Var) expr).setName(previousName.replace("?spatial","?forGroupBy")); 66.638 - // 66.639 - // val = strategy.evaluate(copy,bindingSet); 66.640 - // //poly = (StrabonPolyhedron) val; 66.641 - // } catch (ValueExprEvaluationException e) { 66.642 - // e.printStackTrace(); 66.643 - // } catch (QueryEvaluationException e) { 66.644 - // e.printStackTrace(); 66.645 - // } 66.646 - // 66.647 - // } 66.648 - // else //FunctionCall again 66.649 - // { 66.650 - // try { 66.651 - // val = strategy.evaluate(expr, bindingSet); 66.652 - // 66.653 - // } catch (ValueExprEvaluationException e) { 66.654 - // e.printStackTrace(); 66.655 - // } catch (QueryEvaluationException e) { 66.656 - // e.printStackTrace(); 66.657 - // } 66.658 - // } 66.659 - // poly = (StrabonPolyhedron) val; 66.660 - // Geometry aggr = this.spatialAggregatesResult.get(fc); 66.661 - // if(aggr==null) 66.662 - // { 66.663 - // this.spatialAggregatesResult.put(fc, poly.getGeometry()); 66.664 - // } 66.665 - // else 66.666 - // { 66.667 - // this.spatialAggregatesResult.remove(fc); 66.668 - // this.spatialAggregatesResult.put(fc, aggr.union(poly.getGeometry())); 66.669 - // //aggr.union(poly.getGeometry()); 66.670 - // } 66.671 - // //System.out.println("placeholder"); 66.672 - // 66.673 - // } 66.674 - 66.675 - private Aggregate create(AggregateOperator operator) 66.676 - throws ValueExprEvaluationException, QueryEvaluationException 66.677 - { 66.678 - if (operator instanceof Count) { 66.679 - return new CountAggregate((Count)operator); 66.680 - } 66.681 - else if (operator instanceof Min) { 66.682 - return new MinAggregate((Min)operator); 66.683 - } 66.684 - else if (operator instanceof Max) { 66.685 - return new MaxAggregate((Max)operator); 66.686 - } 66.687 - else if (operator instanceof Sum) { 66.688 - return new SumAggregate((Sum)operator); 66.689 - } 66.690 - else if (operator instanceof Avg) { 66.691 - return new AvgAggregate((Avg)operator); 66.692 - } 66.693 - else if (operator instanceof Sample) { 66.694 - return new SampleAggregate((Sample)operator); 66.695 - } 66.696 - else if (operator instanceof GroupConcat) { 66.697 - return new ConcatAggregate((GroupConcat)operator); 66.698 - } 66.699 - return null; 66.700 - } 66.701 - } 66.702 - 66.703 - private abstract class Aggregate { 66.704 - 66.705 - private final Set<Value> distinct; 66.706 - 66.707 - private final ValueExpr arg; 66.708 - 66.709 - public Aggregate(AggregateOperatorBase operator) { 66.710 - this.arg = operator.getArg(); 66.711 - if (operator.isDistinct()) { 66.712 - distinct = new HashSet<Value>(); 66.713 - } 66.714 - else { 66.715 - distinct = null; 66.716 - } 66.717 - } 66.718 - 66.719 - public abstract Value getValue() 66.720 - throws ValueExprEvaluationException; 66.721 - 66.722 - public abstract void processAggregate(BindingSet bindingSet) 66.723 - throws QueryEvaluationException; 66.724 - 66.725 - protected boolean distinct(Value value) { 66.726 - return distinct == null || distinct.add(value); 66.727 - } 66.728 - 66.729 - protected ValueExpr getArg() { 66.730 - return arg; 66.731 - } 66.732 - 66.733 - protected Value evaluate(BindingSet s) 66.734 - throws QueryEvaluationException 66.735 - { 66.736 - try { 66.737 - return strategy.evaluate(getArg(), s); 66.738 - } 66.739 - catch (ValueExprEvaluationException e) { 66.740 - return null; // treat missing or invalid expressions as null 66.741 - } 66.742 - } 66.743 - } 66.744 - 66.745 - private class CountAggregate extends Aggregate { 66.746 - 66.747 - private long count = 0; 66.748 - 66.749 - public CountAggregate(Count operator) { 66.750 - super(operator); 66.751 - } 66.752 - 66.753 - @Override 66.754 - public void processAggregate(BindingSet s) 66.755 - throws QueryEvaluationException 66.756 - { 66.757 - if (getArg() != null) { 66.758 - Value value = evaluate(s); 66.759 - if (value != null && distinct(value)) { 66.760 - count++; 66.761 - } 66.762 - } 66.763 - else { 66.764 - count++; 66.765 - } 66.766 - } 66.767 - 66.768 - @Override 66.769 - public Value getValue() { 66.770 - return vf.createLiteral(Long.toString(count), XMLSchema.INTEGER); 66.771 - } 66.772 - } 66.773 - 66.774 - private class MinAggregate extends Aggregate { 66.775 - 66.776 - private final ValueComparator comparator = new ValueComparator(); 66.777 - 66.778 - private Value min = null; 66.779 - 66.780 - public MinAggregate(Min operator) { 66.781 - super(operator); 66.782 - } 66.783 - 66.784 - @Override 66.785 - public void processAggregate(BindingSet s) 66.786 - throws QueryEvaluationException 66.787 - { 66.788 - Value v = evaluate(s); 66.789 - if (distinct(v)) { 66.790 - if (min == null) { 66.791 - min = v; 66.792 - } 66.793 - else if (comparator.compare(v, min) < 0) { 66.794 - min = v; 66.795 - } 66.796 - } 66.797 - } 66.798 - 66.799 - @Override 66.800 - public Value getValue() { 66.801 - return min; 66.802 - } 66.803 - } 66.804 - 66.805 - private class MaxAggregate extends Aggregate { 66.806 - 66.807 - private final ValueComparator comparator = new ValueComparator(); 66.808 - 66.809 - private Value max = null; 66.810 - 66.811 - public MaxAggregate(Max operator) { 66.812 - super(operator); 66.813 - } 66.814 - 66.815 - @Override 66.816 - public void processAggregate(BindingSet s) 66.817 - throws QueryEvaluationException 66.818 - { 66.819 - Value v = evaluate(s); 66.820 - if (distinct(v)) { 66.821 - if (max == null) { 66.822 - max = v; 66.823 - } 66.824 - else if (comparator.compare(v, max) > 0) { 66.825 - max = v; 66.826 - } 66.827 - } 66.828 - } 66.829 - 66.830 - @Override 66.831 - public Value getValue() { 66.832 - return max; 66.833 - } 66.834 - } 66.835 - 66.836 - private class SumAggregate extends Aggregate { 66.837 - 66.838 - private Literal sum = vf.createLiteral("0", XMLSchema.INTEGER); 66.839 - 66.840 - private ValueExprEvaluationException typeError = null; 66.841 - 66.842 - public SumAggregate(Sum operator) { 66.843 - super(operator); 66.844 - } 66.845 - 66.846 - @Override 66.847 - public void processAggregate(BindingSet s) 66.848 - throws QueryEvaluationException 66.849 - { 66.850 - if (typeError != null) { 66.851 - // halt further processing if a type error has been raised 66.852 - return; 66.853 - } 66.854 - 66.855 - Value v = evaluate(s); 66.856 - if (distinct(v)) { 66.857 - if (v instanceof Literal) { 66.858 - Literal nextLiteral = (Literal)v; 66.859 - // check if the literal is numeric, if not, skip it. This is 66.860 - // strictly speaking not spec-compliant, but a whole lot more 66.861 - // useful. 66.862 - if (nextLiteral.getDatatype() != null 66.863 - && XMLDatatypeUtil.isNumericDatatype(nextLiteral.getDatatype())) 66.864 - { 66.865 - sum = MathUtil.compute(sum, nextLiteral, MathOp.PLUS); 66.866 - } 66.867 - } 66.868 - else if (v != null) { 66.869 - typeError = new ValueExprEvaluationException("not a number: " + v); 66.870 - } 66.871 - } 66.872 - } 66.873 - 66.874 - @Override 66.875 - public Value getValue() 66.876 - throws ValueExprEvaluationException 66.877 - { 66.878 - if (typeError != null) { 66.879 - throw typeError; 66.880 - } 66.881 - 66.882 - return sum; 66.883 - } 66.884 - } 66.885 - 66.886 - private class AvgAggregate extends Aggregate { 66.887 - 66.888 - private long count = 0; 66.889 - 66.890 - private Literal sum = vf.createLiteral("0", XMLSchema.INTEGER); 66.891 - 66.892 - private ValueExprEvaluationException typeError = null; 66.893 - 66.894 - public AvgAggregate(Avg operator) { 66.895 - super(operator); 66.896 - } 66.897 - 66.898 - @Override 66.899 - public void processAggregate(BindingSet s) 66.900 - throws QueryEvaluationException 66.901 - { 66.902 - if (typeError != null) { 66.903 - // Prevent calculating the aggregate further if a type error has 66.904 - // occured. 66.905 - return; 66.906 - } 66.907 - 66.908 - Value v = evaluate(s); 66.909 - if (distinct(v)) { 66.910 - if (v instanceof Literal) { 66.911 - Literal nextLiteral = (Literal)v; 66.912 - // check if the literal is numeric, if not, skip it. This is 66.913 - // strictly speaking not spec-compliant, but a whole lot more 66.914 - // useful. 66.915 - if (nextLiteral.getDatatype() != null 66.916 - && XMLDatatypeUtil.isNumericDatatype(nextLiteral.getDatatype())) 66.917 - { 66.918 - sum = MathUtil.compute(sum, nextLiteral, MathOp.PLUS); 66.919 - } 66.920 - count++; 66.921 - } 66.922 - else if (v != null) { 66.923 - // we do not actually throw the exception yet, but record it and 66.924 - // stop further processing. The exception will be thrown when 66.925 - // getValue() is invoked. 66.926 - typeError = new ValueExprEvaluationException("not a number: " + v); 66.927 - } 66.928 - } 66.929 - } 66.930 - 66.931 - @Override 66.932 - public Value getValue() 66.933 - throws ValueExprEvaluationException 66.934 - { 66.935 - if (typeError != null) { 66.936 - // a type error occurred while processing the aggregate, throw it 66.937 - // now. 66.938 - throw typeError; 66.939 - } 66.940 - 66.941 - if (count == 0) { 66.942 - return vf.createLiteral(0.0d); 66.943 - } 66.944 - 66.945 - Literal sizeLit = vf.createLiteral(count); 66.946 - return MathUtil.compute(sum, sizeLit, MathOp.DIVIDE); 66.947 - } 66.948 - } 66.949 - 66.950 - private class SampleAggregate extends Aggregate { 66.951 - 66.952 - private Value sample = null; 66.953 - 66.954 - public SampleAggregate(Sample operator) { 66.955 - super(operator); 66.956 - } 66.957 - 66.958 - @Override 66.959 - public void processAggregate(BindingSet s) 66.960 - throws QueryEvaluationException 66.961 - { 66.962 - if (sample == null) { 66.963 - sample = evaluate(s); 66.964 - } 66.965 - } 66.966 - 66.967 - @Override 66.968 - public Value getValue() { 66.969 - return sample; 66.970 - } 66.971 - } 66.972 - 66.973 - private class ConcatAggregate extends Aggregate { 66.974 - 66.975 - private StringBuilder concatenated = new StringBuilder(); 66.976 - 66.977 - private String separator = " "; 66.978 - 66.979 - public ConcatAggregate(GroupConcat groupConcatOp) 66.980 - throws ValueExprEvaluationException, QueryEvaluationException 66.981 - { 66.982 - super(groupConcatOp); 66.983 - ValueExpr separatorExpr = groupConcatOp.getSeparator(); 66.984 - if (separatorExpr != null) { 66.985 - Value separatorValue = strategy.evaluate(separatorExpr, parentBindings); 66.986 - separator = separatorValue.stringValue(); 66.987 - } 66.988 - } 66.989 - 66.990 - @Override 66.991 - public void processAggregate(BindingSet s) 66.992 - throws QueryEvaluationException 66.993 - { 66.994 - Value v = evaluate(s); 66.995 - if (v != null && distinct(v)) { 66.996 - concatenated.append(v.stringValue()); 66.997 - concatenated.append(separator); 66.998 - } 66.999 - } 66.1000 - 66.1001 - @Override 66.1002 - public Value getValue() { 66.1003 - if (concatenated.length() == 0) { 66.1004 - return vf.createLiteral(""); 66.1005 - } 66.1006 - 66.1007 - // remove separator at the end. 66.1008 - int len = concatenated.length() - separator.length(); 66.1009 - return vf.createLiteral(concatenated.substring(0, len)); 66.1010 - } 66.1011 - } 66.1012 - 66.1013 +/* 66.1014 + * Copyright Aduna (http://www.aduna-software.com/) (c) 1997-2007. 66.1015 + * 66.1016 + * Licensed under the Aduna BSD-style license. 66.1017 + */ 66.1018 +package org.openrdf.query.algebra.evaluation.iterator; 66.1019 + 66.1020 +import info.aduna.iteration.CloseableIteration; 66.1021 +import info.aduna.iteration.CloseableIteratorIteration; 66.1022 +import info.aduna.lang.ObjectUtil; 66.1023 + 66.1024 +import java.util.Collection; 66.1025 +import java.util.HashSet; 66.1026 +import java.util.Iterator; 66.1027 +import java.util.LinkedHashMap; 66.1028 +import java.util.LinkedList; 66.1029 +import java.util.Map; 66.1030 +import java.util.NoSuchElementException; 66.1031 +import java.util.Set; 66.1032 + 66.1033 +import org.openrdf.model.Literal; 66.1034 +import org.openrdf.model.Value; 66.1035 +import org.openrdf.model.datatypes.XMLDatatypeUtil; 66.1036 +import org.openrdf.model.impl.LiteralImpl; 66.1037 +import org.openrdf.model.impl.URIImpl; 66.1038 +import org.openrdf.model.impl.ValueFactoryImpl; 66.1039 +import org.openrdf.model.vocabulary.XMLSchema; 66.1040 +import org.openrdf.query.BindingSet; 66.1041 +import org.openrdf.query.QueryEvaluationException; 66.1042 +import org.openrdf.query.algebra.AggregateOperator; 66.1043 +import org.openrdf.query.algebra.AggregateOperatorBase; 66.1044 +import org.openrdf.query.algebra.Avg; 66.1045 +import org.openrdf.query.algebra.Compare; 66.1046 +import org.openrdf.query.algebra.Count; 66.1047 +import org.openrdf.query.algebra.FunctionCall; 66.1048 +import org.openrdf.query.algebra.Group; 66.1049 +import org.openrdf.query.algebra.GroupConcat; 66.1050 +import org.openrdf.query.algebra.GroupElem; 66.1051 +import org.openrdf.query.algebra.MathExpr.MathOp; 66.1052 +import org.openrdf.query.algebra.Max; 66.1053 +import org.openrdf.query.algebra.Min; 66.1054 +import org.openrdf.query.algebra.Sample; 66.1055 +import org.openrdf.query.algebra.Sum; 66.1056 +import org.openrdf.query.algebra.ValueExpr; 66.1057 +import org.openrdf.query.algebra.Var; 66.1058 +import org.openrdf.query.algebra.evaluation.EvaluationStrategy; 66.1059 +import org.openrdf.query.algebra.evaluation.QueryBindingSet; 66.1060 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException; 66.1061 +import org.openrdf.query.algebra.evaluation.function.Function; 66.1062 +import org.openrdf.query.algebra.evaluation.function.FunctionRegistry; 66.1063 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 66.1064 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 66.1065 +import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.aggregate.ExtentFunc; 66.1066 +import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.BoundaryFunc; 66.1067 +import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.BufferFunc; 66.1068 +import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.ConvexHullFunc; 66.1069 +import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.DifferenceFunc; 66.1070 +import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.EnvelopeFunc; 66.1071 +import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.IntersectionFunc; 66.1072 +import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.SymDifferenceFunc; 66.1073 +import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.TransformFunc; 66.1074 +import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.UnionFunc; 66.1075 +import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric.AreaFunc; 66.1076 +import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric.DistanceFunc; 66.1077 +import org.openrdf.query.algebra.evaluation.util.MathUtil; 66.1078 +import org.openrdf.query.algebra.evaluation.util.ValueComparator; 66.1079 +import org.openrdf.query.impl.EmptyBindingSet; 66.1080 + 66.1081 +import com.vividsolutions.jts.geom.Geometry; 66.1082 + 66.1083 +/** 66.1084 + * 66.1085 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 66.1086 + */ 66.1087 +public class StSPARQLGroupIterator extends CloseableIteratorIteration<BindingSet, QueryEvaluationException> { 66.1088 + 66.1089 + /*-----------* 66.1090 + * Constants * 66.1091 + *-----------*/ 66.1092 + 66.1093 + private final ValueFactoryImpl vf = ValueFactoryImpl.getInstance(); 66.1094 + 66.1095 + private final EvaluationStrategy strategy; 66.1096 + 66.1097 + private final BindingSet parentBindings; 66.1098 + 66.1099 + private final Group group; 66.1100 + 66.1101 + /*--------------* 66.1102 + * Constructors * 66.1103 + *--------------*/ 66.1104 + 66.1105 + public StSPARQLGroupIterator(EvaluationStrategy strategy, Group group, BindingSet parentBindings) 66.1106 + throws QueryEvaluationException 66.1107 + { 66.1108 + this.strategy = strategy; 66.1109 + this.group = group; 66.1110 + this.parentBindings = parentBindings; 66.1111 + super.setIterator(createIterator()); 66.1112 + } 66.1113 + 66.1114 + /*---------* 66.1115 + * Methods * 66.1116 + *---------*/ 66.1117 + 66.1118 + private Iterator<BindingSet> createIterator() 66.1119 + throws QueryEvaluationException 66.1120 + { 66.1121 + Collection<Entry> entries = buildEntries(); 66.1122 + Collection<BindingSet> bindingSets = new LinkedList<BindingSet>(); 66.1123 + 66.1124 + for (Entry entry : entries) { 66.1125 + QueryBindingSet sol = new QueryBindingSet(parentBindings); 66.1126 + 66.1127 + for (String name : group.getGroupBindingNames()) { 66.1128 + BindingSet prototype = entry.getPrototype(); 66.1129 + if (prototype != null) { 66.1130 + Value value = prototype.getValue(name); 66.1131 + if (value != null) { 66.1132 + // Potentially overwrites bindings from super 66.1133 + sol.setBinding(name, value); 66.1134 + } 66.1135 + } 66.1136 + } 66.1137 + //XXX added bindings to enable the evaluation of order by!! 66.1138 + //Must probably find a way to remove them afterwards!! 66.1139 + for(String name : entry.getPrototype().getBindingNames()) 66.1140 + { 66.1141 + if(name.startsWith("-mbb-")) 66.1142 + { 66.1143 + sol.setBinding(name,entry.getPrototype().getValue(name)); 66.1144 + } 66.1145 + } 66.1146 + 66.1147 + entry.bindSolution(sol); 66.1148 + 66.1149 + bindingSets.add(sol); 66.1150 + } 66.1151 + 66.1152 + return bindingSets.iterator(); 66.1153 + } 66.1154 + 66.1155 + private Collection<Entry> buildEntries() 66.1156 + throws QueryEvaluationException 66.1157 + { 66.1158 + CloseableIteration<BindingSet, QueryEvaluationException> iter; 66.1159 + iter = strategy.evaluate(group.getArg(), parentBindings); 66.1160 + 66.1161 + try { 66.1162 + Map<Key, Entry> entries = new LinkedHashMap<Key, Entry>(); 66.1163 + 66.1164 + if (!iter.hasNext()) { 66.1165 + // no solutions, still need to process aggregates to produce a 66.1166 + // zero-result. 66.1167 + entries.put(new Key(new EmptyBindingSet()), new Entry(new EmptyBindingSet())); 66.1168 + } 66.1169 + 66.1170 + while (iter.hasNext()) { 66.1171 + BindingSet sol; 66.1172 + try { 66.1173 + sol = iter.next(); 66.1174 + } 66.1175 + catch (NoSuchElementException e) { 66.1176 + break; // closed 66.1177 + } 66.1178 + Key key = new Key(sol); 66.1179 + Entry entry = entries.get(key); 66.1180 + 66.1181 + if (entry == null) { 66.1182 + entry = new Entry(sol); 66.1183 + entries.put(key, entry); 66.1184 + } 66.1185 + 66.1186 + entry.addSolution(sol); 66.1187 + } 66.1188 + 66.1189 + return entries.values(); 66.1190 + } 66.1191 + finally { 66.1192 + iter.close(); 66.1193 + } 66.1194 + 66.1195 + } 66.1196 + 66.1197 + /** 66.1198 + * A unique key for a set of existing bindings. 66.1199 + * 66.1200 + * @author David Huynh 66.1201 + */ 66.1202 + protected class Key { 66.1203 + 66.1204 + private BindingSet bindingSet; 66.1205 + 66.1206 + private int hash; 66.1207 + 66.1208 + public Key(BindingSet bindingSet) { 66.1209 + this.bindingSet = bindingSet; 66.1210 + 66.1211 + for (String name : group.getGroupBindingNames()) { 66.1212 + Value value = bindingSet.getValue(name); 66.1213 + if (value != null) { 66.1214 + this.hash ^= value.hashCode(); 66.1215 + } 66.1216 + } 66.1217 + } 66.1218 + 66.1219 + @Override 66.1220 + public int hashCode() { 66.1221 + return hash; 66.1222 + } 66.1223 + 66.1224 + @Override 66.1225 + public boolean equals(Object other) { 66.1226 + if (other instanceof Key && other.hashCode() == hash) { 66.1227 + BindingSet otherSolution = ((Key)other).bindingSet; 66.1228 + 66.1229 + for (String name : group.getGroupBindingNames()) { 66.1230 + Value v1 = bindingSet.getValue(name); 66.1231 + Value v2 = otherSolution.getValue(name); 66.1232 + 66.1233 + if (!ObjectUtil.nullEquals(v1, v2)) { 66.1234 + return false; 66.1235 + } 66.1236 + } 66.1237 + 66.1238 + return true; 66.1239 + } 66.1240 + 66.1241 + return false; 66.1242 + } 66.1243 + } 66.1244 + 66.1245 + private class Entry { 66.1246 + 66.1247 + private BindingSet prototype; 66.1248 + 66.1249 + private Map<String, Aggregate> aggregates; 66.1250 + 66.1251 + private Map<String, FunctionCall> spatialAggregates; 66.1252 + 66.1253 + private Map<FunctionCall, Geometry> spatialAggregatesResult; 66.1254 + 66.1255 + public Entry(BindingSet prototype) 66.1256 + throws ValueExprEvaluationException, QueryEvaluationException 66.1257 + { 66.1258 + this.prototype = prototype; 66.1259 + this.aggregates = new LinkedHashMap<String, Aggregate>(); 66.1260 + this.spatialAggregates = new LinkedHashMap<String, FunctionCall>(); 66.1261 + this.spatialAggregatesResult = new LinkedHashMap<FunctionCall, Geometry>(); 66.1262 + 66.1263 + for (GroupElem ge : group.getGroupElements()) { 66.1264 + if(ge.getName().endsWith("-aggregateInside-")) 66.1265 + { 66.1266 + //System.out.println("Placeholder"); 66.1267 + String name = ge.getName(); 66.1268 + if(!ge.getName().startsWith("havingCondition")) 66.1269 + { 66.1270 + name = name.replace("-aggregateInside-",""); 66.1271 + } 66.1272 + if(((Avg) ge.getOperator()).getArg() instanceof FunctionCall) 66.1273 + { 66.1274 + spatialAggregates.put(name, (FunctionCall) ((Avg)ge.getOperator()).getArg()); 66.1275 + } 66.1276 + if(((Avg) ge.getOperator()).getArg() instanceof Compare) 66.1277 + { 66.1278 + // Compare tmp = (Compare) ((Avg) ge.getOperator()).getArg(); 66.1279 + // if(tmp.getLeftArg() instanceof FunctionCall) 66.1280 + // { 66.1281 + // 66.1282 + // } 66.1283 + // if(tmp.getRightArg() instanceof FunctionCall) 66.1284 + // { 66.1285 + // 66.1286 + // } 66.1287 + } 66.1288 + 66.1289 + } 66.1290 + else 66.1291 + { 66.1292 + Aggregate create = create(ge.getOperator()); 66.1293 + if (create != null) { 66.1294 + aggregates.put(ge.getName(), create); 66.1295 + } 66.1296 + } 66.1297 + } 66.1298 + } 66.1299 + 66.1300 + public BindingSet getPrototype() { 66.1301 + return prototype; 66.1302 + } 66.1303 + 66.1304 + public void addSolution(BindingSet bindingSet) 66.1305 + throws QueryEvaluationException 66.1306 + { 66.1307 + for (Aggregate aggregate : aggregates.values()) { 66.1308 + aggregate.processAggregate(bindingSet); 66.1309 + } 66.1310 + for (FunctionCall spatialAggregate : spatialAggregates.values()) { 66.1311 + processSpatialAggregate(spatialAggregate, bindingSet); 66.1312 + //spatialAggregates.processAggregate(bindingSet); 66.1313 + } 66.1314 + } 66.1315 + 66.1316 + public void bindSolution(QueryBindingSet sol) 66.1317 + throws QueryEvaluationException 66.1318 + { 66.1319 + for (String name : aggregates.keySet()) { 66.1320 + try { 66.1321 + Value value = aggregates.get(name).getValue(); 66.1322 + if (value != null) { 66.1323 + // Potentially overwrites bindings from super 66.1324 + sol.setBinding(name, value); 66.1325 + } 66.1326 + } 66.1327 + catch (ValueExprEvaluationException ex) { 66.1328 + // There was a type error when calculating the value of the 66.1329 + // aggregate. 66.1330 + // We silently ignore the error, resulting in no result value 66.1331 + // being bound. 66.1332 + } 66.1333 + } 66.1334 + 66.1335 + // for(String name : spatialAggregates.keySet()) 66.1336 + // { 66.1337 + // //Must compute the spatial construct at this point 66.1338 + // ValueExpr expr = spatialAggregates.get(name); 66.1339 + // 66.1340 + // 66.1341 + // //the names are no longer the same 66.1342 + // Geometry geom = spatialAggregatesResult.get(spatialAggregates.get(name)); 66.1343 + // StrabonPolyhedron poly = null; 66.1344 + // try { 66.1345 + // poly = new StrabonPolyhedron(geom); 66.1346 + // } catch (Exception e) { 66.1347 + // e.printStackTrace(); 66.1348 + // } 66.1349 + // sol.setBinding(name,poly); 66.1350 + // 66.1351 + // } 66.1352 + 66.1353 + for(String name : spatialAggregates.keySet()) 66.1354 + { 66.1355 + //Must compute the spatial construct at this point 66.1356 + ValueExpr expr = spatialAggregates.get(name); 66.1357 + 66.1358 + Value val = null; 66.1359 + try { 66.1360 + val = evaluateConstruct(expr, this.prototype); 66.1361 + } catch (Exception e) { 66.1362 + e.printStackTrace(); 66.1363 + } 66.1364 + if (val != null) { 66.1365 + if(val instanceof StrabonPolyhedron) 66.1366 + { 66.1367 + String label = val.toString()+";http://www.opengis.net/def/crs/EPSG/0/"+((StrabonPolyhedron)val).getGeometry().getSRID(); 66.1368 + Literal wkt = new LiteralImpl(label,new URIImpl(GeoConstants.WKT)); 66.1369 + sol.setBinding(name,wkt); 66.1370 + } 66.1371 + else 66.1372 + { 66.1373 + sol.setBinding(name, val); 66.1374 + } 66.1375 + } 66.1376 + 66.1377 + } 66.1378 + 66.1379 + 66.1380 + 66.1381 + 66.1382 + } 66.1383 + 66.1384 + /** 66.1385 + * XXX addition 66.1386 + */ 66.1387 + 66.1388 + /** 66.1389 + * Code added in order to evaluate spatial constructs present in select that contain a spatial aggregate (e.g. Union(?geo1)) 66.1390 + * @param expr a spatial construct or a spatial var 66.1391 + * @param prototype the bindings needed to retrieve values for the Vars 66.1392 + * @return The evaluated stSPARQL construct 66.1393 + * @throws Exception 66.1394 + */ 66.1395 + private Value evaluateConstruct(ValueExpr expr, BindingSet prototype) throws Exception 66.1396 + { 66.1397 + if(prototype instanceof EmptyBindingSet) 66.1398 + { 66.1399 + return null; 66.1400 + } 66.1401 + if(expr instanceof FunctionCall) 66.1402 + { 66.1403 + StrabonPolyhedron leftArg = null; 66.1404 + StrabonPolyhedron rightArg = null; 66.1405 + 66.1406 + Function function = FunctionRegistry.getInstance().get(((FunctionCall) expr).getURI()); 66.1407 + 66.1408 + if(function instanceof UnionFunc) 66.1409 + { 66.1410 + if(((FunctionCall) expr).getArgs().size()==1) 66.1411 + { 66.1412 + //Aggregate!!! => Value ready in spatialAggregatesResults 66.1413 + return new StrabonPolyhedron(spatialAggregatesResult.get(expr)); 66.1414 + } 66.1415 + else 66.1416 + { 66.1417 + leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype); 66.1418 + rightArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(1),prototype); 66.1419 + return StrabonPolyhedron.union(leftArg, rightArg); 66.1420 + } 66.1421 + } 66.1422 + else if(function instanceof ExtentFunc) 66.1423 + { 66.1424 + //Aggregate!!! => Value ready in spatialAggregatesResults 66.1425 + return new StrabonPolyhedron(spatialAggregatesResult.get(expr)); 66.1426 + } 66.1427 + else if(function instanceof BufferFunc) 66.1428 + { 66.1429 + //FIXME Still haven't run example when 2nd argument is a Var 66.1430 + leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype); 66.1431 + Value radius = strategy.evaluate(((FunctionCall) expr).getArgs().get(1),prototype); 66.1432 + LiteralImpl lit = (LiteralImpl) radius; 66.1433 + return StrabonPolyhedron.buffer(leftArg,lit.doubleValue()); 66.1434 + } 66.1435 + else if(function instanceof TransformFunc) 66.1436 + { 66.1437 + leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype); 66.1438 + Value sridCoarse = strategy.evaluate(((FunctionCall) expr).getArgs().get(1),prototype); 66.1439 + URIImpl srid = (URIImpl) sridCoarse; 66.1440 + return StrabonPolyhedron.transform(leftArg,srid); 66.1441 + } 66.1442 + else if(function instanceof EnvelopeFunc) 66.1443 + { 66.1444 + leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype); 66.1445 + return StrabonPolyhedron.envelope(leftArg); 66.1446 + } 66.1447 + else if(function instanceof ConvexHullFunc) 66.1448 + { 66.1449 + leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype); 66.1450 + return StrabonPolyhedron.convexHull(leftArg); 66.1451 + } 66.1452 + else if(function instanceof BoundaryFunc) 66.1453 + { 66.1454 + leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype); 66.1455 + return StrabonPolyhedron.boundary(leftArg); 66.1456 + } 66.1457 + else if(function instanceof IntersectionFunc) 66.1458 + { 66.1459 + leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype); 66.1460 + rightArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(1),prototype); 66.1461 + return StrabonPolyhedron.intersection(leftArg, rightArg); 66.1462 + } 66.1463 + else if(function instanceof DifferenceFunc) 66.1464 + { 66.1465 + leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype); 66.1466 + rightArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(1),prototype); 66.1467 + return StrabonPolyhedron.difference(leftArg, rightArg); 66.1468 + } 66.1469 + else if(function instanceof SymDifferenceFunc) 66.1470 + { 66.1471 + leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype); 66.1472 + rightArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(1),prototype); 66.1473 + return StrabonPolyhedron.symDifference(leftArg, rightArg); 66.1474 + } 66.1475 + //FOR HAVING!! 66.1476 + else if(function instanceof AreaFunc) 66.1477 + { 66.1478 + leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype); 66.1479 + return vf.createLiteral(""+StrabonPolyhedron.area(leftArg), XMLSchema.DOUBLE); 66.1480 + } 66.1481 + else if(function instanceof DistanceFunc) 66.1482 + { 66.1483 + leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype); 66.1484 + rightArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(1),prototype); 66.1485 + return vf.createLiteral(""+StrabonPolyhedron.distance(leftArg, rightArg), XMLSchema.DOUBLE); 66.1486 + } 66.1487 + else 66.1488 + { 66.1489 + throw new Exception("Function "+function.getURI().toString()+" not currently supported"); 66.1490 + } 66.1491 + 66.1492 + } 66.1493 + else if(expr instanceof Var) 66.1494 + { 66.1495 + // Value tmp = prototype.getValue(((Var) expr).getName().replace("?spatial","")); 66.1496 + // return tmp.; 66.1497 + Var tmp = (Var) expr; 66.1498 + if(tmp.getName().contains("?spatial")) 66.1499 + { 66.1500 + tmp.setName(tmp.getName().replace("?spatial","?forGroupBy")); 66.1501 + } 66.1502 + else 66.1503 + { 66.1504 + tmp.setName(tmp.getName()+"?forGroupBy"); 66.1505 + } 66.1506 + return strategy.evaluate(tmp,prototype); 66.1507 + } 66.1508 + else 66.1509 + { 66.1510 + throw new Exception("Functionality required for this aggregate not currently included"); 66.1511 + } 66.1512 + 66.1513 + } 66.1514 + 66.1515 + private void processSpatialAggregate(FunctionCall fc, BindingSet bindingSet) 66.1516 + { 66.1517 + computeAggregateFunctions(fc, bindingSet); 66.1518 + } 66.1519 + 66.1520 + //Currently: Either Union OR Extent 66.1521 + private void computeAggregateFunctions(ValueExpr expr, BindingSet bindingSet) 66.1522 + { 66.1523 + if(expr instanceof FunctionCall) 66.1524 + { 66.1525 + Function function = FunctionRegistry.getInstance().get(((FunctionCall) expr).getURI()); 66.1526 + boolean condition = ((!(function instanceof UnionFunc) || !(((FunctionCall) expr).getArgs().size()==1)) 66.1527 + &&!(function instanceof ExtentFunc)); 66.1528 + if(condition) 66.1529 + { 66.1530 + //Recursively check arguments 66.1531 + for(int i = 0 ; i< ((FunctionCall) expr).getArgs().size(); i++) 66.1532 + { 66.1533 + computeAggregateFunctions(((FunctionCall) expr).getArgs().get(i), bindingSet); 66.1534 + } 66.1535 + } 66.1536 + else 66.1537 + { 66.1538 + //Need to compute spatial aggregate 66.1539 + //Will add result to spatialAggregatesResult and utilize it when the spatialAggregates are iterated 66.1540 + 66.1541 + ValueExpr onlyArg = ((FunctionCall) expr).getArgs().get(0); 66.1542 + Value val = null; 66.1543 + StrabonPolyhedron poly = null; 66.1544 + if(onlyArg instanceof Var) 66.1545 + { 66.1546 + try { 66.1547 + String previousName = ((Var) onlyArg).getName(); 66.1548 + Var copy = (Var) onlyArg.clone(); 66.1549 + if(previousName.contains("?spatial")) 66.1550 + { 66.1551 + copy.setName(previousName.replace("?spatial","?forGroupBy")); 66.1552 + } 66.1553 + else 66.1554 + { 66.1555 + copy.setName(previousName+"?forGroupBy"); 66.1556 + } 66.1557 + val = strategy.evaluate(copy,bindingSet); 66.1558 + } catch (ValueExprEvaluationException e) { 66.1559 + e.printStackTrace(); 66.1560 + } catch (QueryEvaluationException e) { 66.1561 + e.printStackTrace(); 66.1562 + } 66.1563 + } 66.1564 + else //FunctionCall again 66.1565 + { 66.1566 + try { 66.1567 + val = strategy.evaluate(onlyArg, bindingSet); 66.1568 + 66.1569 + } catch (ValueExprEvaluationException e) { 66.1570 + e.printStackTrace(); 66.1571 + } catch (QueryEvaluationException e) { 66.1572 + e.printStackTrace(); 66.1573 + } 66.1574 + } 66.1575 + poly = (StrabonPolyhedron) val; 66.1576 + Geometry aggr = this.spatialAggregatesResult.get(expr); 66.1577 + if(aggr==null) 66.1578 + { 66.1579 + 66.1580 + if(function instanceof UnionFunc) 66.1581 + { 66.1582 + this.spatialAggregatesResult.put((FunctionCall) expr, poly.getGeometry()); 66.1583 + } 66.1584 + else if(function instanceof ExtentFunc) 66.1585 + { 66.1586 + Geometry env = poly.getGeometry().getEnvelope(); 66.1587 + env.setSRID(poly.getGeometry().getSRID()); 66.1588 + this.spatialAggregatesResult.put((FunctionCall) expr, env); 66.1589 + } 66.1590 + } 66.1591 + else 66.1592 + { 66.1593 + this.spatialAggregatesResult.remove(expr); 66.1594 + if(function instanceof UnionFunc) 66.1595 + { 66.1596 + //XXX possible issue with expressions like 66.1597 + // ?x hasGeom sth^^4326 66.1598 + // ?x hasGeom sthElse^^2100 66.1599 + Geometry united = aggr.union(poly.getGeometry()); 66.1600 + united.setSRID(poly.getGeometry().getSRID()); 66.1601 + this.spatialAggregatesResult.put((FunctionCall) expr, united); 66.1602 + } 66.1603 + else if(function instanceof ExtentFunc) 66.1604 + { 66.1605 + //XXX possible issue with expressions like 66.1606 + // ?x hasGeom sth^^4326 66.1607 + // ?x hasGeom sthElse^^2100 66.1608 + Geometry env = aggr.union(poly.getGeometry().getEnvelope()).getEnvelope(); 66.1609 + env.setSRID(poly.getGeometry().getSRID()); 66.1610 + this.spatialAggregatesResult.put((FunctionCall) expr, env); 66.1611 + } 66.1612 + } 66.1613 + } 66.1614 + } 66.1615 + else //Var 66.1616 + { 66.1617 + return; 66.1618 + } 66.1619 + } 66.1620 + 66.1621 + 66.1622 + 66.1623 + /** 66.1624 + * XXX 24/11/11 66.1625 + * Keeping a backup before altering code in order to support nested strdf:union expressions 66.1626 + */ 66.1627 + // private void processSpatialAggregate(FunctionCall fc, BindingSet bindingSet) 66.1628 + // { 66.1629 + // ValueExpr expr = fc.getArgs().get(0); 66.1630 + // Value val = null; 66.1631 + // StrabonPolyhedron poly = null; 66.1632 + // if(expr instanceof Var) 66.1633 + // { 66.1634 + // try { 66.1635 + // String previousName = ((Var) expr).getName(); 66.1636 + // Var copy = (Var) expr.clone(); 66.1637 + //// copy.setName(previousName.replace("?spatial","?forGroupBy")); 66.1638 + // if(previousName.contains("?spatial")) 66.1639 + // { 66.1640 + // copy.setName(previousName.replace("?spatial","?forGroupBy")); 66.1641 + // } 66.1642 + // else 66.1643 + // { 66.1644 + // copy.setName(previousName+"?forGroupBy"); 66.1645 + // } 66.1646 + // //((Var) expr).setName(previousName.replace("?spatial","?forGroupBy")); 66.1647 + // 66.1648 + // val = strategy.evaluate(copy,bindingSet); 66.1649 + // //poly = (StrabonPolyhedron) val; 66.1650 + // } catch (ValueExprEvaluationException e) { 66.1651 + // e.printStackTrace(); 66.1652 + // } catch (QueryEvaluationException e) { 66.1653 + // e.printStackTrace(); 66.1654 + // } 66.1655 + // 66.1656 + // } 66.1657 + // else //FunctionCall again 66.1658 + // { 66.1659 + // try { 66.1660 + // val = strategy.evaluate(expr, bindingSet); 66.1661 + // 66.1662 + // } catch (ValueExprEvaluationException e) { 66.1663 + // e.printStackTrace(); 66.1664 + // } catch (QueryEvaluationException e) { 66.1665 + // e.printStackTrace(); 66.1666 + // } 66.1667 + // } 66.1668 + // poly = (StrabonPolyhedron) val; 66.1669 + // Geometry aggr = this.spatialAggregatesResult.get(fc); 66.1670 + // if(aggr==null) 66.1671 + // { 66.1672 + // this.spatialAggregatesResult.put(fc, poly.getGeometry()); 66.1673 + // } 66.1674 + // else 66.1675 + // { 66.1676 + // this.spatialAggregatesResult.remove(fc); 66.1677 + // this.spatialAggregatesResult.put(fc, aggr.union(poly.getGeometry())); 66.1678 + // //aggr.union(poly.getGeometry()); 66.1679 + // } 66.1680 + // //System.out.println("placeholder"); 66.1681 + // 66.1682 + // } 66.1683 + 66.1684 + private Aggregate create(AggregateOperator operator) 66.1685 + throws ValueExprEvaluationException, QueryEvaluationException 66.1686 + { 66.1687 + if (operator instanceof Count) { 66.1688 + return new CountAggregate((Count)operator); 66.1689 + } 66.1690 + else if (operator instanceof Min) { 66.1691 + return new MinAggregate((Min)operator); 66.1692 + } 66.1693 + else if (operator instanceof Max) { 66.1694 + return new MaxAggregate((Max)operator); 66.1695 + } 66.1696 + else if (operator instanceof Sum) { 66.1697 + return new SumAggregate((Sum)operator); 66.1698 + } 66.1699 + else if (operator instanceof Avg) { 66.1700 + return new AvgAggregate((Avg)operator); 66.1701 + } 66.1702 + else if (operator instanceof Sample) { 66.1703 + return new SampleAggregate((Sample)operator); 66.1704 + } 66.1705 + else if (operator instanceof GroupConcat) { 66.1706 + return new ConcatAggregate((GroupConcat)operator); 66.1707 + } 66.1708 + return null; 66.1709 + } 66.1710 + } 66.1711 + 66.1712 + private abstract class Aggregate { 66.1713 + 66.1714 + private final Set<Value> distinct; 66.1715 + 66.1716 + private final ValueExpr arg; 66.1717 + 66.1718 + public Aggregate(AggregateOperatorBase operator) { 66.1719 + this.arg = operator.getArg(); 66.1720 + if (operator.isDistinct()) { 66.1721 + distinct = new HashSet<Value>(); 66.1722 + } 66.1723 + else { 66.1724 + distinct = null; 66.1725 + } 66.1726 + } 66.1727 + 66.1728 + public abstract Value getValue() 66.1729 + throws ValueExprEvaluationException; 66.1730 + 66.1731 + public abstract void processAggregate(BindingSet bindingSet) 66.1732 + throws QueryEvaluationException; 66.1733 + 66.1734 + protected boolean distinct(Value value) { 66.1735 + return distinct == null || distinct.add(value); 66.1736 + } 66.1737 + 66.1738 + protected ValueExpr getArg() { 66.1739 + return arg; 66.1740 + } 66.1741 + 66.1742 + protected Value evaluate(BindingSet s) 66.1743 + throws QueryEvaluationException 66.1744 + { 66.1745 + try { 66.1746 + return strategy.evaluate(getArg(), s); 66.1747 + } 66.1748 + catch (ValueExprEvaluationException e) { 66.1749 + return null; // treat missing or invalid expressions as null 66.1750 + } 66.1751 + } 66.1752 + } 66.1753 + 66.1754 + private class CountAggregate extends Aggregate { 66.1755 + 66.1756 + private long count = 0; 66.1757 + 66.1758 + public CountAggregate(Count operator) { 66.1759 + super(operator); 66.1760 + } 66.1761 + 66.1762 + @Override 66.1763 + public void processAggregate(BindingSet s) 66.1764 + throws QueryEvaluationException 66.1765 + { 66.1766 + if (getArg() != null) { 66.1767 + Value value = evaluate(s); 66.1768 + if (value != null && distinct(value)) { 66.1769 + count++; 66.1770 + } 66.1771 + } 66.1772 + else { 66.1773 + count++; 66.1774 + } 66.1775 + } 66.1776 + 66.1777 + @Override 66.1778 + public Value getValue() { 66.1779 + return vf.createLiteral(Long.toString(count), XMLSchema.INTEGER); 66.1780 + } 66.1781 + } 66.1782 + 66.1783 + private class MinAggregate extends Aggregate { 66.1784 + 66.1785 + private final ValueComparator comparator = new ValueComparator(); 66.1786 + 66.1787 + private Value min = null; 66.1788 + 66.1789 + public MinAggregate(Min operator) { 66.1790 + super(operator); 66.1791 + } 66.1792 + 66.1793 + @Override 66.1794 + public void processAggregate(BindingSet s) 66.1795 + throws QueryEvaluationException 66.1796 + { 66.1797 + Value v = evaluate(s); 66.1798 + if (distinct(v)) { 66.1799 + if (min == null) { 66.1800 + min = v; 66.1801 + } 66.1802 + else if (comparator.compare(v, min) < 0) { 66.1803 + min = v; 66.1804 + } 66.1805 + } 66.1806 + } 66.1807 + 66.1808 + @Override 66.1809 + public Value getValue() { 66.1810 + return min; 66.1811 + } 66.1812 + } 66.1813 + 66.1814 + private class MaxAggregate extends Aggregate { 66.1815 + 66.1816 + private final ValueComparator comparator = new ValueComparator(); 66.1817 + 66.1818 + private Value max = null; 66.1819 + 66.1820 + public MaxAggregate(Max operator) { 66.1821 + super(operator); 66.1822 + } 66.1823 + 66.1824 + @Override 66.1825 + public void processAggregate(BindingSet s) 66.1826 + throws QueryEvaluationException 66.1827 + { 66.1828 + Value v = evaluate(s); 66.1829 + if (distinct(v)) { 66.1830 + if (max == null) { 66.1831 + max = v; 66.1832 + } 66.1833 + else if (comparator.compare(v, max) > 0) { 66.1834 + max = v; 66.1835 + } 66.1836 + } 66.1837 + } 66.1838 + 66.1839 + @Override 66.1840 + public Value getValue() { 66.1841 + return max; 66.1842 + } 66.1843 + } 66.1844 + 66.1845 + private class SumAggregate extends Aggregate { 66.1846 + 66.1847 + private Literal sum = vf.createLiteral("0", XMLSchema.INTEGER); 66.1848 + 66.1849 + private ValueExprEvaluationException typeError = null; 66.1850 + 66.1851 + public SumAggregate(Sum operator) { 66.1852 + super(operator); 66.1853 + } 66.1854 + 66.1855 + @Override 66.1856 + public void processAggregate(BindingSet s) 66.1857 + throws QueryEvaluationException 66.1858 + { 66.1859 + if (typeError != null) { 66.1860 + // halt further processing if a type error has been raised 66.1861 + return; 66.1862 + } 66.1863 + 66.1864 + Value v = evaluate(s); 66.1865 + if (distinct(v)) { 66.1866 + if (v instanceof Literal) { 66.1867 + Literal nextLiteral = (Literal)v; 66.1868 + // check if the literal is numeric, if not, skip it. This is 66.1869 + // strictly speaking not spec-compliant, but a whole lot more 66.1870 + // useful. 66.1871 + if (nextLiteral.getDatatype() != null 66.1872 + && XMLDatatypeUtil.isNumericDatatype(nextLiteral.getDatatype())) 66.1873 + { 66.1874 + sum = MathUtil.compute(sum, nextLiteral, MathOp.PLUS); 66.1875 + } 66.1876 + } 66.1877 + else if (v != null) { 66.1878 + typeError = new ValueExprEvaluationException("not a number: " + v); 66.1879 + } 66.1880 + } 66.1881 + } 66.1882 + 66.1883 + @Override 66.1884 + public Value getValue() 66.1885 + throws ValueExprEvaluationException 66.1886 + { 66.1887 + if (typeError != null) { 66.1888 + throw typeError; 66.1889 + } 66.1890 + 66.1891 + return sum; 66.1892 + } 66.1893 + } 66.1894 + 66.1895 + private class AvgAggregate extends Aggregate { 66.1896 + 66.1897 + private long count = 0; 66.1898 + 66.1899 + private Literal sum = vf.createLiteral("0", XMLSchema.INTEGER); 66.1900 + 66.1901 + private ValueExprEvaluationException typeError = null; 66.1902 + 66.1903 + public AvgAggregate(Avg operator) { 66.1904 + super(operator); 66.1905 + } 66.1906 + 66.1907 + @Override 66.1908 + public void processAggregate(BindingSet s) 66.1909 + throws QueryEvaluationException 66.1910 + { 66.1911 + if (typeError != null) { 66.1912 + // Prevent calculating the aggregate further if a type error has 66.1913 + // occured. 66.1914 + return; 66.1915 + } 66.1916 + 66.1917 + Value v = evaluate(s); 66.1918 + if (distinct(v)) { 66.1919 + if (v instanceof Literal) { 66.1920 + Literal nextLiteral = (Literal)v; 66.1921 + // check if the literal is numeric, if not, skip it. This is 66.1922 + // strictly speaking not spec-compliant, but a whole lot more 66.1923 + // useful. 66.1924 + if (nextLiteral.getDatatype() != null 66.1925 + && XMLDatatypeUtil.isNumericDatatype(nextLiteral.getDatatype())) 66.1926 + { 66.1927 + sum = MathUtil.compute(sum, nextLiteral, MathOp.PLUS); 66.1928 + } 66.1929 + count++; 66.1930 + } 66.1931 + else if (v != null) { 66.1932 + // we do not actually throw the exception yet, but record it and 66.1933 + // stop further processing. The exception will be thrown when 66.1934 + // getValue() is invoked. 66.1935 + typeError = new ValueExprEvaluationException("not a number: " + v); 66.1936 + } 66.1937 + } 66.1938 + } 66.1939 + 66.1940 + @Override 66.1941 + public Value getValue() 66.1942 + throws ValueExprEvaluationException 66.1943 + { 66.1944 + if (typeError != null) { 66.1945 + // a type error occurred while processing the aggregate, throw it 66.1946 + // now. 66.1947 + throw typeError; 66.1948 + } 66.1949 + 66.1950 + if (count == 0) { 66.1951 + return vf.createLiteral(0.0d); 66.1952 + } 66.1953 + 66.1954 + Literal sizeLit = vf.createLiteral(count); 66.1955 + return MathUtil.compute(sum, sizeLit, MathOp.DIVIDE); 66.1956 + } 66.1957 + } 66.1958 + 66.1959 + private class SampleAggregate extends Aggregate { 66.1960 + 66.1961 + private Value sample = null; 66.1962 + 66.1963 + public SampleAggregate(Sample operator) { 66.1964 + super(operator); 66.1965 + } 66.1966 + 66.1967 + @Override 66.1968 + public void processAggregate(BindingSet s) 66.1969 + throws QueryEvaluationException 66.1970 + { 66.1971 + if (sample == null) { 66.1972 + sample = evaluate(s); 66.1973 + } 66.1974 + } 66.1975 + 66.1976 + @Override 66.1977 + public Value getValue() { 66.1978 + return sample; 66.1979 + } 66.1980 + } 66.1981 + 66.1982 + private class ConcatAggregate extends Aggregate { 66.1983 + 66.1984 + private StringBuilder concatenated = new StringBuilder(); 66.1985 + 66.1986 + private String separator = " "; 66.1987 + 66.1988 + public ConcatAggregate(GroupConcat groupConcatOp) 66.1989 + throws ValueExprEvaluationException, QueryEvaluationException 66.1990 + { 66.1991 + super(groupConcatOp); 66.1992 + ValueExpr separatorExpr = groupConcatOp.getSeparator(); 66.1993 + if (separatorExpr != null) { 66.1994 + Value separatorValue = strategy.evaluate(separatorExpr, parentBindings); 66.1995 + separator = separatorValue.stringValue(); 66.1996 + } 66.1997 + } 66.1998 + 66.1999 + @Override 66.2000 + public void processAggregate(BindingSet s) 66.2001 + throws QueryEvaluationException 66.2002 + { 66.2003 + Value v = evaluate(s); 66.2004 + if (v != null && distinct(v)) { 66.2005 + concatenated.append(v.stringValue()); 66.2006 + concatenated.append(separator); 66.2007 + } 66.2008 + } 66.2009 + 66.2010 + @Override 66.2011 + public Value getValue() { 66.2012 + if (concatenated.length() == 0) { 66.2013 + return vf.createLiteral(""); 66.2014 + } 66.2015 + 66.2016 + // remove separator at the end. 66.2017 + int len = concatenated.length() - separator.length(); 66.2018 + return vf.createLiteral(concatenated.substring(0, len)); 66.2019 + } 66.2020 + } 66.2021 + 66.2022 } 66.2023 \ No newline at end of file
67.1 --- a/evaluation/src/main/resources/META-INF/services/org.openrdf.query.algebra.evaluation.function.Function Thu Sep 06 00:43:34 2012 +0300 67.2 +++ b/evaluation/src/main/resources/META-INF/services/org.openrdf.query.algebra.evaluation.function.Function Thu Sep 06 00:44:45 2012 +0300 67.3 @@ -1,78 +1,78 @@ 67.4 -org.openrdf.query.algebra.evaluation.function.StringCast 67.5 -org.openrdf.query.algebra.evaluation.function.FloatCast 67.6 -org.openrdf.query.algebra.evaluation.function.DoubleCast 67.7 -org.openrdf.query.algebra.evaluation.function.DecimalCast 67.8 -org.openrdf.query.algebra.evaluation.function.IntegerCast 67.9 -org.openrdf.query.algebra.evaluation.function.BooleanCast 67.10 -org.openrdf.query.algebra.evaluation.function.DateTimeCast 67.11 -org.openrdf.query.algebra.evaluation.function.link.SimilarTermFunc 67.12 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.mbb.MbbIntersectsFunc 67.13 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.mbb.MbbEqualsFunc 67.14 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.IntersectsFunc 67.15 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.AnyInteractFunc 67.16 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.ContainsFunc 67.17 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.CoveredByFunc 67.18 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.CoversFunc 67.19 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.DisjointFunc 67.20 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.EqualsFunc 67.21 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.InsideFunc 67.22 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.OverlapFunc 67.23 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.TouchFunc 67.24 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.RelateFunc 67.25 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.LeftFunc 67.26 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.RightFunc 67.27 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.AboveFunc 67.28 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.BelowFunc 67.29 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.BufferFunc 67.30 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.TransformFunc 67.31 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.UnionFunc 67.32 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.IntersectionFunc 67.33 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.DifferenceFunc 67.34 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.SymDifferenceFunc 67.35 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.EnvelopeFunc 67.36 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.ConvexHullFunc 67.37 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.BoundaryFunc 67.38 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric.DistanceFunc 67.39 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric.AreaFunc 67.40 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.DimensionFunc 67.41 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.GeometryTypeFunc 67.42 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.AsTextFunc 67.43 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.AsGMLFunc 67.44 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.SridFunc 67.45 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.IsEmptyFunc 67.46 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.IsSimpleFunc 67.47 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.aggregate.ExtentFunc 67.48 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlBoundaryFunc 67.49 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlBufferFunc 67.50 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlConvexHullFunc 67.51 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlDifferenceFunc 67.52 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlDistanceFunc 67.53 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlEnvelopeFunc 67.54 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlIntersectionFunc 67.55 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlSymmetricDifferenceFunc 67.56 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlUnionFunc 67.57 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelateFunc 67.58 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer.EgenhoferContainsFunc 67.59 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer.EgenhoferCoveredByFunc 67.60 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer.EgenhoferCoversFunc 67.61 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer.EgenhoferDisjointFunc 67.62 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer.EgenhoferEqualsFunc 67.63 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer.EgenhoferInsideFunc 67.64 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer.EgenhoferMeetFunc 67.65 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer.EgenhoferOverlapFunc 67.66 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8.RCC8DisconnectedFunc 67.67 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8.RCC8EqualsFunc 67.68 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8.RCC8ExternallyConnectedFunc 67.69 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8.RCC8NonTangentialProperPartFunc 67.70 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8.RCC8NonTangentialProperPartInverseFunc 67.71 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8.RCC8PartiallyOverlappingFunc 67.72 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8.RCC8TangentialProperPartFunc 67.73 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8.RCC8TangentialProperPartInverseFunc 67.74 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf.SimpleFeaturesContainsFunc 67.75 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf.SimpleFeaturesCrossesFunc 67.76 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf.SimpleFeaturesDisjointFunc 67.77 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf.SimpleFeaturesEqualsFunc 67.78 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf.SimpleFeaturesIntersectsFunc 67.79 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf.SimpleFeaturesOverlapsFunc 67.80 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf.SimpleFeaturesWithinFunc 67.81 +org.openrdf.query.algebra.evaluation.function.StringCast 67.82 +org.openrdf.query.algebra.evaluation.function.FloatCast 67.83 +org.openrdf.query.algebra.evaluation.function.DoubleCast 67.84 +org.openrdf.query.algebra.evaluation.function.DecimalCast 67.85 +org.openrdf.query.algebra.evaluation.function.IntegerCast 67.86 +org.openrdf.query.algebra.evaluation.function.BooleanCast 67.87 +org.openrdf.query.algebra.evaluation.function.DateTimeCast 67.88 +org.openrdf.query.algebra.evaluation.function.link.SimilarTermFunc 67.89 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.mbb.MbbIntersectsFunc 67.90 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.mbb.MbbEqualsFunc 67.91 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.IntersectsFunc 67.92 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.AnyInteractFunc 67.93 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.ContainsFunc 67.94 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.CoveredByFunc 67.95 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.CoversFunc 67.96 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.DisjointFunc 67.97 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.EqualsFunc 67.98 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.InsideFunc 67.99 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.OverlapFunc 67.100 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.TouchFunc 67.101 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.RelateFunc 67.102 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.LeftFunc 67.103 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.RightFunc 67.104 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.AboveFunc 67.105 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.BelowFunc 67.106 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.BufferFunc 67.107 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.TransformFunc 67.108 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.UnionFunc 67.109 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.IntersectionFunc 67.110 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.DifferenceFunc 67.111 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.SymDifferenceFunc 67.112 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.EnvelopeFunc 67.113 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.ConvexHullFunc 67.114 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.BoundaryFunc 67.115 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric.DistanceFunc 67.116 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric.AreaFunc 67.117 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.DimensionFunc 67.118 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.GeometryTypeFunc 67.119 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.AsTextFunc 67.120 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.AsGMLFunc 67.121 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.SridFunc 67.122 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.IsEmptyFunc 67.123 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.IsSimpleFunc 67.124 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.aggregate.ExtentFunc 67.125 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlBoundaryFunc 67.126 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlBufferFunc 67.127 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlConvexHullFunc 67.128 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlDifferenceFunc 67.129 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlDistanceFunc 67.130 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlEnvelopeFunc 67.131 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlIntersectionFunc 67.132 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlSymmetricDifferenceFunc 67.133 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlUnionFunc 67.134 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelateFunc 67.135 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer.EgenhoferContainsFunc 67.136 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer.EgenhoferCoveredByFunc 67.137 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer.EgenhoferCoversFunc 67.138 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer.EgenhoferDisjointFunc 67.139 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer.EgenhoferEqualsFunc 67.140 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer.EgenhoferInsideFunc 67.141 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer.EgenhoferMeetFunc 67.142 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer.EgenhoferOverlapFunc 67.143 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8.RCC8DisconnectedFunc 67.144 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8.RCC8EqualsFunc 67.145 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8.RCC8ExternallyConnectedFunc 67.146 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8.RCC8NonTangentialProperPartFunc 67.147 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8.RCC8NonTangentialProperPartInverseFunc 67.148 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8.RCC8PartiallyOverlappingFunc 67.149 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8.RCC8TangentialProperPartFunc 67.150 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8.RCC8TangentialProperPartInverseFunc 67.151 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf.SimpleFeaturesContainsFunc 67.152 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf.SimpleFeaturesCrossesFunc 67.153 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf.SimpleFeaturesDisjointFunc 67.154 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf.SimpleFeaturesEqualsFunc 67.155 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf.SimpleFeaturesIntersectsFunc 67.156 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf.SimpleFeaturesOverlapsFunc 67.157 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf.SimpleFeaturesWithinFunc 67.158 org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf.SimpleFeatureTouchesFunc 67.159 \ No newline at end of file
68.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlAbove.java Thu Sep 06 00:43:34 2012 +0300 68.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlAbove.java Thu Sep 06 00:44:45 2012 +0300 68.3 @@ -1,19 +1,19 @@ 68.4 -/* 68.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 68.6 - * 68.7 - * Licensed under the Aduna BSD-style license. 68.8 - */ 68.9 -package org.openrdf.sail.generaldb.algebra; 68.10 - 68.11 - 68.12 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 68.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 68.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 68.15 - 68.16 -public class GeneralDBSqlAbove extends GeneralDBSqlGeoSpatial{ 68.17 - 68.18 - public GeneralDBSqlAbove(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 68.19 - super(left, right); 68.20 - } 68.21 - 68.22 +/* 68.23 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 68.24 + * 68.25 + * Licensed under the Aduna BSD-style license. 68.26 + */ 68.27 +package org.openrdf.sail.generaldb.algebra; 68.28 + 68.29 + 68.30 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 68.31 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 68.32 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 68.33 + 68.34 +public class GeneralDBSqlAbove extends GeneralDBSqlGeoSpatial{ 68.35 + 68.36 + public GeneralDBSqlAbove(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 68.37 + super(left, right); 68.38 + } 68.39 + 68.40 } 68.41 \ No newline at end of file
69.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlAnyInteract.java Thu Sep 06 00:43:34 2012 +0300 69.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlAnyInteract.java Thu Sep 06 00:44:45 2012 +0300 69.3 @@ -1,19 +1,19 @@ 69.4 -/* 69.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 69.6 - * 69.7 - * Licensed under the Aduna BSD-style license. 69.8 - */ 69.9 -package org.openrdf.sail.generaldb.algebra; 69.10 - 69.11 - 69.12 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 69.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 69.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 69.15 - 69.16 -public class GeneralDBSqlAnyInteract extends GeneralDBSqlGeoSpatial{ 69.17 - 69.18 - public GeneralDBSqlAnyInteract(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 69.19 - super(left, right); 69.20 - } 69.21 - 69.22 +/* 69.23 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 69.24 + * 69.25 + * Licensed under the Aduna BSD-style license. 69.26 + */ 69.27 +package org.openrdf.sail.generaldb.algebra; 69.28 + 69.29 + 69.30 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 69.31 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 69.32 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 69.33 + 69.34 +public class GeneralDBSqlAnyInteract extends GeneralDBSqlGeoSpatial{ 69.35 + 69.36 + public GeneralDBSqlAnyInteract(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 69.37 + super(left, right); 69.38 + } 69.39 + 69.40 } 69.41 \ No newline at end of file
70.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlBelow.java Thu Sep 06 00:43:34 2012 +0300 70.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlBelow.java Thu Sep 06 00:44:45 2012 +0300 70.3 @@ -1,19 +1,19 @@ 70.4 -/* 70.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 70.6 - * 70.7 - * Licensed under the Aduna BSD-style license. 70.8 - */ 70.9 -package org.openrdf.sail.generaldb.algebra; 70.10 - 70.11 - 70.12 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 70.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 70.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 70.15 - 70.16 -public class GeneralDBSqlBelow extends GeneralDBSqlGeoSpatial{ 70.17 - 70.18 - public GeneralDBSqlBelow(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 70.19 - super(left, right); 70.20 - } 70.21 - 70.22 +/* 70.23 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 70.24 + * 70.25 + * Licensed under the Aduna BSD-style license. 70.26 + */ 70.27 +package org.openrdf.sail.generaldb.algebra; 70.28 + 70.29 + 70.30 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 70.31 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 70.32 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 70.33 + 70.34 +public class GeneralDBSqlBelow extends GeneralDBSqlGeoSpatial{ 70.35 + 70.36 + public GeneralDBSqlBelow(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 70.37 + super(left, right); 70.38 + } 70.39 + 70.40 } 70.41 \ No newline at end of file
71.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlContains.java Thu Sep 06 00:43:34 2012 +0300 71.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlContains.java Thu Sep 06 00:44:45 2012 +0300 71.3 @@ -1,19 +1,19 @@ 71.4 -/* 71.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 71.6 - * 71.7 - * Licensed under the Aduna BSD-style license. 71.8 - */ 71.9 -package org.openrdf.sail.generaldb.algebra; 71.10 - 71.11 - 71.12 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 71.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 71.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 71.15 - 71.16 -public class GeneralDBSqlContains extends GeneralDBSqlGeoSpatial{ 71.17 - 71.18 - public GeneralDBSqlContains(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 71.19 - super(left, right); 71.20 - } 71.21 - 71.22 +/* 71.23 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 71.24 + * 71.25 + * Licensed under the Aduna BSD-style license. 71.26 + */ 71.27 +package org.openrdf.sail.generaldb.algebra; 71.28 + 71.29 + 71.30 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 71.31 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 71.32 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 71.33 + 71.34 +public class GeneralDBSqlContains extends GeneralDBSqlGeoSpatial{ 71.35 + 71.36 + public GeneralDBSqlContains(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 71.37 + super(left, right); 71.38 + } 71.39 + 71.40 } 71.41 \ No newline at end of file
72.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlCoveredBy.java Thu Sep 06 00:43:34 2012 +0300 72.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlCoveredBy.java Thu Sep 06 00:44:45 2012 +0300 72.3 @@ -1,20 +1,20 @@ 72.4 -/* 72.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 72.6 - * 72.7 - * Licensed under the Aduna BSD-style license. 72.8 - */ 72.9 -package org.openrdf.sail.generaldb.algebra; 72.10 - 72.11 - 72.12 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 72.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 72.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 72.15 - 72.16 -public class GeneralDBSqlCoveredBy extends GeneralDBSqlGeoSpatial{ 72.17 - 72.18 - public GeneralDBSqlCoveredBy(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 72.19 - super(left, right); 72.20 - } 72.21 - 72.22 - 72.23 +/* 72.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 72.25 + * 72.26 + * Licensed under the Aduna BSD-style license. 72.27 + */ 72.28 +package org.openrdf.sail.generaldb.algebra; 72.29 + 72.30 + 72.31 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 72.32 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 72.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 72.34 + 72.35 +public class GeneralDBSqlCoveredBy extends GeneralDBSqlGeoSpatial{ 72.36 + 72.37 + public GeneralDBSqlCoveredBy(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 72.38 + super(left, right); 72.39 + } 72.40 + 72.41 + 72.42 } 72.43 \ No newline at end of file
73.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlCovers.java Thu Sep 06 00:43:34 2012 +0300 73.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlCovers.java Thu Sep 06 00:44:45 2012 +0300 73.3 @@ -1,20 +1,20 @@ 73.4 -/* 73.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 73.6 - * 73.7 - * Licensed under the Aduna BSD-style license. 73.8 - */ 73.9 -package org.openrdf.sail.generaldb.algebra; 73.10 - 73.11 - 73.12 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 73.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 73.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 73.15 - 73.16 -public class GeneralDBSqlCovers extends GeneralDBSqlGeoSpatial{ 73.17 - 73.18 - public GeneralDBSqlCovers(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 73.19 - super(left, right); 73.20 - } 73.21 - 73.22 - 73.23 +/* 73.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 73.25 + * 73.26 + * Licensed under the Aduna BSD-style license. 73.27 + */ 73.28 +package org.openrdf.sail.generaldb.algebra; 73.29 + 73.30 + 73.31 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 73.32 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 73.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 73.34 + 73.35 +public class GeneralDBSqlCovers extends GeneralDBSqlGeoSpatial{ 73.36 + 73.37 + public GeneralDBSqlCovers(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 73.38 + super(left, right); 73.39 + } 73.40 + 73.41 + 73.42 } 73.43 \ No newline at end of file
74.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlDisjoint.java Thu Sep 06 00:43:34 2012 +0300 74.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlDisjoint.java Thu Sep 06 00:44:45 2012 +0300 74.3 @@ -1,20 +1,20 @@ 74.4 -/* 74.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 74.6 - * 74.7 - * Licensed under the Aduna BSD-style license. 74.8 - */ 74.9 -package org.openrdf.sail.generaldb.algebra; 74.10 - 74.11 - 74.12 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 74.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 74.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 74.15 - 74.16 -public class GeneralDBSqlDisjoint extends GeneralDBSqlGeoSpatial{ 74.17 - 74.18 - public GeneralDBSqlDisjoint(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 74.19 - super(left, right); 74.20 - } 74.21 - 74.22 - 74.23 +/* 74.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 74.25 + * 74.26 + * Licensed under the Aduna BSD-style license. 74.27 + */ 74.28 +package org.openrdf.sail.generaldb.algebra; 74.29 + 74.30 + 74.31 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 74.32 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 74.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 74.34 + 74.35 +public class GeneralDBSqlDisjoint extends GeneralDBSqlGeoSpatial{ 74.36 + 74.37 + public GeneralDBSqlDisjoint(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 74.38 + super(left, right); 74.39 + } 74.40 + 74.41 + 74.42 } 74.43 \ No newline at end of file
75.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlEqualsSpatial.java Thu Sep 06 00:43:34 2012 +0300 75.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlEqualsSpatial.java Thu Sep 06 00:44:45 2012 +0300 75.3 @@ -1,20 +1,20 @@ 75.4 -/* 75.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 75.6 - * 75.7 - * Licensed under the Aduna BSD-style license. 75.8 - */ 75.9 -package org.openrdf.sail.generaldb.algebra; 75.10 - 75.11 - 75.12 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 75.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 75.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 75.15 - 75.16 -public class GeneralDBSqlEqualsSpatial extends GeneralDBSqlGeoSpatial{ 75.17 - 75.18 - public GeneralDBSqlEqualsSpatial(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 75.19 - super(left, right); 75.20 - } 75.21 - 75.22 - 75.23 +/* 75.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 75.25 + * 75.26 + * Licensed under the Aduna BSD-style license. 75.27 + */ 75.28 +package org.openrdf.sail.generaldb.algebra; 75.29 + 75.30 + 75.31 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 75.32 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 75.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 75.34 + 75.35 +public class GeneralDBSqlEqualsSpatial extends GeneralDBSqlGeoSpatial{ 75.36 + 75.37 + public GeneralDBSqlEqualsSpatial(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 75.38 + super(left, right); 75.39 + } 75.40 + 75.41 + 75.42 } 75.43 \ No newline at end of file
76.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoArea.java Thu Sep 06 00:43:34 2012 +0300 76.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoArea.java Thu Sep 06 00:44:45 2012 +0300 76.3 @@ -1,25 +1,25 @@ 76.4 -/* 76.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 76.6 - * 76.7 - * Licensed under the Aduna BSD-style license. 76.8 - */ 76.9 -package org.openrdf.sail.generaldb.algebra; 76.10 - 76.11 - 76.12 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 76.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 76.14 - 76.15 -public class GeneralDBSqlGeoArea extends GeneralDBSqlSpatialMetricUnary{ 76.16 - 76.17 - public GeneralDBSqlGeoArea(GeneralDBSqlExpr expr) { 76.18 - super(expr); 76.19 - } 76.20 - 76.21 - @Override 76.22 - public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 76.23 - throws X 76.24 - { 76.25 - visitor.meet(this); 76.26 - } 76.27 - 76.28 +/* 76.29 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 76.30 + * 76.31 + * Licensed under the Aduna BSD-style license. 76.32 + */ 76.33 +package org.openrdf.sail.generaldb.algebra; 76.34 + 76.35 + 76.36 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 76.37 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 76.38 + 76.39 +public class GeneralDBSqlGeoArea extends GeneralDBSqlSpatialMetricUnary{ 76.40 + 76.41 + public GeneralDBSqlGeoArea(GeneralDBSqlExpr expr) { 76.42 + super(expr); 76.43 + } 76.44 + 76.45 + @Override 76.46 + public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 76.47 + throws X 76.48 + { 76.49 + visitor.meet(this); 76.50 + } 76.51 + 76.52 } 76.53 \ No newline at end of file
77.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoAsText.java Thu Sep 06 00:43:34 2012 +0300 77.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoAsText.java Thu Sep 06 00:44:45 2012 +0300 77.3 @@ -1,31 +1,31 @@ 77.4 -/* 77.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 77.6 - * 77.7 - * Licensed under the Aduna BSD-style license. 77.8 - */ 77.9 -package org.openrdf.sail.generaldb.algebra; 77.10 - 77.11 - 77.12 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 77.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 77.14 - 77.15 -/** 77.16 - * 77.17 - * @see {@link org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.AsTextFunc} 77.18 - * 77.19 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 77.20 - */ 77.21 -public class GeneralDBSqlGeoAsText extends GeneralDBSqlSpatialProperty { 77.22 - 77.23 - public GeneralDBSqlGeoAsText(GeneralDBSqlExpr expr) { 77.24 - super(expr); 77.25 - } 77.26 - 77.27 - @Override 77.28 - public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 77.29 - throws X 77.30 - { 77.31 - visitor.meet(this); 77.32 - } 77.33 - 77.34 +/* 77.35 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 77.36 + * 77.37 + * Licensed under the Aduna BSD-style license. 77.38 + */ 77.39 +package org.openrdf.sail.generaldb.algebra; 77.40 + 77.41 + 77.42 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 77.43 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 77.44 + 77.45 +/** 77.46 + * 77.47 + * @see {@link org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.AsTextFunc} 77.48 + * 77.49 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 77.50 + */ 77.51 +public class GeneralDBSqlGeoAsText extends GeneralDBSqlSpatialProperty { 77.52 + 77.53 + public GeneralDBSqlGeoAsText(GeneralDBSqlExpr expr) { 77.54 + super(expr); 77.55 + } 77.56 + 77.57 + @Override 77.58 + public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 77.59 + throws X 77.60 + { 77.61 + visitor.meet(this); 77.62 + } 77.63 + 77.64 } 77.65 \ No newline at end of file
78.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoBoundary.java Thu Sep 06 00:43:34 2012 +0300 78.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoBoundary.java Thu Sep 06 00:44:45 2012 +0300 78.3 @@ -1,25 +1,25 @@ 78.4 -/* 78.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 78.6 - * 78.7 - * Licensed under the Aduna BSD-style license. 78.8 - */ 78.9 -package org.openrdf.sail.generaldb.algebra; 78.10 - 78.11 - 78.12 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 78.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 78.14 - 78.15 -public class GeneralDBSqlGeoBoundary extends GeneralDBSqlSpatialConstructUnary{ 78.16 - 78.17 - public GeneralDBSqlGeoBoundary(GeneralDBSqlExpr expr) { 78.18 - super(expr); 78.19 - } 78.20 - 78.21 - @Override 78.22 - public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 78.23 - throws X 78.24 - { 78.25 - visitor.meet(this); 78.26 - } 78.27 - 78.28 +/* 78.29 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 78.30 + * 78.31 + * Licensed under the Aduna BSD-style license. 78.32 + */ 78.33 +package org.openrdf.sail.generaldb.algebra; 78.34 + 78.35 + 78.36 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 78.37 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 78.38 + 78.39 +public class GeneralDBSqlGeoBoundary extends GeneralDBSqlSpatialConstructUnary{ 78.40 + 78.41 + public GeneralDBSqlGeoBoundary(GeneralDBSqlExpr expr) { 78.42 + super(expr); 78.43 + } 78.44 + 78.45 + @Override 78.46 + public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 78.47 + throws X 78.48 + { 78.49 + visitor.meet(this); 78.50 + } 78.51 + 78.52 } 78.53 \ No newline at end of file
79.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoBuffer.java Thu Sep 06 00:43:34 2012 +0300 79.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoBuffer.java Thu Sep 06 00:44:45 2012 +0300 79.3 @@ -1,25 +1,25 @@ 79.4 -/* 79.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 79.6 - * 79.7 - * Licensed under the Aduna BSD-style license. 79.8 - */ 79.9 -package org.openrdf.sail.generaldb.algebra; 79.10 - 79.11 - 79.12 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 79.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 79.14 - 79.15 -public class GeneralDBSqlGeoBuffer extends GeneralDBSqlSpatialConstructBinary{ 79.16 - 79.17 - public GeneralDBSqlGeoBuffer(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 79.18 - super(left, right); 79.19 - } 79.20 - 79.21 - @Override 79.22 - public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 79.23 - throws X 79.24 - { 79.25 - visitor.meet(this); 79.26 - } 79.27 - 79.28 +/* 79.29 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 79.30 + * 79.31 + * Licensed under the Aduna BSD-style license. 79.32 + */ 79.33 +package org.openrdf.sail.generaldb.algebra; 79.34 + 79.35 + 79.36 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 79.37 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 79.38 + 79.39 +public class GeneralDBSqlGeoBuffer extends GeneralDBSqlSpatialConstructBinary{ 79.40 + 79.41 + public GeneralDBSqlGeoBuffer(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 79.42 + super(left, right); 79.43 + } 79.44 + 79.45 + @Override 79.46 + public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 79.47 + throws X 79.48 + { 79.49 + visitor.meet(this); 79.50 + } 79.51 + 79.52 } 79.53 \ No newline at end of file
80.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoConvexHull.java Thu Sep 06 00:43:34 2012 +0300 80.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoConvexHull.java Thu Sep 06 00:44:45 2012 +0300 80.3 @@ -1,25 +1,25 @@ 80.4 -/* 80.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 80.6 - * 80.7 - * Licensed under the Aduna BSD-style license. 80.8 - */ 80.9 -package org.openrdf.sail.generaldb.algebra; 80.10 - 80.11 - 80.12 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 80.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 80.14 - 80.15 -public class GeneralDBSqlGeoConvexHull extends GeneralDBSqlSpatialConstructUnary{ 80.16 - 80.17 - public GeneralDBSqlGeoConvexHull(GeneralDBSqlExpr expr) { 80.18 - super(expr); 80.19 - } 80.20 - 80.21 - @Override 80.22 - public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 80.23 - throws X 80.24 - { 80.25 - visitor.meet(this); 80.26 - } 80.27 - 80.28 +/* 80.29 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 80.30 + * 80.31 + * Licensed under the Aduna BSD-style license. 80.32 + */ 80.33 +package org.openrdf.sail.generaldb.algebra; 80.34 + 80.35 + 80.36 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 80.37 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 80.38 + 80.39 +public class GeneralDBSqlGeoConvexHull extends GeneralDBSqlSpatialConstructUnary{ 80.40 + 80.41 + public GeneralDBSqlGeoConvexHull(GeneralDBSqlExpr expr) { 80.42 + super(expr); 80.43 + } 80.44 + 80.45 + @Override 80.46 + public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 80.47 + throws X 80.48 + { 80.49 + visitor.meet(this); 80.50 + } 80.51 + 80.52 } 80.53 \ No newline at end of file
81.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoDifference.java Thu Sep 06 00:43:34 2012 +0300 81.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoDifference.java Thu Sep 06 00:44:45 2012 +0300 81.3 @@ -1,25 +1,25 @@ 81.4 -/* 81.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 81.6 - * 81.7 - * Licensed under the Aduna BSD-style license. 81.8 - */ 81.9 -package org.openrdf.sail.generaldb.algebra; 81.10 - 81.11 - 81.12 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 81.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 81.14 - 81.15 -public class GeneralDBSqlGeoDifference extends GeneralDBSqlSpatialConstructBinary{ 81.16 - 81.17 - public GeneralDBSqlGeoDifference(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 81.18 - super(left, right); 81.19 - } 81.20 - 81.21 - @Override 81.22 - public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 81.23 - throws X 81.24 - { 81.25 - visitor.meet(this); 81.26 - } 81.27 - 81.28 +/* 81.29 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 81.30 + * 81.31 + * Licensed under the Aduna BSD-style license. 81.32 + */ 81.33 +package org.openrdf.sail.generaldb.algebra; 81.34 + 81.35 + 81.36 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 81.37 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 81.38 + 81.39 +public class GeneralDBSqlGeoDifference extends GeneralDBSqlSpatialConstructBinary{ 81.40 + 81.41 + public GeneralDBSqlGeoDifference(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 81.42 + super(left, right); 81.43 + } 81.44 + 81.45 + @Override 81.46 + public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 81.47 + throws X 81.48 + { 81.49 + visitor.meet(this); 81.50 + } 81.51 + 81.52 } 81.53 \ No newline at end of file
82.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoDimension.java Thu Sep 06 00:43:34 2012 +0300 82.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoDimension.java Thu Sep 06 00:44:45 2012 +0300 82.3 @@ -1,30 +1,30 @@ 82.4 -/* 82.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 82.6 - * 82.7 - * Licensed under the Aduna BSD-style license. 82.8 - */ 82.9 -package org.openrdf.sail.generaldb.algebra; 82.10 - 82.11 - 82.12 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 82.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 82.14 - 82.15 -/** 82.16 - * 82.17 - * @see {@link org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.DimensionFunc} 82.18 - * 82.19 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 82.20 - */ 82.21 -public class GeneralDBSqlGeoDimension extends GeneralDBSqlSpatialProperty { 82.22 - 82.23 - public GeneralDBSqlGeoDimension(GeneralDBSqlExpr expr) { 82.24 - super(expr); 82.25 - } 82.26 - 82.27 - @Override 82.28 - public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 82.29 - throws X 82.30 - { 82.31 - visitor.meet(this); 82.32 - } 82.33 +/* 82.34 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 82.35 + * 82.36 + * Licensed under the Aduna BSD-style license. 82.37 + */ 82.38 +package org.openrdf.sail.generaldb.algebra; 82.39 + 82.40 + 82.41 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 82.42 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 82.43 + 82.44 +/** 82.45 + * 82.46 + * @see {@link org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.DimensionFunc} 82.47 + * 82.48 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 82.49 + */ 82.50 +public class GeneralDBSqlGeoDimension extends GeneralDBSqlSpatialProperty { 82.51 + 82.52 + public GeneralDBSqlGeoDimension(GeneralDBSqlExpr expr) { 82.53 + super(expr); 82.54 + } 82.55 + 82.56 + @Override 82.57 + public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 82.58 + throws X 82.59 + { 82.60 + visitor.meet(this); 82.61 + } 82.62 } 82.63 \ No newline at end of file
83.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoDistance.java Thu Sep 06 00:43:34 2012 +0300 83.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoDistance.java Thu Sep 06 00:44:45 2012 +0300 83.3 @@ -1,25 +1,25 @@ 83.4 -/* 83.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 83.6 - * 83.7 - * Licensed under the Aduna BSD-style license. 83.8 - */ 83.9 -package org.openrdf.sail.generaldb.algebra; 83.10 - 83.11 - 83.12 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 83.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 83.14 - 83.15 -public class GeneralDBSqlGeoDistance extends GeneralDBSqlSpatialMetricBinary{ 83.16 - 83.17 - public GeneralDBSqlGeoDistance(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 83.18 - super(left, right); 83.19 - } 83.20 - 83.21 - @Override 83.22 - public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 83.23 - throws X 83.24 - { 83.25 - visitor.meet(this); 83.26 - } 83.27 - 83.28 +/* 83.29 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 83.30 + * 83.31 + * Licensed under the Aduna BSD-style license. 83.32 + */ 83.33 +package org.openrdf.sail.generaldb.algebra; 83.34 + 83.35 + 83.36 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 83.37 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 83.38 + 83.39 +public class GeneralDBSqlGeoDistance extends GeneralDBSqlSpatialMetricBinary{ 83.40 + 83.41 + public GeneralDBSqlGeoDistance(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 83.42 + super(left, right); 83.43 + } 83.44 + 83.45 + @Override 83.46 + public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 83.47 + throws X 83.48 + { 83.49 + visitor.meet(this); 83.50 + } 83.51 + 83.52 } 83.53 \ No newline at end of file
84.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoEnvelope.java Thu Sep 06 00:43:34 2012 +0300 84.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoEnvelope.java Thu Sep 06 00:44:45 2012 +0300 84.3 @@ -1,25 +1,25 @@ 84.4 -/* 84.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 84.6 - * 84.7 - * Licensed under the Aduna BSD-style license. 84.8 - */ 84.9 -package org.openrdf.sail.generaldb.algebra; 84.10 - 84.11 - 84.12 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 84.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 84.14 - 84.15 -public class GeneralDBSqlGeoEnvelope extends GeneralDBSqlSpatialConstructUnary{ 84.16 - 84.17 - public GeneralDBSqlGeoEnvelope(GeneralDBSqlExpr expr) { 84.18 - super(expr); 84.19 - } 84.20 - 84.21 - @Override 84.22 - public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 84.23 - throws X 84.24 - { 84.25 - visitor.meet(this); 84.26 - } 84.27 - 84.28 +/* 84.29 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 84.30 + * 84.31 + * Licensed under the Aduna BSD-style license. 84.32 + */ 84.33 +package org.openrdf.sail.generaldb.algebra; 84.34 + 84.35 + 84.36 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 84.37 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 84.38 + 84.39 +public class GeneralDBSqlGeoEnvelope extends GeneralDBSqlSpatialConstructUnary{ 84.40 + 84.41 + public GeneralDBSqlGeoEnvelope(GeneralDBSqlExpr expr) { 84.42 + super(expr); 84.43 + } 84.44 + 84.45 + @Override 84.46 + public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 84.47 + throws X 84.48 + { 84.49 + visitor.meet(this); 84.50 + } 84.51 + 84.52 } 84.53 \ No newline at end of file
85.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoGeometryType.java Thu Sep 06 00:43:34 2012 +0300 85.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoGeometryType.java Thu Sep 06 00:44:45 2012 +0300 85.3 @@ -1,25 +1,25 @@ 85.4 -/* 85.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 85.6 - * 85.7 - * Licensed under the Aduna BSD-style license. 85.8 - */ 85.9 -package org.openrdf.sail.generaldb.algebra; 85.10 - 85.11 - 85.12 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 85.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 85.14 - 85.15 -public class GeneralDBSqlGeoGeometryType extends GeneralDBSqlSpatialProperty{ 85.16 - 85.17 - public GeneralDBSqlGeoGeometryType(GeneralDBSqlExpr expr) { 85.18 - super(expr); 85.19 - } 85.20 - 85.21 - @Override 85.22 - public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 85.23 - throws X 85.24 - { 85.25 - visitor.meet(this); 85.26 - } 85.27 - 85.28 +/* 85.29 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 85.30 + * 85.31 + * Licensed under the Aduna BSD-style license. 85.32 + */ 85.33 +package org.openrdf.sail.generaldb.algebra; 85.34 + 85.35 + 85.36 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 85.37 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 85.38 + 85.39 +public class GeneralDBSqlGeoGeometryType extends GeneralDBSqlSpatialProperty{ 85.40 + 85.41 + public GeneralDBSqlGeoGeometryType(GeneralDBSqlExpr expr) { 85.42 + super(expr); 85.43 + } 85.44 + 85.45 + @Override 85.46 + public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 85.47 + throws X 85.48 + { 85.49 + visitor.meet(this); 85.50 + } 85.51 + 85.52 } 85.53 \ No newline at end of file
86.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoIntersection.java Thu Sep 06 00:43:34 2012 +0300 86.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoIntersection.java Thu Sep 06 00:44:45 2012 +0300 86.3 @@ -1,25 +1,25 @@ 86.4 -/* 86.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 86.6 - * 86.7 - * Licensed under the Aduna BSD-style license. 86.8 - */ 86.9 -package org.openrdf.sail.generaldb.algebra; 86.10 - 86.11 - 86.12 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 86.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 86.14 - 86.15 -public class GeneralDBSqlGeoIntersection extends GeneralDBSqlSpatialConstructBinary{ 86.16 - 86.17 - public GeneralDBSqlGeoIntersection(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 86.18 - super(left, right); 86.19 - } 86.20 - 86.21 - @Override 86.22 - public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 86.23 - throws X 86.24 - { 86.25 - visitor.meet(this); 86.26 - } 86.27 - 86.28 +/* 86.29 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 86.30 + * 86.31 + * Licensed under the Aduna BSD-style license. 86.32 + */ 86.33 +package org.openrdf.sail.generaldb.algebra; 86.34 + 86.35 + 86.36 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 86.37 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 86.38 + 86.39 +public class GeneralDBSqlGeoIntersection extends GeneralDBSqlSpatialConstructBinary{ 86.40 + 86.41 + public GeneralDBSqlGeoIntersection(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 86.42 + super(left, right); 86.43 + } 86.44 + 86.45 + @Override 86.46 + public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 86.47 + throws X 86.48 + { 86.49 + visitor.meet(this); 86.50 + } 86.51 + 86.52 } 86.53 \ No newline at end of file
87.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoIsEmpty.java Thu Sep 06 00:43:34 2012 +0300 87.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoIsEmpty.java Thu Sep 06 00:44:45 2012 +0300 87.3 @@ -1,30 +1,30 @@ 87.4 -/* 87.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 87.6 - * 87.7 - * Licensed under the Aduna BSD-style license. 87.8 - */ 87.9 -package org.openrdf.sail.generaldb.algebra; 87.10 - 87.11 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 87.12 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 87.13 - 87.14 -/** 87.15 - * 87.16 - * @see {@link org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.IsEmptyFunc} 87.17 - * 87.18 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 87.19 - */ 87.20 -public class GeneralDBSqlGeoIsEmpty extends GeneralDBSqlSpatialProperty { 87.21 - 87.22 - public GeneralDBSqlGeoIsEmpty(GeneralDBSqlExpr expr) { 87.23 - super(expr); 87.24 - } 87.25 - 87.26 - @Override 87.27 - public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 87.28 - throws X 87.29 - { 87.30 - visitor.meet(this); 87.31 - } 87.32 - 87.33 +/* 87.34 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 87.35 + * 87.36 + * Licensed under the Aduna BSD-style license. 87.37 + */ 87.38 +package org.openrdf.sail.generaldb.algebra; 87.39 + 87.40 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 87.41 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 87.42 + 87.43 +/** 87.44 + * 87.45 + * @see {@link org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.IsEmptyFunc} 87.46 + * 87.47 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 87.48 + */ 87.49 +public class GeneralDBSqlGeoIsEmpty extends GeneralDBSqlSpatialProperty { 87.50 + 87.51 + public GeneralDBSqlGeoIsEmpty(GeneralDBSqlExpr expr) { 87.52 + super(expr); 87.53 + } 87.54 + 87.55 + @Override 87.56 + public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 87.57 + throws X 87.58 + { 87.59 + visitor.meet(this); 87.60 + } 87.61 + 87.62 } 87.63 \ No newline at end of file
88.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoIsSimple.java Thu Sep 06 00:43:34 2012 +0300 88.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoIsSimple.java Thu Sep 06 00:44:45 2012 +0300 88.3 @@ -1,31 +1,31 @@ 88.4 -/* 88.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 88.6 - * 88.7 - * Licensed under the Aduna BSD-style license. 88.8 - */ 88.9 -package org.openrdf.sail.generaldb.algebra; 88.10 - 88.11 - 88.12 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 88.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 88.14 - 88.15 -/** 88.16 - * 88.17 - * @see {@link org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.IsSimpleFunc} 88.18 - * 88.19 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 88.20 - */ 88.21 -public class GeneralDBSqlGeoIsSimple extends GeneralDBSqlSpatialProperty { 88.22 - 88.23 - public GeneralDBSqlGeoIsSimple(GeneralDBSqlExpr expr) { 88.24 - super(expr); 88.25 - } 88.26 - 88.27 - @Override 88.28 - public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 88.29 - throws X 88.30 - { 88.31 - visitor.meet(this); 88.32 - } 88.33 - 88.34 +/* 88.35 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 88.36 + * 88.37 + * Licensed under the Aduna BSD-style license. 88.38 + */ 88.39 +package org.openrdf.sail.generaldb.algebra; 88.40 + 88.41 + 88.42 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 88.43 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 88.44 + 88.45 +/** 88.46 + * 88.47 + * @see {@link org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.IsSimpleFunc} 88.48 + * 88.49 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 88.50 + */ 88.51 +public class GeneralDBSqlGeoIsSimple extends GeneralDBSqlSpatialProperty { 88.52 + 88.53 + public GeneralDBSqlGeoIsSimple(GeneralDBSqlExpr expr) { 88.54 + super(expr); 88.55 + } 88.56 + 88.57 + @Override 88.58 + public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 88.59 + throws X 88.60 + { 88.61 + visitor.meet(this); 88.62 + } 88.63 + 88.64 } 88.65 \ No newline at end of file
89.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoSpatial.java Thu Sep 06 00:43:34 2012 +0300 89.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoSpatial.java Thu Sep 06 00:44:45 2012 +0300 89.3 @@ -1,21 +1,21 @@ 89.4 -package org.openrdf.sail.generaldb.algebra; 89.5 - 89.6 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 89.7 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 89.8 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 89.9 - 89.10 -public abstract class GeneralDBSqlGeoSpatial extends BinaryGeneralDBOperator 89.11 -{ 89.12 - 89.13 - public GeneralDBSqlGeoSpatial(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 89.14 - super(left, right); 89.15 - } 89.16 - 89.17 - @Override 89.18 - public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 89.19 - throws X 89.20 - { 89.21 - visitor.meet(this); 89.22 - } 89.23 - 89.24 -} 89.25 +package org.openrdf.sail.generaldb.algebra; 89.26 + 89.27 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 89.28 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 89.29 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 89.30 + 89.31 +public abstract class GeneralDBSqlGeoSpatial extends BinaryGeneralDBOperator 89.32 +{ 89.33 + 89.34 + public GeneralDBSqlGeoSpatial(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 89.35 + super(left, right); 89.36 + } 89.37 + 89.38 + @Override 89.39 + public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 89.40 + throws X 89.41 + { 89.42 + visitor.meet(this); 89.43 + } 89.44 + 89.45 +}
90.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoSrid.java Thu Sep 06 00:43:34 2012 +0300 90.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoSrid.java Thu Sep 06 00:44:45 2012 +0300 90.3 @@ -1,29 +1,29 @@ 90.4 -/* 90.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 90.6 - * 90.7 - * Licensed under the Aduna BSD-style license. 90.8 - */ 90.9 -package org.openrdf.sail.generaldb.algebra; 90.10 - 90.11 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 90.12 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 90.13 - 90.14 -/** 90.15 - * 90.16 - * @see {@link org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.SridFunc} 90.17 - * 90.18 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 90.19 - */ 90.20 -public class GeneralDBSqlGeoSrid extends GeneralDBSqlSpatialProperty { 90.21 - 90.22 - public GeneralDBSqlGeoSrid(GeneralDBSqlExpr expr) { 90.23 - super(expr); 90.24 - } 90.25 - 90.26 - @Override 90.27 - public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 90.28 - throws X 90.29 - { 90.30 - visitor.meet(this); 90.31 - } 90.32 +/* 90.33 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 90.34 + * 90.35 + * Licensed under the Aduna BSD-style license. 90.36 + */ 90.37 +package org.openrdf.sail.generaldb.algebra; 90.38 + 90.39 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 90.40 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 90.41 + 90.42 +/** 90.43 + * 90.44 + * @see {@link org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.SridFunc} 90.45 + * 90.46 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 90.47 + */ 90.48 +public class GeneralDBSqlGeoSrid extends GeneralDBSqlSpatialProperty { 90.49 + 90.50 + public GeneralDBSqlGeoSrid(GeneralDBSqlExpr expr) { 90.51 + super(expr); 90.52 + } 90.53 + 90.54 + @Override 90.55 + public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 90.56 + throws X 90.57 + { 90.58 + visitor.meet(this); 90.59 + } 90.60 } 90.61 \ No newline at end of file
91.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoSymDifference.java Thu Sep 06 00:43:34 2012 +0300 91.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoSymDifference.java Thu Sep 06 00:44:45 2012 +0300 91.3 @@ -1,25 +1,25 @@ 91.4 -/* 91.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 91.6 - * 91.7 - * Licensed under the Aduna BSD-style license. 91.8 - */ 91.9 -package org.openrdf.sail.generaldb.algebra; 91.10 - 91.11 - 91.12 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 91.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 91.14 - 91.15 -public class GeneralDBSqlGeoSymDifference extends GeneralDBSqlSpatialConstructBinary{ 91.16 - 91.17 - public GeneralDBSqlGeoSymDifference(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 91.18 - super(left, right); 91.19 - } 91.20 - 91.21 - @Override 91.22 - public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 91.23 - throws X 91.24 - { 91.25 - visitor.meet(this); 91.26 - } 91.27 - 91.28 +/* 91.29 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 91.30 + * 91.31 + * Licensed under the Aduna BSD-style license. 91.32 + */ 91.33 +package org.openrdf.sail.generaldb.algebra; 91.34 + 91.35 + 91.36 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 91.37 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 91.38 + 91.39 +public class GeneralDBSqlGeoSymDifference extends GeneralDBSqlSpatialConstructBinary{ 91.40 + 91.41 + public GeneralDBSqlGeoSymDifference(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 91.42 + super(left, right); 91.43 + } 91.44 + 91.45 + @Override 91.46 + public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 91.47 + throws X 91.48 + { 91.49 + visitor.meet(this); 91.50 + } 91.51 + 91.52 } 91.53 \ No newline at end of file
92.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoTransform.java Thu Sep 06 00:43:34 2012 +0300 92.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoTransform.java Thu Sep 06 00:44:45 2012 +0300 92.3 @@ -1,25 +1,25 @@ 92.4 -/* 92.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 92.6 - * 92.7 - * Licensed under the Aduna BSD-style license. 92.8 - */ 92.9 -package org.openrdf.sail.generaldb.algebra; 92.10 - 92.11 - 92.12 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 92.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 92.14 - 92.15 -public class GeneralDBSqlGeoTransform extends GeneralDBSqlSpatialConstructBinary{ 92.16 - 92.17 - public GeneralDBSqlGeoTransform(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 92.18 - super(left, right); 92.19 - } 92.20 - 92.21 - @Override 92.22 - public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 92.23 - throws X 92.24 - { 92.25 - visitor.meet(this); 92.26 - } 92.27 - 92.28 +/* 92.29 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 92.30 + * 92.31 + * Licensed under the Aduna BSD-style license. 92.32 + */ 92.33 +package org.openrdf.sail.generaldb.algebra; 92.34 + 92.35 + 92.36 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 92.37 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 92.38 + 92.39 +public class GeneralDBSqlGeoTransform extends GeneralDBSqlSpatialConstructBinary{ 92.40 + 92.41 + public GeneralDBSqlGeoTransform(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 92.42 + super(left, right); 92.43 + } 92.44 + 92.45 + @Override 92.46 + public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 92.47 + throws X 92.48 + { 92.49 + visitor.meet(this); 92.50 + } 92.51 + 92.52 } 92.53 \ No newline at end of file
93.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoUnion.java Thu Sep 06 00:43:34 2012 +0300 93.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoUnion.java Thu Sep 06 00:44:45 2012 +0300 93.3 @@ -1,25 +1,25 @@ 93.4 -/* 93.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 93.6 - * 93.7 - * Licensed under the Aduna BSD-style license. 93.8 - */ 93.9 -package org.openrdf.sail.generaldb.algebra; 93.10 - 93.11 - 93.12 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 93.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 93.14 - 93.15 -public class GeneralDBSqlGeoUnion extends GeneralDBSqlSpatialConstructBinary{ 93.16 - 93.17 - public GeneralDBSqlGeoUnion(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 93.18 - super(left, right); 93.19 - } 93.20 - 93.21 - @Override 93.22 - public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 93.23 - throws X 93.24 - { 93.25 - visitor.meet(this); 93.26 - } 93.27 - 93.28 +/* 93.29 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 93.30 + * 93.31 + * Licensed under the Aduna BSD-style license. 93.32 + */ 93.33 +package org.openrdf.sail.generaldb.algebra; 93.34 + 93.35 + 93.36 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 93.37 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 93.38 + 93.39 +public class GeneralDBSqlGeoUnion extends GeneralDBSqlSpatialConstructBinary{ 93.40 + 93.41 + public GeneralDBSqlGeoUnion(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 93.42 + super(left, right); 93.43 + } 93.44 + 93.45 + @Override 93.46 + public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 93.47 + throws X 93.48 + { 93.49 + visitor.meet(this); 93.50 + } 93.51 + 93.52 } 93.53 \ No newline at end of file
94.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlInside.java Thu Sep 06 00:43:34 2012 +0300 94.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlInside.java Thu Sep 06 00:44:45 2012 +0300 94.3 @@ -1,21 +1,21 @@ 94.4 -/* 94.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 94.6 - * 94.7 - * Licensed under the Aduna BSD-style license. 94.8 - */ 94.9 -package org.openrdf.sail.generaldb.algebra; 94.10 - 94.11 - 94.12 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 94.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 94.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 94.15 - 94.16 -public class GeneralDBSqlInside extends GeneralDBSqlGeoSpatial{ 94.17 - 94.18 - public GeneralDBSqlInside(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 94.19 - super(left, right); 94.20 - } 94.21 - 94.22 - 94.23 - 94.24 +/* 94.25 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 94.26 + * 94.27 + * Licensed under the Aduna BSD-style license. 94.28 + */ 94.29 +package org.openrdf.sail.generaldb.algebra; 94.30 + 94.31 + 94.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 94.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 94.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 94.35 + 94.36 +public class GeneralDBSqlInside extends GeneralDBSqlGeoSpatial{ 94.37 + 94.38 + public GeneralDBSqlInside(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 94.39 + super(left, right); 94.40 + } 94.41 + 94.42 + 94.43 + 94.44 } 94.45 \ No newline at end of file
95.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlIntersects.java Thu Sep 06 00:43:34 2012 +0300 95.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlIntersects.java Thu Sep 06 00:44:45 2012 +0300 95.3 @@ -1,19 +1,19 @@ 95.4 -/* 95.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 95.6 - * 95.7 - * Licensed under the Aduna BSD-style license. 95.8 - */ 95.9 -package org.openrdf.sail.generaldb.algebra; 95.10 - 95.11 - 95.12 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 95.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 95.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 95.15 - 95.16 -public class GeneralDBSqlIntersects extends GeneralDBSqlGeoSpatial{ 95.17 - 95.18 - public GeneralDBSqlIntersects(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 95.19 - super(left, right); 95.20 - } 95.21 - 95.22 +/* 95.23 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 95.24 + * 95.25 + * Licensed under the Aduna BSD-style license. 95.26 + */ 95.27 +package org.openrdf.sail.generaldb.algebra; 95.28 + 95.29 + 95.30 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 95.31 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 95.32 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 95.33 + 95.34 +public class GeneralDBSqlIntersects extends GeneralDBSqlGeoSpatial{ 95.35 + 95.36 + public GeneralDBSqlIntersects(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 95.37 + super(left, right); 95.38 + } 95.39 + 95.40 } 95.41 \ No newline at end of file
96.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlLeft.java Thu Sep 06 00:43:34 2012 +0300 96.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlLeft.java Thu Sep 06 00:44:45 2012 +0300 96.3 @@ -1,18 +1,18 @@ 96.4 -/* 96.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 96.6 - * 96.7 - * Licensed under the Aduna BSD-style license. 96.8 - */ 96.9 -package org.openrdf.sail.generaldb.algebra; 96.10 - 96.11 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 96.12 - 96.13 - 96.14 - 96.15 -public class GeneralDBSqlLeft extends GeneralDBSqlGeoSpatial{ 96.16 - 96.17 - public GeneralDBSqlLeft(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 96.18 - super(left, right); 96.19 - } 96.20 - 96.21 +/* 96.22 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 96.23 + * 96.24 + * Licensed under the Aduna BSD-style license. 96.25 + */ 96.26 +package org.openrdf.sail.generaldb.algebra; 96.27 + 96.28 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 96.29 + 96.30 + 96.31 + 96.32 +public class GeneralDBSqlLeft extends GeneralDBSqlGeoSpatial{ 96.33 + 96.34 + public GeneralDBSqlLeft(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 96.35 + super(left, right); 96.36 + } 96.37 + 96.38 } 96.39 \ No newline at end of file
97.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlMbbEquals.java Thu Sep 06 00:43:34 2012 +0300 97.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlMbbEquals.java Thu Sep 06 00:44:45 2012 +0300 97.3 @@ -1,19 +1,19 @@ 97.4 -/* 97.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 97.6 - * 97.7 - * Licensed under the Aduna BSD-style license. 97.8 - */ 97.9 -package org.openrdf.sail.generaldb.algebra; 97.10 - 97.11 - 97.12 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 97.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 97.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 97.15 - 97.16 -public class GeneralDBSqlMbbEquals extends GeneralDBSqlGeoSpatial{ 97.17 - 97.18 - public GeneralDBSqlMbbEquals(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 97.19 - super(left, right); 97.20 - } 97.21 - 97.22 +/* 97.23 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 97.24 + * 97.25 + * Licensed under the Aduna BSD-style license. 97.26 + */ 97.27 +package org.openrdf.sail.generaldb.algebra; 97.28 + 97.29 + 97.30 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 97.31 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 97.32 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 97.33 + 97.34 +public class GeneralDBSqlMbbEquals extends GeneralDBSqlGeoSpatial{ 97.35 + 97.36 + public GeneralDBSqlMbbEquals(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 97.37 + super(left, right); 97.38 + } 97.39 + 97.40 } 97.41 \ No newline at end of file
98.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlMbbIntersects.java Thu Sep 06 00:43:34 2012 +0300 98.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlMbbIntersects.java Thu Sep 06 00:44:45 2012 +0300 98.3 @@ -1,19 +1,19 @@ 98.4 -/* 98.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 98.6 - * 98.7 - * Licensed under the Aduna BSD-style license. 98.8 - */ 98.9 -package org.openrdf.sail.generaldb.algebra; 98.10 - 98.11 - 98.12 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 98.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 98.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 98.15 - 98.16 -public class GeneralDBSqlMbbIntersects extends GeneralDBSqlGeoSpatial{ 98.17 - 98.18 - public GeneralDBSqlMbbIntersects(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 98.19 - super(left, right); 98.20 - } 98.21 - 98.22 +/* 98.23 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 98.24 + * 98.25 + * Licensed under the Aduna BSD-style license. 98.26 + */ 98.27 +package org.openrdf.sail.generaldb.algebra; 98.28 + 98.29 + 98.30 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 98.31 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 98.32 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 98.33 + 98.34 +public class GeneralDBSqlMbbIntersects extends GeneralDBSqlGeoSpatial{ 98.35 + 98.36 + public GeneralDBSqlMbbIntersects(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 98.37 + super(left, right); 98.38 + } 98.39 + 98.40 } 98.41 \ No newline at end of file
99.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlOverlap.java Thu Sep 06 00:43:34 2012 +0300 99.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlOverlap.java Thu Sep 06 00:44:45 2012 +0300 99.3 @@ -1,20 +1,20 @@ 99.4 -/* 99.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 99.6 - * 99.7 - * Licensed under the Aduna BSD-style license. 99.8 - */ 99.9 -package org.openrdf.sail.generaldb.algebra; 99.10 - 99.11 - 99.12 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 99.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 99.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 99.15 - 99.16 -public class GeneralDBSqlOverlap extends GeneralDBSqlGeoSpatial{ 99.17 - 99.18 - public GeneralDBSqlOverlap(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 99.19 - super(left, right); 99.20 - } 99.21 - 99.22 - 99.23 +/* 99.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 99.25 + * 99.26 + * Licensed under the Aduna BSD-style license. 99.27 + */ 99.28 +package org.openrdf.sail.generaldb.algebra; 99.29 + 99.30 + 99.31 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 99.32 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 99.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 99.34 + 99.35 +public class GeneralDBSqlOverlap extends GeneralDBSqlGeoSpatial{ 99.36 + 99.37 + public GeneralDBSqlOverlap(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 99.38 + super(left, right); 99.39 + } 99.40 + 99.41 + 99.42 } 99.43 \ No newline at end of file
100.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlRelate.java Thu Sep 06 00:43:34 2012 +0300 100.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlRelate.java Thu Sep 06 00:44:45 2012 +0300 100.3 @@ -1,26 +1,26 @@ 100.4 -/* 100.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 100.6 - * 100.7 - * Licensed under the Aduna BSD-style license. 100.8 - */ 100.9 -package org.openrdf.sail.generaldb.algebra; 100.10 - 100.11 - 100.12 -import org.openrdf.sail.generaldb.algebra.base.TripleGeneralDBOperator; 100.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 100.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 100.15 - 100.16 -public class GeneralDBSqlRelate extends TripleGeneralDBOperator{ 100.17 - 100.18 - public GeneralDBSqlRelate(GeneralDBSqlExpr left, GeneralDBSqlExpr right, GeneralDBSqlExpr third) { 100.19 - super(left, right, third); 100.20 - } 100.21 - 100.22 - @Override 100.23 - public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 100.24 - throws X 100.25 - { 100.26 - visitor.meet(this); 100.27 - } 100.28 - 100.29 +/* 100.30 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 100.31 + * 100.32 + * Licensed under the Aduna BSD-style license. 100.33 + */ 100.34 +package org.openrdf.sail.generaldb.algebra; 100.35 + 100.36 + 100.37 +import org.openrdf.sail.generaldb.algebra.base.TripleGeneralDBOperator; 100.38 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 100.39 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 100.40 + 100.41 +public class GeneralDBSqlRelate extends TripleGeneralDBOperator{ 100.42 + 100.43 + public GeneralDBSqlRelate(GeneralDBSqlExpr left, GeneralDBSqlExpr right, GeneralDBSqlExpr third) { 100.44 + super(left, right, third); 100.45 + } 100.46 + 100.47 + @Override 100.48 + public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 100.49 + throws X 100.50 + { 100.51 + visitor.meet(this); 100.52 + } 100.53 + 100.54 } 100.55 \ No newline at end of file
101.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlRight.java Thu Sep 06 00:43:34 2012 +0300 101.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlRight.java Thu Sep 06 00:44:45 2012 +0300 101.3 @@ -1,19 +1,19 @@ 101.4 -/* 101.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 101.6 - * 101.7 - * Licensed under the Aduna BSD-style license. 101.8 - */ 101.9 -package org.openrdf.sail.generaldb.algebra; 101.10 - 101.11 - 101.12 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 101.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 101.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 101.15 - 101.16 -public class GeneralDBSqlRight extends GeneralDBSqlGeoSpatial{ 101.17 - 101.18 - public GeneralDBSqlRight(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 101.19 - super(left, right); 101.20 - } 101.21 - 101.22 +/* 101.23 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 101.24 + * 101.25 + * Licensed under the Aduna BSD-style license. 101.26 + */ 101.27 +package org.openrdf.sail.generaldb.algebra; 101.28 + 101.29 + 101.30 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 101.31 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 101.32 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 101.33 + 101.34 +public class GeneralDBSqlRight extends GeneralDBSqlGeoSpatial{ 101.35 + 101.36 + public GeneralDBSqlRight(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 101.37 + super(left, right); 101.38 + } 101.39 + 101.40 } 101.41 \ No newline at end of file
102.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlSpatialConstructBinary.java Thu Sep 06 00:43:34 2012 +0300 102.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlSpatialConstructBinary.java Thu Sep 06 00:44:45 2012 +0300 102.3 @@ -1,24 +1,24 @@ 102.4 -package org.openrdf.sail.generaldb.algebra; 102.5 - 102.6 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 102.7 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 102.8 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 102.9 - 102.10 -/** 102.11 - * 102.12 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 102.13 - */ 102.14 -public class GeneralDBSqlSpatialConstructBinary extends BinaryGeneralDBOperator { 102.15 - public GeneralDBSqlSpatialConstructBinary(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 102.16 - super(left, right); 102.17 - } 102.18 - 102.19 - @Override 102.20 - public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 102.21 - throws X 102.22 - { 102.23 - visitor.meet(this); 102.24 - } 102.25 -} 102.26 - 102.27 - 102.28 +package org.openrdf.sail.generaldb.algebra; 102.29 + 102.30 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 102.31 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 102.32 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 102.33 + 102.34 +/** 102.35 + * 102.36 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 102.37 + */ 102.38 +public class GeneralDBSqlSpatialConstructBinary extends BinaryGeneralDBOperator { 102.39 + public GeneralDBSqlSpatialConstructBinary(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 102.40 + super(left, right); 102.41 + } 102.42 + 102.43 + @Override 102.44 + public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 102.45 + throws X 102.46 + { 102.47 + visitor.meet(this); 102.48 + } 102.49 +} 102.50 + 102.51 +
103.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlSpatialConstructUnary.java Thu Sep 06 00:43:34 2012 +0300 103.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlSpatialConstructUnary.java Thu Sep 06 00:44:45 2012 +0300 103.3 @@ -1,27 +1,27 @@ 103.4 -package org.openrdf.sail.generaldb.algebra; 103.5 - 103.6 -import java.util.ArrayList; 103.7 - 103.8 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 103.9 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 103.10 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 103.11 -import org.openrdf.sail.generaldb.algebra.base.UnaryGeneralDBOperator; 103.12 - 103.13 -public class GeneralDBSqlSpatialConstructUnary extends UnaryGeneralDBOperator 103.14 -{ 103.15 - 103.16 - 103.17 - /*CONSTRUCTOR*/ 103.18 - 103.19 - public GeneralDBSqlSpatialConstructUnary(GeneralDBSqlExpr expr) { 103.20 - super(expr); 103.21 - } 103.22 - 103.23 - @Override 103.24 - public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 103.25 - throws X 103.26 - { 103.27 - visitor.meet(this); 103.28 - } 103.29 - 103.30 +package org.openrdf.sail.generaldb.algebra; 103.31 + 103.32 +import java.util.ArrayList; 103.33 + 103.34 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 103.35 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 103.36 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 103.37 +import org.openrdf.sail.generaldb.algebra.base.UnaryGeneralDBOperator; 103.38 + 103.39 +public class GeneralDBSqlSpatialConstructUnary extends UnaryGeneralDBOperator 103.40 +{ 103.41 + 103.42 + 103.43 + /*CONSTRUCTOR*/ 103.44 + 103.45 + public GeneralDBSqlSpatialConstructUnary(GeneralDBSqlExpr expr) { 103.46 + super(expr); 103.47 + } 103.48 + 103.49 + @Override 103.50 + public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 103.51 + throws X 103.52 + { 103.53 + visitor.meet(this); 103.54 + } 103.55 + 103.56 } 103.57 \ No newline at end of file
104.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlSpatialMetricBinary.java Thu Sep 06 00:43:34 2012 +0300 104.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlSpatialMetricBinary.java Thu Sep 06 00:44:45 2012 +0300 104.3 @@ -1,29 +1,29 @@ 104.4 -package org.openrdf.sail.generaldb.algebra; 104.5 - 104.6 -import java.util.ArrayList; 104.7 - 104.8 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 104.9 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 104.10 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 104.11 -import org.openrdf.sail.generaldb.algebra.base.UnaryGeneralDBOperator; 104.12 - 104.13 -public class GeneralDBSqlSpatialMetricBinary extends BinaryGeneralDBOperator 104.14 -{ 104.15 - 104.16 - 104.17 - /*CONSTRUCTOR*/ 104.18 - 104.19 - public GeneralDBSqlSpatialMetricBinary(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 104.20 - super(left, right); 104.21 - } 104.22 - 104.23 - @Override 104.24 - public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 104.25 - throws X 104.26 - { 104.27 - visitor.meet(this); 104.28 - } 104.29 - 104.30 -} 104.31 - 104.32 - 104.33 +package org.openrdf.sail.generaldb.algebra; 104.34 + 104.35 +import java.util.ArrayList; 104.36 + 104.37 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 104.38 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 104.39 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 104.40 +import org.openrdf.sail.generaldb.algebra.base.UnaryGeneralDBOperator; 104.41 + 104.42 +public class GeneralDBSqlSpatialMetricBinary extends BinaryGeneralDBOperator 104.43 +{ 104.44 + 104.45 + 104.46 + /*CONSTRUCTOR*/ 104.47 + 104.48 + public GeneralDBSqlSpatialMetricBinary(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 104.49 + super(left, right); 104.50 + } 104.51 + 104.52 + @Override 104.53 + public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 104.54 + throws X 104.55 + { 104.56 + visitor.meet(this); 104.57 + } 104.58 + 104.59 +} 104.60 + 104.61 +
105.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlSpatialMetricUnary.java Thu Sep 06 00:43:34 2012 +0300 105.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlSpatialMetricUnary.java Thu Sep 06 00:44:45 2012 +0300 105.3 @@ -1,27 +1,27 @@ 105.4 -package org.openrdf.sail.generaldb.algebra; 105.5 - 105.6 -import java.util.ArrayList; 105.7 - 105.8 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 105.9 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 105.10 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 105.11 -import org.openrdf.sail.generaldb.algebra.base.UnaryGeneralDBOperator; 105.12 - 105.13 -public class GeneralDBSqlSpatialMetricUnary extends UnaryGeneralDBOperator 105.14 -{ 105.15 - 105.16 - 105.17 - /*CONSTRUCTOR*/ 105.18 - 105.19 - public GeneralDBSqlSpatialMetricUnary(GeneralDBSqlExpr expr) { 105.20 - super(expr); 105.21 - } 105.22 - 105.23 - @Override 105.24 - public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 105.25 - throws X 105.26 - { 105.27 - visitor.meet(this); 105.28 - } 105.29 - 105.30 +package org.openrdf.sail.generaldb.algebra; 105.31 + 105.32 +import java.util.ArrayList; 105.33 + 105.34 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 105.35 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 105.36 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 105.37 +import org.openrdf.sail.generaldb.algebra.base.UnaryGeneralDBOperator; 105.38 + 105.39 +public class GeneralDBSqlSpatialMetricUnary extends UnaryGeneralDBOperator 105.40 +{ 105.41 + 105.42 + 105.43 + /*CONSTRUCTOR*/ 105.44 + 105.45 + public GeneralDBSqlSpatialMetricUnary(GeneralDBSqlExpr expr) { 105.46 + super(expr); 105.47 + } 105.48 + 105.49 + @Override 105.50 + public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 105.51 + throws X 105.52 + { 105.53 + visitor.meet(this); 105.54 + } 105.55 + 105.56 } 105.57 \ No newline at end of file
106.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlSpatialProperty.java Thu Sep 06 00:43:34 2012 +0300 106.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlSpatialProperty.java Thu Sep 06 00:44:45 2012 +0300 106.3 @@ -1,28 +1,28 @@ 106.4 -package org.openrdf.sail.generaldb.algebra; 106.5 - 106.6 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 106.7 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 106.8 -import org.openrdf.sail.generaldb.algebra.base.UnaryGeneralDBOperator; 106.9 - 106.10 -/** 106.11 - * This class represents a unary operator in a SQL expression for returning various 106.12 - * properties of a geometry. 106.13 - * 106.14 - * @see {@link org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc} 106.15 - * 106.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 106.17 - */ 106.18 -public class GeneralDBSqlSpatialProperty extends UnaryGeneralDBOperator { 106.19 - 106.20 - public GeneralDBSqlSpatialProperty(GeneralDBSqlExpr arg) { 106.21 - super(arg); 106.22 - } 106.23 - 106.24 - @Override 106.25 - public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 106.26 - throws X 106.27 - { 106.28 - visitor.meet(this); 106.29 - } 106.30 - 106.31 -} 106.32 +package org.openrdf.sail.generaldb.algebra; 106.33 + 106.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 106.35 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 106.36 +import org.openrdf.sail.generaldb.algebra.base.UnaryGeneralDBOperator; 106.37 + 106.38 +/** 106.39 + * This class represents a unary operator in a SQL expression for returning various 106.40 + * properties of a geometry. 106.41 + * 106.42 + * @see {@link org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc} 106.43 + * 106.44 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 106.45 + */ 106.46 +public class GeneralDBSqlSpatialProperty extends UnaryGeneralDBOperator { 106.47 + 106.48 + public GeneralDBSqlSpatialProperty(GeneralDBSqlExpr arg) { 106.49 + super(arg); 106.50 + } 106.51 + 106.52 + @Override 106.53 + public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) 106.54 + throws X 106.55 + { 106.56 + visitor.meet(this); 106.57 + } 106.58 + 106.59 +}
107.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlTouch.java Thu Sep 06 00:43:34 2012 +0300 107.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlTouch.java Thu Sep 06 00:44:45 2012 +0300 107.3 @@ -1,20 +1,20 @@ 107.4 -/* 107.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 107.6 - * 107.7 - * Licensed under the Aduna BSD-style license. 107.8 - */ 107.9 -package org.openrdf.sail.generaldb.algebra; 107.10 - 107.11 - 107.12 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 107.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 107.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 107.15 - 107.16 -public class GeneralDBSqlTouch extends GeneralDBSqlGeoSpatial{ 107.17 - 107.18 - public GeneralDBSqlTouch(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 107.19 - super(left, right); 107.20 - } 107.21 - 107.22 - 107.23 +/* 107.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 107.25 + * 107.26 + * Licensed under the Aduna BSD-style license. 107.27 + */ 107.28 +package org.openrdf.sail.generaldb.algebra; 107.29 + 107.30 + 107.31 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 107.32 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 107.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 107.34 + 107.35 +public class GeneralDBSqlTouch extends GeneralDBSqlGeoSpatial{ 107.36 + 107.37 + public GeneralDBSqlTouch(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 107.38 + super(left, right); 107.39 + } 107.40 + 107.41 + 107.42 } 107.43 \ No newline at end of file
108.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/egenhofer/GeneralDBSqlEgenhofer_Contains.java Thu Sep 06 00:43:34 2012 +0300 108.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/egenhofer/GeneralDBSqlEgenhofer_Contains.java Thu Sep 06 00:44:45 2012 +0300 108.3 @@ -1,20 +1,20 @@ 108.4 -/* 108.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 108.6 - * 108.7 - * Licensed under the Aduna BSD-style license. 108.8 - */ 108.9 -package org.openrdf.sail.generaldb.algebra.egenhofer; 108.10 - 108.11 - 108.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 108.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 108.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 108.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 108.16 - 108.17 -public class GeneralDBSqlEgenhofer_Contains extends GeneralDBSqlGeoSpatial{ 108.18 - 108.19 - public GeneralDBSqlEgenhofer_Contains(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 108.20 - super(left, right); 108.21 - } 108.22 - 108.23 +/* 108.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 108.25 + * 108.26 + * Licensed under the Aduna BSD-style license. 108.27 + */ 108.28 +package org.openrdf.sail.generaldb.algebra.egenhofer; 108.29 + 108.30 + 108.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 108.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 108.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 108.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 108.35 + 108.36 +public class GeneralDBSqlEgenhofer_Contains extends GeneralDBSqlGeoSpatial{ 108.37 + 108.38 + public GeneralDBSqlEgenhofer_Contains(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 108.39 + super(left, right); 108.40 + } 108.41 + 108.42 } 108.43 \ No newline at end of file
109.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/egenhofer/GeneralDBSqlEgenhofer_CoveredBy.java Thu Sep 06 00:43:34 2012 +0300 109.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/egenhofer/GeneralDBSqlEgenhofer_CoveredBy.java Thu Sep 06 00:44:45 2012 +0300 109.3 @@ -1,20 +1,20 @@ 109.4 -/* 109.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 109.6 - * 109.7 - * Licensed under the Aduna BSD-style license. 109.8 - */ 109.9 -package org.openrdf.sail.generaldb.algebra.egenhofer; 109.10 - 109.11 - 109.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 109.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 109.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 109.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 109.16 - 109.17 -public class GeneralDBSqlEgenhofer_CoveredBy extends GeneralDBSqlGeoSpatial{ 109.18 - 109.19 - public GeneralDBSqlEgenhofer_CoveredBy(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 109.20 - super(left, right); 109.21 - } 109.22 - 109.23 +/* 109.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 109.25 + * 109.26 + * Licensed under the Aduna BSD-style license. 109.27 + */ 109.28 +package org.openrdf.sail.generaldb.algebra.egenhofer; 109.29 + 109.30 + 109.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 109.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 109.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 109.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 109.35 + 109.36 +public class GeneralDBSqlEgenhofer_CoveredBy extends GeneralDBSqlGeoSpatial{ 109.37 + 109.38 + public GeneralDBSqlEgenhofer_CoveredBy(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 109.39 + super(left, right); 109.40 + } 109.41 + 109.42 } 109.43 \ No newline at end of file
110.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/egenhofer/GeneralDBSqlEgenhofer_Covers.java Thu Sep 06 00:43:34 2012 +0300 110.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/egenhofer/GeneralDBSqlEgenhofer_Covers.java Thu Sep 06 00:44:45 2012 +0300 110.3 @@ -1,20 +1,20 @@ 110.4 -/* 110.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 110.6 - * 110.7 - * Licensed under the Aduna BSD-style license. 110.8 - */ 110.9 -package org.openrdf.sail.generaldb.algebra.egenhofer; 110.10 - 110.11 - 110.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 110.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 110.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 110.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 110.16 - 110.17 -public class GeneralDBSqlEgenhofer_Covers extends GeneralDBSqlGeoSpatial{ 110.18 - 110.19 - public GeneralDBSqlEgenhofer_Covers(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 110.20 - super(left, right); 110.21 - } 110.22 - 110.23 +/* 110.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 110.25 + * 110.26 + * Licensed under the Aduna BSD-style license. 110.27 + */ 110.28 +package org.openrdf.sail.generaldb.algebra.egenhofer; 110.29 + 110.30 + 110.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 110.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 110.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 110.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 110.35 + 110.36 +public class GeneralDBSqlEgenhofer_Covers extends GeneralDBSqlGeoSpatial{ 110.37 + 110.38 + public GeneralDBSqlEgenhofer_Covers(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 110.39 + super(left, right); 110.40 + } 110.41 + 110.42 } 110.43 \ No newline at end of file
111.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/egenhofer/GeneralDBSqlEgenhofer_Disjoint.java Thu Sep 06 00:43:34 2012 +0300 111.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/egenhofer/GeneralDBSqlEgenhofer_Disjoint.java Thu Sep 06 00:44:45 2012 +0300 111.3 @@ -1,20 +1,20 @@ 111.4 -/* 111.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 111.6 - * 111.7 - * Licensed under the Aduna BSD-style license. 111.8 - */ 111.9 -package org.openrdf.sail.generaldb.algebra.egenhofer; 111.10 - 111.11 - 111.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 111.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 111.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 111.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 111.16 - 111.17 -public class GeneralDBSqlEgenhofer_Disjoint extends GeneralDBSqlGeoSpatial{ 111.18 - 111.19 - public GeneralDBSqlEgenhofer_Disjoint(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 111.20 - super(left, right); 111.21 - } 111.22 - 111.23 +/* 111.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 111.25 + * 111.26 + * Licensed under the Aduna BSD-style license. 111.27 + */ 111.28 +package org.openrdf.sail.generaldb.algebra.egenhofer; 111.29 + 111.30 + 111.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 111.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 111.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 111.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 111.35 + 111.36 +public class GeneralDBSqlEgenhofer_Disjoint extends GeneralDBSqlGeoSpatial{ 111.37 + 111.38 + public GeneralDBSqlEgenhofer_Disjoint(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 111.39 + super(left, right); 111.40 + } 111.41 + 111.42 } 111.43 \ No newline at end of file
112.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/egenhofer/GeneralDBSqlEgenhofer_Equals.java Thu Sep 06 00:43:34 2012 +0300 112.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/egenhofer/GeneralDBSqlEgenhofer_Equals.java Thu Sep 06 00:44:45 2012 +0300 112.3 @@ -1,20 +1,20 @@ 112.4 -/* 112.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 112.6 - * 112.7 - * Licensed under the Aduna BSD-style license. 112.8 - */ 112.9 -package org.openrdf.sail.generaldb.algebra.egenhofer; 112.10 - 112.11 - 112.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 112.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 112.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 112.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 112.16 - 112.17 -public class GeneralDBSqlEgenhofer_Equals extends GeneralDBSqlGeoSpatial{ 112.18 - 112.19 - public GeneralDBSqlEgenhofer_Equals(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 112.20 - super(left, right); 112.21 - } 112.22 - 112.23 +/* 112.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 112.25 + * 112.26 + * Licensed under the Aduna BSD-style license. 112.27 + */ 112.28 +package org.openrdf.sail.generaldb.algebra.egenhofer; 112.29 + 112.30 + 112.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 112.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 112.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 112.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 112.35 + 112.36 +public class GeneralDBSqlEgenhofer_Equals extends GeneralDBSqlGeoSpatial{ 112.37 + 112.38 + public GeneralDBSqlEgenhofer_Equals(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 112.39 + super(left, right); 112.40 + } 112.41 + 112.42 } 112.43 \ No newline at end of file
113.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/egenhofer/GeneralDBSqlEgenhofer_Inside.java Thu Sep 06 00:43:34 2012 +0300 113.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/egenhofer/GeneralDBSqlEgenhofer_Inside.java Thu Sep 06 00:44:45 2012 +0300 113.3 @@ -1,20 +1,20 @@ 113.4 -/* 113.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 113.6 - * 113.7 - * Licensed under the Aduna BSD-style license. 113.8 - */ 113.9 -package org.openrdf.sail.generaldb.algebra.egenhofer; 113.10 - 113.11 - 113.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 113.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 113.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 113.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 113.16 - 113.17 -public class GeneralDBSqlEgenhofer_Inside extends GeneralDBSqlGeoSpatial{ 113.18 - 113.19 - public GeneralDBSqlEgenhofer_Inside(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 113.20 - super(left, right); 113.21 - } 113.22 - 113.23 +/* 113.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 113.25 + * 113.26 + * Licensed under the Aduna BSD-style license. 113.27 + */ 113.28 +package org.openrdf.sail.generaldb.algebra.egenhofer; 113.29 + 113.30 + 113.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 113.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 113.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 113.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 113.35 + 113.36 +public class GeneralDBSqlEgenhofer_Inside extends GeneralDBSqlGeoSpatial{ 113.37 + 113.38 + public GeneralDBSqlEgenhofer_Inside(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 113.39 + super(left, right); 113.40 + } 113.41 + 113.42 } 113.43 \ No newline at end of file
114.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/egenhofer/GeneralDBSqlEgenhofer_Meet.java Thu Sep 06 00:43:34 2012 +0300 114.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/egenhofer/GeneralDBSqlEgenhofer_Meet.java Thu Sep 06 00:44:45 2012 +0300 114.3 @@ -1,20 +1,20 @@ 114.4 -/* 114.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 114.6 - * 114.7 - * Licensed under the Aduna BSD-style license. 114.8 - */ 114.9 -package org.openrdf.sail.generaldb.algebra.egenhofer; 114.10 - 114.11 - 114.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 114.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 114.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 114.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 114.16 - 114.17 -public class GeneralDBSqlEgenhofer_Meet extends GeneralDBSqlGeoSpatial{ 114.18 - 114.19 - public GeneralDBSqlEgenhofer_Meet(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 114.20 - super(left, right); 114.21 - } 114.22 - 114.23 +/* 114.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 114.25 + * 114.26 + * Licensed under the Aduna BSD-style license. 114.27 + */ 114.28 +package org.openrdf.sail.generaldb.algebra.egenhofer; 114.29 + 114.30 + 114.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 114.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 114.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 114.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 114.35 + 114.36 +public class GeneralDBSqlEgenhofer_Meet extends GeneralDBSqlGeoSpatial{ 114.37 + 114.38 + public GeneralDBSqlEgenhofer_Meet(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 114.39 + super(left, right); 114.40 + } 114.41 + 114.42 } 114.43 \ No newline at end of file
115.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/egenhofer/GeneralDBSqlEgenhofer_Overlap.java Thu Sep 06 00:43:34 2012 +0300 115.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/egenhofer/GeneralDBSqlEgenhofer_Overlap.java Thu Sep 06 00:44:45 2012 +0300 115.3 @@ -1,20 +1,20 @@ 115.4 -/* 115.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 115.6 - * 115.7 - * Licensed under the Aduna BSD-style license. 115.8 - */ 115.9 -package org.openrdf.sail.generaldb.algebra.egenhofer; 115.10 - 115.11 - 115.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 115.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 115.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 115.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 115.16 - 115.17 -public class GeneralDBSqlEgenhofer_Overlap extends GeneralDBSqlGeoSpatial{ 115.18 - 115.19 - public GeneralDBSqlEgenhofer_Overlap(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 115.20 - super(left, right); 115.21 - } 115.22 - 115.23 +/* 115.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 115.25 + * 115.26 + * Licensed under the Aduna BSD-style license. 115.27 + */ 115.28 +package org.openrdf.sail.generaldb.algebra.egenhofer; 115.29 + 115.30 + 115.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 115.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 115.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 115.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 115.35 + 115.36 +public class GeneralDBSqlEgenhofer_Overlap extends GeneralDBSqlGeoSpatial{ 115.37 + 115.38 + public GeneralDBSqlEgenhofer_Overlap(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 115.39 + super(left, right); 115.40 + } 115.41 + 115.42 } 115.43 \ No newline at end of file
116.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/rcc8/GeneralDBSqlRCC8_Dc.java Thu Sep 06 00:43:34 2012 +0300 116.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/rcc8/GeneralDBSqlRCC8_Dc.java Thu Sep 06 00:44:45 2012 +0300 116.3 @@ -1,20 +1,20 @@ 116.4 -/* 116.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 116.6 - * 116.7 - * Licensed under the Aduna BSD-style license. 116.8 - */ 116.9 -package org.openrdf.sail.generaldb.algebra.rcc8; 116.10 - 116.11 - 116.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 116.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 116.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 116.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 116.16 - 116.17 -public class GeneralDBSqlRCC8_Dc extends GeneralDBSqlGeoSpatial{ 116.18 - 116.19 - public GeneralDBSqlRCC8_Dc(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 116.20 - super(left, right); 116.21 - } 116.22 - 116.23 +/* 116.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 116.25 + * 116.26 + * Licensed under the Aduna BSD-style license. 116.27 + */ 116.28 +package org.openrdf.sail.generaldb.algebra.rcc8; 116.29 + 116.30 + 116.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 116.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 116.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 116.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 116.35 + 116.36 +public class GeneralDBSqlRCC8_Dc extends GeneralDBSqlGeoSpatial{ 116.37 + 116.38 + public GeneralDBSqlRCC8_Dc(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 116.39 + super(left, right); 116.40 + } 116.41 + 116.42 } 116.43 \ No newline at end of file
117.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/rcc8/GeneralDBSqlRCC8_Ec.java Thu Sep 06 00:43:34 2012 +0300 117.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/rcc8/GeneralDBSqlRCC8_Ec.java Thu Sep 06 00:44:45 2012 +0300 117.3 @@ -1,20 +1,20 @@ 117.4 -/* 117.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 117.6 - * 117.7 - * Licensed under the Aduna BSD-style license. 117.8 - */ 117.9 -package org.openrdf.sail.generaldb.algebra.rcc8; 117.10 - 117.11 - 117.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 117.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 117.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 117.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 117.16 - 117.17 -public class GeneralDBSqlRCC8_Ec extends GeneralDBSqlGeoSpatial{ 117.18 - 117.19 - public GeneralDBSqlRCC8_Ec(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 117.20 - super(left, right); 117.21 - } 117.22 - 117.23 +/* 117.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 117.25 + * 117.26 + * Licensed under the Aduna BSD-style license. 117.27 + */ 117.28 +package org.openrdf.sail.generaldb.algebra.rcc8; 117.29 + 117.30 + 117.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 117.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 117.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 117.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 117.35 + 117.36 +public class GeneralDBSqlRCC8_Ec extends GeneralDBSqlGeoSpatial{ 117.37 + 117.38 + public GeneralDBSqlRCC8_Ec(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 117.39 + super(left, right); 117.40 + } 117.41 + 117.42 } 117.43 \ No newline at end of file
118.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/rcc8/GeneralDBSqlRCC8_Eq.java Thu Sep 06 00:43:34 2012 +0300 118.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/rcc8/GeneralDBSqlRCC8_Eq.java Thu Sep 06 00:44:45 2012 +0300 118.3 @@ -1,20 +1,20 @@ 118.4 -/* 118.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 118.6 - * 118.7 - * Licensed under the Aduna BSD-style license. 118.8 - */ 118.9 -package org.openrdf.sail.generaldb.algebra.rcc8; 118.10 - 118.11 - 118.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 118.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 118.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 118.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 118.16 - 118.17 -public class GeneralDBSqlRCC8_Eq extends GeneralDBSqlGeoSpatial{ 118.18 - 118.19 - public GeneralDBSqlRCC8_Eq(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 118.20 - super(left, right); 118.21 - } 118.22 - 118.23 +/* 118.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 118.25 + * 118.26 + * Licensed under the Aduna BSD-style license. 118.27 + */ 118.28 +package org.openrdf.sail.generaldb.algebra.rcc8; 118.29 + 118.30 + 118.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 118.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 118.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 118.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 118.35 + 118.36 +public class GeneralDBSqlRCC8_Eq extends GeneralDBSqlGeoSpatial{ 118.37 + 118.38 + public GeneralDBSqlRCC8_Eq(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 118.39 + super(left, right); 118.40 + } 118.41 + 118.42 } 118.43 \ No newline at end of file
119.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/rcc8/GeneralDBSqlRCC8_Ntpp.java Thu Sep 06 00:43:34 2012 +0300 119.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/rcc8/GeneralDBSqlRCC8_Ntpp.java Thu Sep 06 00:44:45 2012 +0300 119.3 @@ -1,20 +1,20 @@ 119.4 -/* 119.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 119.6 - * 119.7 - * Licensed under the Aduna BSD-style license. 119.8 - */ 119.9 -package org.openrdf.sail.generaldb.algebra.rcc8; 119.10 - 119.11 - 119.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 119.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 119.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 119.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 119.16 - 119.17 -public class GeneralDBSqlRCC8_Ntpp extends GeneralDBSqlGeoSpatial{ 119.18 - 119.19 - public GeneralDBSqlRCC8_Ntpp(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 119.20 - super(left, right); 119.21 - } 119.22 - 119.23 +/* 119.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 119.25 + * 119.26 + * Licensed under the Aduna BSD-style license. 119.27 + */ 119.28 +package org.openrdf.sail.generaldb.algebra.rcc8; 119.29 + 119.30 + 119.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 119.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 119.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 119.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 119.35 + 119.36 +public class GeneralDBSqlRCC8_Ntpp extends GeneralDBSqlGeoSpatial{ 119.37 + 119.38 + public GeneralDBSqlRCC8_Ntpp(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 119.39 + super(left, right); 119.40 + } 119.41 + 119.42 } 119.43 \ No newline at end of file
120.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/rcc8/GeneralDBSqlRCC8_Ntppi.java Thu Sep 06 00:43:34 2012 +0300 120.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/rcc8/GeneralDBSqlRCC8_Ntppi.java Thu Sep 06 00:44:45 2012 +0300 120.3 @@ -1,20 +1,20 @@ 120.4 -/* 120.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 120.6 - * 120.7 - * Licensed under the Aduna BSD-style license. 120.8 - */ 120.9 -package org.openrdf.sail.generaldb.algebra.rcc8; 120.10 - 120.11 - 120.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 120.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 120.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 120.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 120.16 - 120.17 -public class GeneralDBSqlRCC8_Ntppi extends GeneralDBSqlGeoSpatial{ 120.18 - 120.19 - public GeneralDBSqlRCC8_Ntppi(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 120.20 - super(left, right); 120.21 - } 120.22 - 120.23 +/* 120.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 120.25 + * 120.26 + * Licensed under the Aduna BSD-style license. 120.27 + */ 120.28 +package org.openrdf.sail.generaldb.algebra.rcc8; 120.29 + 120.30 + 120.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 120.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 120.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 120.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 120.35 + 120.36 +public class GeneralDBSqlRCC8_Ntppi extends GeneralDBSqlGeoSpatial{ 120.37 + 120.38 + public GeneralDBSqlRCC8_Ntppi(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 120.39 + super(left, right); 120.40 + } 120.41 + 120.42 } 120.43 \ No newline at end of file
121.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/rcc8/GeneralDBSqlRCC8_Po.java Thu Sep 06 00:43:34 2012 +0300 121.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/rcc8/GeneralDBSqlRCC8_Po.java Thu Sep 06 00:44:45 2012 +0300 121.3 @@ -1,20 +1,20 @@ 121.4 -/* 121.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 121.6 - * 121.7 - * Licensed under the Aduna BSD-style license. 121.8 - */ 121.9 -package org.openrdf.sail.generaldb.algebra.rcc8; 121.10 - 121.11 - 121.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 121.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 121.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 121.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 121.16 - 121.17 -public class GeneralDBSqlRCC8_Po extends GeneralDBSqlGeoSpatial{ 121.18 - 121.19 - public GeneralDBSqlRCC8_Po(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 121.20 - super(left, right); 121.21 - } 121.22 - 121.23 +/* 121.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 121.25 + * 121.26 + * Licensed under the Aduna BSD-style license. 121.27 + */ 121.28 +package org.openrdf.sail.generaldb.algebra.rcc8; 121.29 + 121.30 + 121.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 121.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 121.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 121.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 121.35 + 121.36 +public class GeneralDBSqlRCC8_Po extends GeneralDBSqlGeoSpatial{ 121.37 + 121.38 + public GeneralDBSqlRCC8_Po(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 121.39 + super(left, right); 121.40 + } 121.41 + 121.42 } 121.43 \ No newline at end of file
122.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/rcc8/GeneralDBSqlRCC8_Tpp.java Thu Sep 06 00:43:34 2012 +0300 122.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/rcc8/GeneralDBSqlRCC8_Tpp.java Thu Sep 06 00:44:45 2012 +0300 122.3 @@ -1,20 +1,20 @@ 122.4 -/* 122.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 122.6 - * 122.7 - * Licensed under the Aduna BSD-style license. 122.8 - */ 122.9 -package org.openrdf.sail.generaldb.algebra.rcc8; 122.10 - 122.11 - 122.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 122.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 122.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 122.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 122.16 - 122.17 -public class GeneralDBSqlRCC8_Tpp extends GeneralDBSqlGeoSpatial{ 122.18 - 122.19 - public GeneralDBSqlRCC8_Tpp(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 122.20 - super(left, right); 122.21 - } 122.22 - 122.23 +/* 122.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 122.25 + * 122.26 + * Licensed under the Aduna BSD-style license. 122.27 + */ 122.28 +package org.openrdf.sail.generaldb.algebra.rcc8; 122.29 + 122.30 + 122.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 122.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 122.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 122.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 122.35 + 122.36 +public class GeneralDBSqlRCC8_Tpp extends GeneralDBSqlGeoSpatial{ 122.37 + 122.38 + public GeneralDBSqlRCC8_Tpp(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 122.39 + super(left, right); 122.40 + } 122.41 + 122.42 } 122.43 \ No newline at end of file
123.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/rcc8/GeneralDBSqlRCC8_Tppi.java Thu Sep 06 00:43:34 2012 +0300 123.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/rcc8/GeneralDBSqlRCC8_Tppi.java Thu Sep 06 00:44:45 2012 +0300 123.3 @@ -1,20 +1,20 @@ 123.4 -/* 123.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 123.6 - * 123.7 - * Licensed under the Aduna BSD-style license. 123.8 - */ 123.9 -package org.openrdf.sail.generaldb.algebra.rcc8; 123.10 - 123.11 - 123.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 123.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 123.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 123.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 123.16 - 123.17 -public class GeneralDBSqlRCC8_Tppi extends GeneralDBSqlGeoSpatial{ 123.18 - 123.19 - public GeneralDBSqlRCC8_Tppi(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 123.20 - super(left, right); 123.21 - } 123.22 - 123.23 +/* 123.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 123.25 + * 123.26 + * Licensed under the Aduna BSD-style license. 123.27 + */ 123.28 +package org.openrdf.sail.generaldb.algebra.rcc8; 123.29 + 123.30 + 123.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 123.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 123.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 123.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 123.35 + 123.36 +public class GeneralDBSqlRCC8_Tppi extends GeneralDBSqlGeoSpatial{ 123.37 + 123.38 + public GeneralDBSqlRCC8_Tppi(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 123.39 + super(left, right); 123.40 + } 123.41 + 123.42 } 123.43 \ No newline at end of file
124.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/sf/GeneralDBSqlSF_Contains.java Thu Sep 06 00:43:34 2012 +0300 124.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/sf/GeneralDBSqlSF_Contains.java Thu Sep 06 00:44:45 2012 +0300 124.3 @@ -1,20 +1,20 @@ 124.4 -/* 124.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 124.6 - * 124.7 - * Licensed under the Aduna BSD-style license. 124.8 - */ 124.9 -package org.openrdf.sail.generaldb.algebra.sf; 124.10 - 124.11 - 124.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 124.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 124.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 124.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 124.16 - 124.17 -public class GeneralDBSqlSF_Contains extends GeneralDBSqlGeoSpatial{ 124.18 - 124.19 - public GeneralDBSqlSF_Contains(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 124.20 - super(left, right); 124.21 - } 124.22 - 124.23 +/* 124.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 124.25 + * 124.26 + * Licensed under the Aduna BSD-style license. 124.27 + */ 124.28 +package org.openrdf.sail.generaldb.algebra.sf; 124.29 + 124.30 + 124.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 124.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 124.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 124.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 124.35 + 124.36 +public class GeneralDBSqlSF_Contains extends GeneralDBSqlGeoSpatial{ 124.37 + 124.38 + public GeneralDBSqlSF_Contains(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 124.39 + super(left, right); 124.40 + } 124.41 + 124.42 } 124.43 \ No newline at end of file
125.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/sf/GeneralDBSqlSF_Crosses.java Thu Sep 06 00:43:34 2012 +0300 125.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/sf/GeneralDBSqlSF_Crosses.java Thu Sep 06 00:44:45 2012 +0300 125.3 @@ -1,20 +1,20 @@ 125.4 -/* 125.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 125.6 - * 125.7 - * Licensed under the Aduna BSD-style license. 125.8 - */ 125.9 -package org.openrdf.sail.generaldb.algebra.sf; 125.10 - 125.11 - 125.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 125.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 125.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 125.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 125.16 - 125.17 -public class GeneralDBSqlSF_Crosses extends GeneralDBSqlGeoSpatial{ 125.18 - 125.19 - public GeneralDBSqlSF_Crosses(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 125.20 - super(left, right); 125.21 - } 125.22 - 125.23 +/* 125.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 125.25 + * 125.26 + * Licensed under the Aduna BSD-style license. 125.27 + */ 125.28 +package org.openrdf.sail.generaldb.algebra.sf; 125.29 + 125.30 + 125.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 125.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 125.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 125.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 125.35 + 125.36 +public class GeneralDBSqlSF_Crosses extends GeneralDBSqlGeoSpatial{ 125.37 + 125.38 + public GeneralDBSqlSF_Crosses(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 125.39 + super(left, right); 125.40 + } 125.41 + 125.42 } 125.43 \ No newline at end of file
126.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/sf/GeneralDBSqlSF_Disjoint.java Thu Sep 06 00:43:34 2012 +0300 126.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/sf/GeneralDBSqlSF_Disjoint.java Thu Sep 06 00:44:45 2012 +0300 126.3 @@ -1,20 +1,20 @@ 126.4 -/* 126.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 126.6 - * 126.7 - * Licensed under the Aduna BSD-style license. 126.8 - */ 126.9 -package org.openrdf.sail.generaldb.algebra.sf; 126.10 - 126.11 - 126.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 126.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 126.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 126.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 126.16 - 126.17 -public class GeneralDBSqlSF_Disjoint extends GeneralDBSqlGeoSpatial{ 126.18 - 126.19 - public GeneralDBSqlSF_Disjoint(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 126.20 - super(left, right); 126.21 - } 126.22 - 126.23 +/* 126.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 126.25 + * 126.26 + * Licensed under the Aduna BSD-style license. 126.27 + */ 126.28 +package org.openrdf.sail.generaldb.algebra.sf; 126.29 + 126.30 + 126.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 126.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 126.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 126.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 126.35 + 126.36 +public class GeneralDBSqlSF_Disjoint extends GeneralDBSqlGeoSpatial{ 126.37 + 126.38 + public GeneralDBSqlSF_Disjoint(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 126.39 + super(left, right); 126.40 + } 126.41 + 126.42 } 126.43 \ No newline at end of file
127.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/sf/GeneralDBSqlSF_Equals.java Thu Sep 06 00:43:34 2012 +0300 127.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/sf/GeneralDBSqlSF_Equals.java Thu Sep 06 00:44:45 2012 +0300 127.3 @@ -1,20 +1,20 @@ 127.4 -/* 127.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 127.6 - * 127.7 - * Licensed under the Aduna BSD-style license. 127.8 - */ 127.9 -package org.openrdf.sail.generaldb.algebra.sf; 127.10 - 127.11 - 127.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 127.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 127.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 127.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 127.16 - 127.17 -public class GeneralDBSqlSF_Equals extends GeneralDBSqlGeoSpatial{ 127.18 - 127.19 - public GeneralDBSqlSF_Equals(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 127.20 - super(left, right); 127.21 - } 127.22 - 127.23 +/* 127.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 127.25 + * 127.26 + * Licensed under the Aduna BSD-style license. 127.27 + */ 127.28 +package org.openrdf.sail.generaldb.algebra.sf; 127.29 + 127.30 + 127.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 127.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 127.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 127.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 127.35 + 127.36 +public class GeneralDBSqlSF_Equals extends GeneralDBSqlGeoSpatial{ 127.37 + 127.38 + public GeneralDBSqlSF_Equals(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 127.39 + super(left, right); 127.40 + } 127.41 + 127.42 } 127.43 \ No newline at end of file
128.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/sf/GeneralDBSqlSF_Intersects.java Thu Sep 06 00:43:34 2012 +0300 128.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/sf/GeneralDBSqlSF_Intersects.java Thu Sep 06 00:44:45 2012 +0300 128.3 @@ -1,20 +1,20 @@ 128.4 -/* 128.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 128.6 - * 128.7 - * Licensed under the Aduna BSD-style license. 128.8 - */ 128.9 -package org.openrdf.sail.generaldb.algebra.sf; 128.10 - 128.11 - 128.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 128.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 128.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 128.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 128.16 - 128.17 -public class GeneralDBSqlSF_Intersects extends GeneralDBSqlGeoSpatial{ 128.18 - 128.19 - public GeneralDBSqlSF_Intersects(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 128.20 - super(left, right); 128.21 - } 128.22 - 128.23 +/* 128.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 128.25 + * 128.26 + * Licensed under the Aduna BSD-style license. 128.27 + */ 128.28 +package org.openrdf.sail.generaldb.algebra.sf; 128.29 + 128.30 + 128.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 128.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 128.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 128.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 128.35 + 128.36 +public class GeneralDBSqlSF_Intersects extends GeneralDBSqlGeoSpatial{ 128.37 + 128.38 + public GeneralDBSqlSF_Intersects(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 128.39 + super(left, right); 128.40 + } 128.41 + 128.42 } 128.43 \ No newline at end of file
129.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/sf/GeneralDBSqlSF_Overlaps.java Thu Sep 06 00:43:34 2012 +0300 129.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/sf/GeneralDBSqlSF_Overlaps.java Thu Sep 06 00:44:45 2012 +0300 129.3 @@ -1,20 +1,20 @@ 129.4 -/* 129.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 129.6 - * 129.7 - * Licensed under the Aduna BSD-style license. 129.8 - */ 129.9 -package org.openrdf.sail.generaldb.algebra.sf; 129.10 - 129.11 - 129.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 129.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 129.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 129.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 129.16 - 129.17 -public class GeneralDBSqlSF_Overlaps extends GeneralDBSqlGeoSpatial{ 129.18 - 129.19 - public GeneralDBSqlSF_Overlaps(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 129.20 - super(left, right); 129.21 - } 129.22 - 129.23 +/* 129.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 129.25 + * 129.26 + * Licensed under the Aduna BSD-style license. 129.27 + */ 129.28 +package org.openrdf.sail.generaldb.algebra.sf; 129.29 + 129.30 + 129.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 129.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 129.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 129.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 129.35 + 129.36 +public class GeneralDBSqlSF_Overlaps extends GeneralDBSqlGeoSpatial{ 129.37 + 129.38 + public GeneralDBSqlSF_Overlaps(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 129.39 + super(left, right); 129.40 + } 129.41 + 129.42 } 129.43 \ No newline at end of file
130.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/sf/GeneralDBSqlSF_Touches.java Thu Sep 06 00:43:34 2012 +0300 130.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/sf/GeneralDBSqlSF_Touches.java Thu Sep 06 00:44:45 2012 +0300 130.3 @@ -1,20 +1,20 @@ 130.4 -/* 130.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 130.6 - * 130.7 - * Licensed under the Aduna BSD-style license. 130.8 - */ 130.9 -package org.openrdf.sail.generaldb.algebra.sf; 130.10 - 130.11 - 130.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 130.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 130.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 130.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 130.16 - 130.17 -public class GeneralDBSqlSF_Touches extends GeneralDBSqlGeoSpatial{ 130.18 - 130.19 - public GeneralDBSqlSF_Touches(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 130.20 - super(left, right); 130.21 - } 130.22 - 130.23 +/* 130.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 130.25 + * 130.26 + * Licensed under the Aduna BSD-style license. 130.27 + */ 130.28 +package org.openrdf.sail.generaldb.algebra.sf; 130.29 + 130.30 + 130.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 130.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 130.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 130.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 130.35 + 130.36 +public class GeneralDBSqlSF_Touches extends GeneralDBSqlGeoSpatial{ 130.37 + 130.38 + public GeneralDBSqlSF_Touches(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 130.39 + super(left, right); 130.40 + } 130.41 + 130.42 } 130.43 \ No newline at end of file
131.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/sf/GeneralDBSqlSF_Within.java Thu Sep 06 00:43:34 2012 +0300 131.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/sf/GeneralDBSqlSF_Within.java Thu Sep 06 00:44:45 2012 +0300 131.3 @@ -1,20 +1,20 @@ 131.4 -/* 131.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 131.6 - * 131.7 - * Licensed under the Aduna BSD-style license. 131.8 - */ 131.9 -package org.openrdf.sail.generaldb.algebra.sf; 131.10 - 131.11 - 131.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 131.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 131.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 131.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 131.16 - 131.17 -public class GeneralDBSqlSF_Within extends GeneralDBSqlGeoSpatial{ 131.18 - 131.19 - public GeneralDBSqlSF_Within(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 131.20 - super(left, right); 131.21 - } 131.22 - 131.23 +/* 131.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 131.25 + * 131.26 + * Licensed under the Aduna BSD-style license. 131.27 + */ 131.28 +package org.openrdf.sail.generaldb.algebra.sf; 131.29 + 131.30 + 131.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial; 131.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 131.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;