From 0e12b0890d86a914569cedb15edba1b923c131a6 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Tue, 19 Jan 2021 16:19:30 +0100 Subject: [PATCH] Removed marytts-d4science #20135 --- CHANGELOG.md | 2 +- pom.xml | 2 +- .../geo/algorithms/TimeExtractionTable.java | 56 ------------------- .../geo/algorithms/ZExtractionTable.java | 56 ------------------- 4 files changed, 2 insertions(+), 114 deletions(-) delete mode 100644 src/main/java/org/gcube/dataanalysis/geo/algorithms/TimeExtractionTable.java delete mode 100644 src/main/java/org/gcube/dataanalysis/geo/algorithms/ZExtractionTable.java diff --git a/CHANGELOG.md b/CHANGELOG.md index f5c7e01..a5d7668 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ # Changelog -## [1.5.2] 2021-01-18 +## [1.5.2-SNAPSHOT] 2021-01-18 - update gis-interface lower bound range - replaced repositories defined into the pom with the new nexus url (nexus.d4science.org). update version to 1.5.2-SNAPSHOT diff --git a/pom.xml b/pom.xml index 4a4a331..4af4450 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.gcube.dataanalysis ecological-engine-geospatial-extensions - 1.5.2 + 1.5.2-SNAPSHOT ecological-engine-geospatial-extensions ecological-engine-geospatial-extension diff --git a/src/main/java/org/gcube/dataanalysis/geo/algorithms/TimeExtractionTable.java b/src/main/java/org/gcube/dataanalysis/geo/algorithms/TimeExtractionTable.java deleted file mode 100644 index 4a6b4c3..0000000 --- a/src/main/java/org/gcube/dataanalysis/geo/algorithms/TimeExtractionTable.java +++ /dev/null @@ -1,56 +0,0 @@ -package org.gcube.dataanalysis.geo.algorithms; - -import java.util.ArrayList; -import java.util.List; - -import org.gcube.dataanalysis.ecoengine.datatypes.ColumnType; -import org.gcube.dataanalysis.ecoengine.datatypes.DatabaseType; -import org.gcube.dataanalysis.ecoengine.datatypes.InputTable; -import org.gcube.dataanalysis.ecoengine.datatypes.PrimitiveType; -import org.gcube.dataanalysis.ecoengine.datatypes.StatisticalType; -import org.gcube.dataanalysis.ecoengine.datatypes.enumtypes.PrimitiveTypes; -import org.gcube.dataanalysis.ecoengine.datatypes.enumtypes.TableTemplates; -import org.gcube.dataanalysis.ecoengine.utils.IOHelper; -import org.gcube.dataanalysis.geo.connectors.table.TableMatrixRepresentation; - - -public class TimeExtractionTable extends TimeExtraction{ - - @Override - public String getDescription() { - return "An algorithm to extract a time series of values associated to a table containing geospatial information. " + - "The algorithm analyses the time series and automatically searches for hidden periodicities. " + - "It produces one chart of the time series, one table containing the time series values and possibly the spectrogram."; - } - - @Override - public List getInputParameters() { - - List inputs = new ArrayList(); - - List template= new ArrayList(); - template.add(TableTemplates.GENERIC); - InputTable table = new InputTable(template,TableMatrixRepresentation.tableNameParameter,"A geospatial table containing at least x,y information",""); - inputs.add(table); - ColumnType columnx = new ColumnType(TableMatrixRepresentation.tableNameParameter, TableMatrixRepresentation.xDimensionColumnParameter, "The column containing x (longitude) information", "x", false); - inputs.add(columnx); - ColumnType columny = new ColumnType(TableMatrixRepresentation.tableNameParameter, TableMatrixRepresentation.yDimensionColumnParameter, "The column containing y (latitude) information", "y", false); - inputs.add(columny); - ColumnType columnt = new ColumnType(TableMatrixRepresentation.tableNameParameter, TableMatrixRepresentation.timeDimensionColumnParameter, "The column containing time information", "datetime", false); - inputs.add(columnt); - ColumnType columnvalue = new ColumnType(TableMatrixRepresentation.tableNameParameter, TableMatrixRepresentation.valueDimensionColumnParameter, "A column containing real valued features", "value", false); - inputs.add(columnvalue); - inputs.add(new PrimitiveType(String.class.getName(), null, PrimitiveTypes.STRING, TableMatrixRepresentation.filterParameter, "A filter on one of the columns (e.g. speed=2)", " ")); - - IOHelper.addStringInput(inputs, TableMatrixRepresentation.zDimensionColumnParameter, "The column containing z (altitude or depth) information (optional)", "z"); - - List previnputs = super.getInputParameters(); - previnputs.remove(0); - inputs.addAll(previnputs); - - DatabaseType.addDefaultDBPars(inputs); - - return inputs; - } - -} diff --git a/src/main/java/org/gcube/dataanalysis/geo/algorithms/ZExtractionTable.java b/src/main/java/org/gcube/dataanalysis/geo/algorithms/ZExtractionTable.java deleted file mode 100644 index 755e4a0..0000000 --- a/src/main/java/org/gcube/dataanalysis/geo/algorithms/ZExtractionTable.java +++ /dev/null @@ -1,56 +0,0 @@ -package org.gcube.dataanalysis.geo.algorithms; - -import java.util.ArrayList; -import java.util.List; - -import org.gcube.dataanalysis.ecoengine.datatypes.ColumnType; -import org.gcube.dataanalysis.ecoengine.datatypes.DatabaseType; -import org.gcube.dataanalysis.ecoengine.datatypes.InputTable; -import org.gcube.dataanalysis.ecoengine.datatypes.PrimitiveType; -import org.gcube.dataanalysis.ecoengine.datatypes.StatisticalType; -import org.gcube.dataanalysis.ecoengine.datatypes.enumtypes.PrimitiveTypes; -import org.gcube.dataanalysis.ecoengine.datatypes.enumtypes.TableTemplates; -import org.gcube.dataanalysis.ecoengine.utils.IOHelper; -import org.gcube.dataanalysis.geo.connectors.table.TableMatrixRepresentation; - - -public class ZExtractionTable extends ZExtraction{ - - @Override - public String getDescription() { - return "An algorithm to extract a time series of values associated to a table containing geospatial information. " + - "The algorithm analyses the time series and automatically searches for hidden periodicities. " + - "It produces one chart of the time series, one table containing the time series values and possibly the spectrogram."; - } - - @Override - public List getInputParameters() { - - List inputs = new ArrayList(); - - List template= new ArrayList(); - template.add(TableTemplates.GENERIC); - InputTable table = new InputTable(template,TableMatrixRepresentation.tableNameParameter,"A geospatial table containing at least x,y information",""); - inputs.add(table); - ColumnType columnx = new ColumnType(TableMatrixRepresentation.tableNameParameter, TableMatrixRepresentation.xDimensionColumnParameter, "The column containing x (longitude) information", "x", false); - inputs.add(columnx); - ColumnType columny = new ColumnType(TableMatrixRepresentation.tableNameParameter, TableMatrixRepresentation.yDimensionColumnParameter, "The column containing y (latitude) information", "y", false); - inputs.add(columny); - ColumnType columnt = new ColumnType(TableMatrixRepresentation.tableNameParameter, TableMatrixRepresentation.zDimensionColumnParameter, "The column containing z information", "z", false); - inputs.add(columnt); - ColumnType columnvalue = new ColumnType(TableMatrixRepresentation.tableNameParameter, TableMatrixRepresentation.valueDimensionColumnParameter, "A column containing real valued features", "value", false); - inputs.add(columnvalue); - inputs.add(new PrimitiveType(String.class.getName(), null, PrimitiveTypes.STRING, TableMatrixRepresentation.filterParameter, "A filter on one of the columns (e.g. speed=2)", " ")); - - IOHelper.addStringInput(inputs, TableMatrixRepresentation.timeDimensionColumnParameter, "The column containing time information (optional).", "time"); - - List previnputs = super.getInputParameters(); - previnputs.remove(0); - inputs.addAll(previnputs); - - DatabaseType.addDefaultDBPars(inputs); - - return inputs; - } - -}