Removed marytts-d4science #20135
This commit is contained in:
parent
2feee0196b
commit
0e12b0890d
|
@ -1,5 +1,5 @@
|
||||||
# Changelog
|
# Changelog
|
||||||
## [1.5.2] 2021-01-18
|
## [1.5.2-SNAPSHOT] 2021-01-18
|
||||||
- update gis-interface lower bound range
|
- 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
|
- replaced repositories defined into the pom with the new nexus url (nexus.d4science.org). update version to 1.5.2-SNAPSHOT
|
||||||
|
|
||||||
|
|
2
pom.xml
2
pom.xml
|
@ -9,7 +9,7 @@
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.gcube.dataanalysis</groupId>
|
<groupId>org.gcube.dataanalysis</groupId>
|
||||||
<artifactId>ecological-engine-geospatial-extensions</artifactId>
|
<artifactId>ecological-engine-geospatial-extensions</artifactId>
|
||||||
<version>1.5.2</version>
|
<version>1.5.2-SNAPSHOT</version>
|
||||||
|
|
||||||
<name>ecological-engine-geospatial-extensions</name>
|
<name>ecological-engine-geospatial-extensions</name>
|
||||||
<description>ecological-engine-geospatial-extension</description>
|
<description>ecological-engine-geospatial-extension</description>
|
||||||
|
|
|
@ -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<StatisticalType> getInputParameters() {
|
|
||||||
|
|
||||||
List<StatisticalType> inputs = new ArrayList<StatisticalType>();
|
|
||||||
|
|
||||||
List<TableTemplates> template= new ArrayList<TableTemplates>();
|
|
||||||
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<StatisticalType> previnputs = super.getInputParameters();
|
|
||||||
previnputs.remove(0);
|
|
||||||
inputs.addAll(previnputs);
|
|
||||||
|
|
||||||
DatabaseType.addDefaultDBPars(inputs);
|
|
||||||
|
|
||||||
return inputs;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -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<StatisticalType> getInputParameters() {
|
|
||||||
|
|
||||||
List<StatisticalType> inputs = new ArrayList<StatisticalType>();
|
|
||||||
|
|
||||||
List<TableTemplates> template= new ArrayList<TableTemplates>();
|
|
||||||
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<StatisticalType> previnputs = super.getInputParameters();
|
|
||||||
previnputs.remove(0);
|
|
||||||
inputs.addAll(previnputs);
|
|
||||||
|
|
||||||
DatabaseType.addDefaultDBPars(inputs);
|
|
||||||
|
|
||||||
return inputs;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
Loading…
Reference in New Issue