Author: chatellier Date: 2009-03-12 21:03:05 +0000 (Thu, 12 Mar 2009) New Revision: 1953 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java Log: Fix end AS detection ans analyseResult call Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2009-03-12 21:02:35 UTC (rev 1952) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2009-03-12 21:03:05 UTC (rev 1953) @@ -1055,6 +1055,9 @@ result.simulLogLevel = simulLogLevel; result.scriptLogLevel= scriptLogLevel; result.libLogLevel= libLogLevel; + result.numberOfSensitivitySimulation = numberOfSensitivitySimulation; + result.sensitivityExportNames = sensitivityExportNames; + result.sensitivityCalculator = sensitivityCalculator; return result; } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-03-12 21:02:35 UTC (rev 1952) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-03-12 21:03:05 UTC (rev 1953) @@ -100,6 +100,10 @@ control.setProgress(0); control.setStarted(true); + // FIXME temp auto save + // force saving of control file + control.setAutoSaveState(true); + // replace prescript if specified on method if (simulationPrescript != null && !simulationPrescript.trim().isEmpty()) { 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-12 21:02:35 UTC (rev 1952) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-03-12 21:03:05 UTC (rev 1953) @@ -596,13 +596,23 @@ && currentSimulationControl.getProgress() >= currentSimulationControl.getProgressMax()) { SimulationStorage storage = SimulationStorage.getSimulation(currentId); simulationStorageForAnalyze.add(storage); + if (log.isDebugEnabled()) { + log.debug("Found simulation number = " + simulationIndex); + } } else { + if (log.isDebugEnabled()) { + log.debug("Miss simulation number = " + simulationIndex); + } + // no need to continue // if only miss one, break break; } } + else { + break; + } } // si on a toutes les simulation est qu'elles sont finie @@ -614,8 +624,7 @@ } try { // FIXME sensitivityScenarios are not available here :( - SensitivityScenarios sensitivityScenarios = new SensitivityScenarios(); - sensitivityCalculator.analyzeResult(sensitivityScenarios, simulationStorageForAnalyze); + sensitivityCalculator.analyzeResult(null, simulationStorageForAnalyze); } catch(SensitivityException e) { if (log.isErrorEnabled()) {