1.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/GeoConstants.java	Fri Mar 08 19:41:02 2013 +0200
     1.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/GeoConstants.java	Fri Mar 08 21:15:08 2013 +0200
     1.3 @@ -34,6 +34,11 @@
     1.4  	public static final String rdfi						= "http://rdfi.di.uoa.gr/ontology#";
     1.5  
     1.6  	/**
     1.7 +	 * The namespace for GeoSPARQL
     1.8 +	 */
     1.9 +	public static final String geo						= "http://www.opengis.net/ont/geosparql#";
    1.10 +	
    1.11 +	/**
    1.12  	 * The URI for the datatype SemiLinearPointSet
    1.13  	 * (linear constraint-based representation of geometries)
    1.14  	 */
    1.15 @@ -42,13 +47,17 @@
    1.16  	/**
    1.17  	 * The URI for the datatype Well-Known Text (WKT)
    1.18  	 */
    1.19 -	public static final String WKT 						= stRDF + "WKT";
    1.20 +	// TODO ggarbis variable WKT variable changed to support geo:wktLiteral for benchmarking
    1.21 +	public static final String WKT 						= geo + "wktLiteral";
    1.22 +//	public static final String WKT 						= = stRDF + "WKT";
    1.23  
    1.24  	/**
    1.25  	 * The URI for the datatype Geography Markup Language (GML) as it defined
    1.26  	 * in the model stRDF and query language stSPARQL
    1.27  	 */
    1.28 -	public static final String GML						= stRDF + "GML";
    1.29 +	// TODO ggarbis variable GML variable changed to support geo:gmlLiteral for benchmarking
    1.30 +	public static final String GML						= geo + "wktLiteral";//= stRDF + "GML";
    1.31 +//	public static final String GML						= = stRDF + "GML";
    1.32  
    1.33  	/**
    1.34  	 * 

     2.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/Polyhedron.java	Fri Mar 08 19:41:02 2013 +0200
     2.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/Polyhedron.java	Fri Mar 08 21:15:08 2013 +0200
     2.3 @@ -11,21 +11,49 @@
     2.4  
     2.5  import java.io.Serializable;
     2.6  
     2.7 -
     2.8  /**
     2.9   * @author Kostis Kyzirakos <kkyzir@di.uoa.gr>
    2.10 - *
    2.11 + * 
    2.12   */
    2.13  public class Polyhedron implements Serializable {
    2.14 -	
    2.15 +
    2.16  	private static final long serialVersionUID = 76255052985367749L;
    2.17 -	
    2.18 -	public static final int OPTIMAL_CONVEX_PARTITION = 0; //Optimal number of pieces, O(n^4) time and O(n^3) space
    2.19 -	public static final int APPROXIMATE_CONVEX_PARTITION = 1; //Approximate optimal number of pieces, uses approximation algorithm of Hertel and Mehlhorn (triangulation), O(n) time and space.
    2.20 -	public static final int GREEN_CONVEX_PARTITION = 2; //Approximate optimal number of pieces, uses sweep-line approximation algorithm of Greene, O(n log(n)) time and O(n) space.
    2.21 -	public static final int Y_MONOTONE_PARTITION = 3; //Same complexity as Hertel and Mehlhorn, but can sometimes produce better results (i.e., convex partitions with fewer pieces).
    2.22  
    2.23 -	public static final String stRDFSemiLinearPointset="http://strdf.di.uoa.gr/ontology#SemiLinearPointSet";
    2.24 -	public static final String ogcGeometry="http://strdf.di.uoa.gr/ontology#WKT";
    2.25 +	public static final int OPTIMAL_CONVEX_PARTITION = 0; // Optimal number of
    2.26 +															// pieces, O(n^4)
    2.27 +															// time and O(n^3)
    2.28 +															// space
    2.29 +	public static final int APPROXIMATE_CONVEX_PARTITION = 1; // Approximate
    2.30 +																// optimal
    2.31 +																// number of
    2.32 +																// pieces, uses
    2.33 +																// approximation
    2.34 +																// algorithm of
    2.35 +																// Hertel and
    2.36 +																// Mehlhorn
    2.37 +																// (triangulation),
    2.38 +																// O(n) time and
    2.39 +																// space.
    2.40 +	public static final int GREEN_CONVEX_PARTITION = 2; // Approximate optimal
    2.41 +														// number of pieces,
    2.42 +														// uses sweep-line
    2.43 +														// approximation
    2.44 +														// algorithm of Greene,
    2.45 +														// O(n log(n)) time and
    2.46 +														// O(n) space.
    2.47 +	public static final int Y_MONOTONE_PARTITION = 3; // Same complexity as
    2.48 +														// Hertel and Mehlhorn,
    2.49 +														// but can sometimes
    2.50 +														// produce better
    2.51 +														// results (i.e., convex
    2.52 +														// partitions with fewer
    2.53 +														// pieces).
    2.54 +
    2.55 +	public static final String stRDFSemiLinearPointset = "http://strdf.di.uoa.gr/ontology#SemiLinearPointSet";
    2.56 +	// TODO ggarbis ogcGeometry variable changed to support geo:wktLiteral for
    2.57 +	// benchmarking
    2.58 +	public static final String ogcGeometry = "http://www.opengis.net/ont/geosparql#wktLiteral";
    2.59 +	// public static final String
    2.60 +	// ogcGeometry="http://strdf.di.uoa.gr/ontology#WKT";
    2.61  
    2.62  }