From 3cf7ce9af558016d4ab1a0a6b77779d19fc4024a Mon Sep 17 00:00:00 2001 From: Gianpaolo Coro Date: Wed, 26 Feb 2014 00:02:09 +0000 Subject: [PATCH] signal processing and matrix model git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/EcologicalEngineGeoSpatialExtension@92308 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../dataanalysis/geo/algorithms/MapsComparator.java | 7 ++++--- .../dataanalysis/geo/algorithms/MapsComparatorNode.java | 9 +++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/gcube/dataanalysis/geo/algorithms/MapsComparator.java b/src/main/java/org/gcube/dataanalysis/geo/algorithms/MapsComparator.java index de54628..a059835 100644 --- a/src/main/java/org/gcube/dataanalysis/geo/algorithms/MapsComparator.java +++ b/src/main/java/org/gcube/dataanalysis/geo/algorithms/MapsComparator.java @@ -101,13 +101,14 @@ public class MapsComparator extends DataAnalysis { // delete this force String scope = config.getGcubeScope(); AnalysisLogger.getLogger().debug("MapsComparator: Externally set scope "+scope); - if (scope == null) + if (scope == null){ scope = ScopeProvider.instance.get(); - + config.setGcubeScope(scope); + } // scope = "/gcube"; // String scope = null; AnalysisLogger.getLogger().debug("MapsComparator: Using Scope: " + scope + " Z: " + z + " Values Threshold: " + valuesthreshold + " Layer1: " + layerT1 + " vs " + layerT2); - MatrixExtractor intersector = new MatrixExtractor(scope, config.getConfigPath()); + MatrixExtractor intersector = new MatrixExtractor(config); AnalysisLogger.getLogger().debug("MapsComparator: MatrixExtractor initialized"); status = 10; diff --git a/src/main/java/org/gcube/dataanalysis/geo/algorithms/MapsComparatorNode.java b/src/main/java/org/gcube/dataanalysis/geo/algorithms/MapsComparatorNode.java index 925cadd..562ad8d 100644 --- a/src/main/java/org/gcube/dataanalysis/geo/algorithms/MapsComparatorNode.java +++ b/src/main/java/org/gcube/dataanalysis/geo/algorithms/MapsComparatorNode.java @@ -138,10 +138,11 @@ public class MapsComparatorNode extends ActorNode{ private double calcResolution(String layerT1, String layerT2) throws Exception{ String scope = config.getGcubeScope(); - if (scope == null) + if (scope == null){ scope = ScopeProvider.instance.get(); - - MatrixExtractor intersector = new MatrixExtractor(scope, config.getConfigPath()); + config.setGcubeScope(scope); + } + MatrixExtractor intersector = new MatrixExtractor(config); AnalysisLogger.getLogger().debug("MapsComparator: GeoIntersector initialized"); double x1 = -180; @@ -261,7 +262,7 @@ public class MapsComparatorNode extends ActorNode{ int positivescount = 0; if (slicey1<=y2){ - MatrixExtractor intersector = new MatrixExtractor(scope, config.getConfigPath()); + MatrixExtractor intersector = new MatrixExtractor(config); AnalysisLogger.getLogger().debug("MapsComparator: GeoIntersector initialized"); AnalysisLogger.getLogger().debug("MapsComparator: ****Rasterizing map 1 in the range: ("+x1+" , "+slicey1+"; "+x2+" , "+slicey2+") with res "+resolution); double[][] slice1 = intersector.takeTimeInstantMatrix(layerT1, time1, x1, x2, slicey1, slicey2, z, resolution, resolution);