diff --git a/cfg/transducerers.properties b/cfg/transducerers.properties index 9c0a9f0..f2c4e22 100644 --- a/cfg/transducerers.properties +++ b/cfg/transducerers.properties @@ -3,5 +3,6 @@ BIOCLIMATE_HCAF=org.gcube.dataanalysis.ecoengine.transducers.BioClimateHCAFTrans BIOCLIMATE_HSPEN=org.gcube.dataanalysis.ecoengine.transducers.BioClimateHSPENTransducer HCAF_INTERPOLATION=org.gcube.dataanalysis.ecoengine.transducers.InterpolationTransducer OCCURRENCES_MERGER=org.gcube.dataanalysis.ecoengine.transducers.OccurrencePointsMerger +OCCURRENCES_INTERSECTOR=org.gcube.dataanalysis.ecoengine.transducers.OccurrencePointsIntersector OCCURRENCES_INSEAS_ONEARTH=org.gcube.dataanalysis.ecoengine.transducers.OccurrencePointsInSeaOnEarth OCCURRENCES_DUPLICATE_DELETER=org.gcube.dataanalysis.ecoengine.transducers.OccurrencePointsDuplicatesDeleter diff --git a/src/main/java/org/gcube/dataanalysis/ecoengine/test/checks/TestTransducers.java b/src/main/java/org/gcube/dataanalysis/ecoengine/test/checks/TestTransducers.java index 7e9c20b..b82e6dd 100644 --- a/src/main/java/org/gcube/dataanalysis/ecoengine/test/checks/TestTransducers.java +++ b/src/main/java/org/gcube/dataanalysis/ecoengine/test/checks/TestTransducers.java @@ -34,21 +34,23 @@ public static void main(String[] args) throws Exception { trans.get(0).init(); Regressor.process(trans.get(0)); trans = null; + */ - trans = TransducerersFactory.getTransducerers(testConfigLocal5()); + trans = TransducerersFactory.getTransducerers(testConfigLocal8()); trans.get(0).init(); Regressor.process(trans.get(0)); trans = null; - + /* trans = TransducerersFactory.getTransducerers(testConfigLocal6()); trans.get(0).init(); Regressor.process(trans.get(0)); trans = null; - */ + trans = TransducerersFactory.getTransducerers(testConfigLocal7()); trans.get(0).init(); Regressor.process(trans.get(0)); trans = null; + */ } @@ -110,11 +112,11 @@ public static void main(String[] args) throws Exception { config.setParam("scientificNameColumn", "scientificname"); config.setParam("eventDateColumn", "eventdate"); config.setParam("lastModificationColumn", "modified"); - config.setParam("rightTableName", "whitesharkoccurrences2"); - config.setParam("leftTableName", "whitesharkoccurrences1"); - config.setParam("finalTableName", "whitesharkoccurrencesmerged"); + config.setParam("rightTableName", "occurrencetestduplicates2"); + config.setParam("leftTableName", "occurrencetestduplicates"); + config.setParam("finalTableName", "occurrencesmerged"); config.setParam("spatialTolerance", "0.5"); - config.setParam("confidence", "80"); + config.setParam("confidence", "90"); return config; @@ -148,11 +150,32 @@ public static void main(String[] args) throws Exception { config.setParam("lastModificationColumn", "modified"); config.setParam("OccurrencePointsTableName", "occurrencetestduplicates"); config.setParam("finalTableName", "occurrencesnoduplicates"); - config.setParam("spatialTolerance", "0.5"); - config.setParam("confidence", "50"); + config.setParam("spatialTolerance", "20"); + config.setParam("confidence", "60"); return config; } + + private static AlgorithmConfiguration testConfigLocal8() { + + AlgorithmConfiguration config = Regressor.getConfig(); + config.setAgent("OCCURRENCES_INTERSECTOR"); + + config.setParam("longitudeColumn", "decimallongitude"); + config.setParam("latitudeColumn", "decimallatitude"); + config.setParam("recordedByColumn", "recordedby"); + config.setParam("scientificNameColumn", "scientificname"); + config.setParam("eventDateColumn", "eventdate"); + config.setParam("lastModificationColumn", "modified"); + config.setParam("rightTableName", "occurrencetestduplicates2"); + config.setParam("leftTableName", "occurrencetestduplicates"); + config.setParam("finalTableName", "occurrencesintersected"); + config.setParam("spatialTolerance", "0.5"); + config.setParam("confidence", "80"); + + + return config; + } }