From 00bc6a897874cf955f3fca693e65d44dbe1404ad Mon Sep 17 00:00:00 2001 From: Gianpaolo Coro Date: Tue, 27 Sep 2016 14:49:17 +0000 Subject: [PATCH] git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/EcologicalEngineExternalAlgorithms@131891 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../AbsoluteSpeciesBarChartsAlgorithm.java | 4 ++-- .../dataanalysis/trendylyzeralgorithms/SimpleAlgorithm.java | 4 ++-- .../SpeciesObservationsAreaBarChart.java | 4 ++-- .../SpeciesObservationsPerLMEAreaPerYearLineChart.java | 4 ++-- .../SpeciesObservationsPerMEOWAreaPerYearLineChart.java | 4 ++-- .../trendylyzeralgorithms/SpeciesObservationsPerYear.java | 4 ++-- .../TaxaObservationsBarChartAlgorithm.java | 4 ++-- .../TaxaObservationsPerYearLineChart.java | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/gcube/dataanalysis/trendylyzeralgorithms/AbsoluteSpeciesBarChartsAlgorithm.java b/src/main/java/org/gcube/dataanalysis/trendylyzeralgorithms/AbsoluteSpeciesBarChartsAlgorithm.java index ad3a406..aec29f6 100644 --- a/src/main/java/org/gcube/dataanalysis/trendylyzeralgorithms/AbsoluteSpeciesBarChartsAlgorithm.java +++ b/src/main/java/org/gcube/dataanalysis/trendylyzeralgorithms/AbsoluteSpeciesBarChartsAlgorithm.java @@ -22,13 +22,13 @@ import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; 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.interfaces.StandardLocalExternalAlgorithm; +import org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm; import org.jfree.chart.JFreeChart; import org.jfree.data.category.DefaultCategoryDataset; import org.postgresql.Driver; public class AbsoluteSpeciesBarChartsAlgorithm extends - StandardLocalExternalAlgorithm { + StandardLocalInfraAlgorithm { LinkedHashMap map = new LinkedHashMap(); static String databaseName = "DatabaseName"; diff --git a/src/main/java/org/gcube/dataanalysis/trendylyzeralgorithms/SimpleAlgorithm.java b/src/main/java/org/gcube/dataanalysis/trendylyzeralgorithms/SimpleAlgorithm.java index 89bcd84..392952c 100644 --- a/src/main/java/org/gcube/dataanalysis/trendylyzeralgorithms/SimpleAlgorithm.java +++ b/src/main/java/org/gcube/dataanalysis/trendylyzeralgorithms/SimpleAlgorithm.java @@ -16,12 +16,12 @@ import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; 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.interfaces.StandardLocalExternalAlgorithm; +import org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm; import org.jfree.chart.JFreeChart; import org.jfree.data.category.DefaultCategoryDataset; import org.postgresql.Driver; -public class SimpleAlgorithm extends StandardLocalExternalAlgorithm{ +public class SimpleAlgorithm extends StandardLocalInfraAlgorithm{ //case of db used static String urlParameterName = "DatabaseURL"; diff --git a/src/main/java/org/gcube/dataanalysis/trendylyzeralgorithms/SpeciesObservationsAreaBarChart.java b/src/main/java/org/gcube/dataanalysis/trendylyzeralgorithms/SpeciesObservationsAreaBarChart.java index e81dcdb..338b99a 100644 --- a/src/main/java/org/gcube/dataanalysis/trendylyzeralgorithms/SpeciesObservationsAreaBarChart.java +++ b/src/main/java/org/gcube/dataanalysis/trendylyzeralgorithms/SpeciesObservationsAreaBarChart.java @@ -20,13 +20,13 @@ import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; 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.interfaces.StandardLocalExternalAlgorithm; +import org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm; import org.jfree.chart.JFreeChart; import org.jfree.data.category.DefaultCategoryDataset; import org.postgresql.Driver; public class SpeciesObservationsAreaBarChart extends - StandardLocalExternalAlgorithm { + StandardLocalInfraAlgorithm { static String databaseName = "DatabaseName"; static String userParameterName = "DatabaseUserName"; static String passwordParameterName = "DatabasePassword"; diff --git a/src/main/java/org/gcube/dataanalysis/trendylyzeralgorithms/SpeciesObservationsPerLMEAreaPerYearLineChart.java b/src/main/java/org/gcube/dataanalysis/trendylyzeralgorithms/SpeciesObservationsPerLMEAreaPerYearLineChart.java index 18f3c46..f43fb2d 100644 --- a/src/main/java/org/gcube/dataanalysis/trendylyzeralgorithms/SpeciesObservationsPerLMEAreaPerYearLineChart.java +++ b/src/main/java/org/gcube/dataanalysis/trendylyzeralgorithms/SpeciesObservationsPerLMEAreaPerYearLineChart.java @@ -23,7 +23,7 @@ import org.gcube.dataanalysis.ecoengine.datatypes.PrimitiveType; import org.gcube.dataanalysis.ecoengine.datatypes.PrimitiveTypesList; import org.gcube.dataanalysis.ecoengine.datatypes.StatisticalType; import org.gcube.dataanalysis.ecoengine.datatypes.enumtypes.PrimitiveTypes; -import org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorithm; +import org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm; import org.gcube.dataanalysis.ecoengine.utils.DynamicEnum; import org.jfree.chart.JFreeChart; import org.jfree.data.time.TimeSeries; @@ -34,7 +34,7 @@ import org.postgresql.Driver; -public class SpeciesObservationsPerLMEAreaPerYearLineChart extends StandardLocalExternalAlgorithm { +public class SpeciesObservationsPerLMEAreaPerYearLineChart extends StandardLocalInfraAlgorithm { static String databaseName = "DatabaseName"; static String userParameterName = "DatabaseUserName"; diff --git a/src/main/java/org/gcube/dataanalysis/trendylyzeralgorithms/SpeciesObservationsPerMEOWAreaPerYearLineChart.java b/src/main/java/org/gcube/dataanalysis/trendylyzeralgorithms/SpeciesObservationsPerMEOWAreaPerYearLineChart.java index fe1c235..b54c973 100644 --- a/src/main/java/org/gcube/dataanalysis/trendylyzeralgorithms/SpeciesObservationsPerMEOWAreaPerYearLineChart.java +++ b/src/main/java/org/gcube/dataanalysis/trendylyzeralgorithms/SpeciesObservationsPerMEOWAreaPerYearLineChart.java @@ -24,7 +24,7 @@ import org.gcube.dataanalysis.ecoengine.datatypes.PrimitiveType; import org.gcube.dataanalysis.ecoengine.datatypes.PrimitiveTypesList; import org.gcube.dataanalysis.ecoengine.datatypes.StatisticalType; import org.gcube.dataanalysis.ecoengine.datatypes.enumtypes.PrimitiveTypes; -import org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorithm; +import org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm; import org.gcube.dataanalysis.ecoengine.utils.DynamicEnum; import org.jfree.chart.JFreeChart; import org.jfree.data.time.TimeSeries; @@ -32,7 +32,7 @@ import org.jfree.data.time.TimeSeriesCollection; import org.jfree.data.time.Year; import org.postgresql.Driver; -public class SpeciesObservationsPerMEOWAreaPerYearLineChart extends StandardLocalExternalAlgorithm { +public class SpeciesObservationsPerMEOWAreaPerYearLineChart extends StandardLocalInfraAlgorithm { static String databaseName = "DatabaseName"; static String userParameterName = "DatabaseUserName"; diff --git a/src/main/java/org/gcube/dataanalysis/trendylyzeralgorithms/SpeciesObservationsPerYear.java b/src/main/java/org/gcube/dataanalysis/trendylyzeralgorithms/SpeciesObservationsPerYear.java index 730bd4b..60bfd46 100644 --- a/src/main/java/org/gcube/dataanalysis/trendylyzeralgorithms/SpeciesObservationsPerYear.java +++ b/src/main/java/org/gcube/dataanalysis/trendylyzeralgorithms/SpeciesObservationsPerYear.java @@ -22,7 +22,7 @@ import org.gcube.dataanalysis.ecoengine.datatypes.PrimitiveType; import org.gcube.dataanalysis.ecoengine.datatypes.PrimitiveTypesList; import org.gcube.dataanalysis.ecoengine.datatypes.StatisticalType; import org.gcube.dataanalysis.ecoengine.datatypes.enumtypes.PrimitiveTypes; -import org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorithm; +import org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm; import org.jfree.chart.JFreeChart; import org.jfree.chart.plot.ThermometerPlot; import org.jfree.data.category.DefaultCategoryDataset; @@ -32,7 +32,7 @@ import org.jfree.data.time.TimeSeriesCollection; import org.jfree.data.time.Year; import org.postgresql.Driver; -public class SpeciesObservationsPerYear extends StandardLocalExternalAlgorithm { +public class SpeciesObservationsPerYear extends StandardLocalInfraAlgorithm { static String databaseName = "DatabaseName"; static String userParameterName = "DatabaseUserName"; static String passwordParameterName = "DatabasePassword"; diff --git a/src/main/java/org/gcube/dataanalysis/trendylyzeralgorithms/TaxaObservationsBarChartAlgorithm.java b/src/main/java/org/gcube/dataanalysis/trendylyzeralgorithms/TaxaObservationsBarChartAlgorithm.java index e12950d..11b3934 100644 --- a/src/main/java/org/gcube/dataanalysis/trendylyzeralgorithms/TaxaObservationsBarChartAlgorithm.java +++ b/src/main/java/org/gcube/dataanalysis/trendylyzeralgorithms/TaxaObservationsBarChartAlgorithm.java @@ -19,12 +19,12 @@ import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; 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.interfaces.StandardLocalExternalAlgorithm; +import org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm; import org.jfree.chart.JFreeChart; import org.jfree.data.category.DefaultCategoryDataset; import org.postgresql.Driver; -public class TaxaObservationsBarChartAlgorithm extends StandardLocalExternalAlgorithm{ +public class TaxaObservationsBarChartAlgorithm extends StandardLocalInfraAlgorithm{ static String databaseName = "DatabaseName"; static String userParameterName = "DatabaseUserName"; static String passwordParameterName = "DatabasePassword"; diff --git a/src/main/java/org/gcube/dataanalysis/trendylyzeralgorithms/TaxaObservationsPerYearLineChart.java b/src/main/java/org/gcube/dataanalysis/trendylyzeralgorithms/TaxaObservationsPerYearLineChart.java index 8849aa9..76317e1 100644 --- a/src/main/java/org/gcube/dataanalysis/trendylyzeralgorithms/TaxaObservationsPerYearLineChart.java +++ b/src/main/java/org/gcube/dataanalysis/trendylyzeralgorithms/TaxaObservationsPerYearLineChart.java @@ -21,7 +21,7 @@ import org.gcube.dataanalysis.ecoengine.datatypes.PrimitiveType; import org.gcube.dataanalysis.ecoengine.datatypes.PrimitiveTypesList; import org.gcube.dataanalysis.ecoengine.datatypes.StatisticalType; import org.gcube.dataanalysis.ecoengine.datatypes.enumtypes.PrimitiveTypes; -import org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorithm; +import org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm; import org.jfree.chart.JFreeChart; import org.jfree.data.time.TimeSeries; import org.jfree.data.time.TimeSeriesCollection; @@ -29,7 +29,7 @@ import org.jfree.data.time.Year; import org.postgresql.Driver; public class TaxaObservationsPerYearLineChart - extends StandardLocalExternalAlgorithm { + extends StandardLocalInfraAlgorithm { static String databaseName = "DatabaseName"; static String userParameterName = "DatabaseUserName"; static String passwordParameterName = "DatabasePassword";