Author: chatellier Date: 2009-03-17 17:36:59 +0000 (Tue, 17 Mar 2009) New Revision: 78 Modified: trunk/sensitivity/SensitivityCalculatorJavaExpandGrid.java trunk/sensitivity/SensitivityCalculatorRMorris.java Log: On a maintenant les instances des exports et non plus seulement leur noms Modified: trunk/sensitivity/SensitivityCalculatorJavaExpandGrid.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorJavaExpandGrid.java 2009-03-17 14:32:13 UTC (rev 77) +++ trunk/sensitivity/SensitivityCalculatorJavaExpandGrid.java 2009-03-17 17:36:59 UTC (rev 78) @@ -28,7 +28,6 @@ import org.codelutin.j2r.RProxy; import org.codelutin.util.FileUtil; -import fr.ifremer.isisfish.datastore.ExportStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan; import fr.ifremer.isisfish.simulator.sensitivity.Factor; @@ -205,7 +204,7 @@ .getFactors().size();*/ int sensitivityNumber = simulationStorages.get(0).getParameter() - .getSensitivityExportNames().size(); + .getSensitivityExport().size(); for (int k = 0; k < sensitivityNumber; k++) { @@ -232,23 +231,16 @@ simulationStorages.get(l).getDirectory().toString() + File.separator + SimulationStorage.RESULT_EXPORT_DIRECTORY, - ExportStorage - .getExport( - simulationStorages - .get(l) - .getParameter() - .getSensitivityExportNames() - .get(k)) - .getNewExportInstance().getExportFilename() - + ExportStorage - .getExport( - simulationStorages - .get(l) - .getParameter() - .getSensitivityExportNames() - .get(k)) - .getNewExportInstance() - .getExtensionFilename()); + simulationStorages + .get(l) + .getParameter() + .getSensitivityExport() + .get(k).getExportFilename() + + simulationStorages + .get(l) + .getParameter() + .getSensitivityExport() + .get(k).getExtensionFilename()); String simulResult = FileUtil.readAsString(importFile); double simulationResult = Double.valueOf(simulResult); if (l < simulationStorages.size() - 1) { @@ -323,21 +315,21 @@ //Save the results with the scenarios. engine.voidEval("write.csv(dataforaov,\"" + simulationStorages.get(0).getParameter() - .getSensitivityExportNames().get(k) + .getSensitivityExport().get(k).getExportFilename() + "_Results.csv\")"); log.info("Message sent to R : write.csv(dataforaov,\"" + simulationStorages.get(0).getParameter() - .getSensitivityExportNames().get(k) + .getSensitivityExport().get(k).getExportFilename() + "_Results.csv\")"); //Save the sensitivity indices engine.voidEval("write.csv(exportsensitivity,\"" + simulationStorages.get(0).getParameter() - .getSensitivityExportNames().get(k) + .getSensitivityExport().get(k).getExportFilename() + "_SensitivityIndices.csv\")"); log.info("Message sent to R : write.csv(exportsensitivity,\"" + simulationStorages.get(0).getParameter() - .getSensitivityExportNames().get(k) + .getSensitivityExport().get(k).getExportFilename() + "_SensitivityIndices.csv\")"); //FIXME export through java to enable export when using Rserve (when distant Rserve). engine.terminate(); Modified: trunk/sensitivity/SensitivityCalculatorRMorris.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorRMorris.java 2009-03-17 14:32:13 UTC (rev 77) +++ trunk/sensitivity/SensitivityCalculatorRMorris.java 2009-03-17 17:36:59 UTC (rev 78) @@ -31,7 +31,6 @@ import org.codelutin.math.matrix.MatrixND; import org.codelutin.util.FileUtil; -import fr.ifremer.isisfish.datastore.ExportStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan; import fr.ifremer.isisfish.simulator.sensitivity.Domain; @@ -267,7 +266,7 @@ .eval("length(y$X)/y$factors"); int sensitivityNumber = simulationStorages.get(0).getParameter() - .getSensitivityExportNames().size(); + .getSensitivityExport().size(); for (int k = 0; k < sensitivityNumber; k++) { @@ -276,23 +275,16 @@ for (int l = 0; l < scenariosNumber; l++) { File importFile = new File( simulationStorages.get(l).getDirectory().toString(), - ExportStorage - .getExport( - simulationStorages - .get(l) - .getParameter() - .getSensitivityExportNames() - .get(k)) - .getNewExportInstance().getExportFilename() - + ExportStorage - .getExport( - simulationStorages - .get(l) - .getParameter() - .getSensitivityExportNames() - .get(k)) - .getNewExportInstance() - .getExtensionFilename()); + simulationStorages + .get(l) + .getParameter() + .getSensitivityExport() + .get(k).getExportFilename() + + simulationStorages + .get(l) + .getParameter() + .getSensitivityExport() + .get(k).getExtensionFilename()); String simulResult = FileUtil.readAsString(importFile); double simulationResult = Double.valueOf(simulResult); if (l < simulationStorages.size() - 1) { @@ -329,7 +321,7 @@ + "\")"); engine.voidEval("write.csv(df,\"" + simulationStorages.get(0).getParameter() - .getSensitivityExportNames().get(k) + .getSensitivityExport().get(k).getExportFilename() + "_SensitivityIndices.csv\")"); //FIXME export through java to enable export when using Rserve