Strabon

changeset 697:46455d2cd75a temporals

moved abstract member functions getOperator and getPostgresFunction to the GeneralDbSql alternatives
author Konstantina
date Thu Nov 08 01:27:04 2012 +0200 (2012-11-08)
parents 6d16c88b9b86
children 399517323302
files evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/construct/PeriodIntersectionFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/construct/PeriodMinusFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/construct/TemporalConstructFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/construct/periodUnionFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/AdjacentPeriodFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/AfterPeriodFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/BeforePeriodFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/EqualsPeriodFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/NequalsPeriodFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/OverleftPeriodFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/OverrightPeriodFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/PeriodContainedByFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/PeriodContainsFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/TemporalRelationFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/periodOverlapsFunc.java generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlAdjacentPeriod.java generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlAfterPeriod.java generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlBeforePeriod.java generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlEqualsPeriod.java generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlNequalsPeriod.java generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlOverleftPeriod.java generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlOverrightPeriod.java generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlPeriodContainedBy.java generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlPeriodContains.java generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlPeriodIntersection.java generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlPeriodMinus.java generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlPeriodOverlaps.java generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlPeriodUnion.java generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlTemporal.java generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GneralDBSqlTemporalConstructBinary.java
line diff
     1.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/construct/PeriodIntersectionFunc.java	Thu Nov 08 00:55:34 2012 +0200
     1.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/construct/PeriodIntersectionFunc.java	Thu Nov 08 01:27:04 2012 +0200
     1.3 @@ -25,16 +25,5 @@
     1.4  		return TemporalConstants.periodIntersection;
     1.5  	}
     1.6  
     1.7 -	//there is no operator assigned to this function
     1.8 -	@Override
     1.9 -	public String getOperator() {
    1.10 -		return null;
    1.11 -	}
    1.12 -
    1.13  	
    1.14 -	@Override
    1.15 -	public String getPostgresFunction() {
    1.16 -		return "period_intersect";
    1.17 -	}
    1.18 -
    1.19  }
    1.20 \ No newline at end of file
     2.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/construct/PeriodMinusFunc.java	Thu Nov 08 00:55:34 2012 +0200
     2.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/construct/PeriodMinusFunc.java	Thu Nov 08 01:27:04 2012 +0200
     2.3 @@ -24,16 +24,6 @@
     2.4  		return TemporalConstants.minusPeriod;
     2.5  	}
     2.6  
     2.7 -	//there is no operator assigned to this function
     2.8 -	@Override
     2.9 -	public String getOperator() {
    2.10 -		return "-";
    2.11 -	}
    2.12  
    2.13  
    2.14 -	@Override
    2.15 -	public String getPostgresFunction() {
    2.16 -		return "minus";
    2.17 -	}
    2.18 -
    2.19  }
    2.20 \ No newline at end of file
     3.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/construct/TemporalConstructFunc.java	Thu Nov 08 00:55:34 2012 +0200
     3.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/construct/TemporalConstructFunc.java	Thu Nov 08 01:27:04 2012 +0200
     3.3 @@ -18,7 +18,7 @@
     3.4   * @author Konstantina Bereta <Konstantina.Bereta@di.uoa.gr>
     3.5   *
     3.6   */
     3.7 -public abstract class TemporalConstructFunc implements Function {
     3.8 +public  abstract class TemporalConstructFunc implements Function {
     3.9  	
    3.10  
    3.11  	public Value evaluate(ValueFactory valueFactory, Value... args)
    3.12 @@ -30,14 +30,6 @@
    3.13  		
    3.14  	public abstract  String getURI();
    3.15  	
    3.16 -	/*In Postgres Temporal it seems that an operator is assigned to every PERIOD function 
    3.17 -	 * I store this information in the declaration of each function so that i can use it in the mapping
    3.18 -	 * of stSPARQL queries to spatiotemporally extended SQL queries
    3.19 -	 * */
    3.20 -	public abstract  String getOperator();
    3.21 -	
    3.22 -	//This method returns the respective function of the Postgres Temporal extension
    3.23 -	public abstract  String getPostgresFunction();
    3.24  
    3.25  }
    3.26  
     4.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/construct/periodUnionFunc.java	Thu Nov 08 00:55:34 2012 +0200
     4.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/construct/periodUnionFunc.java	Thu Nov 08 01:27:04 2012 +0200
     4.3 @@ -24,15 +24,6 @@
     4.4  		return TemporalConstants.periodUnion;
     4.5  	}
     4.6  
     4.7 -	@Override
     4.8 -	public String getOperator() {
     4.9 -		return "+";
    4.10 -	}
    4.11  
    4.12 -	
    4.13 -	@Override
    4.14 -	public String getPostgresFunction() {
    4.15 -		return "period_union";
    4.16 -	}
    4.17  
    4.18  }
    4.19 \ No newline at end of file
     5.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/AdjacentPeriodFunc.java	Thu Nov 08 00:55:34 2012 +0200
     5.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/AdjacentPeriodFunc.java	Thu Nov 08 01:27:04 2012 +0200
     5.3 @@ -22,16 +22,5 @@
     5.4  		return TemporalConstants.adjacentPeriod;
     5.5  	}
     5.6  
     5.7 -	//there is no operator assigned to this function
     5.8 -	@Override
     5.9 -	public String getOperator() {
    5.10 -		return null;
    5.11 -	}
    5.12 -
    5.13 -	
    5.14 -	@Override
    5.15 -	public String getPostgresFunction() {
    5.16 -		return "adjacent";
    5.17 -	}
    5.18  
    5.19  }
    5.20 \ No newline at end of file
     6.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/AfterPeriodFunc.java	Thu Nov 08 00:55:34 2012 +0200
     6.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/AfterPeriodFunc.java	Thu Nov 08 01:27:04 2012 +0200
     6.3 @@ -23,18 +23,4 @@
     6.4  	}
     6.5  
     6.6  	
     6.7 -	@Override
     6.8 -	public String getOperator() {
     6.9 -		return ">>";
    6.10 -	}
    6.11 -
    6.12 -
    6.13 -
    6.14 -	@Override
    6.15 -	public String getPostgresFunction() {
    6.16 -		
    6.17 -		return "after";
    6.18 -	}
    6.19 -
    6.20 -
    6.21  }
    6.22 \ No newline at end of file
     7.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/BeforePeriodFunc.java	Thu Nov 08 00:55:34 2012 +0200
     7.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/BeforePeriodFunc.java	Thu Nov 08 01:27:04 2012 +0200
     7.3 @@ -22,18 +22,5 @@
     7.4  		return TemporalConstants.beforePeriod;
     7.5  	}
     7.6  
     7.7 -	
     7.8 -	@Override
     7.9 -	public String getOperator() {
    7.10 -		return "<<";
    7.11 -	}
    7.12 -
    7.13 -
    7.14 -	
    7.15 -	@Override
    7.16 -	public String getPostgresFunction() {
    7.17 -		return "before";
    7.18 -	}
    7.19 -
    7.20  
    7.21  }
     8.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/EqualsPeriodFunc.java	Thu Nov 08 00:55:34 2012 +0200
     8.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/EqualsPeriodFunc.java	Thu Nov 08 01:27:04 2012 +0200
     8.3 @@ -21,17 +21,5 @@
     8.4  		return TemporalConstants.equalsPeriod;
     8.5  	}
     8.6  
     8.7 -	@Override
     8.8 -	public String getOperator() {
     8.9 -		return "=";
    8.10 -	}
    8.11 -
    8.12  	
    8.13 -	@Override
    8.14 -	public String getPostgresFunction() {
    8.15 -		
    8.16 -		return "equals";
    8.17 -	}
    8.18 -
    8.19 -
    8.20  }
    8.21 \ No newline at end of file
     9.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/NequalsPeriodFunc.java	Thu Nov 08 00:55:34 2012 +0200
     9.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/NequalsPeriodFunc.java	Thu Nov 08 01:27:04 2012 +0200
     9.3 @@ -21,18 +21,4 @@
     9.4  		return TemporalConstants.nequalsPeriod;
     9.5  	}
     9.6  
     9.7 -	
     9.8 -	@Override
     9.9 -	public String getOperator() {
    9.10 -		return "!=";
    9.11 -	}
    9.12 -
    9.13 -
    9.14 -	
    9.15 -	@Override
    9.16 -	public String getPostgresFunction() {
    9.17 -		
    9.18 -		return "nequals";
    9.19 -	}
    9.20 -
    9.21  }
    9.22 \ No newline at end of file
    10.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/OverleftPeriodFunc.java	Thu Nov 08 00:55:34 2012 +0200
    10.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/OverleftPeriodFunc.java	Thu Nov 08 01:27:04 2012 +0200
    10.3 @@ -22,19 +22,6 @@
    10.4  		return TemporalConstants.overleftPeriod;
    10.5  	}
    10.6  
    10.7 -	
    10.8 -	@Override
    10.9 -	public String getOperator() {
   10.10 -		return "&<";
   10.11 -	}
   10.12 -
   10.13 -
   10.14 -	
   10.15 -	@Override
   10.16 -	public String getPostgresFunction() {
   10.17 -
   10.18 -		return "overleft";
   10.19 -	}
   10.20  
   10.21  
   10.22  }
   10.23 \ No newline at end of file
    11.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/OverrightPeriodFunc.java	Thu Nov 08 00:55:34 2012 +0200
    11.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/OverrightPeriodFunc.java	Thu Nov 08 01:27:04 2012 +0200
    11.3 @@ -23,18 +23,5 @@
    11.4  	}
    11.5  
    11.6  	
    11.7 -	@Override
    11.8 -	public String getOperator() {
    11.9 -		return "&>";
   11.10 -	}
   11.11 -
   11.12 -
   11.13 -	
   11.14 -	@Override
   11.15 -	public String getPostgresFunction() {
   11.16 -
   11.17 -		return "overright";
   11.18 -	}
   11.19 -
   11.20  
   11.21  }
    12.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/PeriodContainedByFunc.java	Thu Nov 08 00:55:34 2012 +0200
    12.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/PeriodContainedByFunc.java	Thu Nov 08 01:27:04 2012 +0200
    12.3 @@ -23,20 +23,4 @@
    12.4  	}
    12.5  
    12.6  
    12.7 -	@Override
    12.8 -	public String getOperator() {
    12.9 -		return "@";
   12.10 -	}
   12.11 -
   12.12 -
   12.13 -	/* (non-Javadoc)
   12.14 -	 * @see org.openrdf.query.algebra.evaluation.function.temporal.stsparql.relation.TemporalRelationFunc#getPostgresFunction()
   12.15 -	 */
   12.16 -	@Override
   12.17 -	public String getPostgresFunction() {
   12.18 -		// TODO Auto-generated method stub
   12.19 -		return null;
   12.20 -	}
   12.21 -
   12.22 -
   12.23  }
    13.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/PeriodContainsFunc.java	Thu Nov 08 00:55:34 2012 +0200
    13.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/PeriodContainsFunc.java	Thu Nov 08 01:27:04 2012 +0200
    13.3 @@ -24,17 +24,4 @@
    13.4  	}
    13.5  
    13.6  	
    13.7 -	@Override
    13.8 -	public String getOperator() {
    13.9 -		return "~";
   13.10 -	}
   13.11 -
   13.12 -
   13.13 -	@Override
   13.14 -	public String getPostgresFunction() {
   13.15 -
   13.16 -		return "contains";
   13.17 -	}
   13.18 -
   13.19 -
   13.20  }
    14.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/TemporalRelationFunc.java	Thu Nov 08 00:55:34 2012 +0200
    14.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/TemporalRelationFunc.java	Thu Nov 08 01:27:04 2012 +0200
    14.3 @@ -31,13 +31,5 @@
    14.4  		
    14.5  	public abstract  String getURI();
    14.6  	
    14.7 -	/*In Postgres Temporal it seems that an operator is assigned to every PERIOD function 
    14.8 -	 * I store this information in the declaration of each function so that i can use it in the mapping
    14.9 -	 * of stSPARQL queries to spatiotemporally extended SQL queries
   14.10 -	 * */
   14.11 -	public abstract  String getOperator();
   14.12 -	//This method returns the respective function of the Postgres Temporal extension
   14.13 -	public abstract  String getPostgresFunction();
   14.14 -
   14.15  }
   14.16  
    15.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/periodOverlapsFunc.java	Thu Nov 08 00:55:34 2012 +0200
    15.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/periodOverlapsFunc.java	Thu Nov 08 01:27:04 2012 +0200
    15.3 @@ -22,17 +22,4 @@
    15.4  	}
    15.5  
    15.6  	
    15.7 -	@Override
    15.8 -	public String getOperator() {
    15.9 -		return "&&";
   15.10 -	}
   15.11 -
   15.12 -
   15.13 -	@Override
   15.14 -	public String getPostgresFunction() {
   15.15 -		
   15.16 -		return "overlaps";
   15.17 -	}
   15.18 -
   15.19 -
   15.20  }
   15.21 \ No newline at end of file
    16.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlAdjacentPeriod.java	Thu Nov 08 00:55:34 2012 +0200
    16.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlAdjacentPeriod.java	Thu Nov 08 01:27:04 2012 +0200
    16.3 @@ -21,4 +21,22 @@
    16.4  		super(left, right);
    16.5  	}
    16.6  
    16.7 +	/* (non-Javadoc)
    16.8 +	 * @see org.openrdf.sail.generaldb.algebra.temporal.GeneralDBSqlTemporal#getOperator()
    16.9 +	 */
   16.10 +	@Override
   16.11 +	public String getOperator() {
   16.12 +		
   16.13 +		return null;
   16.14 +	}
   16.15 +
   16.16 +	/* (non-Javadoc)
   16.17 +	 * @see org.openrdf.sail.generaldb.algebra.temporal.GeneralDBSqlTemporal#getPostgresFunction()
   16.18 +	 */
   16.19 +	@Override
   16.20 +	public String getPostgresFunction() {
   16.21 +		// TODO Auto-generated method stub
   16.22 +		return "adjacent";
   16.23 +	}
   16.24 +
   16.25  }
   16.26 \ No newline at end of file
    17.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlAfterPeriod.java	Thu Nov 08 00:55:34 2012 +0200
    17.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlAfterPeriod.java	Thu Nov 08 01:27:04 2012 +0200
    17.3 @@ -21,4 +21,22 @@
    17.4  		super(left, right);
    17.5  	}
    17.6  
    17.7 +	/* (non-Javadoc)
    17.8 +	 * @see org.openrdf.sail.generaldb.algebra.temporal.GeneralDBSqlTemporal#getOperator()
    17.9 +	 */
   17.10 +	@Override
   17.11 +	public String getOperator() {
   17.12 +		
   17.13 +		return ">>";
   17.14 +	}
   17.15 +
   17.16 +	/* (non-Javadoc)
   17.17 +	 * @see org.openrdf.sail.generaldb.algebra.temporal.GeneralDBSqlTemporal#getPostgresFunction()
   17.18 +	 */
   17.19 +	@Override
   17.20 +	public String getPostgresFunction() {
   17.21 +		// TODO Auto-generated method stub
   17.22 +		return "after";
   17.23 +	}
   17.24 +
   17.25  }
   17.26 \ No newline at end of file
    18.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlBeforePeriod.java	Thu Nov 08 00:55:34 2012 +0200
    18.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlBeforePeriod.java	Thu Nov 08 01:27:04 2012 +0200
    18.3 @@ -21,4 +21,22 @@
    18.4  		super(left, right);
    18.5  	}
    18.6  
    18.7 +	/* (non-Javadoc)
    18.8 +	 * @see org.openrdf.sail.generaldb.algebra.temporal.GeneralDBSqlTemporal#getOperator()
    18.9 +	 */
   18.10 +	@Override
   18.11 +	public String getOperator() {
   18.12 +		
   18.13 +		return "<<";
   18.14 +	}
   18.15 +
   18.16 +	/* (non-Javadoc)
   18.17 +	 * @see org.openrdf.sail.generaldb.algebra.temporal.GeneralDBSqlTemporal#getPostgresFunction()
   18.18 +	 */
   18.19 +	@Override
   18.20 +	public String getPostgresFunction() {
   18.21 +		
   18.22 +		return "before";
   18.23 +	}
   18.24 +
   18.25  }
   18.26 \ No newline at end of file
    19.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlEqualsPeriod.java	Thu Nov 08 00:55:34 2012 +0200
    19.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlEqualsPeriod.java	Thu Nov 08 01:27:04 2012 +0200
    19.3 @@ -21,4 +21,22 @@
    19.4  		super(left, right);
    19.5  	}
    19.6  
    19.7 +	/* (non-Javadoc)
    19.8 +	 * @see org.openrdf.sail.generaldb.algebra.temporal.GeneralDBSqlTemporal#getOperator()
    19.9 +	 */
   19.10 +	@Override
   19.11 +	public String getOperator() {
   19.12 +		
   19.13 +		return "=";
   19.14 +	}
   19.15 +
   19.16 +	/* (non-Javadoc)
   19.17 +	 * @see org.openrdf.sail.generaldb.algebra.temporal.GeneralDBSqlTemporal#getPostgresFunction()
   19.18 +	 */
   19.19 +	@Override
   19.20 +	public String getPostgresFunction() {
   19.21 +		// TODO Auto-generated method stub
   19.22 +		return "equals";
   19.23 +	}
   19.24 +
   19.25  }
   19.26 \ No newline at end of file
    20.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlNequalsPeriod.java	Thu Nov 08 00:55:34 2012 +0200
    20.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlNequalsPeriod.java	Thu Nov 08 01:27:04 2012 +0200
    20.3 @@ -21,4 +21,22 @@
    20.4  		super(left, right);
    20.5  	}
    20.6  
    20.7 +	/* (non-Javadoc)
    20.8 +	 * @see org.openrdf.sail.generaldb.algebra.temporal.GeneralDBSqlTemporal#getOperator()
    20.9 +	 */
   20.10 +	@Override
   20.11 +	public String getOperator() {
   20.12 +	
   20.13 +		return "!=";
   20.14 +	}
   20.15 +
   20.16 +	/* (non-Javadoc)
   20.17 +	 * @see org.openrdf.sail.generaldb.algebra.temporal.GeneralDBSqlTemporal#getPostgresFunction()
   20.18 +	 */
   20.19 +	@Override
   20.20 +	public String getPostgresFunction() {
   20.21 +
   20.22 +		return "nequals";
   20.23 +	}
   20.24 +
   20.25  }
   20.26 \ No newline at end of file
    21.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlOverleftPeriod.java	Thu Nov 08 00:55:34 2012 +0200
    21.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlOverleftPeriod.java	Thu Nov 08 01:27:04 2012 +0200
    21.3 @@ -21,4 +21,22 @@
    21.4  		super(left, right);
    21.5  	}
    21.6  
    21.7 +	/* (non-Javadoc)
    21.8 +	 * @see org.openrdf.sail.generaldb.algebra.temporal.GeneralDBSqlTemporal#getOperator()
    21.9 +	 */
   21.10 +	@Override
   21.11 +	public String getOperator() {
   21.12 +		
   21.13 +		return "&&";
   21.14 +	}
   21.15 +
   21.16 +	/* (non-Javadoc)
   21.17 +	 * @see org.openrdf.sail.generaldb.algebra.temporal.GeneralDBSqlTemporal#getPostgresFunction()
   21.18 +	 */
   21.19 +	@Override
   21.20 +	public String getPostgresFunction() {
   21.21 +		
   21.22 +		return "overlaps";
   21.23 +	}
   21.24 +
   21.25  }
   21.26 \ No newline at end of file
    22.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlOverrightPeriod.java	Thu Nov 08 00:55:34 2012 +0200
    22.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlOverrightPeriod.java	Thu Nov 08 01:27:04 2012 +0200
    22.3 @@ -21,4 +21,22 @@
    22.4  		super(left, right);
    22.5  	}
    22.6  
    22.7 +	/* (non-Javadoc)
    22.8 +	 * @see org.openrdf.sail.generaldb.algebra.temporal.GeneralDBSqlTemporal#getOperator()
    22.9 +	 */
   22.10 +	@Override
   22.11 +	public String getOperator() {
   22.12 +
   22.13 +		return "&>";
   22.14 +	}
   22.15 +
   22.16 +	/* (non-Javadoc)
   22.17 +	 * @see org.openrdf.sail.generaldb.algebra.temporal.GeneralDBSqlTemporal#getPostgresFunction()
   22.18 +	 */
   22.19 +	@Override
   22.20 +	public String getPostgresFunction() {
   22.21 +
   22.22 +		return "overright";
   22.23 +	}
   22.24 +
   22.25  }
   22.26 \ No newline at end of file
    23.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlPeriodContainedBy.java	Thu Nov 08 00:55:34 2012 +0200
    23.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlPeriodContainedBy.java	Thu Nov 08 01:27:04 2012 +0200
    23.3 @@ -21,4 +21,22 @@
    23.4  		super(left, right);
    23.5  	}
    23.6  
    23.7 +	/* (non-Javadoc)
    23.8 +	 * @see org.openrdf.sail.generaldb.algebra.temporal.GeneralDBSqlTemporal#getOperator()
    23.9 +	 */
   23.10 +	@Override
   23.11 +	public String getOperator() {
   23.12 +
   23.13 +		return "@";
   23.14 +	}
   23.15 +
   23.16 +	/* (non-Javadoc)
   23.17 +	 * @see org.openrdf.sail.generaldb.algebra.temporal.GeneralDBSqlTemporal#getPostgresFunction()
   23.18 +	 */
   23.19 +	@Override
   23.20 +	public String getPostgresFunction() {
   23.21 +
   23.22 +		return "contained_by";
   23.23 +	}
   23.24 +
   23.25  }
   23.26 \ No newline at end of file
    24.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlPeriodContains.java	Thu Nov 08 00:55:34 2012 +0200
    24.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlPeriodContains.java	Thu Nov 08 01:27:04 2012 +0200
    24.3 @@ -21,4 +21,22 @@
    24.4  		super(left, right);
    24.5  	}
    24.6  
    24.7 +	/* (non-Javadoc)
    24.8 +	 * @see org.openrdf.sail.generaldb.algebra.temporal.GeneralDBSqlTemporal#getOperator()
    24.9 +	 */
   24.10 +	@Override
   24.11 +	public String getOperator() {
   24.12 +
   24.13 +		return "~";
   24.14 +	}
   24.15 +
   24.16 +	/* (non-Javadoc)
   24.17 +	 * @see org.openrdf.sail.generaldb.algebra.temporal.GeneralDBSqlTemporal#getPostgresFunction()
   24.18 +	 */
   24.19 +	@Override
   24.20 +	public String getPostgresFunction() {
   24.21 +
   24.22 +		return "contains";
   24.23 +	}
   24.24 +
   24.25  }
   24.26 \ No newline at end of file
    25.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlPeriodIntersection.java	Thu Nov 08 00:55:34 2012 +0200
    25.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlPeriodIntersection.java	Thu Nov 08 01:27:04 2012 +0200
    25.3 @@ -17,7 +17,7 @@
    25.4   * @author Konstantina Bereta <Konstantina.Bereta@di.uoa.gr>
    25.5   *
    25.6   */
    25.7 -public class GeneralDBSqlPeriodIntersection extends GeneralDBSqlSpatialConstructBinary{
    25.8 +public class GeneralDBSqlPeriodIntersection extends GneralDBSqlTemporalConstructBinary{
    25.9  
   25.10  	public GeneralDBSqlPeriodIntersection(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   25.11  		super(left, right);
   25.12 @@ -30,4 +30,22 @@
   25.13  		visitor.meet(this);
   25.14  	}
   25.15  
   25.16 +	/* (non-Javadoc)
   25.17 +	 * @see org.openrdf.sail.generaldb.algebra.temporal.GneralDBSqlTemporalConstructBinary#getOperator()
   25.18 +	 */
   25.19 +	@Override
   25.20 +	public String getOperator() {
   25.21 +
   25.22 +		return "period_intersect";
   25.23 +	}
   25.24 +
   25.25 +	/* (non-Javadoc)
   25.26 +	 * @see org.openrdf.sail.generaldb.algebra.temporal.GneralDBSqlTemporalConstructBinary#getPostgresFunction()
   25.27 +	 */
   25.28 +	@Override
   25.29 +	public String getPostgresFunction() {
   25.30 +
   25.31 +		return null;
   25.32 +	}
   25.33 +
   25.34  }
   25.35 \ No newline at end of file
    26.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlPeriodMinus.java	Thu Nov 08 00:55:34 2012 +0200
    26.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlPeriodMinus.java	Thu Nov 08 01:27:04 2012 +0200
    26.3 @@ -17,7 +17,7 @@
    26.4   * @author Konstantina Bereta <Konstantina.Bereta@di.uoa.gr>
    26.5   *
    26.6   */
    26.7 -public class GeneralDBSqlPeriodMinus extends GeneralDBSqlSpatialConstructBinary{
    26.8 +public class GeneralDBSqlPeriodMinus extends GneralDBSqlTemporalConstructBinary{
    26.9  
   26.10  	public GeneralDBSqlPeriodMinus(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   26.11  		super(left, right);
   26.12 @@ -30,4 +30,22 @@
   26.13  		visitor.meet(this);
   26.14  	}
   26.15  
   26.16 +	/* (non-Javadoc)
   26.17 +	 * @see org.openrdf.sail.generaldb.algebra.temporal.GneralDBSqlTemporalConstructBinary#getOperator()
   26.18 +	 */
   26.19 +	@Override
   26.20 +	public String getOperator() {
   26.21 +
   26.22 +		return "+";
   26.23 +	}
   26.24 +
   26.25 +	/* (non-Javadoc)
   26.26 +	 * @see org.openrdf.sail.generaldb.algebra.temporal.GneralDBSqlTemporalConstructBinary#getPostgresFunction()
   26.27 +	 */
   26.28 +	@Override
   26.29 +	public String getPostgresFunction() {
   26.30 +
   26.31 +		return "minus";
   26.32 +	}
   26.33 +
   26.34  }
   26.35 \ No newline at end of file
    27.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlPeriodOverlaps.java	Thu Nov 08 00:55:34 2012 +0200
    27.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlPeriodOverlaps.java	Thu Nov 08 01:27:04 2012 +0200
    27.3 @@ -22,4 +22,22 @@
    27.4  		super(left, right);
    27.5  	}
    27.6  
    27.7 +	/* (non-Javadoc)
    27.8 +	 * @see org.openrdf.sail.generaldb.algebra.temporal.GeneralDBSqlTemporal#getOperator()
    27.9 +	 */
   27.10 +	@Override
   27.11 +	public String getOperator() {
   27.12 +
   27.13 +		return "&&";
   27.14 +	}
   27.15 +
   27.16 +	/* (non-Javadoc)
   27.17 +	 * @see org.openrdf.sail.generaldb.algebra.temporal.GeneralDBSqlTemporal#getPostgresFunction()
   27.18 +	 */
   27.19 +	@Override
   27.20 +	public String getPostgresFunction() {
   27.21 +
   27.22 +		return "overlaps";
   27.23 +	}
   27.24 +
   27.25  }
   27.26 \ No newline at end of file
    28.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlPeriodUnion.java	Thu Nov 08 00:55:34 2012 +0200
    28.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlPeriodUnion.java	Thu Nov 08 01:27:04 2012 +0200
    28.3 @@ -17,7 +17,7 @@
    28.4   * @author Konstantina Bereta <Konstantina.Bereta@di.uoa.gr>
    28.5   *
    28.6   */
    28.7 -public class GeneralDBSqlPeriodUnion extends GeneralDBSqlSpatialConstructBinary{
    28.8 +public class GeneralDBSqlPeriodUnion extends GneralDBSqlTemporalConstructBinary{
    28.9  
   28.10  	public GeneralDBSqlPeriodUnion(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   28.11  		super(left, right);
   28.12 @@ -30,4 +30,22 @@
   28.13  		visitor.meet(this);
   28.14  	}
   28.15  
   28.16 +	/* (non-Javadoc)
   28.17 +	 * @see org.openrdf.sail.generaldb.algebra.temporal.GneralDBSqlTemporalConstructBinary#getOperator()
   28.18 +	 */
   28.19 +	@Override
   28.20 +	public String getOperator() {
   28.21 +
   28.22 +		return "+";
   28.23 +	}
   28.24 +
   28.25 +	/* (non-Javadoc)
   28.26 +	 * @see org.openrdf.sail.generaldb.algebra.temporal.GneralDBSqlTemporalConstructBinary#getPostgresFunction()
   28.27 +	 */
   28.28 +	@Override
   28.29 +	public String getPostgresFunction() {
   28.30 +
   28.31 +		return "period_union";
   28.32 +	}
   28.33 +
   28.34  }
   28.35 \ No newline at end of file
    29.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlTemporal.java	Thu Nov 08 00:55:34 2012 +0200
    29.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlTemporal.java	Thu Nov 08 01:27:04 2012 +0200
    29.3 @@ -17,9 +17,17 @@
    29.4   * @author Konstantina Bereta <Konstantina.Bereta@di.uoa.gr>
    29.5   *
    29.6   */
    29.7 -public class GeneralDBSqlTemporal extends BinaryGeneralDBOperator
    29.8 +public abstract class GeneralDBSqlTemporal extends BinaryGeneralDBOperator
    29.9  {
   29.10  
   29.11 +	/*In Postgres Temporal it seems that an operator is assigned to every PERIOD function 
   29.12 +	 * I store this information in the declaration of each function so that i can use it in the mapping
   29.13 +	 * of stSPARQL queries to spatiotemporally extended SQL queries
   29.14 +	 * */
   29.15 +	public abstract  String getOperator();
   29.16 +	//This method returns the respective function of the Postgres Temporal extension
   29.17 +	public abstract  String getPostgresFunction();
   29.18 +
   29.19  	public GeneralDBSqlTemporal(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   29.20  		super(left, right);
   29.21  	}
   29.22 @@ -30,6 +38,7 @@
   29.23  	{
   29.24  		visitor.meet(this);
   29.25  	}
   29.26 +	
   29.27  
   29.28  }
   29.29  
    30.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GneralDBSqlTemporalConstructBinary.java	Thu Nov 08 00:55:34 2012 +0200
    30.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GneralDBSqlTemporalConstructBinary.java	Thu Nov 08 01:27:04 2012 +0200
    30.3 @@ -17,8 +17,17 @@
    30.4   * @author Konstantina Bereta <Konstantina.Bereta@di.uoa.gr>
    30.5   *
    30.6   */
    30.7 -public class GneralDBSqlTemporalConstructBinary extends BinaryGeneralDBOperator {
    30.8 -		public GneralDBSqlTemporalConstructBinary(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
    30.9 +public abstract class GneralDBSqlTemporalConstructBinary extends BinaryGeneralDBOperator {
   30.10 +		
   30.11 +	/*In Postgres Temporal it seems that an operator is assigned to every PERIOD function 
   30.12 +	 * I store this information in the declaration of each function so that i can use it in the mapping
   30.13 +	 * of stSPARQL queries to spatiotemporally extended SQL queries
   30.14 +	 * */
   30.15 +	public abstract  String getOperator();
   30.16 +	//This method returns the respective function of the Postgres Temporal extension
   30.17 +	public abstract  String getPostgresFunction();
   30.18 +
   30.19 +	public GneralDBSqlTemporalConstructBinary(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   30.20  			super(left, right);
   30.21  		}
   30.22