Gianpaolo Coro 2015-04-10 14:33:43 +00:00
parent 029751edc0
commit 78ffae8ffb
3 changed files with 25 additions and 14 deletions

View File

@ -56,9 +56,15 @@ public class CustomRegressor {
config.setConfigPath("./cfg/");
config.setPersistencePath("./");
/*
config.setParam("DatabaseUserName","gcube");
config.setParam("DatabasePassword","d4science2");
config.setParam("DatabaseURL","jdbc:postgresql://146.48.87.169/testdb");
*/
config.setParam("DatabaseUserName","utente");
config.setParam("DatabasePassword","d4science");
config.setParam("DatabaseURL","jdbc:postgresql://statistical-manager.d.d4science.research-infrastructures.eu/testdb");
config.setParam("DatabaseDriver","org.postgresql.Driver");
AnalysisLogger.setLogger(config.getConfigPath()+AlgorithmConfiguration.defaultLoggerFile);
return config;

View File

@ -49,18 +49,18 @@ public static AlgorithmConfiguration getConfig() {
config.setModel("FAOMSY");
config.setParam("UserName", "gianpaolo.coro");
// config.setGcubeScope("/gcube");
config.setGcubeScope("/d4science.research-infrastructures.eu");
config.setGcubeScope("/gcube");
// config.setGcubeScope("/d4science.research-infrastructures.eu");
config.setParam("ServiceUserName", "gianpaolo.coro");
D4ScienceDistributedProcessing.maxMessagesAllowedPerJob=2;
// config.setParam("StocksFile","http://goo.gl/g6YtVx");
//config.setParam("StocksFile","https://dl.dropboxusercontent.com/u/12809149/FAOMSY_Short1.csv");
// config.setParam("StocksFile","https://dl.dropboxusercontent.com/u/12809149/FAOMSY_Short2.csv");
// config.setParam("StocksFile","https://dl.dropboxusercontent.com/u/12809149/FAOMSY_Short1.csv");
config.setParam("StocksFile","https://dl.dropboxusercontent.com/u/12809149/FAOMSY_Short2.csv");
// config.setParam("StocksFile","https://dl.dropboxusercontent.com/u/12809149/FAOMSY_Longtest.csv");
config.setParam("StocksFile","http://goo.gl/B09ZL0"); //50species
// config.setParam("StocksFile","http://goo.gl/B09ZL0"); //50species
//config.setParam("IDsFile","http://goo.gl/9rg3qK");
// config.setParam("StocksFile","http://goo.gl/Mp2ZLY");
// config.setParam("StocksFile","http://goo.gl/btuIIe");

View File

@ -18,7 +18,7 @@ public class RegressionTestGenerators {
System.out.println("TEST 1");
List<ComputationalAgent> generators = GeneratorsFactory.getGenerators(testAquamapsSuitable2050());
List<ComputationalAgent> generators = GeneratorsFactory.getGenerators(testAquamapsSuitable());
generators.get(0).init();
Regressor.process(generators.get(0));
generators = null;
@ -27,7 +27,7 @@ public class RegressionTestGenerators {
private static AlgorithmConfiguration testAquamapsSuitable() {
AlgorithmConfiguration config = Regressor.getConfig();
AlgorithmConfiguration config = CustomRegressor.getConfig();
config.setNumberOfResources(5);
config.setModel("AQUAMAPS_SUITABLE");
@ -37,7 +37,7 @@ public class RegressionTestGenerators {
config.setParam("DistributionTable", "hspec_suitable_test_parallel");
config.setParam("CsquarecodesTable", "hcaf_d");
config.setParam("EnvelopeTable", "hspen_micro_1");
config.setParam("EnvelopeTable", "hspen_filteredid_3a150e47_274e_47fc_b257_6a2933ec8e67");
config.setParam("OccurrencePointsTable", "occurrencecells");
config.setParam("CreateTable", "true");
@ -46,7 +46,7 @@ public class RegressionTestGenerators {
private static AlgorithmConfiguration testAquamapsNative() {
AlgorithmConfiguration config = Regressor.getConfig();
AlgorithmConfiguration config = CustomRegressor.getConfig();
config.setNumberOfResources(5);
config.setModel("AQUAMAPS_NATIVE");
@ -57,7 +57,9 @@ public class RegressionTestGenerators {
config.setParam("DistributionTable", "hspec_native_test_parallel2_1000");
config.setParam("CsquarecodesTable", "hcaf_d");
// config.setParam("EnvelopeTable", "hspen_micro_1");
config.setParam("EnvelopeTable", "hspen_mini_1000");
// config.setParam("EnvelopeTable", "hspen_mini_1000");
config.setParam("EnvelopeTable", "hspen_filteredid_3a150e47_274e_47fc_b257_6a2933ec8e67");
config.setParam("OccurrencePointsTable", "occurrencecells");
config.setParam("CreateTable", "true");
@ -67,7 +69,7 @@ public class RegressionTestGenerators {
private static AlgorithmConfiguration testAquamapsNative2050() {
AlgorithmConfiguration config = Regressor.getConfig();
AlgorithmConfiguration config = CustomRegressor.getConfig();
config.setNumberOfResources(5);
config.setModel("AQUAMAPS_NATIVE_2050");
@ -78,7 +80,8 @@ public class RegressionTestGenerators {
config.setParam("DistributionTable", "hspec_native2050_test_parallel");
config.setParam("CsquarecodesTable", "hcaf_d");
// config.setParam("EnvelopeTable", "hspen_micro_1");
config.setParam("EnvelopeTable", "hspen_validation");
// config.setParam("EnvelopeTable", "hspen_validation");
config.setParam("EnvelopeTable", "hspen_filteredid_3a150e47_274e_47fc_b257_6a2933ec8e67");//1species
config.setParam("OccurrencePointsTable", "occurrencecells");
config.setParam("CreateTable", "true");
@ -87,7 +90,7 @@ public class RegressionTestGenerators {
private static AlgorithmConfiguration testAquamapsSuitable2050() {
AlgorithmConfiguration config = Regressor.getConfig();
AlgorithmConfiguration config = CustomRegressor.getConfig();
config.setNumberOfResources(5);
config.setModel("AQUAMAPS_SUITABLE_2050");
@ -97,7 +100,9 @@ public class RegressionTestGenerators {
config.setParam("DistributionTable", "hspec_suitable2050_test_parallel_validation2");
config.setParam("CsquarecodesTable", "hcaf_d");
config.setParam("EnvelopeTable", "hspen_micro_1");
// config.setParam("EnvelopeTable", "hspen_micro_1");
config.setParam("EnvelopeTable", "hspen_filteredid_3a150e47_274e_47fc_b257_6a2933ec8e67");
// config.setParam("EnvelopeTable", "hspen_validation");
config.setParam("OccurrencePointsTable", "occurrencecells");
config.setParam("CreateTable", "true");