Author: chatellier Date: 2009-03-19 16:37:39 +0000 (Thu, 19 Mar 2009) New Revision: 2011 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java Log: Fusion des deux liste d'export avaan l'export Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java 2009-03-19 15:24:55 UTC (rev 2010) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java 2009-03-19 16:37:39 UTC (rev 2011) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2007 + * Copyright (C) 2007 - 2009 * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or @@ -17,35 +17,31 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -/* * - * SimulationExportResultWrapper.java - * - * Created: 14 nov. 07 00:22:51 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ - package fr.ifremer.isisfish.simulator; import java.io.File; +import java.util.ArrayList; +import java.util.List; -import fr.ifremer.isisfish.IsisConfig; +import fr.ifremer.isisfish.datastore.ExportStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; +import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.export.ExportHelper; - /** + * SimulationExportResultWrapper. + * + * Created: 14 nov. 07 00:22:51 + * * @author poussin + * @version $Revision$ * + * Last update: $Date$ + * by : $Author$ */ - public class SimulationExportResultWrapper implements SimulationListener { - /* (non-Javadoc) + /* * @see fr.ifremer.isisfish.simulator.SimulationListener#afterSimulation(fr.ifremer.isisfish.simulator.SimulationContext) */ public void afterSimulation(SimulationContext context) { @@ -55,20 +51,40 @@ // // Export des résultats // - if (parameters.getExportNames() != null + /*if (parameters.getExportNames() != null && parameters.getExportNames().size() > 0) { File exportDir = SimulationStorage.getResultExportDirectory(rootDirectory); exportDir.mkdirs(); ExportHelper.doExport(simulation, exportDir, parameters.getExportNames(), rootDirectory); - } + }*/ + + // FIXME changed since sensitivity export adding + // Ici on contantene les 2 listes d'exports + // mais on fait du instance>name>instance + // c'est couteux + List<String> allExportNames = new ArrayList<String>(); + if (parameters.getExportNames() != null) { + allExportNames.addAll(parameters.getExportNames()); + } + if (parameters.getSensitivityExport() != null) { + for (Export export : parameters.getSensitivityExport()) { + String name = ExportStorage.getName(export); + allExportNames.add(name); + } + } + if (!allExportNames.isEmpty()) { + File exportDir = SimulationStorage + .getResultExportDirectory(rootDirectory); + exportDir.mkdirs(); + ExportHelper.doExport(simulation, exportDir, allExportNames, + rootDirectory); + } } - /* (non-Javadoc) + /* * @see fr.ifremer.isisfish.simulator.SimulationListener#beforeSimulation(fr.ifremer.isisfish.simulator.SimulationContext) */ public void beforeSimulation(SimulationContext context) { } } - -