From 09e73c8d87dfba8ad4b722ef0ca89f42cdf79bea Mon Sep 17 00:00:00 2001 From: Gianpaolo Coro Date: Tue, 4 Jun 2013 08:42:46 +0000 Subject: [PATCH] added debug strings git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/EcologicalEngine@76713 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../dataanalysis/ecoengine/interfaces/DataAnalysis.java | 9 +++++++-- .../interfaces/StandardLocalExternalAlgorithm.java | 6 +++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/gcube/dataanalysis/ecoengine/interfaces/DataAnalysis.java b/src/main/java/org/gcube/dataanalysis/ecoengine/interfaces/DataAnalysis.java index c734704..9a71dca 100644 --- a/src/main/java/org/gcube/dataanalysis/ecoengine/interfaces/DataAnalysis.java +++ b/src/main/java/org/gcube/dataanalysis/ecoengine/interfaces/DataAnalysis.java @@ -108,12 +108,17 @@ public abstract class DataAnalysis implements Evaluator{ public void init() throws Exception { + init(true); + } + + public void init(boolean initRapidMiner) throws Exception { AnalysisLogger.setLogger(config.getConfigPath() + AlgorithmConfiguration.defaultLoggerFile); // init db connection connection = AlgorithmConfiguration.getConnectionFromConfig(config); - config.initRapidMiner(); + if (initRapidMiner) + config.initRapidMiner(); } - + public void setConfiguration(AlgorithmConfiguration config) { this.config = config; diff --git a/src/main/java/org/gcube/dataanalysis/ecoengine/interfaces/StandardLocalExternalAlgorithm.java b/src/main/java/org/gcube/dataanalysis/ecoengine/interfaces/StandardLocalExternalAlgorithm.java index 74f9e5f..d7c3fdf 100644 --- a/src/main/java/org/gcube/dataanalysis/ecoengine/interfaces/StandardLocalExternalAlgorithm.java +++ b/src/main/java/org/gcube/dataanalysis/ecoengine/interfaces/StandardLocalExternalAlgorithm.java @@ -22,7 +22,7 @@ public abstract class StandardLocalExternalAlgorithm implements Transducerer { protected float status = 0; protected List inputs = new ArrayList(); protected ResourceFactory resourceManager; - protected LinkedHashMap outputParameters = new LinkedHashMap(); + public LinkedHashMap outputParameters = new LinkedHashMap(); protected void addEnumerateInput(Object itemsList, String name, String description, String defaultvalue) { @@ -42,6 +42,10 @@ public abstract class StandardLocalExternalAlgorithm implements Transducerer { inputs.add(new PrimitiveType(String.class.getName(), null, PrimitiveTypes.STRING, name, description, defaultvalue)); } + protected void addNumberInput(String name, String description, String defaultvalue) { + inputs.add(new PrimitiveType(Integer.class.getName(), null, PrimitiveTypes.NUMBER, name,description,defaultvalue)); + } + protected void addOutputString(String name, String value) { outputParameters.put(name, value); }