Strabon

changeset 366:a4f8329dc488

added some comments in classes corresponding to extension functions and filled-in author name
author Babis Nikolaou <charnik@di.uoa.gr>
date Tue Jun 26 20:02:09 2012 +0300 (2012-06-26)
parents 2d086614c69f
children 5bc9b08e456f
files evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/link/SimilarTermFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/SpatialConstructFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/SpatialMetricFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/SpatialPropertyFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/SpatialRelationshipFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlNonTopologicalConstruct.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlNonTopologicalMetric.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlRelateFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlRelation.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferContainsFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlBoundaryFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlBufferFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlConvexHullFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlDifferenceFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlDistanceFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlEnvelopeFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlIntersectionFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlSymmetricDifferenceFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlUnionFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8DisconnectedFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8EqualsFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8ExternallyConnectedFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8NonTangentialProperPartFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8NonTangentialProperPartInverseFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8PartiallyOverlappingFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8TangentialProperPartFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8TangentialProperPartInverseFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeatureTouchesFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesContainsFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesCrossesFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesDisjointFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesEqualsFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesIntersectsFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesOverlapsFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesWithinFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/aggregate/ExtentFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/BoundaryFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/BufferFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/ConvexHullFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/DifferenceFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/EnvelopeFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/IntersectionFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/SymDifferenceFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/TransformFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/UnionFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/metric/AreaFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/metric/DistanceFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/AsTextFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/DimensionFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/GeometryTypeFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/IsEmptyFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/IsSimpleFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/SridFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/AboveFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/AnyInteractFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/BelowFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/ContainsFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/CoveredByFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/CoversFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/DisjointFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/EqualsFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/InsideFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/LeftFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/OverlapFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/RelateFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/RightFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/TouchFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/impl/SpatialJoinOptimizer.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/impl/stSPARQLConstantOptimizer.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/iterator/StSPARQLGroupIterator.java
line diff
     1.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/link/SimilarTermFunc.java	Tue Jun 26 17:25:40 2012 +0300
     1.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/link/SimilarTermFunc.java	Tue Jun 26 20:02:09 2012 +0300
     1.3 @@ -11,7 +11,10 @@
     1.4  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
     1.5  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
     1.6  
     1.7 -
     1.8 +/**
     1.9 + * 
    1.10 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
    1.11 + */
    1.12  public class SimilarTermFunc extends GeoSparqlRelation {
    1.13  	
    1.14  	protected static String name = "similarTerm";
    1.15 @@ -19,7 +22,7 @@
    1.16  	@Override
    1.17  	public String getURI() {
    1.18  		return StrabonPolyhedron.stRDF+name;
    1.19 -		}
    1.20 +	}
    1.21  
    1.22      public Value evaluate(ValueFactory valueFactory, Value... args)
    1.23              throws ValueExprEvaluationException {
     2.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/SpatialConstructFunc.java	Tue Jun 26 17:25:40 2012 +0300
     2.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/SpatialConstructFunc.java	Tue Jun 26 20:02:09 2012 +0300
     2.3 @@ -5,7 +5,17 @@
     2.4  import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
     2.5  import org.openrdf.query.algebra.evaluation.function.Function;
     2.6  
     2.7 -public class SpatialConstructFunc implements Function {
     2.8 +/**
     2.9 + * This class represents a spatial function doing a geometric operation on a geometry (or a set
    2.10 + * of geometries in the case of aggregate functions) and returning the result as a new geometry.
    2.11 + * 
    2.12 + * @see package {@link org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct}
    2.13 + *      and		{@link org.openrdf.query.algebra.evaluation.function.spatial.stsparql.aggregage}
    2.14 + * 
    2.15 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
    2.16 + * @author Charalampos Nikolaou <charnik@di.uoa.gr>
    2.17 + */
    2.18 +public abstract class SpatialConstructFunc implements Function {
    2.19  
    2.20  	//No need for any implementation, I will have replaced this class's presence before reaching this place
    2.21  	public Value evaluate(ValueFactory valueFactory, Value... args)
    2.22 @@ -14,10 +24,6 @@
    2.23  		return null;
    2.24  	}
    2.25  
    2.26 -	//I'll have everyone override it
    2.27 -	public String getURI() {
    2.28 -
    2.29 -		return null;
    2.30 -	}
    2.31 -
    2.32 +	// charnik: made method (and hence the class) abstract
    2.33 +	public abstract String getURI();
    2.34  }
     3.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/SpatialMetricFunc.java	Tue Jun 26 17:25:40 2012 +0300
     3.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/SpatialMetricFunc.java	Tue Jun 26 20:02:09 2012 +0300
     3.3 @@ -5,20 +5,24 @@
     3.4  import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
     3.5  import org.openrdf.query.algebra.evaluation.function.Function;
     3.6  
     3.7 -public class SpatialMetricFunc implements Function {
     3.8 -
     3.9 +/**
    3.10 + * This class represents a spatial function doing a metric computation
    3.11 + * (e.g., calculating the area for a geometry, or the distance between
    3.12 + * two geometries).
    3.13 + * 
    3.14 + * @see package {@link org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric}
    3.15 + * 
    3.16 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
    3.17 + * @author Charalampos Nikolaou <charnik@di.uoa.gr>
    3.18 + */
    3.19 +public abstract class SpatialMetricFunc implements Function {
    3.20  
    3.21  	//No need for any implementation, I will have replaced this class's presence before reaching this place
    3.22 -	public Value evaluate(ValueFactory valueFactory, Value... args)
    3.23 -	throws ValueExprEvaluationException {
    3.24 +	public Value evaluate(ValueFactory valueFactory, Value... args) throws ValueExprEvaluationException {
    3.25  
    3.26  		return null;
    3.27  	}
    3.28  
    3.29 -	//I'll have everyone override it
    3.30 -	public String getURI() {
    3.31 -
    3.32 -		return null;
    3.33 -	}
    3.34 -
    3.35 +	// charnik: made method (and hence the class) abstract
    3.36 +	public abstract String getURI();
    3.37  }
     4.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/SpatialPropertyFunc.java	Tue Jun 26 17:25:40 2012 +0300
     4.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/SpatialPropertyFunc.java	Tue Jun 26 20:02:09 2012 +0300
     4.3 @@ -5,8 +5,18 @@
     4.4  import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
     4.5  import org.openrdf.query.algebra.evaluation.function.Function;
     4.6  
     4.7 -public class SpatialPropertyFunc implements Function {
     4.8 -
     4.9 +/**
    4.10 + * This class represents a spatial function returning/computing a property
    4.11 + * on a geometry, such as its dimension (0 for points, 1 for line segments
    4.12 + * and so on), its type (Polygon, Point, etc.), SRID, etc.
    4.13 + * 
    4.14 + * @see package {@link org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property}
    4.15 + * 
    4.16 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
    4.17 + * @author Charalampos Nikolaou <charnik@di.uoa.gr>
    4.18 + *
    4.19 + */
    4.20 +public abstract class SpatialPropertyFunc implements Function {
    4.21  
    4.22  	//No need for any implementation, I will have replaced this class's presence before reaching this place
    4.23  	public Value evaluate(ValueFactory valueFactory, Value... args)
    4.24 @@ -15,10 +25,6 @@
    4.25  		return null;
    4.26  	}
    4.27  
    4.28 -	//I'll have everyone override it
    4.29 -	public String getURI() {
    4.30 -
    4.31 -		return null;
    4.32 -	}
    4.33 -
    4.34 +	// charnik: made method (and hence the class) abstract
    4.35 +	public abstract String getURI();
    4.36  }
     5.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/SpatialRelationshipFunc.java	Tue Jun 26 17:25:40 2012 +0300
     5.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/SpatialRelationshipFunc.java	Tue Jun 26 20:02:09 2012 +0300
     5.3 @@ -5,9 +5,19 @@
     5.4  import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
     5.5  import org.openrdf.query.algebra.evaluation.function.Function;
     5.6  
     5.7 +/**
     5.8 + * This class represents a spatial function testing whether two geometries
     5.9 + * are spatially related (e.g., there is a topological relationship between
    5.10 + * them such as containment, disjointness, etc. or they share a point).
    5.11 + * 
    5.12 + * @see package {@link org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation}
    5.13 + * 
    5.14 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
    5.15 + * @author Charalampos Nikolaou <charnik@di.uoa.gr>
    5.16 + * 
    5.17 + */
    5.18  public abstract class SpatialRelationshipFunc implements Function {
    5.19  
    5.20 -
    5.21  	//No need for any implementation, I will have replaced this class's presence before reaching this place
    5.22  	public Value evaluate(ValueFactory valueFactory, Value... args)
    5.23  	throws ValueExprEvaluationException {
    5.24 @@ -15,10 +25,6 @@
    5.25  		return null;
    5.26  	}
    5.27  
    5.28 -	//I'll have everyone override it
    5.29 -	public String getURI() {
    5.30 -
    5.31 -		return null;
    5.32 -	}
    5.33 -
    5.34 +	// charnik: made method (and hence the class) abstract
    5.35 +	public abstract String getURI();
    5.36  }
     6.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlNonTopologicalConstruct.java	Tue Jun 26 17:25:40 2012 +0300
     6.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlNonTopologicalConstruct.java	Tue Jun 26 20:02:09 2012 +0300
     6.3 @@ -5,37 +5,28 @@
     6.4   */
     6.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql;
     6.6  
     6.7 -import java.math.BigDecimal;
     6.8 -import java.math.BigInteger;
     6.9 -
    6.10 -import org.openrdf.model.Literal;
    6.11 -import org.openrdf.model.URI;
    6.12  import org.openrdf.model.Value;
    6.13  import org.openrdf.model.ValueFactory;
    6.14 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
    6.15 -import org.openrdf.model.vocabulary.XMLSchema;
    6.16  import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
    6.17 -import org.openrdf.query.algebra.evaluation.function.Function;
    6.18  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
    6.19 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
    6.20 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
    6.21  
    6.22 -//import eu.ist.semsorgrid4env.strabon.structures.StrabonPolyhedron;
    6.23 -
    6.24 +/**
    6.25 + * This class represents a spatial function like the one defined in its superclass 
    6.26 + * {@link SpatialConstructFunc} class for the case of stSPARQL.
    6.27 + * 
    6.28 + * @see package {@link org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological}
    6.29 + * 
    6.30 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
    6.31 + * @author Charalampos Nikolaou <charnik@di.uoa.gr>
    6.32 + */
    6.33  public abstract class GeoSparqlNonTopologicalConstruct extends SpatialConstructFunc {
    6.34  
    6.35  	//No need for any implementation, I will have replaced this class's presence before reaching this place
    6.36  	public Value evaluate(ValueFactory valueFactory, Value... args)
    6.37  	throws ValueExprEvaluationException {
    6.38 -
    6.39  		return null;
    6.40  	}
    6.41  
    6.42 -	//I'll have everyone override it
    6.43 -	public String getURI() {
    6.44 -
    6.45 -		return null;
    6.46 -	}
    6.47 -
    6.48 -	
    6.49 +	// charnik: made the method abstract
    6.50 +	public abstract String getURI();
    6.51  }
     7.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlNonTopologicalMetric.java	Tue Jun 26 17:25:40 2012 +0300
     7.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlNonTopologicalMetric.java	Tue Jun 26 20:02:09 2012 +0300
     7.3 @@ -5,37 +5,28 @@
     7.4   */
     7.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql;
     7.6  
     7.7 -import java.math.BigDecimal;
     7.8 -import java.math.BigInteger;
     7.9 -
    7.10 -import org.openrdf.model.Literal;
    7.11 -import org.openrdf.model.URI;
    7.12  import org.openrdf.model.Value;
    7.13  import org.openrdf.model.ValueFactory;
    7.14 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
    7.15 -import org.openrdf.model.vocabulary.XMLSchema;
    7.16  import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
    7.17 -import org.openrdf.query.algebra.evaluation.function.Function;
    7.18  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
    7.19 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
    7.20 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
    7.21  
    7.22 -//import eu.ist.semsorgrid4env.strabon.structures.StrabonPolyhedron;
    7.23 -
    7.24 +/**
    7.25 + * This class represents a spatial function like the one defined in its superclass 
    7.26 + * {@link SpatialConstructFunc} class for the case of stSPARQL.
    7.27 + * 
    7.28 + * @see package {@link org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological}
    7.29 + * 
    7.30 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
    7.31 + * @author Charalampos Nikolaou <charnik@di.uoa.gr>
    7.32 + */
    7.33  public abstract class GeoSparqlNonTopologicalMetric extends SpatialConstructFunc {
    7.34  
    7.35  	//No need for any implementation, I will have replaced this class's presence before reaching this place
    7.36  	public Value evaluate(ValueFactory valueFactory, Value... args)
    7.37  	throws ValueExprEvaluationException {
    7.38 -
    7.39  		return null;
    7.40  	}
    7.41  
    7.42 -	//I'll have everyone override it
    7.43 -	public String getURI() {
    7.44 -
    7.45 -		return null;
    7.46 -	}
    7.47 -
    7.48 -	
    7.49 +	// charnik: made the method abstract
    7.50 +	public abstract String getURI();
    7.51  }
     8.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlRelateFunc.java	Tue Jun 26 17:25:40 2012 +0300
     8.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlRelateFunc.java	Tue Jun 26 20:02:09 2012 +0300
     8.3 @@ -8,12 +8,14 @@
     8.4  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
     8.5  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
     8.6  
     8.7 -
     8.8 +/**
     8.9 + * 
    8.10 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
    8.11 + */
    8.12  public class GeoSparqlRelateFunc extends GeoSparqlRelation {
    8.13  
    8.14  	@Override
    8.15  	public String getURI() {
    8.16  		return StrabonPolyhedron.geoSparqlRelate;
    8.17 -		}
    8.18 -
    8.19 +	}
    8.20  }
     9.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlRelation.java	Tue Jun 26 17:25:40 2012 +0300
     9.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlRelation.java	Tue Jun 26 20:02:09 2012 +0300
     9.3 @@ -5,22 +5,20 @@
     9.4   */
     9.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql;
     9.6  
     9.7 -import java.math.BigDecimal;
     9.8 -import java.math.BigInteger;
     9.9 -
    9.10 -import org.openrdf.model.Literal;
    9.11 -import org.openrdf.model.URI;
    9.12  import org.openrdf.model.Value;
    9.13  import org.openrdf.model.ValueFactory;
    9.14 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
    9.15 -import org.openrdf.model.vocabulary.XMLSchema;
    9.16  import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
    9.17 -import org.openrdf.query.algebra.evaluation.function.Function;
    9.18  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
    9.19 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
    9.20  
    9.21 -//import eu.ist.semsorgrid4env.strabon.structures.StrabonPolyhedron;
    9.22 -
    9.23 +/**
    9.24 + * This class represents a spatial function like the one defined in its superclass 
    9.25 + * {@link SpatialRelationshipFunc} class for the case of stSPARQL.
    9.26 + * 
    9.27 + * @see package {@link org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer}
    9.28 + * 
    9.29 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
    9.30 + * @author Charalampos Nikolaou <charnik@di.uoa.gr>
    9.31 + */
    9.32  public abstract class GeoSparqlRelation extends SpatialRelationshipFunc {
    9.33  
    9.34  	//No need for any implementation, I will have replaced this class's presence before reaching this place
    9.35 @@ -30,11 +28,6 @@
    9.36  		return null;
    9.37  	}
    9.38  
    9.39 -	//I'll have everyone override it
    9.40 -	public String getURI() {
    9.41 -
    9.42 -		return null;
    9.43 -	}
    9.44 -
    9.45 -	
    9.46 +	// charnik: made this method (and hence the class) abstract
    9.47 +	public abstract String getURI();
    9.48  }
    10.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferContainsFunc.java	Tue Jun 26 17:25:40 2012 +0300
    10.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferContainsFunc.java	Tue Jun 26 20:02:09 2012 +0300
    10.3 @@ -8,12 +8,14 @@
    10.4  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    10.5  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    10.6  
    10.7 -
    10.8 +/**
    10.9 + * 
   10.10 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   10.11 + */
   10.12  public class EgenhoferContainsFunc extends GeoSparqlRelation {
   10.13  
   10.14  	@Override
   10.15  	public String getURI() {
   10.16  		return StrabonPolyhedron.ehContains;
   10.17 -		}
   10.18 -
   10.19 +	}
   10.20  }
    11.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlBoundaryFunc.java	Tue Jun 26 17:25:40 2012 +0300
    11.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlBoundaryFunc.java	Tue Jun 26 20:02:09 2012 +0300
    11.3 @@ -5,25 +5,12 @@
    11.4   */
    11.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological;
    11.6  
    11.7 -import java.math.BigDecimal;
    11.8 -import java.math.BigInteger;
    11.9 -
   11.10 -import org.openrdf.model.Literal;
   11.11 -import org.openrdf.model.URI;
   11.12 -import org.openrdf.model.Value;
   11.13 -import org.openrdf.model.ValueFactory;
   11.14 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   11.15 -import org.openrdf.model.vocabulary.XMLSchema;
   11.16 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   11.17 -import org.openrdf.query.algebra.evaluation.function.Function;
   11.18  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   11.19  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct;
   11.20 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   11.21   
   11.22  /**
   11.23 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   11.24   * 
   11.25 - * @author Arjohn Kampman
   11.26 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   11.27   */
   11.28  public class GeoSparqlBoundaryFunc extends GeoSparqlNonTopologicalConstruct {
   11.29  
   11.30 @@ -31,7 +18,4 @@
   11.31  	public String getURI() {
   11.32  		return StrabonPolyhedron.geoSparqlBoundary;
   11.33  	}
   11.34 -
   11.35 -	 
   11.36 - 
   11.37  }
    12.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlBufferFunc.java	Tue Jun 26 17:25:40 2012 +0300
    12.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlBufferFunc.java	Tue Jun 26 20:02:09 2012 +0300
    12.3 @@ -5,25 +5,12 @@
    12.4   */
    12.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological;
    12.6  
    12.7 -import java.math.BigDecimal;
    12.8 -import java.math.BigInteger;
    12.9 -
   12.10 -import org.openrdf.model.Literal;
   12.11 -import org.openrdf.model.URI;
   12.12 -import org.openrdf.model.Value;
   12.13 -import org.openrdf.model.ValueFactory;
   12.14 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   12.15 -import org.openrdf.model.vocabulary.XMLSchema;
   12.16 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   12.17 -import org.openrdf.query.algebra.evaluation.function.Function;
   12.18  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   12.19  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct;
   12.20 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   12.21   
   12.22  /**
   12.23 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   12.24   * 
   12.25 - * @author Arjohn Kampman
   12.26 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   12.27   */
   12.28  public class GeoSparqlBufferFunc extends GeoSparqlNonTopologicalConstruct {
   12.29  
   12.30 @@ -31,7 +18,4 @@
   12.31  	public String getURI() {
   12.32  		return StrabonPolyhedron.geoSparqlBuffer;
   12.33  	}
   12.34 -
   12.35 -	 
   12.36 - 
   12.37  }
    13.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlConvexHullFunc.java	Tue Jun 26 17:25:40 2012 +0300
    13.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlConvexHullFunc.java	Tue Jun 26 20:02:09 2012 +0300
    13.3 @@ -5,25 +5,12 @@
    13.4   */
    13.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological;
    13.6  
    13.7 -import java.math.BigDecimal;
    13.8 -import java.math.BigInteger;
    13.9 -
   13.10 -import org.openrdf.model.Literal;
   13.11 -import org.openrdf.model.URI;
   13.12 -import org.openrdf.model.Value;
   13.13 -import org.openrdf.model.ValueFactory;
   13.14 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   13.15 -import org.openrdf.model.vocabulary.XMLSchema;
   13.16 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   13.17 -import org.openrdf.query.algebra.evaluation.function.Function;
   13.18  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   13.19  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct;
   13.20 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   13.21   
   13.22  /**
   13.23 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   13.24   * 
   13.25 - * @author Arjohn Kampman
   13.26 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   13.27   */
   13.28  public class GeoSparqlConvexHullFunc extends GeoSparqlNonTopologicalConstruct {
   13.29  
   13.30 @@ -31,7 +18,4 @@
   13.31  	public String getURI() {
   13.32  		return StrabonPolyhedron.geoSparqlConvexHull;
   13.33  	}
   13.34 -
   13.35 -	 
   13.36 - 
   13.37  }
    14.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlDifferenceFunc.java	Tue Jun 26 17:25:40 2012 +0300
    14.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlDifferenceFunc.java	Tue Jun 26 20:02:09 2012 +0300
    14.3 @@ -3,6 +3,10 @@
    14.4  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    14.5  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct;
    14.6  
    14.7 +/**
    14.8 + * 
    14.9 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   14.10 + */
   14.11  public class GeoSparqlDifferenceFunc extends GeoSparqlNonTopologicalConstruct {
   14.12  
   14.13  	@Override
    15.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlDistanceFunc.java	Tue Jun 26 17:25:40 2012 +0300
    15.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlDistanceFunc.java	Tue Jun 26 20:02:09 2012 +0300
    15.3 @@ -5,27 +5,17 @@
    15.4   */
    15.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological;
    15.6  
    15.7 -import java.math.BigDecimal;
    15.8 -import java.math.BigInteger;
    15.9 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   15.10 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalMetric;
   15.11  
   15.12 -import org.openrdf.model.Literal;
   15.13 -import org.openrdf.model.URI;
   15.14 -import org.openrdf.model.Value;
   15.15 -import org.openrdf.model.ValueFactory;
   15.16 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   15.17 -import org.openrdf.model.vocabulary.XMLSchema;
   15.18 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   15.19 -import org.openrdf.query.algebra.evaluation.function.Function;
   15.20 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   15.21 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct;
   15.22 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalMetric;
   15.23 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   15.24 -
   15.25 +/**
   15.26 + * 
   15.27 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   15.28 + */
   15.29  public class GeoSparqlDistanceFunc extends GeoSparqlNonTopologicalMetric {
   15.30  
   15.31  	@Override
   15.32  	public String getURI() {
   15.33  		return StrabonPolyhedron.geoSparqlDistance;
   15.34 -		}
   15.35 -
   15.36 +	}
   15.37  }
    16.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlEnvelopeFunc.java	Tue Jun 26 17:25:40 2012 +0300
    16.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlEnvelopeFunc.java	Tue Jun 26 20:02:09 2012 +0300
    16.3 @@ -5,28 +5,17 @@
    16.4   */
    16.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological;
    16.6  
    16.7 -import java.math.BigDecimal;
    16.8 -import java.math.BigInteger;
    16.9 -
   16.10 -import org.openrdf.model.Literal;
   16.11 -import org.openrdf.model.URI;
   16.12 -import org.openrdf.model.Value;
   16.13 -import org.openrdf.model.ValueFactory;
   16.14 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   16.15 -import org.openrdf.model.vocabulary.XMLSchema;
   16.16 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   16.17 -import org.openrdf.query.algebra.evaluation.function.Function;
   16.18  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   16.19  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct;
   16.20 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   16.21   
   16.22 +/**
   16.23 + * 
   16.24 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   16.25 + */
   16.26  public class GeoSparqlEnvelopeFunc extends GeoSparqlNonTopologicalConstruct {
   16.27  
   16.28  	@Override
   16.29  	public String getURI() {
   16.30  		return StrabonPolyhedron.geoSparqlEnvelope;
   16.31  	}
   16.32 -
   16.33 -	 
   16.34 - 
   16.35  }
    17.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlIntersectionFunc.java	Tue Jun 26 17:25:40 2012 +0300
    17.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlIntersectionFunc.java	Tue Jun 26 20:02:09 2012 +0300
    17.3 @@ -3,10 +3,14 @@
    17.4  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    17.5  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct;
    17.6  
    17.7 +/**
    17.8 + * 
    17.9 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   17.10 + */
   17.11  public class GeoSparqlIntersectionFunc extends GeoSparqlNonTopologicalConstruct {
   17.12  
   17.13  	@Override
   17.14  	public String getURI() {
   17.15  		return StrabonPolyhedron.geoSparqlIntersection;
   17.16 -		}
   17.17 +	}
   17.18  }
    18.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlSymmetricDifferenceFunc.java	Tue Jun 26 17:25:40 2012 +0300
    18.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlSymmetricDifferenceFunc.java	Tue Jun 26 20:02:09 2012 +0300
    18.3 @@ -3,10 +3,14 @@
    18.4  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    18.5  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct;
    18.6  
    18.7 +/**
    18.8 + * 
    18.9 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   18.10 + */
   18.11  public class GeoSparqlSymmetricDifferenceFunc extends GeoSparqlNonTopologicalConstruct {
   18.12  
   18.13  	@Override
   18.14  	public String getURI() {
   18.15  		return StrabonPolyhedron.geoSparqlSymmetricDifference;
   18.16 -		}
   18.17 +	}
   18.18  }
    19.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlUnionFunc.java	Tue Jun 26 17:25:40 2012 +0300
    19.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlUnionFunc.java	Tue Jun 26 20:02:09 2012 +0300
    19.3 @@ -3,10 +3,14 @@
    19.4  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    19.5  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct;
    19.6  
    19.7 +/**
    19.8 + * 
    19.9 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   19.10 + */
   19.11  public class GeoSparqlUnionFunc extends GeoSparqlNonTopologicalConstruct {
   19.12  
   19.13  	@Override
   19.14  	public String getURI() {
   19.15  		return StrabonPolyhedron.geoSparqlUnion;
   19.16 -		}
   19.17 +	}
   19.18  }
    20.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8DisconnectedFunc.java	Tue Jun 26 17:25:40 2012 +0300
    20.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8DisconnectedFunc.java	Tue Jun 26 20:02:09 2012 +0300
    20.3 @@ -7,14 +7,15 @@
    20.4  
    20.5  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    20.6  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    20.7 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.EqualsFunc;
    20.8  
    20.9 -
   20.10 +/**
   20.11 + * 
   20.12 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   20.13 + */
   20.14  public class RCC8DisconnectedFunc extends GeoSparqlRelation {
   20.15  
   20.16  	@Override
   20.17  	public String getURI() {
   20.18  		return StrabonPolyhedron.rccDisconnected;
   20.19 -		}
   20.20 -
   20.21 +	}
   20.22  }
    21.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8EqualsFunc.java	Tue Jun 26 17:25:40 2012 +0300
    21.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8EqualsFunc.java	Tue Jun 26 20:02:09 2012 +0300
    21.3 @@ -7,14 +7,15 @@
    21.4  
    21.5  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    21.6  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    21.7 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.EqualsFunc;
    21.8  
    21.9 -
   21.10 +/**
   21.11 + * 
   21.12 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   21.13 + */
   21.14  public class RCC8EqualsFunc extends GeoSparqlRelation {
   21.15  
   21.16  	@Override
   21.17  	public String getURI() {
   21.18  		return StrabonPolyhedron.rccEquals;
   21.19 -		}
   21.20 -
   21.21 +	}
   21.22  }
    22.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8ExternallyConnectedFunc.java	Tue Jun 26 17:25:40 2012 +0300
    22.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8ExternallyConnectedFunc.java	Tue Jun 26 20:02:09 2012 +0300
    22.3 @@ -7,14 +7,15 @@
    22.4  
    22.5  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    22.6  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    22.7 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.EqualsFunc;
    22.8  
    22.9 -
   22.10 +/**
   22.11 + * 
   22.12 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   22.13 + */
   22.14  public class RCC8ExternallyConnectedFunc extends GeoSparqlRelation {
   22.15  
   22.16  	@Override
   22.17  	public String getURI() {
   22.18  		return StrabonPolyhedron.rccExternallyConnected;
   22.19 -		}
   22.20 -
   22.21 +	}
   22.22  }
    23.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8NonTangentialProperPartFunc.java	Tue Jun 26 17:25:40 2012 +0300
    23.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8NonTangentialProperPartFunc.java	Tue Jun 26 20:02:09 2012 +0300
    23.3 @@ -7,14 +7,15 @@
    23.4  
    23.5  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    23.6  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    23.7 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.EqualsFunc;
    23.8  
    23.9 -
   23.10 +/**
   23.11 + * 
   23.12 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   23.13 + */
   23.14  public class RCC8NonTangentialProperPartFunc extends GeoSparqlRelation {
   23.15  
   23.16  	@Override
   23.17  	public String getURI() {
   23.18  		return StrabonPolyhedron.rccNonTangentialProperPart;
   23.19 -		}
   23.20 -
   23.21 +	}
   23.22  }
    24.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8NonTangentialProperPartInverseFunc.java	Tue Jun 26 17:25:40 2012 +0300
    24.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8NonTangentialProperPartInverseFunc.java	Tue Jun 26 20:02:09 2012 +0300
    24.3 @@ -7,14 +7,15 @@
    24.4  
    24.5  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    24.6  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    24.7 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.EqualsFunc;
    24.8  
    24.9 -
   24.10 +/**
   24.11 + * 
   24.12 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   24.13 + */
   24.14  public class RCC8NonTangentialProperPartInverseFunc extends GeoSparqlRelation {
   24.15  
   24.16  	@Override
   24.17  	public String getURI() {
   24.18  		return StrabonPolyhedron.rccNonTangentialProperPartInverse;
   24.19 -		}
   24.20 -
   24.21 +	}
   24.22  }
    25.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8PartiallyOverlappingFunc.java	Tue Jun 26 17:25:40 2012 +0300
    25.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8PartiallyOverlappingFunc.java	Tue Jun 26 20:02:09 2012 +0300
    25.3 @@ -7,14 +7,15 @@
    25.4  
    25.5  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    25.6  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    25.7 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.EqualsFunc;
    25.8  
    25.9 -
   25.10 +/**
   25.11 + * 
   25.12 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   25.13 + */
   25.14  public class RCC8PartiallyOverlappingFunc extends GeoSparqlRelation {
   25.15  
   25.16  	@Override
   25.17  	public String getURI() {
   25.18  		return StrabonPolyhedron.rccPartiallyOverlapping;
   25.19 -		}
   25.20 -
   25.21 +	}
   25.22  }
    26.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8TangentialProperPartFunc.java	Tue Jun 26 17:25:40 2012 +0300
    26.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8TangentialProperPartFunc.java	Tue Jun 26 20:02:09 2012 +0300
    26.3 @@ -7,14 +7,15 @@
    26.4  
    26.5  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    26.6  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    26.7 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.EqualsFunc;
    26.8  
    26.9 -
   26.10 +/**
   26.11 + * 
   26.12 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   26.13 + */
   26.14  public class RCC8TangentialProperPartFunc extends GeoSparqlRelation {
   26.15  
   26.16  	@Override
   26.17  	public String getURI() {
   26.18  		return StrabonPolyhedron.rccTangentialProperPart;
   26.19 -		}
   26.20 -
   26.21 +	}
   26.22  }
    27.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8TangentialProperPartInverseFunc.java	Tue Jun 26 17:25:40 2012 +0300
    27.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8TangentialProperPartInverseFunc.java	Tue Jun 26 20:02:09 2012 +0300
    27.3 @@ -7,14 +7,15 @@
    27.4  
    27.5  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    27.6  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    27.7 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.EqualsFunc;
    27.8  
    27.9 -
   27.10 +/**
   27.11 + * 
   27.12 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   27.13 + */
   27.14  public class RCC8TangentialProperPartInverseFunc extends GeoSparqlRelation {
   27.15  
   27.16  	@Override
   27.17  	public String getURI() {
   27.18  		return StrabonPolyhedron.rccTangentialProperPartInverse;
   27.19 -		}
   27.20 -
   27.21 +	}
   27.22  }
    28.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeatureTouchesFunc.java	Tue Jun 26 17:25:40 2012 +0300
    28.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeatureTouchesFunc.java	Tue Jun 26 20:02:09 2012 +0300
    28.3 @@ -8,12 +8,14 @@
    28.4  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    28.5  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    28.6  
    28.7 -
    28.8 +/**
    28.9 + * 
   28.10 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   28.11 + */
   28.12  public class SimpleFeatureTouchesFunc extends GeoSparqlRelation {
   28.13  
   28.14  	@Override
   28.15  	public String getURI() {
   28.16  		return StrabonPolyhedron.sfTouches;
   28.17 -		}
   28.18 -
   28.19 +	}
   28.20  }
    29.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesContainsFunc.java	Tue Jun 26 17:25:40 2012 +0300
    29.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesContainsFunc.java	Tue Jun 26 20:02:09 2012 +0300
    29.3 @@ -8,12 +8,14 @@
    29.4  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    29.5  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    29.6  
    29.7 -
    29.8 +/**
    29.9 + * 
   29.10 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   29.11 + */
   29.12  public class SimpleFeaturesContainsFunc extends GeoSparqlRelation {
   29.13  
   29.14  	@Override
   29.15  	public String getURI() {
   29.16  		return StrabonPolyhedron.sfContains;
   29.17 -		}
   29.18 -
   29.19 +	}
   29.20  }
    30.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesCrossesFunc.java	Tue Jun 26 17:25:40 2012 +0300
    30.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesCrossesFunc.java	Tue Jun 26 20:02:09 2012 +0300
    30.3 @@ -8,12 +8,14 @@
    30.4  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    30.5  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    30.6  
    30.7 -
    30.8 +/**
    30.9 + * 
   30.10 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   30.11 + */
   30.12  public class SimpleFeaturesCrossesFunc extends GeoSparqlRelation {
   30.13  
   30.14  	@Override
   30.15  	public String getURI() {
   30.16  		return StrabonPolyhedron.sfCrosses;
   30.17 -		}
   30.18 -
   30.19 +	}
   30.20  }
    31.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesDisjointFunc.java	Tue Jun 26 17:25:40 2012 +0300
    31.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesDisjointFunc.java	Tue Jun 26 20:02:09 2012 +0300
    31.3 @@ -8,12 +8,14 @@
    31.4  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    31.5  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    31.6  
    31.7 -
    31.8 +/**
    31.9 + * 
   31.10 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   31.11 + */
   31.12  public class SimpleFeaturesDisjointFunc extends GeoSparqlRelation {
   31.13  
   31.14  	@Override
   31.15  	public String getURI() {
   31.16  		return StrabonPolyhedron.sfDisjoint;
   31.17 -		}
   31.18 -
   31.19 +	}
   31.20  }
    32.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesEqualsFunc.java	Tue Jun 26 17:25:40 2012 +0300
    32.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesEqualsFunc.java	Tue Jun 26 20:02:09 2012 +0300
    32.3 @@ -8,12 +8,14 @@
    32.4  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    32.5  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    32.6  
    32.7 -
    32.8 +/**
    32.9 + * 
   32.10 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   32.11 + */
   32.12  public class SimpleFeaturesEqualsFunc extends GeoSparqlRelation {
   32.13  
   32.14  	@Override
   32.15  	public String getURI() {
   32.16  		return StrabonPolyhedron.sfEquals;
   32.17 -		}
   32.18 -
   32.19 +	}
   32.20  }
    33.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesIntersectsFunc.java	Tue Jun 26 17:25:40 2012 +0300
    33.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesIntersectsFunc.java	Tue Jun 26 20:02:09 2012 +0300
    33.3 @@ -8,12 +8,14 @@
    33.4  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    33.5  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    33.6  
    33.7 -
    33.8 +/**
    33.9 + * 
   33.10 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   33.11 + */
   33.12  public class SimpleFeaturesIntersectsFunc extends GeoSparqlRelation {
   33.13  
   33.14  	@Override
   33.15  	public String getURI() {
   33.16  		return StrabonPolyhedron.sfIntersects;
   33.17 -		}
   33.18 -
   33.19 +	}
   33.20  }
    34.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesOverlapsFunc.java	Tue Jun 26 17:25:40 2012 +0300
    34.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesOverlapsFunc.java	Tue Jun 26 20:02:09 2012 +0300
    34.3 @@ -8,12 +8,14 @@
    34.4  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    34.5  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    34.6  
    34.7 -
    34.8 +/**
    34.9 + * 
   34.10 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   34.11 + */
   34.12  public class SimpleFeaturesOverlapsFunc extends GeoSparqlRelation {
   34.13  
   34.14  	@Override
   34.15  	public String getURI() {
   34.16  		return StrabonPolyhedron.sfOverlaps;
   34.17 -		}
   34.18 -
   34.19 +	}
   34.20  }
    35.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesWithinFunc.java	Tue Jun 26 17:25:40 2012 +0300
    35.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesWithinFunc.java	Tue Jun 26 20:02:09 2012 +0300
    35.3 @@ -8,12 +8,14 @@
    35.4  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    35.5  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    35.6  
    35.7 -
    35.8 +/**
    35.9 + * 
   35.10 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   35.11 + */
   35.12  public class SimpleFeaturesWithinFunc extends GeoSparqlRelation {
   35.13  
   35.14  	@Override
   35.15  	public String getURI() {
   35.16  		return StrabonPolyhedron.sfWithin;
   35.17 -		}
   35.18 -
   35.19 +	}
   35.20  }
    36.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/aggregate/ExtentFunc.java	Tue Jun 26 17:25:40 2012 +0300
    36.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/aggregate/ExtentFunc.java	Tue Jun 26 20:02:09 2012 +0300
    36.3 @@ -3,10 +3,14 @@
    36.4  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
    36.5  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    36.6  
    36.7 +/**
    36.8 + * 
    36.9 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   36.10 + */
   36.11  public class ExtentFunc extends SpatialConstructFunc {
   36.12  
   36.13  	@Override
   36.14  	public String getURI() {
   36.15  		return StrabonPolyhedron.extent;
   36.16 -		}
   36.17 +	}
   36.18  }
    37.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/BoundaryFunc.java	Tue Jun 26 17:25:40 2012 +0300
    37.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/BoundaryFunc.java	Tue Jun 26 20:02:09 2012 +0300
    37.3 @@ -5,25 +5,12 @@
    37.4   */
    37.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct;
    37.6  
    37.7 -import java.math.BigDecimal;
    37.8 -import java.math.BigInteger;
    37.9 -
   37.10 -import org.openrdf.model.Literal;
   37.11 -import org.openrdf.model.URI;
   37.12 -import org.openrdf.model.Value;
   37.13 -import org.openrdf.model.ValueFactory;
   37.14 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   37.15 -import org.openrdf.model.vocabulary.XMLSchema;
   37.16 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   37.17 -import org.openrdf.query.algebra.evaluation.function.Function;
   37.18  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
   37.19  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   37.20 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   37.21   
   37.22  /**
   37.23 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   37.24   * 
   37.25 - * @author Arjohn Kampman
   37.26 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   37.27   */
   37.28  public class BoundaryFunc extends SpatialConstructFunc {
   37.29  
   37.30 @@ -31,7 +18,4 @@
   37.31  	public String getURI() {
   37.32  		return StrabonPolyhedron.boundary;
   37.33  	}
   37.34 -
   37.35 -	 
   37.36 - 
   37.37  }
    38.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/BufferFunc.java	Tue Jun 26 17:25:40 2012 +0300
    38.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/BufferFunc.java	Tue Jun 26 20:02:09 2012 +0300
    38.3 @@ -5,25 +5,11 @@
    38.4   */
    38.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct;
    38.6  
    38.7 -import java.math.BigDecimal;
    38.8 -import java.math.BigInteger;
    38.9 -
   38.10 -import org.openrdf.model.Literal;
   38.11 -import org.openrdf.model.URI;
   38.12 -import org.openrdf.model.Value;
   38.13 -import org.openrdf.model.ValueFactory;
   38.14 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   38.15 -import org.openrdf.model.vocabulary.XMLSchema;
   38.16 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   38.17 -import org.openrdf.query.algebra.evaluation.function.Function;
   38.18  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
   38.19  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   38.20 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   38.21   
   38.22  /**
   38.23 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   38.24 - * 
   38.25 - * @author Arjohn Kampman
   38.26 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   38.27   */
   38.28  public class BufferFunc extends SpatialConstructFunc {
   38.29  
   38.30 @@ -31,7 +17,4 @@
   38.31  	public String getURI() {
   38.32  		return StrabonPolyhedron.buffer;
   38.33  	}
   38.34 -
   38.35 -	 
   38.36 - 
   38.37  }
    39.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/ConvexHullFunc.java	Tue Jun 26 17:25:40 2012 +0300
    39.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/ConvexHullFunc.java	Tue Jun 26 20:02:09 2012 +0300
    39.3 @@ -5,25 +5,12 @@
    39.4   */
    39.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct;
    39.6  
    39.7 -import java.math.BigDecimal;
    39.8 -import java.math.BigInteger;
    39.9 -
   39.10 -import org.openrdf.model.Literal;
   39.11 -import org.openrdf.model.URI;
   39.12 -import org.openrdf.model.Value;
   39.13 -import org.openrdf.model.ValueFactory;
   39.14 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   39.15 -import org.openrdf.model.vocabulary.XMLSchema;
   39.16 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   39.17 -import org.openrdf.query.algebra.evaluation.function.Function;
   39.18  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
   39.19  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   39.20 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   39.21   
   39.22  /**
   39.23 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   39.24   * 
   39.25 - * @author Arjohn Kampman
   39.26 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   39.27   */
   39.28  public class ConvexHullFunc extends SpatialConstructFunc {
   39.29  
   39.30 @@ -31,7 +18,4 @@
   39.31  	public String getURI() {
   39.32  		return StrabonPolyhedron.convexHull;
   39.33  	}
   39.34 -
   39.35 -	 
   39.36 - 
   39.37  }
    40.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/DifferenceFunc.java	Tue Jun 26 17:25:40 2012 +0300
    40.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/DifferenceFunc.java	Tue Jun 26 20:02:09 2012 +0300
    40.3 @@ -3,6 +3,10 @@
    40.4  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
    40.5  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    40.6  
    40.7 +/**
    40.8 + * 
    40.9 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   40.10 + */
   40.11  public class DifferenceFunc extends SpatialConstructFunc {
   40.12  
   40.13  	@Override
    41.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/EnvelopeFunc.java	Tue Jun 26 17:25:40 2012 +0300
    41.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/EnvelopeFunc.java	Tue Jun 26 20:02:09 2012 +0300
    41.3 @@ -5,25 +5,12 @@
    41.4   */
    41.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct;
    41.6  
    41.7 -import java.math.BigDecimal;
    41.8 -import java.math.BigInteger;
    41.9 -
   41.10 -import org.openrdf.model.Literal;
   41.11 -import org.openrdf.model.URI;
   41.12 -import org.openrdf.model.Value;
   41.13 -import org.openrdf.model.ValueFactory;
   41.14 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   41.15 -import org.openrdf.model.vocabulary.XMLSchema;
   41.16 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   41.17 -import org.openrdf.query.algebra.evaluation.function.Function;
   41.18  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
   41.19  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   41.20 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   41.21   
   41.22  /**
   41.23 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   41.24   * 
   41.25 - * @author Arjohn Kampman
   41.26 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   41.27   */
   41.28  public class EnvelopeFunc extends SpatialConstructFunc {
   41.29  
   41.30 @@ -31,7 +18,4 @@
   41.31  	public String getURI() {
   41.32  		return StrabonPolyhedron.envelope;
   41.33  	}
   41.34 -
   41.35 -	 
   41.36 - 
   41.37  }
    42.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/IntersectionFunc.java	Tue Jun 26 17:25:40 2012 +0300
    42.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/IntersectionFunc.java	Tue Jun 26 20:02:09 2012 +0300
    42.3 @@ -3,6 +3,10 @@
    42.4  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
    42.5  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    42.6  
    42.7 +/**
    42.8 + * 
    42.9 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   42.10 + */
   42.11  public class IntersectionFunc extends SpatialConstructFunc {
   42.12  
   42.13  	@Override
    43.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/SymDifferenceFunc.java	Tue Jun 26 17:25:40 2012 +0300
    43.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/SymDifferenceFunc.java	Tue Jun 26 20:02:09 2012 +0300
    43.3 @@ -3,6 +3,10 @@
    43.4  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
    43.5  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    43.6  
    43.7 +/**
    43.8 + * 
    43.9 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   43.10 + */
   43.11  public class SymDifferenceFunc extends SpatialConstructFunc {
   43.12  
   43.13  	@Override
    44.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/TransformFunc.java	Tue Jun 26 17:25:40 2012 +0300
    44.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/TransformFunc.java	Tue Jun 26 20:02:09 2012 +0300
    44.3 @@ -5,25 +5,12 @@
    44.4   */
    44.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct;
    44.6  
    44.7 -import java.math.BigDecimal;
    44.8 -import java.math.BigInteger;
    44.9 -
   44.10 -import org.openrdf.model.Literal;
   44.11 -import org.openrdf.model.URI;
   44.12 -import org.openrdf.model.Value;
   44.13 -import org.openrdf.model.ValueFactory;
   44.14 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   44.15 -import org.openrdf.model.vocabulary.XMLSchema;
   44.16 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   44.17 -import org.openrdf.query.algebra.evaluation.function.Function;
   44.18  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
   44.19  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   44.20 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   44.21   
   44.22  /**
   44.23 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   44.24   * 
   44.25 - * @author Arjohn Kampman
   44.26 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   44.27   */
   44.28  public class TransformFunc extends SpatialConstructFunc {
   44.29  
   44.30 @@ -31,7 +18,4 @@
   44.31  	public String getURI() {
   44.32  		return StrabonPolyhedron.transform;
   44.33  	}
   44.34 -
   44.35 -	 
   44.36 - 
   44.37  }
    45.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/UnionFunc.java	Tue Jun 26 17:25:40 2012 +0300
    45.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/UnionFunc.java	Tue Jun 26 20:02:09 2012 +0300
    45.3 @@ -3,6 +3,10 @@
    45.4  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
    45.5  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    45.6  
    45.7 +/**
    45.8 + * 
    45.9 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   45.10 + */
   45.11  public class UnionFunc extends SpatialConstructFunc {
   45.12  
   45.13  	@Override
    46.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/metric/AreaFunc.java	Tue Jun 26 17:25:40 2012 +0300
    46.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/metric/AreaFunc.java	Tue Jun 26 20:02:09 2012 +0300
    46.3 @@ -5,25 +5,13 @@
    46.4   */
    46.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric;
    46.6  
    46.7 -import java.math.BigDecimal;
    46.8 -import java.math.BigInteger;
    46.9 -
   46.10 -import org.openrdf.model.Literal;
   46.11 -import org.openrdf.model.URI;
   46.12 -import org.openrdf.model.Value;
   46.13 -import org.openrdf.model.ValueFactory;
   46.14 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   46.15 -import org.openrdf.model.vocabulary.XMLSchema;
   46.16 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   46.17 -import org.openrdf.query.algebra.evaluation.function.Function;
   46.18  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialMetricFunc;
   46.19  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   46.20 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   46.21   
   46.22  /**
   46.23 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   46.24 + * A spatial function computing the area of a geometry.
   46.25   * 
   46.26 - * @author Arjohn Kampman
   46.27 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   46.28   */
   46.29  public class AreaFunc extends SpatialMetricFunc {
   46.30  
   46.31 @@ -31,7 +19,4 @@
   46.32  	public String getURI() {
   46.33  		return StrabonPolyhedron.area;
   46.34  	}
   46.35 -
   46.36 -	 
   46.37 - 
   46.38  }
    47.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/metric/DistanceFunc.java	Tue Jun 26 17:25:40 2012 +0300
    47.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/metric/DistanceFunc.java	Tue Jun 26 20:02:09 2012 +0300
    47.3 @@ -5,25 +5,13 @@
    47.4   */
    47.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric;
    47.6  
    47.7 -import java.math.BigDecimal;
    47.8 -import java.math.BigInteger;
    47.9 -
   47.10 -import org.openrdf.model.Literal;
   47.11 -import org.openrdf.model.URI;
   47.12 -import org.openrdf.model.Value;
   47.13 -import org.openrdf.model.ValueFactory;
   47.14 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   47.15 -import org.openrdf.model.vocabulary.XMLSchema;
   47.16 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   47.17 -import org.openrdf.query.algebra.evaluation.function.Function;
   47.18  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialMetricFunc;
   47.19  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   47.20 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   47.21  
   47.22  /**
   47.23 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   47.24 + * A spatial function computing the distance between two geometries.
   47.25   * 
   47.26 - * @author Arjohn Kampman
   47.27 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   47.28   */
   47.29  public class DistanceFunc extends SpatialMetricFunc {
   47.30  
   47.31 @@ -31,5 +19,4 @@
   47.32  	public String getURI() {
   47.33  		return StrabonPolyhedron.distance;
   47.34  		}
   47.35 -
   47.36  }
    48.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/AsTextFunc.java	Tue Jun 26 17:25:40 2012 +0300
    48.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/AsTextFunc.java	Tue Jun 26 20:02:09 2012 +0300
    48.3 @@ -5,25 +5,14 @@
    48.4   */
    48.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property;
    48.6  
    48.7 -import java.math.BigDecimal;
    48.8 -import java.math.BigInteger;
    48.9 -
   48.10 -import org.openrdf.model.Literal;
   48.11 -import org.openrdf.model.URI;
   48.12 -import org.openrdf.model.Value;
   48.13 -import org.openrdf.model.ValueFactory;
   48.14 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   48.15 -import org.openrdf.model.vocabulary.XMLSchema;
   48.16 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   48.17 -import org.openrdf.query.algebra.evaluation.function.Function;
   48.18  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
   48.19  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   48.20 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   48.21   
   48.22  /**
   48.23 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   48.24 + * A spatial function returning a geometry as text.
   48.25 + * FIXME: (WKT or GML?)
   48.26   * 
   48.27 - * @author Arjohn Kampman
   48.28 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   48.29   */
   48.30  public class AsTextFunc extends SpatialPropertyFunc {
   48.31  
   48.32 @@ -31,7 +20,4 @@
   48.33  	public String getURI() {
   48.34  		return StrabonPolyhedron.asText;
   48.35  	}
   48.36 -
   48.37 -	 
   48.38 - 
   48.39  }
    49.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/DimensionFunc.java	Tue Jun 26 17:25:40 2012 +0300
    49.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/DimensionFunc.java	Tue Jun 26 20:02:09 2012 +0300
    49.3 @@ -5,22 +5,13 @@
    49.4   */
    49.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property;
    49.6  
    49.7 -import org.openrdf.model.Literal;
    49.8 -import org.openrdf.model.Value;
    49.9 -import org.openrdf.model.ValueFactory;
   49.10 -import org.openrdf.model.impl.LiteralImpl;
   49.11 -import org.openrdf.model.vocabulary.XMLSchema;
   49.12 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   49.13 -import org.openrdf.query.algebra.evaluation.function.Function;
   49.14  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
   49.15  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   49.16 -
   49.17 -import com.vividsolutions.jts.io.WKTReader;
   49.18   
   49.19  /**
   49.20 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   49.21 + * A spatial function returning the dimension of a geometry.
   49.22   * 
   49.23 - * @author Arjohn Kampman
   49.24 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   49.25   */
   49.26  public class DimensionFunc extends SpatialPropertyFunc {
   49.27  
    50.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/GeometryTypeFunc.java	Tue Jun 26 17:25:40 2012 +0300
    50.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/GeometryTypeFunc.java	Tue Jun 26 20:02:09 2012 +0300
    50.3 @@ -5,25 +5,13 @@
    50.4   */
    50.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property;
    50.6  
    50.7 -import java.math.BigDecimal;
    50.8 -import java.math.BigInteger;
    50.9 -
   50.10 -import org.openrdf.model.Literal;
   50.11 -import org.openrdf.model.URI;
   50.12 -import org.openrdf.model.Value;
   50.13 -import org.openrdf.model.ValueFactory;
   50.14 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   50.15 -import org.openrdf.model.vocabulary.XMLSchema;
   50.16 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   50.17 -import org.openrdf.query.algebra.evaluation.function.Function;
   50.18  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
   50.19  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   50.20 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   50.21   
   50.22  /**
   50.23 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   50.24 + * A spatial function returning the type of a geometry.
   50.25   * 
   50.26 - * @author Arjohn Kampman
   50.27 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   50.28   */
   50.29  public class GeometryTypeFunc extends SpatialPropertyFunc {
   50.30  
   50.31 @@ -31,7 +19,4 @@
   50.32  	public String getURI() {
   50.33  		return StrabonPolyhedron.geometryType;
   50.34  	}
   50.35 -
   50.36 -	 
   50.37 - 
   50.38  }
    51.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/IsEmptyFunc.java	Tue Jun 26 17:25:40 2012 +0300
    51.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/IsEmptyFunc.java	Tue Jun 26 20:02:09 2012 +0300
    51.3 @@ -5,25 +5,13 @@
    51.4   */
    51.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property;
    51.6  
    51.7 -import java.math.BigDecimal;
    51.8 -import java.math.BigInteger;
    51.9 -
   51.10 -import org.openrdf.model.Literal;
   51.11 -import org.openrdf.model.URI;
   51.12 -import org.openrdf.model.Value;
   51.13 -import org.openrdf.model.ValueFactory;
   51.14 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   51.15 -import org.openrdf.model.vocabulary.XMLSchema;
   51.16 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   51.17 -import org.openrdf.query.algebra.evaluation.function.Function;
   51.18  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
   51.19  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   51.20 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   51.21   
   51.22  /**
   51.23 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   51.24 + * A spatial function for testing whether a geometry is empty.
   51.25   * 
   51.26 - * @author Arjohn Kampman
   51.27 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   51.28   */
   51.29  public class IsEmptyFunc extends SpatialPropertyFunc {
   51.30  
   51.31 @@ -31,7 +19,4 @@
   51.32  	public String getURI() {
   51.33  		return StrabonPolyhedron.isEmpty;
   51.34  	}
   51.35 -
   51.36 -	 
   51.37 - 
   51.38  }
    52.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/IsSimpleFunc.java	Tue Jun 26 17:25:40 2012 +0300
    52.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/IsSimpleFunc.java	Tue Jun 26 20:02:09 2012 +0300
    52.3 @@ -5,25 +5,13 @@
    52.4   */
    52.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property;
    52.6  
    52.7 -import java.math.BigDecimal;
    52.8 -import java.math.BigInteger;
    52.9 -
   52.10 -import org.openrdf.model.Literal;
   52.11 -import org.openrdf.model.URI;
   52.12 -import org.openrdf.model.Value;
   52.13 -import org.openrdf.model.ValueFactory;
   52.14 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   52.15 -import org.openrdf.model.vocabulary.XMLSchema;
   52.16 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   52.17 -import org.openrdf.query.algebra.evaluation.function.Function;
   52.18  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
   52.19  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   52.20 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   52.21   
   52.22  /**
   52.23 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   52.24 + * A spatial function for testing whether a geometry is simple.
   52.25   * 
   52.26 - * @author Arjohn Kampman
   52.27 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   52.28   */
   52.29  public class IsSimpleFunc extends SpatialPropertyFunc {
   52.30  
   52.31 @@ -31,7 +19,4 @@
   52.32  	public String getURI() {
   52.33  		return StrabonPolyhedron.isSimple;
   52.34  	}
   52.35 -
   52.36 -	 
   52.37 - 
   52.38  }
    53.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/SridFunc.java	Tue Jun 26 17:25:40 2012 +0300
    53.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/SridFunc.java	Tue Jun 26 20:02:09 2012 +0300
    53.3 @@ -5,25 +5,13 @@
    53.4   */
    53.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property;
    53.6  
    53.7 -import java.math.BigDecimal;
    53.8 -import java.math.BigInteger;
    53.9 -
   53.10 -import org.openrdf.model.Literal;
   53.11 -import org.openrdf.model.URI;
   53.12 -import org.openrdf.model.Value;
   53.13 -import org.openrdf.model.ValueFactory;
   53.14 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   53.15 -import org.openrdf.model.vocabulary.XMLSchema;
   53.16 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   53.17 -import org.openrdf.query.algebra.evaluation.function.Function;
   53.18  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
   53.19  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   53.20 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   53.21   
   53.22  /**
   53.23 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   53.24 + * A spatial function returning the SRID of a geometry.
   53.25   * 
   53.26 - * @author Arjohn Kampman
   53.27 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   53.28   */
   53.29  public class SridFunc extends SpatialPropertyFunc {
   53.30  
   53.31 @@ -31,7 +19,4 @@
   53.32  	public String getURI() {
   53.33  		return StrabonPolyhedron.srid.toString(); //changed this-constant
   53.34  	}
   53.35 -
   53.36 -	 
   53.37 - 
   53.38  }
    54.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/AboveFunc.java	Tue Jun 26 17:25:40 2012 +0300
    54.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/AboveFunc.java	Tue Jun 26 20:02:09 2012 +0300
    54.3 @@ -5,25 +5,12 @@
    54.4   */
    54.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
    54.6  
    54.7 -import java.math.BigDecimal;
    54.8 -import java.math.BigInteger;
    54.9 -
   54.10 -import org.openrdf.model.Literal;
   54.11 -import org.openrdf.model.URI;
   54.12 -import org.openrdf.model.Value;
   54.13 -import org.openrdf.model.ValueFactory;
   54.14 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   54.15 -import org.openrdf.model.vocabulary.XMLSchema;
   54.16 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   54.17 -import org.openrdf.query.algebra.evaluation.function.Function;
   54.18  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   54.19  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   54.20 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   54.21   
   54.22  /**
   54.23 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   54.24   * 
   54.25 - * @author Arjohn Kampman
   54.26 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   54.27   */
   54.28  public class AboveFunc extends SpatialRelationshipFunc {
   54.29  
   54.30 @@ -31,7 +18,4 @@
   54.31  	public String getURI() {
   54.32  		return StrabonPolyhedron.above;
   54.33  	}
   54.34 -
   54.35 -	 
   54.36 - 
   54.37  }
    55.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/AnyInteractFunc.java	Tue Jun 26 17:25:40 2012 +0300
    55.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/AnyInteractFunc.java	Tue Jun 26 20:02:09 2012 +0300
    55.3 @@ -5,27 +5,12 @@
    55.4   */
    55.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
    55.6  
    55.7 -import java.math.BigDecimal;
    55.8 -import java.math.BigInteger;
    55.9 -
   55.10 -import org.openrdf.model.Literal;
   55.11 -import org.openrdf.model.URI;
   55.12 -import org.openrdf.model.Value;
   55.13 -import org.openrdf.model.ValueFactory;
   55.14 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   55.15 -import org.openrdf.model.vocabulary.XMLSchema;
   55.16 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   55.17 -import org.openrdf.query.algebra.evaluation.function.Function;
   55.18  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   55.19  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   55.20 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   55.21 -
   55.22 -//import eu.ist.semsorgrid4env.strabon.structures.StrabonPolyhedron;
   55.23  
   55.24  /**
   55.25 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   55.26   * 
   55.27 - * @author Arjohn Kampman
   55.28 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   55.29   */
   55.30  public class AnyInteractFunc extends SpatialRelationshipFunc {
   55.31  
   55.32 @@ -34,8 +19,6 @@
   55.33  		return StrabonPolyhedron.anyInteract;
   55.34  		}
   55.35  
   55.36 -	
   55.37 -
   55.38  //	public Literal evaluate(ValueFactory valueFactory, Value... args)
   55.39  //		throws ValueExprEvaluationException
   55.40  //	{
    56.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/BelowFunc.java	Tue Jun 26 17:25:40 2012 +0300
    56.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/BelowFunc.java	Tue Jun 26 20:02:09 2012 +0300
    56.3 @@ -5,25 +5,12 @@
    56.4   */
    56.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
    56.6  
    56.7 -import java.math.BigDecimal;
    56.8 -import java.math.BigInteger;
    56.9 -
   56.10 -import org.openrdf.model.Literal;
   56.11 -import org.openrdf.model.URI;
   56.12 -import org.openrdf.model.Value;
   56.13 -import org.openrdf.model.ValueFactory;
   56.14 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   56.15 -import org.openrdf.model.vocabulary.XMLSchema;
   56.16 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   56.17 -import org.openrdf.query.algebra.evaluation.function.Function;
   56.18  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   56.19  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   56.20 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   56.21   
   56.22  /**
   56.23 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   56.24   * 
   56.25 - * @author Arjohn Kampman
   56.26 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   56.27   */
   56.28  public class BelowFunc extends SpatialRelationshipFunc {
   56.29  
   56.30 @@ -31,7 +18,4 @@
   56.31  	public String getURI() {
   56.32  		return StrabonPolyhedron.below;
   56.33  	}
   56.34 -
   56.35 -	 
   56.36 - 
   56.37  }
    57.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/ContainsFunc.java	Tue Jun 26 17:25:40 2012 +0300
    57.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/ContainsFunc.java	Tue Jun 26 20:02:09 2012 +0300
    57.3 @@ -5,25 +5,12 @@
    57.4   */
    57.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
    57.6  
    57.7 -import java.math.BigDecimal;
    57.8 -import java.math.BigInteger;
    57.9 -
   57.10 -import org.openrdf.model.Literal;
   57.11 -import org.openrdf.model.URI;
   57.12 -import org.openrdf.model.Value;
   57.13 -import org.openrdf.model.ValueFactory;
   57.14 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   57.15 -import org.openrdf.model.vocabulary.XMLSchema;
   57.16 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   57.17 -import org.openrdf.query.algebra.evaluation.function.Function;
   57.18  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   57.19  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   57.20 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   57.21   
   57.22  /**
   57.23 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   57.24   * 
   57.25 - * @author Arjohn Kampman
   57.26 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   57.27   */
   57.28  public class ContainsFunc extends SpatialRelationshipFunc {
   57.29  
   57.30 @@ -31,7 +18,4 @@
   57.31  	public String getURI() {
   57.32  		return StrabonPolyhedron.contains;
   57.33  	}
   57.34 -
   57.35 -	 
   57.36 - 
   57.37  }
    58.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/CoveredByFunc.java	Tue Jun 26 17:25:40 2012 +0300
    58.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/CoveredByFunc.java	Tue Jun 26 20:02:09 2012 +0300
    58.3 @@ -5,25 +5,12 @@
    58.4   */
    58.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
    58.6  
    58.7 -import java.math.BigDecimal;
    58.8 -import java.math.BigInteger;
    58.9 -
   58.10 -import org.openrdf.model.Literal;
   58.11 -import org.openrdf.model.URI;
   58.12 -import org.openrdf.model.Value;
   58.13 -import org.openrdf.model.ValueFactory;
   58.14 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   58.15 -import org.openrdf.model.vocabulary.XMLSchema;
   58.16 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   58.17 -import org.openrdf.query.algebra.evaluation.function.Function;
   58.18  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   58.19  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   58.20 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   58.21   
   58.22  /**
   58.23 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   58.24   * 
   58.25 - * @author Arjohn Kampman
   58.26 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   58.27   */
   58.28  public class CoveredByFunc extends SpatialRelationshipFunc {
   58.29  
   58.30 @@ -31,6 +18,4 @@
   58.31  	public String getURI() {
   58.32  		return StrabonPolyhedron.coveredBy;
   58.33  	}
   58.34 -
   58.35 - 
   58.36  }
    59.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/CoversFunc.java	Tue Jun 26 17:25:40 2012 +0300
    59.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/CoversFunc.java	Tue Jun 26 20:02:09 2012 +0300
    59.3 @@ -5,25 +5,12 @@
    59.4   */
    59.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
    59.6  
    59.7 -import java.math.BigDecimal;
    59.8 -import java.math.BigInteger;
    59.9 -
   59.10 -import org.openrdf.model.Literal;
   59.11 -import org.openrdf.model.URI;
   59.12 -import org.openrdf.model.Value;
   59.13 -import org.openrdf.model.ValueFactory;
   59.14 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   59.15 -import org.openrdf.model.vocabulary.XMLSchema;
   59.16 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   59.17 -import org.openrdf.query.algebra.evaluation.function.Function;
   59.18  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   59.19  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   59.20 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   59.21   
   59.22  /**
   59.23 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   59.24   * 
   59.25 - * @author Arjohn Kampman
   59.26 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   59.27   */
   59.28  public class CoversFunc extends SpatialRelationshipFunc {
   59.29  
   59.30 @@ -31,6 +18,4 @@
   59.31  	public String getURI() {
   59.32  		return StrabonPolyhedron.covers;
   59.33  	}
   59.34 - 
   59.35 -
   59.36  }
    60.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/DisjointFunc.java	Tue Jun 26 17:25:40 2012 +0300
    60.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/DisjointFunc.java	Tue Jun 26 20:02:09 2012 +0300
    60.3 @@ -5,25 +5,12 @@
    60.4   */
    60.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
    60.6  
    60.7 -import java.math.BigDecimal;
    60.8 -import java.math.BigInteger;
    60.9 -
   60.10 -import org.openrdf.model.Literal;
   60.11 -import org.openrdf.model.URI;
   60.12 -import org.openrdf.model.Value;
   60.13 -import org.openrdf.model.ValueFactory;
   60.14 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   60.15 -import org.openrdf.model.vocabulary.XMLSchema;
   60.16 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   60.17 -import org.openrdf.query.algebra.evaluation.function.Function;
   60.18  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   60.19  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   60.20 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   60.21   
   60.22  /**
   60.23 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   60.24   * 
   60.25 - * @author Arjohn Kampman
   60.26 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   60.27   */
   60.28  public class DisjointFunc extends SpatialRelationshipFunc {
   60.29  
   60.30 @@ -31,5 +18,4 @@
   60.31  	public String getURI() {
   60.32  		return StrabonPolyhedron.disjoint;
   60.33  	}
   60.34 - 
   60.35  }
    61.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/EqualsFunc.java	Tue Jun 26 17:25:40 2012 +0300
    61.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/EqualsFunc.java	Tue Jun 26 20:02:09 2012 +0300
    61.3 @@ -5,26 +5,12 @@
    61.4   */
    61.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
    61.6  
    61.7 -import java.math.BigDecimal;
    61.8 -import java.math.BigInteger;
    61.9 -
   61.10 -import org.openrdf.model.Literal;
   61.11 -import org.openrdf.model.URI;
   61.12 -import org.openrdf.model.Value;
   61.13 -import org.openrdf.model.ValueFactory;
   61.14 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   61.15 -import org.openrdf.model.vocabulary.XMLSchema;
   61.16 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   61.17 -import org.openrdf.query.algebra.evaluation.function.Function;
   61.18  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   61.19  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   61.20 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   61.21  
   61.22 - 
   61.23  /**
   61.24 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   61.25   * 
   61.26 - * @author Arjohn Kampman
   61.27 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   61.28   */
   61.29  public class EqualsFunc extends SpatialRelationshipFunc {
   61.30  
   61.31 @@ -32,6 +18,4 @@
   61.32  	public String getURI() {
   61.33  		return StrabonPolyhedron.equals;
   61.34  	}
   61.35 - 
   61.36 - 
   61.37  }
    62.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/InsideFunc.java	Tue Jun 26 17:25:40 2012 +0300
    62.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/InsideFunc.java	Tue Jun 26 20:02:09 2012 +0300
    62.3 @@ -5,25 +5,12 @@
    62.4   */
    62.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
    62.6  
    62.7 -import java.math.BigDecimal;
    62.8 -import java.math.BigInteger;
    62.9 -
   62.10 -import org.openrdf.model.Literal;
   62.11 -import org.openrdf.model.URI;
   62.12 -import org.openrdf.model.Value;
   62.13 -import org.openrdf.model.ValueFactory;
   62.14 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   62.15 -import org.openrdf.model.vocabulary.XMLSchema;
   62.16 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   62.17 -import org.openrdf.query.algebra.evaluation.function.Function;
   62.18  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   62.19  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   62.20 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   62.21   
   62.22  /**
   62.23 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   62.24   * 
   62.25 - * @author Arjohn Kampman
   62.26 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   62.27   */
   62.28  public class InsideFunc extends SpatialRelationshipFunc {
   62.29  
   62.30 @@ -31,6 +18,4 @@
   62.31  	public String getURI() {
   62.32  		return StrabonPolyhedron.inside;
   62.33  	}
   62.34 - 
   62.35 - 
   62.36  }
    63.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/LeftFunc.java	Tue Jun 26 17:25:40 2012 +0300
    63.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/LeftFunc.java	Tue Jun 26 20:02:09 2012 +0300
    63.3 @@ -5,25 +5,12 @@
    63.4   */
    63.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
    63.6  
    63.7 -import java.math.BigDecimal;
    63.8 -import java.math.BigInteger;
    63.9 -
   63.10 -import org.openrdf.model.Literal;
   63.11 -import org.openrdf.model.URI;
   63.12 -import org.openrdf.model.Value;
   63.13 -import org.openrdf.model.ValueFactory;
   63.14 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   63.15 -import org.openrdf.model.vocabulary.XMLSchema;
   63.16 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   63.17 -import org.openrdf.query.algebra.evaluation.function.Function;
   63.18  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   63.19  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   63.20 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   63.21   
   63.22  /**
   63.23 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   63.24   * 
   63.25 - * @author Arjohn Kampman
   63.26 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   63.27   */
   63.28  public class LeftFunc extends SpatialRelationshipFunc {
   63.29  
   63.30 @@ -31,7 +18,4 @@
   63.31  	public String getURI() {
   63.32  		return StrabonPolyhedron.left;
   63.33  	}
   63.34 -
   63.35 -	 
   63.36 - 
   63.37  }
    64.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/OverlapFunc.java	Tue Jun 26 17:25:40 2012 +0300
    64.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/OverlapFunc.java	Tue Jun 26 20:02:09 2012 +0300
    64.3 @@ -5,25 +5,12 @@
    64.4   */
    64.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
    64.6  
    64.7 -import java.math.BigDecimal;
    64.8 -import java.math.BigInteger;
    64.9 -
   64.10 -import org.openrdf.model.Literal;
   64.11 -import org.openrdf.model.URI;
   64.12 -import org.openrdf.model.Value;
   64.13 -import org.openrdf.model.ValueFactory;
   64.14 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   64.15 -import org.openrdf.model.vocabulary.XMLSchema;
   64.16 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   64.17 -import org.openrdf.query.algebra.evaluation.function.Function;
   64.18  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   64.19  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   64.20 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   64.21   
   64.22  /**
   64.23 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   64.24   * 
   64.25 - * @author Arjohn Kampman
   64.26 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   64.27   */
   64.28  public class OverlapFunc extends SpatialRelationshipFunc {
   64.29  
   64.30 @@ -31,5 +18,4 @@
   64.31  	public String getURI() {
   64.32  		return StrabonPolyhedron.overlap;
   64.33  	}
   64.34 - 
   64.35  }
    65.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/RelateFunc.java	Tue Jun 26 17:25:40 2012 +0300
    65.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/RelateFunc.java	Tue Jun 26 20:02:09 2012 +0300
    65.3 @@ -5,36 +5,18 @@
    65.4   */
    65.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
    65.6  
    65.7 -import java.math.BigDecimal;
    65.8 -import java.math.BigInteger;
    65.9 -
   65.10 -import org.openrdf.model.Literal;
   65.11 -import org.openrdf.model.URI;
   65.12 -import org.openrdf.model.Value;
   65.13 -import org.openrdf.model.ValueFactory;
   65.14 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   65.15 -import org.openrdf.model.vocabulary.XMLSchema;
   65.16 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   65.17 -import org.openrdf.query.algebra.evaluation.function.Function;
   65.18  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   65.19  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   65.20 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   65.21 -
   65.22 -//import eu.ist.semsorgrid4env.strabon.structures.StrabonPolyhedron;
   65.23  
   65.24  /**
   65.25 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   65.26 - * 
   65.27 - * @author Arjohn Kampman
   65.28 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   65.29   */
   65.30  public class RelateFunc extends SpatialRelationshipFunc {
   65.31  
   65.32  	@Override
   65.33  	public String getURI() {
   65.34  		return StrabonPolyhedron.relate;
   65.35 -		}
   65.36 -
   65.37 -	
   65.38 +	}
   65.39  
   65.40  //	public Literal evaluate(ValueFactory valueFactory, Value... args)
   65.41  //		throws ValueExprEvaluationException
    66.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/RightFunc.java	Tue Jun 26 17:25:40 2012 +0300
    66.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/RightFunc.java	Tue Jun 26 20:02:09 2012 +0300
    66.3 @@ -5,25 +5,12 @@
    66.4   */
    66.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
    66.6  
    66.7 -import java.math.BigDecimal;
    66.8 -import java.math.BigInteger;
    66.9 -
   66.10 -import org.openrdf.model.Literal;
   66.11 -import org.openrdf.model.URI;
   66.12 -import org.openrdf.model.Value;
   66.13 -import org.openrdf.model.ValueFactory;
   66.14 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   66.15 -import org.openrdf.model.vocabulary.XMLSchema;
   66.16 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   66.17 -import org.openrdf.query.algebra.evaluation.function.Function;
   66.18  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   66.19  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   66.20 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   66.21   
   66.22  /**
   66.23 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   66.24   * 
   66.25 - * @author Arjohn Kampman
   66.26 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   66.27   */
   66.28  public class RightFunc extends SpatialRelationshipFunc {
   66.29  
   66.30 @@ -31,7 +18,4 @@
   66.31  	public String getURI() {
   66.32  		return StrabonPolyhedron.right;
   66.33  	}
   66.34 -
   66.35 -	 
   66.36 - 
   66.37  }
    67.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/TouchFunc.java	Tue Jun 26 17:25:40 2012 +0300
    67.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/TouchFunc.java	Tue Jun 26 20:02:09 2012 +0300
    67.3 @@ -5,25 +5,12 @@
    67.4   */
    67.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
    67.6  
    67.7 -import java.math.BigDecimal;
    67.8 -import java.math.BigInteger;
    67.9 -
   67.10 -import org.openrdf.model.Literal;
   67.11 -import org.openrdf.model.URI;
   67.12 -import org.openrdf.model.Value;
   67.13 -import org.openrdf.model.ValueFactory;
   67.14 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   67.15 -import org.openrdf.model.vocabulary.XMLSchema;
   67.16 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   67.17 -import org.openrdf.query.algebra.evaluation.function.Function;
   67.18  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   67.19  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   67.20 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   67.21   
   67.22  /**
   67.23 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   67.24   * 
   67.25 - * @author Arjohn Kampman
   67.26 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   67.27   */
   67.28  public class TouchFunc extends SpatialRelationshipFunc {
   67.29  
   67.30 @@ -31,6 +18,4 @@
   67.31  	public String getURI() {
   67.32  		return StrabonPolyhedron.touch;
   67.33  	}
   67.34 -
   67.35 - 
   67.36  }
    68.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/impl/SpatialJoinOptimizer.java	Tue Jun 26 17:25:40 2012 +0300
    68.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/impl/SpatialJoinOptimizer.java	Tue Jun 26 20:02:09 2012 +0300
    68.3 @@ -7,20 +7,17 @@
    68.4  package org.openrdf.query.algebra.evaluation.impl;
    68.5  
    68.6  import java.util.ArrayList;
    68.7 -import java.util.Collection;
    68.8  import java.util.HashMap;
    68.9  import java.util.Iterator;
   68.10  import java.util.LinkedHashSet;
   68.11  import java.util.List;
   68.12  import java.util.Map;
   68.13  import java.util.Set;
   68.14 -import java.util.TreeSet;
   68.15  
   68.16  import org.openrdf.query.BindingSet;
   68.17  import org.openrdf.query.Dataset;
   68.18  import org.openrdf.query.algebra.Compare;
   68.19  import org.openrdf.query.algebra.Extension;
   68.20 -import org.openrdf.query.algebra.ExtensionElem;
   68.21  import org.openrdf.query.algebra.Filter;
   68.22  import org.openrdf.query.algebra.FunctionCall;
   68.23  import org.openrdf.query.algebra.Join;
   68.24 @@ -28,30 +25,25 @@
   68.25  import org.openrdf.query.algebra.MathExpr;
   68.26  import org.openrdf.query.algebra.Or;
   68.27  import org.openrdf.query.algebra.QueryModelNode;
   68.28 -import org.openrdf.query.algebra.QueryModelNodeBase;
   68.29  import org.openrdf.query.algebra.StatementPattern;
   68.30 -import org.openrdf.query.algebra.MathExpr.MathOp;
   68.31  import org.openrdf.query.algebra.StatementPattern.Scope;
   68.32  import org.openrdf.query.algebra.TupleExpr;
   68.33  import org.openrdf.query.algebra.ValueExpr;
   68.34  import org.openrdf.query.algebra.Var;
   68.35 -import org.openrdf.query.algebra.evaluation.QueryOptimizer;
   68.36  import org.openrdf.query.algebra.evaluation.function.Function;
   68.37 -import org.openrdf.query.algebra.evaluation.function.FunctionRegistry; 
   68.38 +import org.openrdf.query.algebra.evaluation.function.FunctionRegistry;
   68.39  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
   68.40 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialMetricFunc; 
   68.41 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialMetricFunc;
   68.42  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
   68.43  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   68.44  import org.openrdf.query.algebra.helpers.QueryModelVisitorBase;
   68.45 -import org.openrdf.query.algebra.helpers.StatementPatternCollector; 
   68.46 +import org.openrdf.query.algebra.helpers.StatementPatternCollector;
   68.47  
   68.48  /**
   68.49   * A query optimizer that re-orders nested Joins.
   68.50   * 
   68.51 - * @author Arjohn Kampman
   68.52 - * @author James Leigh
   68.53 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   68.54   */
   68.55 -
   68.56  public class SpatialJoinOptimizer 
   68.57  //implements QueryOptimizer //Removed it consciously 
   68.58  {
    69.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/impl/stSPARQLConstantOptimizer.java	Tue Jun 26 17:25:40 2012 +0300
    69.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/impl/stSPARQLConstantOptimizer.java	Tue Jun 26 20:02:09 2012 +0300
    69.3 @@ -39,10 +39,9 @@
    69.4  import org.openrdf.query.impl.EmptyBindingSet;
    69.5  
    69.6  /**
    69.7 - * A query optimizer that optimizes constant value expressions.
    69.8 + * A query optimizer that optimizes constant value expressions for stSPARQL.
    69.9   * 
   69.10 - * @author James Leigh
   69.11 - * @author Arjohn Kampman
   69.12 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   69.13   */
   69.14  public class stSPARQLConstantOptimizer implements QueryOptimizer {
   69.15  
    70.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/iterator/StSPARQLGroupIterator.java	Tue Jun 26 17:25:40 2012 +0300
    70.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/iterator/StSPARQLGroupIterator.java	Tue Jun 26 20:02:09 2012 +0300
    70.3 @@ -5,6 +5,10 @@
    70.4   */
    70.5  package org.openrdf.query.algebra.evaluation.iterator;
    70.6  
    70.7 +import info.aduna.iteration.CloseableIteration;
    70.8 +import info.aduna.iteration.CloseableIteratorIteration;
    70.9 +import info.aduna.lang.ObjectUtil;
   70.10 +
   70.11  import java.util.Collection;
   70.12  import java.util.HashSet;
   70.13  import java.util.Iterator;
   70.14 @@ -14,16 +18,10 @@
   70.15  import java.util.NoSuchElementException;
   70.16  import java.util.Set;
   70.17  
   70.18 -import info.aduna.iteration.CloseableIteration;
   70.19 -import info.aduna.iteration.CloseableIteratorIteration;
   70.20 -import info.aduna.lang.ObjectUtil;
   70.21 -
   70.22 -import org.openrdf.model.URI;
   70.23  import org.openrdf.model.Literal;
   70.24  import org.openrdf.model.Value;
   70.25  import org.openrdf.model.datatypes.XMLDatatypeUtil;
   70.26  import org.openrdf.model.impl.LiteralImpl;
   70.27 -import org.openrdf.model.impl.NumericLiteralImpl;
   70.28  import org.openrdf.model.impl.URIImpl;
   70.29  import org.openrdf.model.impl.ValueFactoryImpl;
   70.30  import org.openrdf.model.vocabulary.XMLSchema;
   70.31 @@ -43,7 +41,6 @@
   70.32  import org.openrdf.query.algebra.Min;
   70.33  import org.openrdf.query.algebra.Sample;
   70.34  import org.openrdf.query.algebra.Sum;
   70.35 -import org.openrdf.query.algebra.ValueConstant;
   70.36  import org.openrdf.query.algebra.ValueExpr;
   70.37  import org.openrdf.query.algebra.Var;
   70.38  import org.openrdf.query.algebra.evaluation.EvaluationStrategy;
   70.39 @@ -71,10 +68,8 @@
   70.40  import com.vividsolutions.jts.geom.Geometry;
   70.41  
   70.42  /**
   70.43 - * @author David Huynh
   70.44 - * @author Arjohn Kampman
   70.45 - * @author Jeen Broekstra
   70.46 - * @author James Leigh
   70.47 + * 
   70.48 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   70.49   */
   70.50  public class StSPARQLGroupIterator extends CloseableIteratorIteration<BindingSet, QueryEvaluationException> {
   70.51