From 6cc3f351f2af96720c47034a54a70388697d2433 Mon Sep 17 00:00:00 2001 From: Gianpaolo Coro Date: Mon, 24 Feb 2014 11:54:07 +0000 Subject: [PATCH] git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/EcologicalEngineGeoSpatialExtension@92164 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../org/gcube/dataanalysis/geo/test/TestChunkization.java | 6 +++--- .../dataanalysis/geo/test/TestChunkizationLayer.java | 6 +++--- .../gcube/dataanalysis/geo/test/TestLayersRetrieval.java | 6 +++--- .../org/gcube/dataanalysis/geo/test/TestRasterTable.java | 8 ++++---- .../dataanalysis/geo/test/maps/TestMapsComparison.java | 4 ++-- .../geo/test/maps/TestMapsComparisonAquaMapsvsFAO.java | 4 ++-- .../geo/test/maps/TestMapsComparisonExampleTCOM.java | 4 ++-- .../geo/test/maps/TestMapsComparisonTemperature.java | 4 ++-- .../geo/test/maps/TestMapsComparisonTemperatureUUID.java | 4 ++-- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/main/java/org/gcube/dataanalysis/geo/test/TestChunkization.java b/src/main/java/org/gcube/dataanalysis/geo/test/TestChunkization.java index e8b4373..aca0598 100644 --- a/src/main/java/org/gcube/dataanalysis/geo/test/TestChunkization.java +++ b/src/main/java/org/gcube/dataanalysis/geo/test/TestChunkization.java @@ -2,7 +2,7 @@ package org.gcube.dataanalysis.geo.test; import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; import org.gcube.dataanalysis.ecoengine.configuration.AlgorithmConfiguration; -import org.gcube.dataanalysis.geo.retrieval.GeoIntersector; +import org.gcube.dataanalysis.geo.matrixmodel.MatrixExtractor; public class TestChunkization { @@ -13,10 +13,10 @@ public class TestChunkization { // String layertitle = "Objectively Analyzed Climatology in [07-01-01 01:00] (3D) {World Ocean Atlas 09: Sea Water Temperature - annual: dods://thredds.research-infrastructures.eu/thredds/dodsC/public/netcdf/temperature_annual_1deg_ENVIRONMENT_OCEANS_.nc}"; long t0 = System.currentTimeMillis(); AnalysisLogger.setLogger(cfg+AlgorithmConfiguration.defaultLoggerFile); - GeoIntersector intersector = new GeoIntersector(null, cfg); + MatrixExtractor intersector = new MatrixExtractor(null, cfg); // intersector.takeTimeSlice(layertitle, 0, -180, 180, -10, 10, 0, 1, 1); // intersector.takeTimeSlice(layertitle, 0, -10, 10, -10, 10, 0,1, 1); - intersector.takeTimeSlice(layertitle, 0, -180, 180, -90, 90, 0, 0.5, 0.5); + intersector.takeTimeInstantMatrix(layertitle, 0, -180, 180, -90, 90, 0, 0.5, 0.5); System.out.println("ELAPSED TIME: "+(System.currentTimeMillis()-t0)); } } diff --git a/src/main/java/org/gcube/dataanalysis/geo/test/TestChunkizationLayer.java b/src/main/java/org/gcube/dataanalysis/geo/test/TestChunkizationLayer.java index f1d2209..0ba7f7a 100644 --- a/src/main/java/org/gcube/dataanalysis/geo/test/TestChunkizationLayer.java +++ b/src/main/java/org/gcube/dataanalysis/geo/test/TestChunkizationLayer.java @@ -2,7 +2,7 @@ package org.gcube.dataanalysis.geo.test; import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; import org.gcube.dataanalysis.ecoengine.configuration.AlgorithmConfiguration; -import org.gcube.dataanalysis.geo.retrieval.GeoIntersector; +import org.gcube.dataanalysis.geo.matrixmodel.MatrixExtractor; public class TestChunkizationLayer { @@ -14,9 +14,9 @@ public class TestChunkizationLayer { String layertitle = "FAO AQUATIC SPECIES DISTRIBUTION MAP OF MEGALASPIS CORDYLA"; long t0 = System.currentTimeMillis(); AnalysisLogger.setLogger(cfg+AlgorithmConfiguration.defaultLoggerFile); - GeoIntersector intersector = new GeoIntersector(null, cfg); + MatrixExtractor intersector = new MatrixExtractor(null, cfg); // intersector.takeTimeSlice(layertitle, 0, -10, 10, -10, 10, 0,1, 1); - intersector.takeTimeSlice(layertitle, 0, -180, 180, -90, 90, 0, 0.5, 0.5); + intersector.takeTimeInstantMatrix(layertitle, 0, -180, 180, -90, 90, 0, 0.5, 0.5); System.out.println("ELAPSED TIME: "+(System.currentTimeMillis()-t0)); } } diff --git a/src/main/java/org/gcube/dataanalysis/geo/test/TestLayersRetrieval.java b/src/main/java/org/gcube/dataanalysis/geo/test/TestLayersRetrieval.java index f994839..2f41279 100644 --- a/src/main/java/org/gcube/dataanalysis/geo/test/TestLayersRetrieval.java +++ b/src/main/java/org/gcube/dataanalysis/geo/test/TestLayersRetrieval.java @@ -8,8 +8,8 @@ import java.util.List; import org.gcube.contentmanagement.graphtools.utils.MathFunctions; import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; import org.gcube.dataanalysis.ecoengine.configuration.AlgorithmConfiguration; -import org.gcube.dataanalysis.geo.meta.features.FeaturesManager; -import org.gcube.dataanalysis.geo.retrieval.GeoIntersector; +import org.gcube.dataanalysis.geo.infrastructure.GeoNetworkInspector; +import org.gcube.dataanalysis.geo.matrixmodel.MatrixExtractor; import org.geotoolkit.metadata.iso.identification.DefaultDataIdentification; import org.opengis.metadata.Metadata; import org.opengis.metadata.identification.Identification; @@ -23,7 +23,7 @@ public class TestLayersRetrieval { public static void main(String[] args) throws Exception{ long t0 = System.currentTimeMillis(); AnalysisLogger.setLogger(cfg+AlgorithmConfiguration.defaultLoggerFile); - FeaturesManager featurer = new FeaturesManager(); + GeoNetworkInspector featurer = new GeoNetworkInspector(); featurer.setScope(null); List metae = featurer.getAllGNInfobyText("thredds", "1"); System.out.println("ELAPSED TIME: "+(System.currentTimeMillis()-t0)); diff --git a/src/main/java/org/gcube/dataanalysis/geo/test/TestRasterTable.java b/src/main/java/org/gcube/dataanalysis/geo/test/TestRasterTable.java index 8b5e00a..e22be45 100644 --- a/src/main/java/org/gcube/dataanalysis/geo/test/TestRasterTable.java +++ b/src/main/java/org/gcube/dataanalysis/geo/test/TestRasterTable.java @@ -2,8 +2,8 @@ package org.gcube.dataanalysis.geo.test; import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; import org.gcube.dataanalysis.ecoengine.configuration.AlgorithmConfiguration; -import org.gcube.dataanalysis.geo.insertion.RasterTable; -import org.gcube.dataanalysis.geo.retrieval.GeoIntersector; +import org.gcube.dataanalysis.geo.matrixmodel.MatrixExtractor; +import org.gcube.dataanalysis.geo.matrixmodel.RasterTable; public class TestRasterTable { @@ -31,7 +31,7 @@ public class TestRasterTable { config.setParam("DatabaseURL","jdbc:postgresql://localhost/testdb"); config.setParam("DatabaseDriver","org.postgresql.Driver"); - GeoIntersector intersector = new GeoIntersector(null, cfg); + MatrixExtractor intersector = new MatrixExtractor(null, cfg); int t = 0; double x1 = -180; double x2 = 180; @@ -41,7 +41,7 @@ public class TestRasterTable { double xResolution = 0.5; double yResolution = 0.5; - double[][] slice = intersector.takeTimeSlice(layertitle, t, x1, x2, y1,y2,z,xResolution,yResolution); + double[][] slice = intersector.takeTimeInstantMatrix(layertitle, t, x1, x2, y1,y2,z,xResolution,yResolution); RasterTable raster = new RasterTable(x1, x2, y1, y2, z, xResolution, yResolution, slice, config); raster.dumpGeoTable(); diff --git a/src/main/java/org/gcube/dataanalysis/geo/test/maps/TestMapsComparison.java b/src/main/java/org/gcube/dataanalysis/geo/test/maps/TestMapsComparison.java index 7ef8395..789c06a 100644 --- a/src/main/java/org/gcube/dataanalysis/geo/test/maps/TestMapsComparison.java +++ b/src/main/java/org/gcube/dataanalysis/geo/test/maps/TestMapsComparison.java @@ -3,8 +3,8 @@ package org.gcube.dataanalysis.geo.test.maps; import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; import org.gcube.dataanalysis.ecoengine.configuration.AlgorithmConfiguration; import org.gcube.dataanalysis.geo.algorithms.MapsComparator; -import org.gcube.dataanalysis.geo.insertion.RasterTable; -import org.gcube.dataanalysis.geo.retrieval.GeoIntersector; +import org.gcube.dataanalysis.geo.matrixmodel.MatrixExtractor; +import org.gcube.dataanalysis.geo.matrixmodel.RasterTable; public class TestMapsComparison { diff --git a/src/main/java/org/gcube/dataanalysis/geo/test/maps/TestMapsComparisonAquaMapsvsFAO.java b/src/main/java/org/gcube/dataanalysis/geo/test/maps/TestMapsComparisonAquaMapsvsFAO.java index 6f6c97c..18f8994 100644 --- a/src/main/java/org/gcube/dataanalysis/geo/test/maps/TestMapsComparisonAquaMapsvsFAO.java +++ b/src/main/java/org/gcube/dataanalysis/geo/test/maps/TestMapsComparisonAquaMapsvsFAO.java @@ -3,8 +3,8 @@ package org.gcube.dataanalysis.geo.test.maps; import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; import org.gcube.dataanalysis.ecoengine.configuration.AlgorithmConfiguration; import org.gcube.dataanalysis.geo.algorithms.MapsComparator; -import org.gcube.dataanalysis.geo.insertion.RasterTable; -import org.gcube.dataanalysis.geo.retrieval.GeoIntersector; +import org.gcube.dataanalysis.geo.matrixmodel.MatrixExtractor; +import org.gcube.dataanalysis.geo.matrixmodel.RasterTable; public class TestMapsComparisonAquaMapsvsFAO { diff --git a/src/main/java/org/gcube/dataanalysis/geo/test/maps/TestMapsComparisonExampleTCOM.java b/src/main/java/org/gcube/dataanalysis/geo/test/maps/TestMapsComparisonExampleTCOM.java index 6106e9d..24c17f3 100644 --- a/src/main/java/org/gcube/dataanalysis/geo/test/maps/TestMapsComparisonExampleTCOM.java +++ b/src/main/java/org/gcube/dataanalysis/geo/test/maps/TestMapsComparisonExampleTCOM.java @@ -3,8 +3,8 @@ package org.gcube.dataanalysis.geo.test.maps; import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; import org.gcube.dataanalysis.ecoengine.configuration.AlgorithmConfiguration; import org.gcube.dataanalysis.geo.algorithms.MapsComparator; -import org.gcube.dataanalysis.geo.insertion.RasterTable; -import org.gcube.dataanalysis.geo.retrieval.GeoIntersector; +import org.gcube.dataanalysis.geo.matrixmodel.MatrixExtractor; +import org.gcube.dataanalysis.geo.matrixmodel.RasterTable; public class TestMapsComparisonExampleTCOM { diff --git a/src/main/java/org/gcube/dataanalysis/geo/test/maps/TestMapsComparisonTemperature.java b/src/main/java/org/gcube/dataanalysis/geo/test/maps/TestMapsComparisonTemperature.java index 0b0a205..511b89b 100644 --- a/src/main/java/org/gcube/dataanalysis/geo/test/maps/TestMapsComparisonTemperature.java +++ b/src/main/java/org/gcube/dataanalysis/geo/test/maps/TestMapsComparisonTemperature.java @@ -3,8 +3,8 @@ package org.gcube.dataanalysis.geo.test.maps; import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; import org.gcube.dataanalysis.ecoengine.configuration.AlgorithmConfiguration; import org.gcube.dataanalysis.geo.algorithms.MapsComparator; -import org.gcube.dataanalysis.geo.insertion.RasterTable; -import org.gcube.dataanalysis.geo.retrieval.GeoIntersector; +import org.gcube.dataanalysis.geo.matrixmodel.MatrixExtractor; +import org.gcube.dataanalysis.geo.matrixmodel.RasterTable; public class TestMapsComparisonTemperature { diff --git a/src/main/java/org/gcube/dataanalysis/geo/test/maps/TestMapsComparisonTemperatureUUID.java b/src/main/java/org/gcube/dataanalysis/geo/test/maps/TestMapsComparisonTemperatureUUID.java index 5a4e64e..4f23a7d 100644 --- a/src/main/java/org/gcube/dataanalysis/geo/test/maps/TestMapsComparisonTemperatureUUID.java +++ b/src/main/java/org/gcube/dataanalysis/geo/test/maps/TestMapsComparisonTemperatureUUID.java @@ -3,8 +3,8 @@ package org.gcube.dataanalysis.geo.test.maps; import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; import org.gcube.dataanalysis.ecoengine.configuration.AlgorithmConfiguration; import org.gcube.dataanalysis.geo.algorithms.MapsComparator; -import org.gcube.dataanalysis.geo.insertion.RasterTable; -import org.gcube.dataanalysis.geo.retrieval.GeoIntersector; +import org.gcube.dataanalysis.geo.matrixmodel.MatrixExtractor; +import org.gcube.dataanalysis.geo.matrixmodel.RasterTable; public class TestMapsComparisonTemperatureUUID {