Strabon

changeset 823:a2d313dff1dd temporals

renamed temporal functions to comply with the respective functions of Allen's interval algebra
author Konstantina Bereta <Konstantina.Bereta@di.uoa.gr>
date Thu Dec 20 14:04:49 2012 +0200 (2012-12-20)
parents 1562eb0afdcb
children 6c14a06b32be
files 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/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/TemporalConstants.java generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/factories/GeneralDBBooleanExprFactory.java
line diff
     1.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/AdjacentPeriodFunc.java	Thu Dec 20 14:00:17 2012 +0200
     1.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/AdjacentPeriodFunc.java	Thu Dec 20 14:04:49 2012 +0200
     1.3 @@ -19,7 +19,7 @@
     1.4  	@Override
     1.5  	public String getURI() {
     1.6  	
     1.7 -		return TemporalConstants.adjacentPeriod;
     1.8 +		return TemporalConstants.adjacent;
     1.9  	}
    1.10  
    1.11  
     2.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/AfterPeriodFunc.java	Thu Dec 20 14:00:17 2012 +0200
     2.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/AfterPeriodFunc.java	Thu Dec 20 14:04:49 2012 +0200
     2.3 @@ -19,7 +19,7 @@
     2.4  	@Override
     2.5  	public String getURI() {
     2.6  	
     2.7 -		return TemporalConstants.afterPeriod;
     2.8 +		return TemporalConstants.after;
     2.9  	}
    2.10  
    2.11  	
     3.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/BeforePeriodFunc.java	Thu Dec 20 14:00:17 2012 +0200
     3.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/BeforePeriodFunc.java	Thu Dec 20 14:04:49 2012 +0200
     3.3 @@ -19,7 +19,7 @@
     3.4  	@Override
     3.5  	public String getURI() {
     3.6  	
     3.7 -		return TemporalConstants.beforePeriod;
     3.8 +		return TemporalConstants.before;
     3.9  	}
    3.10  
    3.11  
     4.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/OverleftPeriodFunc.java	Thu Dec 20 14:00:17 2012 +0200
     4.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/OverleftPeriodFunc.java	Thu Dec 20 14:04:49 2012 +0200
     4.3 @@ -19,7 +19,7 @@
     4.4  	@Override
     4.5  	public String getURI() {
     4.6  	
     4.7 -		return TemporalConstants.overleftPeriod;
     4.8 +		return TemporalConstants.overleft;
     4.9  	}
    4.10  
    4.11  
     5.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/OverrightPeriodFunc.java	Thu Dec 20 14:00:17 2012 +0200
     5.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/OverrightPeriodFunc.java	Thu Dec 20 14:04:49 2012 +0200
     5.3 @@ -19,7 +19,7 @@
     5.4  	@Override
     5.5  	public String getURI() {
     5.6  	
     5.7 -		return TemporalConstants.overrightPeriod;
     5.8 +		return TemporalConstants.overright;
     5.9  	}
    5.10  
    5.11  	
     6.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/PeriodContainedByFunc.java	Thu Dec 20 14:00:17 2012 +0200
     6.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/PeriodContainedByFunc.java	Thu Dec 20 14:04:49 2012 +0200
     6.3 @@ -18,7 +18,7 @@
     6.4  	
     6.5  
     6.6  	public String getURI() {
     6.7 -		return TemporalConstants.containedByPeriod;
     6.8 +		return TemporalConstants.during;
     6.9  
    6.10  	}
    6.11  
     7.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/TemporalConstants.java	Thu Dec 20 14:00:17 2012 +0200
     7.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/TemporalConstants.java	Thu Dec 20 14:04:49 2012 +0200
     7.3 @@ -24,7 +24,7 @@
     7.4  	//Temporal Relationships
     7.5  	public static final String periodContains= stRDF+ "PeriodContains";
     7.6  
     7.7 -	public static final String containedByPeriod= stRDF+ "containedByPeriod";
     7.8 +	public static final String during= stRDF+ "during";
     7.9  
    7.10  	public static final String periodOverlaps= stRDF+ "PeriodOverlaps";
    7.11  
    7.12 @@ -32,17 +32,17 @@
    7.13  
    7.14  	public static final String nequalsPeriod= stRDF+ "nequalsPeriod";
    7.15  
    7.16 -	public static final String adjacentPeriod= stRDF+ "adjacentPeriod";
    7.17 +	public static final String adjacent= stRDF+ "adjacent";
    7.18  
    7.19 -	public static final String beforePeriod= stRDF+ "beforePeriod";
    7.20 +	public static final String before= stRDF+ "beforePeriod";
    7.21  
    7.22 -	public static final String afterPeriod=stRDF+ "afterPeriod";
    7.23 +	public static final String after=stRDF+ "after";
    7.24  
    7.25 -	public static final String overleftPeriod=stRDF+ "overleftPeriod";
    7.26 +	public static final String overleft=stRDF+ "overleft";
    7.27  
    7.28 -	public static final String overrightPeriod=stRDF+ "overrightPeriod";
    7.29 +	public static final String overright=stRDF+ "overright";
    7.30  
    7.31 -	public static final String meetsPeriod=stRDF+ "meetsPeriod";
    7.32 +	public static final String meets=stRDF+ "meets";
    7.33  	
    7.34  	//Temporal Constructs
    7.35  	public static final String periodIntersection=stRDF+ "periodIntersection";
     8.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/factories/GeneralDBBooleanExprFactory.java	Thu Dec 20 14:00:17 2012 +0200
     8.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/factories/GeneralDBBooleanExprFactory.java	Thu Dec 20 14:04:49 2012 +0200
     8.3 @@ -1066,11 +1066,11 @@
     8.4  			return mbbEqualsGeo(leftArg,rightArg);
     8.5  		}
     8.6  		//stSPARQL temporal functions
     8.7 -		else if(function.getURI().equals(TemporalConstants.afterPeriod))
     8.8 +		else if(function.getURI().equals(TemporalConstants.after))
     8.9  		{
    8.10  			return afterPeriod(leftArg,rightArg);
    8.11  		}
    8.12 -		else if(function.getURI().equals(TemporalConstants.beforePeriod))
    8.13 +		else if(function.getURI().equals(TemporalConstants.before))
    8.14  		{
    8.15  			return beforePeriod(leftArg,rightArg);
    8.16  		}