Strabon

changeset 108:1a3dbbb00d95

commented some printouts
author Kostis Kyzirakos <kkyzir@di.uoa.gr>
date Wed Apr 11 14:29:34 2012 +0300 (2012-04-11)
parents 78cd3684e455
children a062277d27c3
files evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/StrabonPolyhedron.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/impl/SpatialJoinOptimizer.java generaldb/src/main/java/org/openrdf/sail/generaldb/optimizers/GeneralDBSelectQueryOptimizer.java generaldb/src/main/java/org/openrdf/sail/generaldb/schema/LiteralTable.java generaldb/src/main/java/org/openrdf/sail/generaldb/schema/ValueTableFactory.java postgis/src/main/java/org/openrdf/sail/postgis/evaluation/PostGISEvaluation.java runtime/src/main/java/eu/earthobservatory/runtime/generaldb/Strabon.java
line diff
     1.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/StrabonPolyhedron.java	Wed Apr 11 13:15:19 2012 +0300
     1.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/StrabonPolyhedron.java	Wed Apr 11 14:29:34 2012 +0300
     1.3 @@ -654,9 +654,9 @@
     1.4  	}
     1.5  
     1.6  	public StrabonPolyhedron(String WKT, int algorithm) throws Exception {
     1.7 -		System.out.println("	new StrabonPolyhedron: before WKTReader");
     1.8 +		//System.out.println("	new StrabonPolyhedron: before WKTReader");
     1.9  		Geometry geo = jts.WKTread(WKT);
    1.10 -		System.out.println("	new StrabonPolyhedron: after WKTReader");
    1.11 +		//System.out.println("	new StrabonPolyhedron: after WKTReader");
    1.12  		this.geometry = new StrabonPolyhedron(geo, algorithm).geometry;
    1.13  	}
    1.14  
     2.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/impl/SpatialJoinOptimizer.java	Wed Apr 11 13:15:19 2012 +0300
     2.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/impl/SpatialJoinOptimizer.java	Wed Apr 11 14:29:34 2012 +0300
     2.3 @@ -195,6 +195,7 @@
     2.4  			}
     2.5  
     2.6  			//Checking graph to be sure
     2.7 +			/*
     2.8  			for(int a = 0; a < allNodes; a++)
     2.9  			{
    2.10  				for(int b = 0; b < allNodes; b++)
    2.11 @@ -204,6 +205,7 @@
    2.12  				}
    2.13  				System.out.println("");
    2.14  			}
    2.15 +			*/
    2.16  
    2.17  			//Time to construct ordered sequence of joins + filters
    2.18  			List<TupleExpr> orderedJoinArgs = new ArrayList<TupleExpr>(allNodes);
    2.19 @@ -223,9 +225,11 @@
    2.20  				}
    2.21  
    2.22  			}
    2.23 +
    2.24 +			/*
    2.25  			System.out.println("*--REWRITTEN TREE--**");
    2.26  			System.out.println(finalList.toString());
    2.27 -
    2.28 +			*/
    2.29  
    2.30  			int varsMapSize = varsMap.size();
    2.31  			for(Integer position : finalList)
    2.32 @@ -724,4 +728,4 @@
    2.33  	}
    2.34  
    2.35  
    2.36 -}
    2.37 \ No newline at end of file
    2.38 +}
     3.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/optimizers/GeneralDBSelectQueryOptimizer.java	Wed Apr 11 13:15:19 2012 +0300
     3.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/optimizers/GeneralDBSelectQueryOptimizer.java	Wed Apr 11 14:29:34 2012 +0300
     3.3 @@ -187,7 +187,7 @@
     3.4  		this.dataset = dataset;
     3.5  		this.bindings = bindings;
     3.6  		tupleExpr.visit(this);
     3.7 -		System.out.println("placeholder");
     3.8 +		//System.out.println("placeholder");
     3.9  	}
    3.10  
    3.11  	@Override
     4.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/schema/LiteralTable.java	Wed Apr 11 13:15:19 2012 +0300
     4.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/schema/LiteralTable.java	Wed Apr 11 14:29:34 2012 +0300
     4.3 @@ -258,7 +258,7 @@
     4.4  		String[] crs=label.split(";");
     4.5  		if((crs.length == 1))
     4.6  		{
     4.7 -			System.out.println("srid not specified. 4326 will be used as default.");
     4.8 +			System.out.println("The coordinate reference system for the spatial literal is not specified. WGS84 (srid 4326) is used (default).");
     4.9  			return 4326; //use this as default
    4.10  		}
    4.11  		String prefix="http://www.opengis.net/def/crs/EPSG/0/";
     5.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/schema/ValueTableFactory.java	Wed Apr 11 13:15:19 2012 +0300
     5.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/schema/ValueTableFactory.java	Wed Apr 11 14:29:34 2012 +0300
     5.3 @@ -171,7 +171,7 @@
     5.4  			int sqlType, int length)
     5.5  		throws SQLException
     5.6  	{
     5.7 -		System.out.println("Create GeoValueTable!!");
     5.8 +		//System.out.println("Create GeoValueTable!!");
     5.9  		GeoValueTable table = newGeoValueTable();
    5.10  		
    5.11  		table.setRdbmsTable(createTable(conn, name));
     6.1 --- a/postgis/src/main/java/org/openrdf/sail/postgis/evaluation/PostGISEvaluation.java	Wed Apr 11 13:15:19 2012 +0300
     6.2 +++ b/postgis/src/main/java/org/openrdf/sail/postgis/evaluation/PostGISEvaluation.java	Wed Apr 11 14:29:34 2012 +0300
     6.3 @@ -64,8 +64,8 @@
     6.4  					stmt.setObject(++p, o);
     6.5  				}
     6.6  				Collection<GeneralDBColumnVar> proj = qb.getProjections();
     6.7 -				System.out.println("In PostGIS Evaluation, query is: ");
     6.8 -				System.out.println(stmt.toString());
     6.9 +				//System.out.println("The SQL query is: ");
    6.10 +				//System.out.println(stmt.toString().replaceAll("\n"," ");
    6.11  				GeneralDBBindingIteration result = new PostGISBindingIteration(stmt);
    6.12  				result.setProjections(proj);
    6.13  				result.setBindings(bindings);
    6.14 @@ -87,4 +87,4 @@
    6.15  			throw new RdbmsQueryEvaluationException(e);
    6.16  		}
    6.17  	}
    6.18 -}
    6.19 \ No newline at end of file
    6.20 +}
     7.1 --- a/runtime/src/main/java/eu/earthobservatory/runtime/generaldb/Strabon.java	Wed Apr 11 13:15:19 2012 +0300
     7.2 +++ b/runtime/src/main/java/eu/earthobservatory/runtime/generaldb/Strabon.java	Wed Apr 11 14:29:34 2012 +0300
     7.3 @@ -720,7 +720,7 @@
     7.4  		}
     7.5  		
     7.6  		// Print results.
     7.7 -		System.out.println(retStream.toString());
     7.8 +		//System.out.println(retStream.toString());
     7.9  
    7.10  		//return ret;
    7.11  		return retStream.toString();