# HG changeset patch
# User George Garbis <ggarbis@di.uoa.gr>
# Date 1362770108 -7200
# Node ID d7babe43a0c4773831c4221a5af8e1c662885daa
# Parent  3d61f42a4b6fb26a33f5f5641fc2f9c631f6abb3
Strabon supports geo:wktLiteral instead of strdf:WKT

diff -r 3d61f42a4b6f -r d7babe43a0c4 evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/GeoConstants.java
--- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/GeoConstants.java	Fri Mar 08 19:41:02 2013 +0200
+++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/GeoConstants.java	Fri Mar 08 21:15:08 2013 +0200
@@ -34,6 +34,11 @@
 	public static final String rdfi						= "http://rdfi.di.uoa.gr/ontology#";
 
 	/**
+	 * The namespace for GeoSPARQL
+	 */
+	public static final String geo						= "http://www.opengis.net/ont/geosparql#";
+	
+	/**
 	 * The URI for the datatype SemiLinearPointSet
 	 * (linear constraint-based representation of geometries)
 	 */
@@ -42,13 +47,17 @@
 	/**
 	 * The URI for the datatype Well-Known Text (WKT)
 	 */
-	public static final String WKT 						= stRDF + "WKT";
+	// TODO ggarbis variable WKT variable changed to support geo:wktLiteral for benchmarking
+	public static final String WKT 						= geo + "wktLiteral";
+//	public static final String WKT 						= = stRDF + "WKT";
 
 	/**
 	 * The URI for the datatype Geography Markup Language (GML) as it defined
 	 * in the model stRDF and query language stSPARQL
 	 */
-	public static final String GML						= stRDF + "GML";
+	// TODO ggarbis variable GML variable changed to support geo:gmlLiteral for benchmarking
+	public static final String GML						= geo + "wktLiteral";//= stRDF + "GML";
+//	public static final String GML						= = stRDF + "GML";
 
 	/**
 	 * 
diff -r 3d61f42a4b6f -r d7babe43a0c4 evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/Polyhedron.java
--- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/Polyhedron.java	Fri Mar 08 19:41:02 2013 +0200
+++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/Polyhedron.java	Fri Mar 08 21:15:08 2013 +0200
@@ -11,21 +11,49 @@
 
 import java.io.Serializable;
 
-
 /**
  * @author Kostis Kyzirakos <kkyzir@di.uoa.gr>
- *
+ * 
  */
 public class Polyhedron implements Serializable {
-	
+
 	private static final long serialVersionUID = 76255052985367749L;
-	
-	public static final int OPTIMAL_CONVEX_PARTITION = 0; //Optimal number of pieces, O(n^4) time and O(n^3) space
-	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.
-	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.
-	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).
 
-	public static final String stRDFSemiLinearPointset="http://strdf.di.uoa.gr/ontology#SemiLinearPointSet";
-	public static final String ogcGeometry="http://strdf.di.uoa.gr/ontology#WKT";
+	public static final int OPTIMAL_CONVEX_PARTITION = 0; // Optimal number of
+															// pieces, O(n^4)
+															// time and O(n^3)
+															// space
+	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.
+	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.
+	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).
+
+	public static final String stRDFSemiLinearPointset = "http://strdf.di.uoa.gr/ontology#SemiLinearPointSet";
+	// TODO ggarbis ogcGeometry variable changed to support geo:wktLiteral for
+	// benchmarking
+	public static final String ogcGeometry = "http://www.opengis.net/ont/geosparql#wktLiteral";
+	// public static final String
+	// ogcGeometry="http://strdf.di.uoa.gr/ontology#WKT";
 
 }