diff --git a/src/org/gcube/dataanalysis/seadatanet/SeaDataNetConnector.java b/src/org/gcube/dataanalysis/seadatanet/SeaDataNetConnector.java index a8eae7b..2cef163 100644 --- a/src/org/gcube/dataanalysis/seadatanet/SeaDataNetConnector.java +++ b/src/org/gcube/dataanalysis/seadatanet/SeaDataNetConnector.java @@ -39,7 +39,7 @@ public class SeaDataNetConnector extends StandardLocalExternalAlgorithm { @Override public String getDescription() { - // TODO Auto-generated method stub + //->adjusted description with proper citation return "A connector for the SeaDataNet infrastructure. This algorithms invokes the Data-Interpolating Variational Analysis (DIVA) SeaDataNet service to interpolate spatial data. " + "The model uses GEBCO bathymetry data and requires an estimate of the maximum spatial span of the correlation between points and the signal-to-noise ratio, among the other parameters. " + "It can interpolate up to 100,000 points randomly taken from the input table. " + @@ -146,7 +146,7 @@ public class SeaDataNetConnector extends StandardLocalExternalAlgorithm { AnalysisLogger.getLogger().debug("Sending data to DIVA: Uploading "+ndata+" records"); // integration DivaHttpClient // UPLOADFILE for DIVA - //->use the HTTPClient Class methods + //->*use the HTTPClient Class methods DivaFilePostResponse response = DivaHTTPClient.uploadFile(fileForDiva); AnalysisLogger.getLogger().debug("DIVA Server Response for the Upload:\n" + response.getSessionid()); status = 50; @@ -157,6 +157,7 @@ public class SeaDataNetConnector extends StandardLocalExternalAlgorithm { //->Record the time of the analysis AnalysisLogger.getLogger().debug("Analysis finished in "+(t1-t0)+" ms"); status = 80; + //->the number of observations is now an integer statResultMap.put("Minimum value estimated by the model", "" + respAnalysis.getVmin()); statResultMap.put("Maximum value estimated by the model", "" + respAnalysis.getVmax()); statResultMap.put("Number of observations used", "" + respAnalysis.getStat_obs_count_used()); @@ -166,18 +167,18 @@ public class SeaDataNetConnector extends StandardLocalExternalAlgorithm { AnalysisLogger.getLogger().debug("Downloading result file in "+neofile.getAbsolutePath()); // DOWNLOAD FILE DivaHTTPClient.downloadFileDiva(respAnalysis.getIdentifier(), neofile.getAbsolutePath()); - //->put the output file in the output object + //->*put the output file in the output object outputfile=neofile; AnalysisLogger.getLogger().debug("Downloading finished"); } catch (Exception e) { - //->ONLY in case of errors, delete the output file + //->*ONLY in case of errors, delete the output file if (neofile.exists()){ neofile.delete(); AnalysisLogger.getLogger().debug("Output file "+neofile.getAbsolutePath()+" deleted!"); } throw e; } finally { - //->in any case, delete the input file because we don't need it anymore + //->*in any case, delete the input file because we don't need it anymore if (fileForDiva.exists()){ fileForDiva.delete(); AnalysisLogger.getLogger().debug("Input file "+fileForDiva.getAbsolutePath()+" deleted!");