Author: chatellier Date: 2009-09-21 08:19:24 +0000 (Mon, 21 Sep 2009) New Revision: 2640 Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Log: Modification de l'instanciation des plans pour prendre en compte les regles additionnelles. Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-09-18 14:13:42 UTC (rev 2639) +++ isis-fish/trunk/changelog.txt 2009-09-21 08:19:24 UTC (rev 2640) @@ -1,5 +1,7 @@ isis-fish (3.2.0.7) stable; urgency=low + * Modify analyze plans starting to take extra rules + * Set ssh key in autorized_keys when connected with password * Isis now start with 1Go of allocated memory * Fix strategies/population selection on old simulation reloading * Always use logger for force writing in debug.txt file Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-09-18 14:13:42 UTC (rev 2639) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-09-21 08:19:24 UTC (rev 2640) @@ -373,13 +373,20 @@ job.setLauncher(launcher); fireStartEvent(job); + // Attention, dans le cas d'un plan d'analyse, le new PrepareSimulationJob + // doit etre fait AVANT de faire le prepareSimulationZipFile + // car, il est possible que l'init des plans ajoute des regles !!! + PrepareSimulationJob task = null; + if (param.getUseAnalysePlan()) { + task = new PrepareSimulationJob(this, job); + } + // on construit le zip de la simulation File zip = prepareSimulationZipFile(control, param, null, true); item.setSimulationZip(zip); if (param.getUseAnalysePlan() && param.isIndependentPlan()) { // c un plan d'analyse independant, on construit toute les sous simu - Runnable task = new PrepareSimulationJob(this, job); subSimulationComputationExecutor.execute(task); } else { // l'item est fini d'etre initialise, on peut l'ajouter a la queue @@ -405,6 +412,7 @@ SensitivityCalculator sensitivitycalculator, DesignPlan designPlan) { try { + // build master sensitivity export directory File masterExportDirectory = new File(IsisFish.config.getDefaultExportDirectory(), id); if (!masterExportDirectory.isDirectory()) { @@ -448,12 +456,10 @@ // build new simulation id String subsimulationId = id + "_" + simulationIndex; - SimulationControl realSimulationControl = new SimulationControl( - subsimulationId); + SimulationControl realSimulationControl = new SimulationControl(subsimulationId); // new item, with zip - SimulationItem item = new SimulationItem(realSimulationControl, - subParam); + SimulationItem item = new SimulationItem(realSimulationControl, subParam); item.setSimulationZip(zip); SimulationJob job = new SimulationJob(this, item, priority); @@ -789,17 +795,6 @@ doNext = result; if (result) { - // FIXME si les plan d'analyse ajoute des regles - // on doit les copier - // copie de toutes regles a utiliser - List<Rule> rules = param.getRules(); - for (Rule rule : rules) { - String name = RuleStorage.getName(rule); - FileUtil.copy(new File(RuleStorage.getRuleDirectory(), name + ".java"), - new File(tmpDirectory, RuleStorage.RULE_PATH + File.separator + name + ".java")); - } - // end FIXME copies des regles ajoutées - File zip = sim.createZip(); SimulationControl childControl = new SimulationControl( simId);