diff --git a/cfg/DestinationDBHibernate.cfg.xml b/cfg/DestinationDBHibernate.cfg.xml index fb7a09b..4624264 100644 --- a/cfg/DestinationDBHibernate.cfg.xml +++ b/cfg/DestinationDBHibernate.cfg.xml @@ -1,64 +1,17 @@ - org.postgresql.Driver - - org.hibernate.connection.C3P0ConnectionProvider - - - - - jdbc:postgresql://dbtest.research-infrastructures.eu/aquamapsorgupdated - utente - d4science - - + org.hibernate.connection.C3P0ConnectionProvider + jdbc:postgresql://localhost/testdb + gcube + d4science2 org.hibernatespatial.postgis.PostgisDialect - org.hibernate.transaction.JDBCTransactionFactory - 3600 - connectiontesttable - - - - 7200 - 3600 10 0 1 - thread - - - - - - - - false - - - - - \ No newline at end of file diff --git a/src/org/gcube/dataanalysis/ecoengine/interfaces/Generator.java b/src/org/gcube/dataanalysis/ecoengine/interfaces/Generator.java index c668fb9..44596b8 100644 --- a/src/org/gcube/dataanalysis/ecoengine/interfaces/Generator.java +++ b/src/org/gcube/dataanalysis/ecoengine/interfaces/Generator.java @@ -5,13 +5,14 @@ import java.util.HashMap; import org.gcube.dataanalysis.ecoengine.configuration.ALG_PROPS; import org.gcube.dataanalysis.ecoengine.configuration.AlgorithmConfiguration; import org.gcube.dataanalysis.ecoengine.configuration.WEIGHT; +import org.gcube.dataanalysis.ecoengine.utils.VarCouple; public interface Generator { public ALG_PROPS[] getSupportedAlgorithms(); //set the input parameters for this generator - public HashMap getInputParameters(); + public HashMap getInputParameters(); //gets the weight of the generator: according to this the generator will be placed in the execution order public WEIGHT getWeight(); diff --git a/src/org/gcube/dataanalysis/ecoengine/interfaces/Model.java b/src/org/gcube/dataanalysis/ecoengine/interfaces/Model.java index f98969d..5b70d43 100644 --- a/src/org/gcube/dataanalysis/ecoengine/interfaces/Model.java +++ b/src/org/gcube/dataanalysis/ecoengine/interfaces/Model.java @@ -4,6 +4,7 @@ import java.util.HashMap; import org.gcube.dataanalysis.ecoengine.configuration.ALG_PROPS; import org.gcube.dataanalysis.ecoengine.configuration.AlgorithmConfiguration; +import org.gcube.dataanalysis.ecoengine.utils.VarCouple; public interface Model { @@ -18,7 +19,7 @@ public interface Model { public String getDescription(); //set the input parameters for this generator - public HashMap getInputParameters(); + public HashMap getInputParameters(); public float getVersion(); diff --git a/src/org/gcube/dataanalysis/ecoengine/interfaces/Modeler.java b/src/org/gcube/dataanalysis/ecoengine/interfaces/Modeler.java index b83d9d9..f003b6b 100644 --- a/src/org/gcube/dataanalysis/ecoengine/interfaces/Modeler.java +++ b/src/org/gcube/dataanalysis/ecoengine/interfaces/Modeler.java @@ -5,6 +5,7 @@ import java.util.HashMap; import org.gcube.dataanalysis.ecoengine.configuration.ALG_PROPS; import org.gcube.dataanalysis.ecoengine.configuration.AlgorithmConfiguration; import org.gcube.dataanalysis.ecoengine.configuration.WEIGHT; +import org.gcube.dataanalysis.ecoengine.utils.VarCouple; public interface Modeler { @@ -12,7 +13,7 @@ public interface Modeler { public ALG_PROPS[] getSupportedModels(); //set the input parameters for this generator - public HashMap getInputParameters(); + public HashMap getInputParameters(); //gets the weight of the generator: according to this the generator will be placed in the execution order public WEIGHT getWeight(); diff --git a/src/org/gcube/dataanalysis/ecoengine/interfaces/SpatialProbabilityDistribution.java b/src/org/gcube/dataanalysis/ecoengine/interfaces/SpatialProbabilityDistribution.java index 73c91e8..2d4ba02 100644 --- a/src/org/gcube/dataanalysis/ecoengine/interfaces/SpatialProbabilityDistribution.java +++ b/src/org/gcube/dataanalysis/ecoengine/interfaces/SpatialProbabilityDistribution.java @@ -3,6 +3,7 @@ package org.gcube.dataanalysis.ecoengine.interfaces; import java.util.HashMap; import org.gcube.dataanalysis.ecoengine.configuration.ALG_PROPS; +import org.gcube.dataanalysis.ecoengine.utils.VarCouple; public interface SpatialProbabilityDistribution { @@ -16,6 +17,6 @@ public interface SpatialProbabilityDistribution { public String getDescription(); //set the input parameters for this generator - public HashMap getInputParameters(); + public HashMap getInputParameters(); } diff --git a/src/org/gcube/dataanalysis/ecoengine/modeling/SimpleModeler.java b/src/org/gcube/dataanalysis/ecoengine/modeling/SimpleModeler.java index df0eb60..b255161 100644 --- a/src/org/gcube/dataanalysis/ecoengine/modeling/SimpleModeler.java +++ b/src/org/gcube/dataanalysis/ecoengine/modeling/SimpleModeler.java @@ -7,6 +7,7 @@ import org.gcube.dataanalysis.ecoengine.configuration.AlgorithmConfiguration; import org.gcube.dataanalysis.ecoengine.configuration.WEIGHT; import org.gcube.dataanalysis.ecoengine.interfaces.Model; import org.gcube.dataanalysis.ecoengine.interfaces.Modeler; +import org.gcube.dataanalysis.ecoengine.utils.VarCouple; public class SimpleModeler implements Modeler{ private Model innermodel; @@ -65,7 +66,7 @@ public class SimpleModeler implements Modeler{ } @Override - public HashMap getInputParameters() { + public HashMap getInputParameters() { return innermodel.getInputParameters(); } diff --git a/src/org/gcube/dataanalysis/ecoengine/models/ModelHSPEN.java b/src/org/gcube/dataanalysis/ecoengine/models/ModelHSPEN.java index 4c403a8..32114b6 100644 --- a/src/org/gcube/dataanalysis/ecoengine/models/ModelHSPEN.java +++ b/src/org/gcube/dataanalysis/ecoengine/models/ModelHSPEN.java @@ -17,6 +17,8 @@ import org.gcube.dataanalysis.ecoengine.interfaces.Model; import org.gcube.dataanalysis.ecoengine.models.cores.aquamaps.AquamapsEnvelopeAlgorithm; import org.gcube.dataanalysis.ecoengine.models.cores.aquamaps.EnvelopeSet; import org.gcube.dataanalysis.ecoengine.utils.DatabaseFactory; +import org.gcube.dataanalysis.ecoengine.utils.VARTYPE; +import org.gcube.dataanalysis.ecoengine.utils.VarCouple; import org.hibernate.SessionFactory; public class ModelHSPEN implements Model { @@ -424,17 +426,17 @@ public class ModelHSPEN implements Model { } @Override - public HashMap getInputParameters() { - HashMap parameters = new HashMap(); - parameters.put("EnvelopeTable", "hspen"); - parameters.put("CsquarecodesTable", "hcaf_d"); - parameters.put("OccurrenceCellsTable", "occurrencecells"); - parameters.put("CreateTable", "true"); - parameters.put("OuputEnvelopeTable", ""); - parameters.put("DatabaseUserName",""); - parameters.put("DatabasePassword",""); - parameters.put("DatabaseURL",""); - parameters.put("DatabaseDriver",""); + public HashMap getInputParameters() { + HashMap parameters = new HashMap(); + parameters.put("EnvelopeTable", new VarCouple(VARTYPE.STRING,"hspen")); + parameters.put("CsquarecodesTable", new VarCouple(VARTYPE.STRING,"hcaf_d")); + parameters.put("OccurrenceCellsTable", new VarCouple(VARTYPE.STRING,"occurrencecells")); + parameters.put("CreateTable", new VarCouple(VARTYPE.STRING,"true")); + parameters.put("OuputEnvelopeTable", new VarCouple(VARTYPE.RANDOM,"hspen_")); + parameters.put("DatabaseUserName",new VarCouple(VARTYPE.DATABASEINFO,"")); + parameters.put("DatabasePassword",new VarCouple(VARTYPE.DATABASEINFO,"")); + parameters.put("DatabaseURL",new VarCouple(VARTYPE.DATABASEINFO,"")); + parameters.put("DatabaseDriver",new VarCouple(VARTYPE.DATABASEINFO,"")); return parameters; } diff --git a/src/org/gcube/dataanalysis/ecoengine/processing/LocalSimpleSplitGenerator.java b/src/org/gcube/dataanalysis/ecoengine/processing/LocalSimpleSplitGenerator.java index 081ab06..6e6b229 100644 --- a/src/org/gcube/dataanalysis/ecoengine/processing/LocalSimpleSplitGenerator.java +++ b/src/org/gcube/dataanalysis/ecoengine/processing/LocalSimpleSplitGenerator.java @@ -19,6 +19,7 @@ import org.gcube.dataanalysis.ecoengine.connectors.livemonitor.ResourceLoad; import org.gcube.dataanalysis.ecoengine.connectors.livemonitor.Resources; import org.gcube.dataanalysis.ecoengine.interfaces.Generator; import org.gcube.dataanalysis.ecoengine.interfaces.SpatialProbabilityDistributionGeneric; +import org.gcube.dataanalysis.ecoengine.utils.VarCouple; public class LocalSimpleSplitGenerator implements Generator { @@ -331,7 +332,7 @@ public class LocalSimpleSplitGenerator implements Generator { } @Override - public HashMap getInputParameters() { + public HashMap getInputParameters() { return distributionModel.getInputParameters(); } diff --git a/src/org/gcube/dataanalysis/ecoengine/processing/LocalSplitGenerator.java b/src/org/gcube/dataanalysis/ecoengine/processing/LocalSplitGenerator.java index fb1dbe1..0cf59fa 100644 --- a/src/org/gcube/dataanalysis/ecoengine/processing/LocalSplitGenerator.java +++ b/src/org/gcube/dataanalysis/ecoengine/processing/LocalSplitGenerator.java @@ -22,6 +22,7 @@ import org.gcube.dataanalysis.ecoengine.connectors.livemonitor.Resources; import org.gcube.dataanalysis.ecoengine.interfaces.Generator; import org.gcube.dataanalysis.ecoengine.interfaces.SpatialProbabilityDistributionTable; import org.gcube.dataanalysis.ecoengine.utils.DatabaseFactory; +import org.gcube.dataanalysis.ecoengine.utils.VarCouple; import org.hibernate.SessionFactory; public class LocalSplitGenerator implements Generator { @@ -474,7 +475,7 @@ public class LocalSplitGenerator implements Generator { } @Override - public HashMap getInputParameters() { + public HashMap getInputParameters() { return distributionModel.getInputParameters(); } diff --git a/src/org/gcube/dataanalysis/ecoengine/processing/RainyCloudGenerator.java b/src/org/gcube/dataanalysis/ecoengine/processing/RainyCloudGenerator.java index 9652da6..39c718d 100644 --- a/src/org/gcube/dataanalysis/ecoengine/processing/RainyCloudGenerator.java +++ b/src/org/gcube/dataanalysis/ecoengine/processing/RainyCloudGenerator.java @@ -13,6 +13,8 @@ import org.gcube.dataanalysis.ecoengine.connectors.RemoteHspecOutputObject; import org.gcube.dataanalysis.ecoengine.connectors.livemonitor.ResourceLoad; import org.gcube.dataanalysis.ecoengine.connectors.livemonitor.Resources; import org.gcube.dataanalysis.ecoengine.interfaces.Generator; +import org.gcube.dataanalysis.ecoengine.utils.VARTYPE; +import org.gcube.dataanalysis.ecoengine.utils.VarCouple; public class RainyCloudGenerator implements Generator { @@ -177,17 +179,17 @@ public class RainyCloudGenerator implements Generator { } @Override - public HashMap getInputParameters() { - HashMap parameters = new HashMap(); - parameters.put("RemoteEnvironment", ""); - parameters.put("ServiceUserName", ""); - parameters.put("CsquarecodesTable", ""); - parameters.put("DatabaseURL", ""); - parameters.put("DatabaseUserName", ""); - parameters.put("DatabasePassword", ""); - parameters.put("DistributionTable", ""); - parameters.put("EnvelopeTable", ""); - parameters.put("RemoteCalculator", ""); + public HashMap getInputParameters() { + HashMap parameters = new HashMap(); + parameters.put("RemoteEnvironment", new VarCouple(VARTYPE.STRING,"")); + parameters.put("ServiceUserName", new VarCouple(VARTYPE.STRING,"")); + parameters.put("CsquarecodesTable", new VarCouple(VARTYPE.STRING,"")); + parameters.put("DatabaseURL", new VarCouple(VARTYPE.DATABASEINFO,"")); + parameters.put("DatabaseUserName", new VarCouple(VARTYPE.DATABASEINFO,"")); + parameters.put("DatabasePassword", new VarCouple(VARTYPE.DATABASEINFO,"")); + parameters.put("DistributionTable", new VarCouple(VARTYPE.RANDOM,"hspec_rem_")); + parameters.put("EnvelopeTable", new VarCouple(VARTYPE.STRING,"")); + parameters.put("RemoteCalculator", new VarCouple(VARTYPE.STRING,"")); return parameters; } diff --git a/src/org/gcube/dataanalysis/ecoengine/processing/factories/GeneratorsFactory.java b/src/org/gcube/dataanalysis/ecoengine/processing/factories/GeneratorsFactory.java index bf419de..25a1f5f 100644 --- a/src/org/gcube/dataanalysis/ecoengine/processing/factories/GeneratorsFactory.java +++ b/src/org/gcube/dataanalysis/ecoengine/processing/factories/GeneratorsFactory.java @@ -12,6 +12,7 @@ import org.gcube.dataanalysis.ecoengine.configuration.AlgorithmConfiguration; import org.gcube.dataanalysis.ecoengine.interfaces.Generator; import org.gcube.dataanalysis.ecoengine.interfaces.SpatialProbabilityDistribution; import org.gcube.dataanalysis.ecoengine.interfaces.SpatialProbabilityDistributionGeneric; +import org.gcube.dataanalysis.ecoengine.utils.VarCouple; public class GeneratorsFactory { @@ -68,8 +69,8 @@ public class GeneratorsFactory { - public static HashMap getAlgorithmParameters(String configPath, String algorithmName) throws Exception{ - HashMap inputs = ProcessorsFactory.getParameters(configPath + AlgorithmConfiguration.algorithmsFile, algorithmName); + public static HashMap getAlgorithmParameters(String configPath, String algorithmName) throws Exception{ + HashMap inputs = ProcessorsFactory.getParameters(configPath + AlgorithmConfiguration.algorithmsFile, algorithmName); return inputs; } diff --git a/src/org/gcube/dataanalysis/ecoengine/processing/factories/ModelersFactory.java b/src/org/gcube/dataanalysis/ecoengine/processing/factories/ModelersFactory.java index c7fa436..d20132e 100644 --- a/src/org/gcube/dataanalysis/ecoengine/processing/factories/ModelersFactory.java +++ b/src/org/gcube/dataanalysis/ecoengine/processing/factories/ModelersFactory.java @@ -10,6 +10,7 @@ import org.gcube.dataanalysis.ecoengine.configuration.ALG_PROPS; import org.gcube.dataanalysis.ecoengine.configuration.AlgorithmConfiguration; import org.gcube.dataanalysis.ecoengine.interfaces.Model; import org.gcube.dataanalysis.ecoengine.interfaces.Modeler; +import org.gcube.dataanalysis.ecoengine.utils.VarCouple; public class ModelersFactory { @@ -30,8 +31,8 @@ public class ModelersFactory { } - public static HashMap getModelParameters(String configPath, String algorithmName) throws Exception{ - HashMap inputs = ProcessorsFactory.getParameters(configPath + AlgorithmConfiguration.modelsFile, algorithmName); + public static HashMap getModelParameters(String configPath, String algorithmName) throws Exception{ + HashMap inputs = ProcessorsFactory.getParameters(configPath + AlgorithmConfiguration.modelsFile, algorithmName); return inputs; } diff --git a/src/org/gcube/dataanalysis/ecoengine/processing/factories/ProcessorsFactory.java b/src/org/gcube/dataanalysis/ecoengine/processing/factories/ProcessorsFactory.java index 36eacda..4edca1b 100644 --- a/src/org/gcube/dataanalysis/ecoengine/processing/factories/ProcessorsFactory.java +++ b/src/org/gcube/dataanalysis/ecoengine/processing/factories/ProcessorsFactory.java @@ -11,6 +11,7 @@ import org.gcube.dataanalysis.ecoengine.interfaces.Generator; import org.gcube.dataanalysis.ecoengine.interfaces.Model; import org.gcube.dataanalysis.ecoengine.interfaces.Modeler; import org.gcube.dataanalysis.ecoengine.interfaces.SpatialProbabilityDistribution; +import org.gcube.dataanalysis.ecoengine.utils.VarCouple; public class ProcessorsFactory { @@ -26,7 +27,7 @@ public class ProcessorsFactory { } - public static HashMap getParameters(String file, String algorithmName) throws Exception{ + public static HashMap getParameters(String file, String algorithmName) throws Exception{ Properties p = AlgorithmConfiguration.getProperties(file); String algorithmclass = p.getProperty(algorithmName); diff --git a/src/org/gcube/dataanalysis/ecoengine/spatialdistributions/AquamapsSuitable.java b/src/org/gcube/dataanalysis/ecoengine/spatialdistributions/AquamapsSuitable.java index 9202ac3..2259eb9 100644 --- a/src/org/gcube/dataanalysis/ecoengine/spatialdistributions/AquamapsSuitable.java +++ b/src/org/gcube/dataanalysis/ecoengine/spatialdistributions/AquamapsSuitable.java @@ -10,6 +10,8 @@ import org.gcube.dataanalysis.ecoengine.configuration.ALG_PROPS; import org.gcube.dataanalysis.ecoengine.configuration.AlgorithmConfiguration; import org.gcube.dataanalysis.ecoengine.interfaces.SpatialProbabilityDistributionTable; import org.gcube.dataanalysis.ecoengine.utils.DatabaseFactory; +import org.gcube.dataanalysis.ecoengine.utils.VARTYPE; +import org.gcube.dataanalysis.ecoengine.utils.VarCouple; import org.hibernate.SessionFactory; public class AquamapsSuitable implements SpatialProbabilityDistributionTable{ @@ -202,17 +204,17 @@ public class AquamapsSuitable implements SpatialProbabilityDistributionTable{ } @Override - public HashMap getInputParameters() { - HashMap parameters = new HashMap(); - parameters.put("EnvelopeTable", "hspen"); - parameters.put("CsquarecodesTable", "hcaf_d"); - parameters.put("DistributionTable", "hspec_default"); - parameters.put("PreprocessedTable", "maxminlat_hspen"); - parameters.put("CreateTable", "hspen_minmaxlat"); - parameters.put("DatabaseUserName",""); - parameters.put("DatabasePassword",""); - parameters.put("DatabaseURL",""); - parameters.put("DatabaseDriver",""); + public HashMap getInputParameters() { + HashMap parameters = new HashMap(); + parameters.put("EnvelopeTable", new VarCouple(VARTYPE.STRING,"hspen")); + parameters.put("CsquarecodesTable", new VarCouple(VARTYPE.STRING,"hcaf_d")); + parameters.put("DistributionTable", new VarCouple(VARTYPE.RANDOM,"hspec_")); + parameters.put("PreprocessedTable", new VarCouple(VARTYPE.STRING,"maxminlat_hspen")); + parameters.put("CreateTable", new VarCouple(VARTYPE.STRING,"hspen_minmaxlat")); + parameters.put("DatabaseUserName",new VarCouple(VARTYPE.DATABASEINFO,"")); + parameters.put("DatabasePassword",new VarCouple(VARTYPE.DATABASEINFO,"")); + parameters.put("DatabaseURL",new VarCouple(VARTYPE.DATABASEINFO,"")); + parameters.put("DatabaseDriver",new VarCouple(VARTYPE.DATABASEINFO,"")); return parameters; } diff --git a/src/org/gcube/dataanalysis/ecoengine/spatialdistributions/DummyAlgorithm.java b/src/org/gcube/dataanalysis/ecoengine/spatialdistributions/DummyAlgorithm.java index 69d9de5..c40fbf6 100644 --- a/src/org/gcube/dataanalysis/ecoengine/spatialdistributions/DummyAlgorithm.java +++ b/src/org/gcube/dataanalysis/ecoengine/spatialdistributions/DummyAlgorithm.java @@ -13,6 +13,7 @@ import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; import org.gcube.dataanalysis.ecoengine.configuration.ALG_PROPS; import org.gcube.dataanalysis.ecoengine.configuration.AlgorithmConfiguration; import org.gcube.dataanalysis.ecoengine.interfaces.SpatialProbabilityDistributionGeneric; +import org.gcube.dataanalysis.ecoengine.utils.VarCouple; public class DummyAlgorithm implements SpatialProbabilityDistributionGeneric{ @@ -189,7 +190,7 @@ public class DummyAlgorithm implements SpatialProbabilityDistributionGeneric{ } @Override - public HashMap getInputParameters() { + public HashMap getInputParameters() { return null; } diff --git a/src/org/gcube/dataanalysis/ecoengine/spatialdistributions/TestAlgorithm.java b/src/org/gcube/dataanalysis/ecoengine/spatialdistributions/TestAlgorithm.java index 765c6a0..663f238 100644 --- a/src/org/gcube/dataanalysis/ecoengine/spatialdistributions/TestAlgorithm.java +++ b/src/org/gcube/dataanalysis/ecoengine/spatialdistributions/TestAlgorithm.java @@ -13,6 +13,7 @@ import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; import org.gcube.dataanalysis.ecoengine.configuration.ALG_PROPS; import org.gcube.dataanalysis.ecoengine.configuration.AlgorithmConfiguration; import org.gcube.dataanalysis.ecoengine.interfaces.SpatialProbabilityDistributionGeneric; +import org.gcube.dataanalysis.ecoengine.utils.VarCouple; public class TestAlgorithm implements SpatialProbabilityDistributionGeneric{ @@ -136,7 +137,7 @@ public class TestAlgorithm implements SpatialProbabilityDistributionGeneric{ } @Override - public HashMap getInputParameters() { + public HashMap getInputParameters() { return null; } diff --git a/src/org/gcube/dataanalysis/ecoengine/test/TestsHSPENTraining.java b/src/org/gcube/dataanalysis/ecoengine/test/TestsHSPENTraining.java index 39cd568..a2e93b5 100644 --- a/src/org/gcube/dataanalysis/ecoengine/test/TestsHSPENTraining.java +++ b/src/org/gcube/dataanalysis/ecoengine/test/TestsHSPENTraining.java @@ -79,10 +79,12 @@ public static void main(String[] args) throws Exception { config.setParam("CsquarecodesTable", "hcaf_d"); config.setParam("CreateTable","true"); + /* config.setParam("DatabaseUserName","gcube"); config.setParam("DatabasePassword","d4science2"); config.setParam("DatabaseURL","jdbc:postgresql://localhost/testdb"); config.setParam("DatabaseDriver","org.postgresql.Driver"); + */ return config; } diff --git a/src/org/gcube/dataanalysis/ecoengine/test/TestsMetaInfo.java b/src/org/gcube/dataanalysis/ecoengine/test/TestsMetaInfo.java index 5bc5d69..ac66afe 100644 --- a/src/org/gcube/dataanalysis/ecoengine/test/TestsMetaInfo.java +++ b/src/org/gcube/dataanalysis/ecoengine/test/TestsMetaInfo.java @@ -8,6 +8,7 @@ import org.gcube.dataanalysis.ecoengine.configuration.AlgorithmConfiguration; import org.gcube.dataanalysis.ecoengine.interfaces.Generator; import org.gcube.dataanalysis.ecoengine.processing.factories.GeneratorsFactory; import org.gcube.dataanalysis.ecoengine.processing.factories.ModelersFactory; +import org.gcube.dataanalysis.ecoengine.utils.VarCouple; public class TestsMetaInfo { /** @@ -18,7 +19,7 @@ public class TestsMetaInfo { public static void main(String[] args) throws Exception { System.out.println("***TEST 1 - Get Algorithm Information***"); - HashMap map = GeneratorsFactory.getAlgorithmParameters("./cfg/","DUMMY"); + HashMap map = GeneratorsFactory.getAlgorithmParameters("./cfg/","DUMMY"); System.out.println("input for DUMMY algorithm: "+map); map = GeneratorsFactory.getAlgorithmParameters("./cfg/","AQUAMAPS_SUITABLE"); diff --git a/src/org/gcube/dataanalysis/ecoengine/utils/DatabaseFactory.java b/src/org/gcube/dataanalysis/ecoengine/utils/DatabaseFactory.java index c4b2e76..27ce204 100644 --- a/src/org/gcube/dataanalysis/ecoengine/utils/DatabaseFactory.java +++ b/src/org/gcube/dataanalysis/ecoengine/utils/DatabaseFactory.java @@ -59,23 +59,23 @@ public class DatabaseFactory{ Node currentnode = nodesIterator.next(); String element = currentnode.valueOf("@name"); if (element.equals("connection.driver_class")) - if (config.getDatabaseDriver() != null){ + if ((config.getDatabaseDriver() != null)&&(config.getDatabaseDriver().length()>0)){ currentnode.setText(config.getDatabaseDriver()); } if (element.equals("connection.url")) { - if (config.getDatabaseURL() != null) + if ((config.getDatabaseURL() != null)&&(config.getDatabaseURL().length()>0)) currentnode.setText(config.getDatabaseURL()); } if (element.equals("connection.username")) { - if (config.getDatabaseUserName() != null) + if ((config.getDatabaseUserName() != null)&&(config.getDatabaseUserName().length()>0)) currentnode.setText(config.getDatabaseUserName()); } if (element.equals("connection.password")) { - if (config.getDatabasePassword() != null) + if ((config.getDatabasePassword() != null)&&(config.getDatabasePassword().length()>0)) currentnode.setText(config.getDatabasePassword()); } if (element.equals("dialect")) { - if (config.getDatabaseDialect() != null) + if ((config.getDatabaseDialect() != null)&&(config.getDatabaseDialect().length()>0)) currentnode.setText(config.getDatabaseDialect()); } if (element.equals("c3p0.idleConnectionTestPeriod")) { diff --git a/src/org/gcube/dataanalysis/ecoengine/utils/VARTYPE.java b/src/org/gcube/dataanalysis/ecoengine/utils/VARTYPE.java new file mode 100644 index 0000000..526421e --- /dev/null +++ b/src/org/gcube/dataanalysis/ecoengine/utils/VARTYPE.java @@ -0,0 +1,8 @@ +package org.gcube.dataanalysis.ecoengine.utils; + +public enum VARTYPE { + STRING, + DATABASEINFO, + CONSTANT, + RANDOM +} diff --git a/src/org/gcube/dataanalysis/ecoengine/utils/VarCouple.java b/src/org/gcube/dataanalysis/ecoengine/utils/VarCouple.java new file mode 100644 index 0000000..0c53cde --- /dev/null +++ b/src/org/gcube/dataanalysis/ecoengine/utils/VarCouple.java @@ -0,0 +1,26 @@ +package org.gcube.dataanalysis.ecoengine.utils; + +public class VarCouple { + + + VARTYPE first; + private String second; + + public VarCouple(VARTYPE first, String second){ + this.first = first; + this.second = second; + } + + public String getSecond(){ + return second; + } + + public String getFirst(){ + return first.toString(); + } + + public String toString(){ + return "("+first+","+second+")"; + } + +}