Author: chatellier Date: 2009-03-16 11:27:28 +0000 (Mon, 16 Mar 2009) New Revision: 1971 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Log: Give master sensitivity export directory Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-03-16 11:10:06 UTC (rev 1970) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-03-16 11:27:28 UTC (rev 1971) @@ -43,6 +43,7 @@ import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishException; import fr.ifremer.isisfish.datastore.AnalysePlanStorage; +import fr.ifremer.isisfish.datastore.ExportStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.simulator.AnalysePlan; import fr.ifremer.isisfish.simulator.SimulationControl; @@ -622,8 +623,10 @@ log.debug("Call analyzeResult on sensitivity script " + sensitivityCalculator.getClass().getSimpleName()); } try { - // FIXME sensitivityScenarios are not available here :( - sensitivityCalculator.analyzeResult(simulationStorageForAnalyze,null); + // build master sensitivity export directory + File masterExportDirectory = new File(ExportStorage.getExportDirectory(), simulationCommonPrefix); + // directory must already exists !!! + sensitivityCalculator.analyzeResult(simulationStorageForAnalyze, masterExportDirectory); } catch(SensitivityException e) { if (log.isErrorEnabled()) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-03-16 11:10:06 UTC (rev 1970) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-03-16 11:27:28 UTC (rev 1971) @@ -400,15 +400,22 @@ SensitivityCalculator sensitivitycalculator, DesignPlan designPlan) { try { + + // build master sensitivity export directory + File masterExportDirectory = new File(ExportStorage.getExportDirectory(), id); + if (!masterExportDirectory.isDirectory()) { + masterExportDirectory.mkdirs(); + } + SensitivityScenarios sensitivityScenarios = sensitivitycalculator - .compute(designPlan,null); + .compute(designPlan, masterExportDirectory); // ajout des parametres de simulation param.setSensitivityCalculator(sensitivitycalculator); param.setNumberOfSensitivitySimulation(sensitivityScenarios.getScenarios().size()); // FIXME to remove when available in UI - List<String> names = ExportStorage.getExportNames(); + /*List<String> names = ExportStorage.getExportNames(); List<String> ASName = new ArrayList<String>(); for (String name : names) { Export export = ExportStorage.getExport(name).getNewExportInstance(); @@ -416,7 +423,7 @@ ASName.add(name); } } - param.setSensitivityExportNames(ASName); + param.setSensitivityExportNames(ASName);*/ // on l'ajoute tout de suite a la liste des simulations demandee // init with default "id" must been changed for designPlan