Author: echatellier Date: 2014-04-28 15:35:20 +0200 (Mon, 28 Apr 2014) New Revision: 3977 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3977 Log: Copie des fonctions d'objectif de d'optimisation dans le zip de preparation (n?\195?\169c?\195?\169ssaire pour les necessaryResults) Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2014-04-28 09:30:23 UTC (rev 3976) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2014-04-28 13:35:20 UTC (rev 3977) @@ -66,6 +66,8 @@ import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.datastore.ExportStorage; +import fr.ifremer.isisfish.datastore.ObjectiveStorage; +import fr.ifremer.isisfish.datastore.OptimizationStorage; import fr.ifremer.isisfish.datastore.RegionStorage; import fr.ifremer.isisfish.datastore.RuleStorage; import fr.ifremer.isisfish.datastore.ScriptStorage; @@ -78,6 +80,8 @@ import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.mexico.MexicoHelper; import fr.ifremer.isisfish.rule.Rule; +import fr.ifremer.isisfish.simulator.Objective; +import fr.ifremer.isisfish.simulator.Optimization; import fr.ifremer.isisfish.simulator.SimulationControl; import fr.ifremer.isisfish.simulator.SimulationException; import fr.ifremer.isisfish.simulator.SimulationParameter; @@ -677,12 +681,13 @@ /** * Prepare les fichiers qui seront utilsé à la simulation: - * Prepare les fichiers qui seront utilsé à la simulation: * <ul> * <li> scripts</li> * <li> rules</li> * <li> exports</li> * <li> simulators</li> + * <li> optimisations</li> + * <li> objectives</li> * <li> export de la database de la region</li> * <li> simultionplan</li> * </ul> @@ -807,6 +812,30 @@ + File.separator + name)); } + // copie de la fonction d'objectif + Objective objective = param.getObjective(); + if (objective != null) { + String name = ObjectiveStorage.getName(objective); + File objectiveFile = new File(ObjectiveStorage.getObjectiveDirectory(), name + ".java"); + if (!objectiveFile.isFile()) { + objectiveFile = new File(ObjectiveStorage.getCommunityObjectiveDirectory(), name + ".java"); + } + FileUtils.copyFile(objectiveFile, new File(tmpDirectory, ObjectiveStorage.OBJECTIVE_PATH + + File.separator + name + ".java")); + } + + // copie du script d'optipmisation + Optimization optimization = param.getOptimization(); + if (optimization != null) { + String name = OptimizationStorage.getName(optimization); + File optimizationFile = new File(OptimizationStorage.getOptimizationDirectory(), name + ".java"); + if (!optimizationFile.isFile()) { + optimizationFile = new File(OptimizationStorage.getCommunityOptimizationDirectory(), name + ".java"); + } + FileUtils.copyFile(optimizationFile, new File(tmpDirectory, OptimizationStorage.OPTIMIZATION_PATH + + File.separator + name + ".java")); + } + // copie des export d'optimisation for (Export export : param.getOptimizationExportsObservations().keySet()) { String name = ExportStorage.getName(export);