From 6bf14fd8233cb3350021c2f2030273b3b3fa980e Mon Sep 17 00:00:00 2001
From: Gianpaolo Coro <gianpaolo.coro@isti.cnr.it>
Date: Thu, 27 Sep 2012 08:48:00 +0000
Subject: [PATCH] git-svn-id:
 https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/EcologicalEngine@59108
 82a268e6-3cf1-43bd-a215-b396298e98cf

---
 .../dataanalysis/ecoengine/clustering/DBScan.java | 15 +++++++++++----
 .../spatialdistributions/AquamapsSuitable.java    |  2 +-
 .../ecoengine/test/checks/TestClusterer.java      | 13 +++++++++----
 .../ecoengine/utils/Transformations.java          |  4 ++++
 4 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/gcube/dataanalysis/ecoengine/clustering/DBScan.java b/src/main/java/org/gcube/dataanalysis/ecoengine/clustering/DBScan.java
index 767528d..24558aa 100644
--- a/src/main/java/org/gcube/dataanalysis/ecoengine/clustering/DBScan.java
+++ b/src/main/java/org/gcube/dataanalysis/ecoengine/clustering/DBScan.java
@@ -259,7 +259,7 @@ public class DBScan implements Clusterer{
 	
 	@Override
 	public void compute() throws Exception {
-		
+		try{
 		if ((config==null)||epsilon==null||minPoints==null||points==null){
 			throw new Exception("DBScan: Error incomplete parameters");
 		}
@@ -286,9 +286,15 @@ public class DBScan implements Clusterer{
 		
 		BuildClusterTable(outputvector);
 		
-		
+		}catch(Exception e){
+			AnalysisLogger.getLogger().debug("ERROR "+e.getLocalizedMessage());
+			e.printStackTrace();
+			throw e;
+		}
+		finally{
 		shutdown();
 		status = 100f;
+		}
 	}
 
 	
@@ -345,7 +351,7 @@ public class DBScan implements Clusterer{
 			}
 			
 			if (bufferRows.length()>0){
-//			AnalysisLogger.getLogger().trace("DBScan: Inserting Buffer "+DatabaseUtils.insertFromBuffer(OccurrencePointsClusterTable, columnsNames, bufferRows));
+//			AnalysisLogger.getLogger().debug("DBScan: Inserting Buffer "+DatabaseUtils.insertFromBuffer(OccurrencePointsClusterTable, columnsNames, bufferRows));
 			AnalysisLogger.getLogger().debug("Writing into DB");
 			DatabaseFactory.executeSQLUpdate(DatabaseUtils.insertFromBuffer(OccurrencePointsClusterTable, columnsNames, bufferRows),dbHibConnection);
 			AnalysisLogger.getLogger().debug("Finished with writing into DB");
@@ -364,7 +370,8 @@ public class DBScan implements Clusterer{
 	public void shutdown() {
 		try{
 			AnalysisLogger.getLogger().debug("Closing DB Connection ");
-		dbHibConnection.close();
+			if (dbHibConnection!=null)
+			dbHibConnection.close();
 		}catch(Exception e){
 			AnalysisLogger.getLogger().debug("Could not shut down connection");
 		}
diff --git a/src/main/java/org/gcube/dataanalysis/ecoengine/spatialdistributions/AquamapsSuitable.java b/src/main/java/org/gcube/dataanalysis/ecoengine/spatialdistributions/AquamapsSuitable.java
index c2bbb0b..d6eb856 100644
--- a/src/main/java/org/gcube/dataanalysis/ecoengine/spatialdistributions/AquamapsSuitable.java
+++ b/src/main/java/org/gcube/dataanalysis/ecoengine/spatialdistributions/AquamapsSuitable.java
@@ -244,7 +244,7 @@ public class AquamapsSuitable implements SpatialProbabilityDistributionTable{
 
 	@Override
 	public String getDescription() {
-		return "Algorithm by Aquamaps";
+		return "Algorithm for Suitable Distribution by Aquamaps";
 	}
 
 	@Override
diff --git a/src/main/java/org/gcube/dataanalysis/ecoengine/test/checks/TestClusterer.java b/src/main/java/org/gcube/dataanalysis/ecoengine/test/checks/TestClusterer.java
index ba384c5..b331e21 100644
--- a/src/main/java/org/gcube/dataanalysis/ecoengine/test/checks/TestClusterer.java
+++ b/src/main/java/org/gcube/dataanalysis/ecoengine/test/checks/TestClusterer.java
@@ -65,17 +65,22 @@ public class TestClusterer {
 		AlgorithmConfiguration config = new AlgorithmConfiguration();
 		config.setConfigPath("./cfg/");
 		config.setPersistencePath("./");
-		config.setParam("OccurrencePointsTable","presence_basking_cluster");
-		config.setParam("FeaturesColumnNames","centerlat,centerlong");
-		config.setParam("OccurrencePointsClusterTable","occCluster_2");
+		config.setParam("OccurrencePointsTable","occurrence_species_id5397d3c4_a7eb_4227_adb4_d9d7d36e8b21");
+		config.setParam("FeaturesColumnNames","recordedby#basisofrecord#locality");
+		config.setParam("OccurrencePointsClusterTable","occCluster_gp");
 		config.setParam("epsilon","10");
-		config.setParam("minPoints","1");
+		config.setParam("min_points","1");
 
 		config.setConfigPath("./cfg/");
 		config.setPersistencePath("./");
 		config.setNumberOfResources(1);
 		config.setAgent("DBSCAN");
 		
+		config.setParam("DatabaseUserName","utente");
+		config.setParam("DatabasePassword","d4science");
+		config.setParam("DatabaseURL","jdbc:postgresql://dbtest.next.research-infrastructures.eu/testdb");
+		config.setParam("DatabaseDriver","org.postgresql.Driver");
+		
 		return config;
 	}
 
diff --git a/src/main/java/org/gcube/dataanalysis/ecoengine/utils/Transformations.java b/src/main/java/org/gcube/dataanalysis/ecoengine/utils/Transformations.java
index 190a639..a1548e1 100644
--- a/src/main/java/org/gcube/dataanalysis/ecoengine/utils/Transformations.java
+++ b/src/main/java/org/gcube/dataanalysis/ecoengine/utils/Transformations.java
@@ -158,12 +158,16 @@ public class Transformations {
 		for (int i=0;i<m;i++){
 			sb.append((int)string.charAt(i));
 		}
+		
 		double d = Double.MAX_VALUE;
 		try{
 		d = Double.valueOf(sb.toString());
 		}catch(Exception e){
 		}
 		
+		if (d>Integer.MAX_VALUE)
+			return (indexString(string.substring(0,3)));
+		
 		return d;
 	}