Author: echatellier Date: 2014-04-28 10:58:10 +0200 (Mon, 28 Apr 2014) New Revision: 3975 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3975 Log: Start optimisation simulation immediatelly Close simulation after end method call Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java 2014-04-24 08:11:01 UTC (rev 3974) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java 2014-04-28 08:58:10 UTC (rev 3975) @@ -110,7 +110,9 @@ int childNumber = childParam.getSimulationPlanNumber(); SimulationControl childControl = new SimulationControl(simId); SimulationItem item = new SimulationItem(childControl, childParam); - item.setStandaloneSimulation(false); + // FIXME set to true for now, but must be changed to run + // simulation optimisation by generation (not one by one) + item.setStandaloneSimulation(true); item.setSimulationNumber(childNumber); item.setSimulationZip(zip); @@ -134,6 +136,11 @@ if (!exception && !control.isStopSimulationRequest()) { optimization.endSimulation(optimizationContext); + // close current generation simulations + for (SimulationStorage sim : sims) { + sim.closeStorage(); + sim.closeMemStorage(); + } optimization.nextSimulation(optimizationContext); sims = optimizationContext.clearNextSimulation(); }