diff --git a/src/main/java/org/gcube/dataanalysis/geo/test/maps/RegressionTestMapsComparison.java b/src/main/java/org/gcube/dataanalysis/geo/test/maps/RegressionTestMapsComparison.java index 96cbb05..c197106 100644 --- a/src/main/java/org/gcube/dataanalysis/geo/test/maps/RegressionTestMapsComparison.java +++ b/src/main/java/org/gcube/dataanalysis/geo/test/maps/RegressionTestMapsComparison.java @@ -33,8 +33,8 @@ public class RegressionTestMapsComparison { config.setParam("DatabasePassword","d4science2"); config.setParam("DatabaseURL","jdbc:postgresql://localhost/testdb"); config.setParam("DatabaseDriver","org.postgresql.Driver"); - config.setParam("LayerTitle_1","86a7ac79-866a-49c6-b5d5-602fc2d87ddd"); - config.setParam("LayerTitle_2","86a7ac79-866a-49c6-b5d5-602fc2d87ddd"); + config.setParam("Layer_1","86a7ac79-866a-49c6-b5d5-602fc2d87ddd"); + config.setParam("Layer_2","86a7ac79-866a-49c6-b5d5-602fc2d87ddd"); config.setParam("ValuesComparisonThreshold",""+0.1); config.setParam("Z","0"); config.setGcubeScope(null); 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 1937a89..7ef8395 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 @@ -41,8 +41,8 @@ public class TestMapsComparison { config.setParam("DatabasePassword","d4science2"); config.setParam("DatabaseURL","jdbc:postgresql://localhost/testdb"); config.setParam("DatabaseDriver","org.postgresql.Driver"); - config.setParam("LayerTitle_1",layertitle); - config.setParam("LayerTitle_2",layertitle2); + config.setParam("Layer_1",layertitle); + config.setParam("Layer_2",layertitle2); config.setParam("ValuesComparisonThreshold","0.01"); config.setParam("Z","0"); config.setGcubeScope(null); 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 cdacda4..6f6c97c 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 @@ -32,8 +32,8 @@ public class TestMapsComparisonAquaMapsvsFAO { config.setParam("DatabasePassword","d4science2"); config.setParam("DatabaseURL","jdbc:postgresql://localhost/testdb"); config.setParam("DatabaseDriver","org.postgresql.Driver"); - config.setParam("LayerTitle_1",layertitle); - config.setParam("LayerTitle_2",layertitle2); + config.setParam("Layer_1",layertitle); + config.setParam("Layer_2",layertitle2); config.setParam("ValuesComparisonThreshold","0.5"); config.setParam("KThreshold","0.5"); 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 8e11372..6106e9d 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 @@ -23,8 +23,8 @@ public class TestMapsComparisonExampleTCOM { config.setParam("DatabasePassword","d4science2"); config.setParam("DatabaseURL","jdbc:postgresql://localhost/testdb"); config.setParam("DatabaseDriver","org.postgresql.Driver"); - config.setParam("LayerTitle_1",layertitle); - config.setParam("LayerTitle_2",layertitle2); + config.setParam("Layer_1",layertitle); + config.setParam("Layer_2",layertitle2); config.setParam("Z","0"); config.setGcubeScope(null); 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 dbf1a4d..9a4ede3 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 @@ -26,8 +26,8 @@ public class TestMapsComparisonTemperature { config.setParam("DatabasePassword","d4science2"); config.setParam("DatabaseURL","jdbc:postgresql://localhost/testdb"); config.setParam("DatabaseDriver","org.postgresql.Driver"); - config.setParam("LayerTitle_1",layertitle); - config.setParam("LayerTitle_2",layertitle2); + config.setParam("Layer_1",layertitle); + config.setParam("Layer_2",layertitle2); config.setParam("ValuesComparisonThreshold",""+100); config.setParam("Z","0"); config.setGcubeScope(null); 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 9833abf..5a4e64e 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 @@ -12,10 +12,13 @@ public class TestMapsComparisonTemperatureUUID { public static void main(String[] args) throws Exception{ // String layertitle = "Temperature in [12-15-09 01:00] (3D) {Native grid ORCA025.L75 monthly average: Data extracted from dataset http://atoll-mercator.vlandata.cls.fr:44080/thredds/dodsC/global-reanalysis-phys-001-004-b-ref-fr-mjm95-gridt}"; // String layertitle = "Standard Deviation from Statistical Mean from [01-16-01 01:00] to [12-16-01 01:00] (3D) {World Ocean Atlas 09: Sea Water Temperature - monthly: dods://thredds.research-infrastructures.eu/thredds/dodsC/public/netcdf/temperature_monthly_1deg_ENVIRONMENT_OCEANS_.nc}"; - String layertitle = "86a7ac79-866a-49c6-b5d5-602fc2d87ddd"; +// String layertitle = "86a7ac79-866a-49c6-b5d5-602fc2d87ddd"; + String layertitle = "35412bde-aa6e-49f6-b9ad-e99458882f92"; + // String layertitle2 = "Statistical Mean 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}"; // String layertitle2 = "0e03d0fa-9c44-4a0c-a7e3-9f6d48710d00"; - String layertitle2 = layertitle; +// String layertitle2 = layertitle; + String layertitle2 = "625ba45b-c19f-4a9d-b3f7-be13e8f73101"; // {MEAN=224.49, VARIANCE=10337.11, NUMBER_OF_ERRORS=47054, NUMBER_OF_COMPARISONS=65522, ACCURACY=28.19, MAXIMUM_ERROR=303.6, MAXIMUM_ERROR_POINT=5006:104, Resolution=0.9972222222222222} @@ -27,8 +30,8 @@ public class TestMapsComparisonTemperatureUUID { config.setParam("DatabasePassword","d4science2"); config.setParam("DatabaseURL","jdbc:postgresql://localhost/testdb"); config.setParam("DatabaseDriver","org.postgresql.Driver"); - config.setParam("LayerTitle_1",layertitle); - config.setParam("LayerTitle_2",layertitle2); + config.setParam("Layer_1",layertitle); + config.setParam("Layer_2",layertitle2); config.setParam("ValuesComparisonThreshold",""+0.1); config.setParam("Z","0"); config.setGcubeScope(null); diff --git a/src/main/java/org/gcube/dataanalysis/geo/test/maps/TestMapsComparisonTemperatureWOA.java b/src/main/java/org/gcube/dataanalysis/geo/test/maps/TestMapsComparisonTemperatureWOA.java index 8236196..2fec83c 100644 --- a/src/main/java/org/gcube/dataanalysis/geo/test/maps/TestMapsComparisonTemperatureWOA.java +++ b/src/main/java/org/gcube/dataanalysis/geo/test/maps/TestMapsComparisonTemperatureWOA.java @@ -20,8 +20,8 @@ public class TestMapsComparisonTemperatureWOA { config.setParam("DatabasePassword","d4science2"); config.setParam("DatabaseURL","jdbc:postgresql://localhost/testdb"); config.setParam("DatabaseDriver","org.postgresql.Driver"); - config.setParam("LayerTitle_1",layertitle); - config.setParam("LayerTitle_2",layertitle2); + config.setParam("Layer_1",layertitle); + config.setParam("Layer_2",layertitle2); config.setParam("ValuesComparisonThreshold",""+100); config.setParam("Z","0"); config.setGcubeScope(null); diff --git a/src/main/java/org/gcube/dataanalysis/geo/test/maps/TestMapsComparisoninTime.java b/src/main/java/org/gcube/dataanalysis/geo/test/maps/TestMapsComparisoninTime.java index 44c7323..5e8aacc 100644 --- a/src/main/java/org/gcube/dataanalysis/geo/test/maps/TestMapsComparisoninTime.java +++ b/src/main/java/org/gcube/dataanalysis/geo/test/maps/TestMapsComparisoninTime.java @@ -46,8 +46,8 @@ public class TestMapsComparisoninTime { config.setParam("DatabasePassword","d4science2"); config.setParam("DatabaseURL","jdbc:postgresql://localhost/testdb"); config.setParam("DatabaseDriver","org.postgresql.Driver"); - config.setParam("LayerTitle_1",layertitle); - config.setParam("LayerTitle_2",layertitle); + config.setParam("Layer_1",layertitle); + config.setParam("Layer_2",layertitle); config.setParam("TimeIndex_1",""+t1); config.setParam("TimeIndex_2",""+t2); config.setParam("ValuesComparisonThreshold","0.01");