gCubeSystem
/
ecological-engine
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/EcologicalEngine@59168 82a268e6-3cf1-43bd-a215-b396298e98cf

This commit is contained in:
Gianpaolo Coro 2012-09-27 17:02:26 +00:00
parent 3a55d1c0f3
commit bed57fdcfe
7 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cfg/DestinationDBHibernate.cfg.xml
View File

@ -6,7 +6,8 @@
<property name="connection.url">jdbc:postgresql://localhost/testdb</property>
<property name="connection.username">gcube</property>
<property name="connection.password">d4science2</property>
<property name="dialect">org.hibernatespatial.postgis.PostgisDialect</property>
<!-- <property name="dialect">org.hibernatespatial.postgis.PostgisDialect</property>-->
<property name="dialect">org.hibernate.dialect.PostgreSQLDialect</property>
<property name="transaction.factory_class">org.hibernate.transaction.JDBCTransactionFactory</property>
<property name="c3p0.timeout">0</property>
<property name="c3p0.max_size">10</property>

9
src/main/java/org/gcube/dataanalysis/ecoengine/datatypes/PrimitiveTypesList.java
View File

@ -4,15 +4,14 @@ import java.util.ArrayList;
import java.util.List;
import org.gcube.dataanalysis.ecoengine.datatypes.enumtypes.PrimitiveTypes;
import org.gcube.dataanalysis.ecoengine.datatypes.enumtypes.TableTemplates;
public class PrimitiveTypesList extends StatisticalType {
protected List<PrimitiveType> list;
PrimitiveTypes type;
String className;
public PrimitiveTypesList(PrimitiveTypes type, String name, String description, boolean optional) {
public PrimitiveTypesList(String className, PrimitiveTypes type, String name, String description, boolean optional) {
super(name, description, optional);
list = new ArrayList<PrimitiveType>();
this.type = type;
@ -30,4 +29,8 @@ public class PrimitiveTypesList extends StatisticalType {
return type;
}
public String getClassName(){
return className;
}
}

2
src/main/java/org/gcube/dataanalysis/ecoengine/models/ModelAquamapsNN.java
View File

@ -54,7 +54,7 @@ public class ModelAquamapsNN implements Model {
InputTable p1 = new InputTable(templatesOccurrences,"AbsenceDataTable","A Table containing absence points");
InputTable p2 = new InputTable(templatesOccurrences,"PresenceDataTable","A Table containing positive occurrences");
PrimitiveType p3 = new PrimitiveType(String.class.getName(), null, PrimitiveTypes.STRING, "SpeciesName","Species Code of the fish the NN will correspond to","Fis-10407");
PrimitiveTypesList p4 = new PrimitiveTypesList(PrimitiveTypes.NUMBER,"LayersNeurons","a list of neurons number for each inner layer separated by comma",false);
PrimitiveTypesList p4 = new PrimitiveTypesList(Integer.class.getName(), PrimitiveTypes.NUMBER,"LayersNeurons","a list of neurons number for each inner layer separated by comma",false);
DatabaseType p5 = new DatabaseType(DatabaseParameters.DATABASEUSERNAME, "DatabaseUserName", "db user name");
DatabaseType p6 = new DatabaseType(DatabaseParameters.DATABASEPASSWORD, "DatabasePassword", "db password");

2
src/main/java/org/gcube/dataanalysis/ecoengine/transducers/BioClimateHCAFTransducer.java
View File

@ -38,7 +38,7 @@ public class BioClimateHCAFTransducer extends BioClimateHSPECTransducer{
List<TableTemplates> templateHspec = new ArrayList<TableTemplates>();
templateHspec.add(TableTemplates.HCAF);
TablesList p7 = new TablesList(templateHspec, "HCAF_TABLE_LIST", "List of HCAF tables to analyze", false);
PrimitiveTypesList p8 = new PrimitiveTypesList(PrimitiveTypes.STRING, "HCAF_TABLE_NAMES", "List of HCAF table names to be used as labels", false);
PrimitiveTypesList p8 = new PrimitiveTypesList(String.class.getName(),PrimitiveTypes.STRING, "HCAF_TABLE_NAMES", "List of HCAF table names to be used as labels", false);
parameters.add(p7);
parameters.add(p8);

2
src/main/java/org/gcube/dataanalysis/ecoengine/transducers/BioClimateHSPECTransducer.java
View File

@ -75,7 +75,7 @@ public class BioClimateHSPECTransducer implements Transducerer{
List<TableTemplates> templateHspec = new ArrayList<TableTemplates>();
templateHspec.add(TableTemplates.HSPEC);
TablesList p7 = new TablesList(templateHspec, "HSPEC_TABLE_LIST", "List of HSPEC tables to analyze", false);
PrimitiveTypesList p8 = new PrimitiveTypesList(PrimitiveTypes.STRING, "HSPEC_TABLE_NAMES", "List of HSPEC table names to be used as labels", false);
PrimitiveTypesList p8 = new PrimitiveTypesList(String.class.getName(),PrimitiveTypes.STRING, "HSPEC_TABLE_NAMES", "List of HSPEC table names to be used as labels", false);
PrimitiveType p9 = new PrimitiveType(Double.class.getName(), null, PrimitiveTypes.NUMBER, "Threshold", "A threshold of probability over which the abundancy per species will be calculated","0.5");

2
src/main/java/org/gcube/dataanalysis/ecoengine/transducers/BioClimateHSPENTransducer.java
View File

@ -38,7 +38,7 @@ public class BioClimateHSPENTransducer extends BioClimateHSPECTransducer{
List<TableTemplates> templateHspec = new ArrayList<TableTemplates>();
templateHspec.add(TableTemplates.HSPEN);
TablesList p7 = new TablesList(templateHspec, "HSPEN_TABLE_LIST", "List of HSPEN tables containing the species for which the salinity will be analyzed", false);
PrimitiveTypesList p8 = new PrimitiveTypesList(PrimitiveTypes.STRING, "HSPEN_TABLE_NAMES", "List of HSPEN table names to be used as labels", false);
PrimitiveTypesList p8 = new PrimitiveTypesList(String.class.getName(),PrimitiveTypes.STRING, "HSPEN_TABLE_NAMES", "List of HSPEN table names to be used as labels", false);
parameters.add(p7);
parameters.add(p8);

2
src/main/java/org/gcube/dataanalysis/ecoengine/transducers/simplequeryexecutors/HspenFilter.java
View File

@ -31,7 +31,7 @@ public class HspenFilter extends QueryExecutor {
public List<StatisticalType> getInputParameters() {
PrimitiveType p3 = new PrimitiveType(String.class.getName(), null, PrimitiveTypes.RANDOM, finalTable,"the name of the Filtered Hspen","hspen_filtered");
PrimitiveTypesList pl = new PrimitiveTypesList(PrimitiveTypes.STRING, speciesCodes, "A list of species codes (Fish Base Format) to take. E.g. Fis-30189", false);
PrimitiveTypesList pl = new PrimitiveTypesList(String.class.getName(),PrimitiveTypes.STRING, speciesCodes, "A list of species codes (Fish Base Format) to take. E.g. Fis-30189", false);
List<StatisticalType> parameters = new ArrayList<StatisticalType>();
parameters.add(p3);