Strabon
changeset 367:5bc9b08e456f
some more comments and author name addition
line diff
1.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/AsTextFunc.java Tue Jun 26 20:02:09 2012 +0300 1.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/AsTextFunc.java Tue Jun 26 20:27:25 2012 +0300 1.3 @@ -9,8 +9,7 @@ 1.4 import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 1.5 1.6 /** 1.7 - * A spatial function returning a geometry as text. 1.8 - * FIXME: (WKT or GML?) 1.9 + * A spatial function returning a geometry as text (in WKT format). 1.10 * 1.11 * @author Manos Karpathiotakis <mk@di.uoa.gr> 1.12 */
2.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoAsText.java Tue Jun 26 20:02:09 2012 +0300 2.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoAsText.java Tue Jun 26 20:27:25 2012 +0300 2.3 @@ -9,7 +9,13 @@ 2.4 import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 2.5 import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 2.6 2.7 -public class GeneralDBSqlGeoAsText extends GeneralDBSqlSpatialProperty{ 2.8 +/** 2.9 + * 2.10 + * @see {@link org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.AsTextFunc} 2.11 + * 2.12 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 2.13 + */ 2.14 +public class GeneralDBSqlGeoAsText extends GeneralDBSqlSpatialProperty { 2.15 2.16 public GeneralDBSqlGeoAsText(GeneralDBSqlExpr expr) { 2.17 super(expr);
3.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoDimension.java Tue Jun 26 20:02:09 2012 +0300 3.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoDimension.java Tue Jun 26 20:27:25 2012 +0300 3.3 @@ -9,7 +9,13 @@ 3.4 import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 3.5 import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 3.6 3.7 -public class GeneralDBSqlGeoDimension extends GeneralDBSqlSpatialProperty{ 3.8 +/** 3.9 + * 3.10 + * @see {@link org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.DimensionFunc} 3.11 + * 3.12 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 3.13 + */ 3.14 +public class GeneralDBSqlGeoDimension extends GeneralDBSqlSpatialProperty { 3.15 3.16 public GeneralDBSqlGeoDimension(GeneralDBSqlExpr expr) { 3.17 super(expr); 3.18 @@ -21,5 +27,4 @@ 3.19 { 3.20 visitor.meet(this); 3.21 } 3.22 - 3.23 } 3.24 \ No newline at end of file
4.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoIsEmpty.java Tue Jun 26 20:02:09 2012 +0300 4.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoIsEmpty.java Tue Jun 26 20:27:25 2012 +0300 4.3 @@ -4,12 +4,17 @@ 4.4 * Licensed under the Aduna BSD-style license. 4.5 */ 4.6 package org.openrdf.sail.generaldb.algebra; 4.7 - 4.8 4.9 import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 4.10 import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 4.11 4.12 -public class GeneralDBSqlGeoIsEmpty extends GeneralDBSqlSpatialProperty{ 4.13 +/** 4.14 + * 4.15 + * @see {@link org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.IsEmptyFunc} 4.16 + * 4.17 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 4.18 + */ 4.19 +public class GeneralDBSqlGeoIsEmpty extends GeneralDBSqlSpatialProperty { 4.20 4.21 public GeneralDBSqlGeoIsEmpty(GeneralDBSqlExpr expr) { 4.22 super(expr);
5.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoIsSimple.java Tue Jun 26 20:02:09 2012 +0300 5.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoIsSimple.java Tue Jun 26 20:27:25 2012 +0300 5.3 @@ -9,7 +9,13 @@ 5.4 import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 5.5 import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 5.6 5.7 -public class GeneralDBSqlGeoIsSimple extends GeneralDBSqlSpatialProperty{ 5.8 +/** 5.9 + * 5.10 + * @see {@link org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.IsSimpleFunc} 5.11 + * 5.12 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 5.13 + */ 5.14 +public class GeneralDBSqlGeoIsSimple extends GeneralDBSqlSpatialProperty { 5.15 5.16 public GeneralDBSqlGeoIsSimple(GeneralDBSqlExpr expr) { 5.17 super(expr);
6.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoSrid.java Tue Jun 26 20:02:09 2012 +0300 6.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoSrid.java Tue Jun 26 20:27:25 2012 +0300 6.3 @@ -5,11 +5,16 @@ 6.4 */ 6.5 package org.openrdf.sail.generaldb.algebra; 6.6 6.7 - 6.8 import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 6.9 import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 6.10 6.11 -public class GeneralDBSqlGeoSrid extends GeneralDBSqlSpatialProperty{ 6.12 +/** 6.13 + * 6.14 + * @see {@link org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.SridFunc} 6.15 + * 6.16 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 6.17 + */ 6.18 +public class GeneralDBSqlGeoSrid extends GeneralDBSqlSpatialProperty { 6.19 6.20 public GeneralDBSqlGeoSrid(GeneralDBSqlExpr expr) { 6.21 super(expr); 6.22 @@ -21,5 +26,4 @@ 6.23 { 6.24 visitor.meet(this); 6.25 } 6.26 - 6.27 } 6.28 \ No newline at end of file
7.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlSpatialConstructBinary.java Tue Jun 26 20:02:09 2012 +0300 7.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlSpatialConstructBinary.java Tue Jun 26 20:27:25 2012 +0300 7.3 @@ -1,18 +1,14 @@ 7.4 package org.openrdf.sail.generaldb.algebra; 7.5 7.6 -import java.util.ArrayList; 7.7 - 7.8 import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 7.9 import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 7.10 import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 7.11 -import org.openrdf.sail.generaldb.algebra.base.UnaryGeneralDBOperator; 7.12 7.13 -public class GeneralDBSqlSpatialConstructBinary extends BinaryGeneralDBOperator 7.14 -{ 7.15 - 7.16 - 7.17 - /*CONSTRUCTOR*/ 7.18 - 7.19 +/** 7.20 + * 7.21 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 7.22 + */ 7.23 +public class GeneralDBSqlSpatialConstructBinary extends BinaryGeneralDBOperator { 7.24 public GeneralDBSqlSpatialConstructBinary(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 7.25 super(left, right); 7.26 } 7.27 @@ -23,7 +19,6 @@ 7.28 { 7.29 visitor.meet(this); 7.30 } 7.31 - 7.32 } 7.33 7.34
8.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlSpatialProperty.java Tue Jun 26 20:02:09 2012 +0300 8.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlSpatialProperty.java Tue Jun 26 20:27:25 2012 +0300 8.3 @@ -5,17 +5,14 @@ 8.4 import org.openrdf.sail.generaldb.algebra.base.UnaryGeneralDBOperator; 8.5 8.6 /** 8.7 + * This class represents a unary operator in a SQL expression for returning various 8.8 + * properties of a geometry. 8.9 * 8.10 - * @author manolee 8.11 - * The following functions have been defined for returning some properties of a 8.12 - *geometry 8.13 + * @see {@link org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc} 8.14 + * 8.15 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 8.16 */ 8.17 - 8.18 -public class GeneralDBSqlSpatialProperty extends UnaryGeneralDBOperator 8.19 -{ 8.20 - 8.21 - 8.22 - /*CONSTRUCTOR*/ 8.23 +public class GeneralDBSqlSpatialProperty extends UnaryGeneralDBOperator { 8.24 8.25 public GeneralDBSqlSpatialProperty(GeneralDBSqlExpr arg) { 8.26 super(arg);
9.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/evaluation/GeneralDBEvaluation.java Tue Jun 26 20:02:09 2012 +0300 9.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/evaluation/GeneralDBEvaluation.java Tue Jun 26 20:27:25 2012 +0300 9.3 @@ -956,6 +956,12 @@ 9.4 //return allVars; 9.5 } 9.6 9.7 + /** 9.8 + * Given an expression get the type of the result. 9.9 + * 9.10 + * @param expr 9.11 + * @return 9.12 + */ 9.13 private int constructReturnType(GeneralDBSqlExpr expr) 9.14 { 9.15 if(expr instanceof GeneralDBSqlSpatialProperty)