Author: bpoussin Date: 2014-04-09 15:57:05 +0200 (Wed, 09 Apr 2014) New Revision: 3942 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3942 Log: - add progress on root simulation - if simulation faild remove it Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java 2014-04-07 14:08:29 UTC (rev 3941) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java 2014-04-09 13:57:05 UTC (rev 3942) @@ -105,6 +105,8 @@ } } + control.setProgressMax(simNumber); + // wait until wall simulation for this generation are done while(!exception && !control.isStopSimulationRequest() && simNumber > done) { @@ -122,9 +124,6 @@ optimization.finish(optimizationContext); } - // on enleve le master plan des simulations en cours, vu que - // toutes les simu sont terminees - simulationService.fireStopEvent(this.job); } catch (Exception eee) { // add manual log // we are in a thread, IsisFishRuntimeException is displayed @@ -133,6 +132,10 @@ log.error(I18n._("isisfish.error.evaluate.optimization.script"), eee); } throw new IsisFishRuntimeException(I18n._("isisfish.error.evaluate.optimization.script"), eee); + } finally { + // on enleve le master plan des simulations en cours, vu que + // toutes les simu sont terminees (correctement ou echouee) + simulationService.fireStopEvent(this.job); } } @@ -179,6 +182,7 @@ } } done++; + control.setProgress(done); } @Override