- Isis-fish-commits - mailman.cloud.codelutin.com

r2649 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities
by chatellier＠users.labs.libre-entreprise.org 28 Sep '09

28 Sep '09

Author: chatellier Date: 2009-09-28 15:03:28 +0000 (Mon, 28 Sep 2009) New Revision: 2649 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java Log: Fix a missing hashCode in month Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2009-09-28 15:03:06 UTC (rev 2648) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2009-09-28 15:03:28 UTC (rev 2649) @@ -89,7 +89,7 @@ /** * overload to return matrix if no matrix available. The matrix returned - * by this method can't be used directly because it conatins only the + * by this method can't be used directly because it contains only the * migration (departure != arrival) and not the coefficient that stay on * the same zone. This coefficient is calculated with over coefficient to * have 1 as sum of all coefficient.

1 0

r2648 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/types src/test/java/fr/ifremer/isisfish src/test/java/fr/ifremer/isisfish/types
by chatellier＠users.labs.libre-entreprise.org 28 Sep '09

28 Sep '09

Author: chatellier Date: 2009-09-28 15:03:06 +0000 (Mon, 28 Sep 2009) New Revision: 2648 Added: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/types/ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/types/MonthTest.java Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/Month.java Log: Fix a missing hashCode in month Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-09-28 14:37:45 UTC (rev 2647) +++ isis-fish/trunk/changelog.txt 2009-09-28 15:03:06 UTC (rev 2648) @@ -1,5 +1,6 @@ isis-fish (3.2.0.7) stable; urgency=low + * Fix a missing hashCode() problem in month (cause problem in matrixND) * Add time unit (seconds) in simulation summary * Make compilation directory per simulation (caparmor concurrency problem) * Fix plan generator was not closing database after finishing sub job Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/Month.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/Month.java 2009-09-28 14:37:45 UTC (rev 2647) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/Month.java 2009-09-28 15:03:06 UTC (rev 2648) @@ -108,7 +108,18 @@ return nextMonth; } - /* (non-Javadoc) + /* + * @see java.lang.Object#hashCode() + */ + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + monthNumber; + return result; + } + + /* * @see org.codelutin.topia.persistence.TopiaEntityAbstract#equals(java.lang.Object) */ @Override @@ -123,9 +134,8 @@ return false; } + /* - * (non-Javadoc) - * * @see java.lang.Object#toString() */ @Override @@ -218,4 +228,5 @@ return result; } + } Added: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/types/MonthTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/types/MonthTest.java (rev 0) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/types/MonthTest.java 2009-09-28 15:03:06 UTC (rev 2648) @@ -0,0 +1,83 @@ +/* *##% + * Copyright (C) 2009 Code Lutin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package fr.ifremer.isisfish.types; + +import static org.codelutin.i18n.I18n._; + +import java.util.LinkedList; +import java.util.List; + +import org.codelutin.math.matrix.MatrixFactory; +import org.codelutin.math.matrix.MatrixND; +import org.junit.Assert; +import org.junit.Test; + +/** + * TODO add comment here. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class MonthTest { + + /** + * Test that indexOf works on list of month. + */ + @Test + public void listTest() { + + List<Month> monthList = new LinkedList<Month>(); + monthList.add(new Month(0)); + monthList.add(new Month(1)); + monthList.add(new Month(2)); + + Assert.assertTrue(monthList.contains(Month.JANUARY)); + Assert.assertFalse(monthList.contains(Month.AUGUST)); + + Assert.assertEquals(0, monthList.indexOf(Month.JANUARY)); + Assert.assertEquals(-1, monthList.indexOf(Month.AUGUST)); + } + + @Test + public void maxtrixWithMonth() { + + List<Month> monthList = new LinkedList<Month>(); + monthList.add(new Month(0)); + monthList.add(new Month(1)); + monthList.add(new Month(2)); + + List<Month> monthList2 = new LinkedList<Month>(); + monthList2.add(Month.FEBRUARY); + + MatrixND tmp = MatrixFactory.getInstance().create( + "test", + new List[] { monthList }, + new String[] { _("isisfish.populationSeasonInfo.months") }); + + MatrixND result = MatrixFactory.getInstance().create( + "test", + new List[] { monthList2 }, + new String[] { _("isisfish.populationSeasonInfo.months") }); + + tmp.pasteSemantics(result); + } +} Property changes on: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/types/MonthTest.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL"

1 0

r2647 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity
by jcouteau＠users.labs.libre-entreprise.org 28 Sep '09

28 Sep '09

Author: jcouteau Date: 2009-09-28 14:37:45 +0000 (Mon, 28 Sep 2009) New Revision: 2647 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java Log: Make difference between MatrixConituousDomain and EquationContinuousDomain Improve R objects (better names, better attributes) Save RData the good place Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2009-09-28 13:44:54 UTC (rev 2646) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2009-09-28 14:37:45 UTC (rev 2647) @@ -31,6 +31,8 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; public abstract class AbstractSensitivityCalculator implements SensitivityCalculator { @@ -58,8 +60,9 @@ String bsup = "Bsup<-c(%s)"; String bsupValues = ""; String attributes = "attributes(isis.factors)<-list(%s\"nomModel\"=\"isis-fish-externeR\",names=c(\"nomFacteur\",\"Nominal\",\"Continu\",\"Binf\",\"Bsup\"))"; + String attribute = "attr(isis.factors,\"%s\")<-\"%s\""; String attributesValues = ""; - String isisfactors = "isis.factors<-data.frame(nomFacteur,Nominal,Continu,Binf,Bsup)"; + String isisfactors = "isis.factors<-data.frame(\"nomFacteur\"=nomFacteur,\"Nominal\"=Nominal,\"Continu\"=Continu,\"Binf\"=Binf,\"Bsup\"=Bsup)"; //Create the vectors List<Factor<?, ?>> factors = plan.getFactors(); @@ -85,14 +88,49 @@ TopiaEntity entity = db.findByTopiaId(topiaId); Object value = BeanUtils.getProperty(entity, propertyName);*/ - nominalValues += 0.0; + if (factor.getDomain() instanceof MatrixContinuousDomain) { + //Continu values, binf values, bsup values and discrete factors attributes - //Continu values, binf values, bsup values and discrete factors attributes - if (factor.getDomain() instanceof ContinuousDomain) { + nominalValues += 1.0; + //Continu values continuValues += "TRUE"; //Binf values + + binfValues += ((MatrixContinuousDomain) factor.getDomain()) + .getRealMinBound(); + + //Bsup values + bsupValues += ((MatrixContinuousDomain) factor.getDomain()) + .getRealMaxBound(); + + } else if (factor.getDomain() instanceof EquationContinuousDomain) { + //Continu values, binf values, bsup values and discrete factors attributes + + nominalValues += ((EquationContinuousDomain) factor.getDomain()) + .getReferenceValue(); + + //Continu values + continuValues += "TRUE"; + + //Binf values + binfValues += ((EquationContinuousDomain) factor.getDomain()) + .getValueForIdentifier(0.0); + + //Bsup values + bsupValues += ((EquationContinuousDomain) factor.getDomain()) + .getValueForIdentifier(1.0); + } else if (factor.getDomain() instanceof ContinuousDomain) { + //Continu values, binf values, bsup values and discrete factors attributes + + nominalValues += 0.0; + + //Continu values + continuValues += "TRUE"; + + //Binf values + binfValues += ((ContinuousDomain) factor.getDomain()) .getMinBound(); @@ -101,6 +139,10 @@ .getMaxBound(); } else { + + //FIXME créer une méthode pour getNominalValue + nominalValues += ""; + //Continu values continuValues += "FALSE"; @@ -110,36 +152,17 @@ //Bsup values bsupValues += ((DiscreteDomain) factor.getDomain()).getValues() .size(); - - //Attribute values - attributesValues += "\"" + factor.getName() + "\"=list("; - Collection values = ((DiscreteDomain) factor.getDomain()) - .getValues().values(); - for (Iterator j = values.iterator(); j.hasNext();) { - attributesValues += j + ","; - j.next(); - } - attributesValues = attributesValues.substring(0, - attributesValues.length() - 1); - attributesValues += "),"; } - if (attributesValues.length() != 0) { - attributesValues = attributesValues.substring(0, - attributesValues.length() - 1); - attributesValues += ","; - } - } String Rcall = ""; REngine engine = new RProxy(); try { - log.info("setwd(\"" + outputdirectory.getParent() + "\")"); - engine.voidEval("setwd(\"" + outputdirectory.getParent() + "\")"); - log.info("load(\".RData\")"); - engine.voidEval("load(\".RData\")"); + //clear the engine (to be sure it's empty) + log.info("rm(list=ls())"); + engine.voidEval("rm(list=ls())"); Rcall = String.format(nomFacteur, factorNames); log.info(Rcall); @@ -164,13 +187,43 @@ log.info(isisfactors); engine.voidEval(isisfactors); - Rcall = String.format(attributes, attributesValues); + Rcall = String.format(attribute, "nomModel", "isis-fish-externeR"); log.info(Rcall); engine.voidEval(Rcall); - log.info("save.image()"); - engine.voidEval("save.image()"); + for (int i = 0; i < factors.size(); i++) { + Factor factor = factors.get(i); + if (factor.getDomain() instanceof DiscreteDomain) { + String attributeValues = "list("; + Collection values = ((DiscreteDomain) factor.getDomain()) + .getValues().values(); + for (Iterator j = values.iterator(); j.hasNext();) { + attributeValues += j + ","; + j.next(); + } + attributeValues = attributeValues.substring(0, + attributeValues.length() - 1); + attributeValues += ")"; + Rcall = String.format(attribute, factor.getName(), + attributeValues); + log.info(Rcall); + engine.voidEval(Rcall); + } + } + + //Set working directory to save the Isis R session + log.info("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); + + log.info("save.image(file=\"" + outputdirectory.getName() + ".RData\")"); + engine.voidEval("save.image(file=\"" + outputdirectory.getName() + + ".RData\")"); + } catch (RException eee) { if (log.isErrorEnabled()) { log.error("R evaluation failed", eee);

1 0

r2646 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 28 Sep '09

28 Sep '09

Author: chatellier Date: 2009-09-28 13:44:54 +0000 (Mon, 28 Sep 2009) New Revision: 2646 Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java Log: Make a isis build directory per simulation, and remove it at simulation end. Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-09-28 13:44:20 UTC (rev 2645) +++ isis-fish/trunk/changelog.txt 2009-09-28 13:44:54 UTC (rev 2646) @@ -1,5 +1,9 @@ isis-fish (3.2.0.7) stable; urgency=low + * Add time unit (seconds) in simulation summary + * Make compilation directory per simulation (caparmor concurrency problem) + * Fix plan generator was not closing database after finishing sub job + * Delete remote launcher result archive after use * 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-09-28 13:44:20 UTC (rev 2645) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-09-28 13:44:54 UTC (rev 2646) @@ -48,6 +48,7 @@ import fr.ifremer.isisfish.actions.SimulationAction; import fr.ifremer.isisfish.actions.VCSAction; import fr.ifremer.isisfish.simulator.SimulationContext; +import fr.ifremer.isisfish.simulator.SimulationControl; import fr.ifremer.isisfish.simulator.launcher.InProcessSimulatorLauncher; import fr.ifremer.isisfish.simulator.launcher.SSHSimulatorLauncher; import fr.ifremer.isisfish.simulator.launcher.SimulationService; @@ -235,13 +236,24 @@ * * Create directory if not exists. * + * Make a specific build directory for running simulation. + * * @return compilation directory */ public File getCompileDirectory() { File result = getOptionAsFile(Option.COMPILATION_DIRECTORY.key); + + // add a subdirectory for simulation context + SimulationContext simContext = SimulationContext.get(); + SimulationControl control = simContext.getSimulationControl(); + if (control != null) { + result = new File(result, control.getId()); + } + if (!result.exists()) { result.mkdirs(); } + return result; } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-09-28 13:44:20 UTC (rev 2645) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-09-28 13:44:54 UTC (rev 2646) @@ -465,6 +465,13 @@ simulation.getInformation().setOptimizationUsage(cache); } + // cleanup specific context build directory + File simulationBuildDirectory = IsisFish.config.getCompileDirectory(); + if (log.isDebugEnabled()) { + log.debug("Delete simulation build directory : " + simulationBuildDirectory.getAbsolutePath()); + } + FileUtil.deleteRecursively(simulationBuildDirectory); + // context is used in Trace.printStatistiqueAndClear() SimulationContext.remove(); }

1 0

r2645 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore
by chatellier＠users.labs.libre-entreprise.org 28 Sep '09

28 Sep '09

Author: chatellier Date: 2009-09-28 13:44:20 +0000 (Mon, 28 Sep 2009) New Revision: 2645 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java Log: Add timeunit in simulation summary Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java 2009-09-28 12:09:13 UTC (rev 2644) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java 2009-09-28 13:44:20 UTC (rev 2645) @@ -118,7 +118,7 @@ + entry.getKey() + " : " + DurationFormatUtils.formatDuration(entry.getValue(), - "s'.'S") + "\n"; + "s'.'S") + "s\n"; } } @@ -157,7 +157,7 @@ if (total > 0) { result += "\t" + ruleName + " : " + DurationFormatUtils.formatDuration(total, "s'.'S"); - result += " (" + details + ")"; + result += "s (" + details + ")"; result += "\n"; } }

1 0

r2644 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 28 Sep '09

28 Sep '09

Author: chatellier Date: 2009-09-28 12:09:13 +0000 (Mon, 28 Sep 2009) New Revision: 2644 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java Log: Delete prescript on exit Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-09-28 09:52:02 UTC (rev 2643) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-09-28 12:09:13 UTC (rev 2644) @@ -868,6 +868,7 @@ File tempPreScriptFile = File.createTempFile("isis-" + simulationId + "-", ".prescript"); + tempPreScriptFile.deleteOnExit(); FileUtil.writeString(tempPreScriptFile, simulationPreScript); String localPath = tempPreScriptFile.getAbsolutePath();

1 0

r2643 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 28 Sep '09

28 Sep '09

Author: chatellier Date: 2009-09-28 09:52:02 +0000 (Mon, 28 Sep 2009) New Revision: 2643 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Log: Force plan generator to close opened storage 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-28 08:36:49 UTC (rev 2642) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-09-28 09:52:02 UTC (rev 2643) @@ -807,6 +807,10 @@ nextJob.setLauncher(job.getLauncher()); nextJob.addPostAction(this); // pour l'appel des after des plans } + + // close context for plan generator + sim.closeStorage(); + // quoi qu'il arrive on supprime le repertoire temporaire if (!FileUtil.deleteRecursively(tmpDirectory)) { log.warn(_("isisfish.error.remove.directory", @@ -829,8 +833,15 @@ public SimulationJob next() { hasNext(); // pour etre sur qu'il a ete appele au moins une fois - SimulationJob result = nextJob; - nextJob = null; + SimulationJob result = null; + + // next est appelee par un autre thread concurrent + // via la methode finished(SimulationJob, SimulationStorage) + synchronized (this) { + result = nextJob; + nextJob = null; + } + return result; }

1 0

r2642 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 28 Sep '09

28 Sep '09

Author: chatellier Date: 2009-09-28 08:36:49 +0000 (Mon, 28 Sep 2009) New Revision: 2642 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java Log: Remove resultFile at JVM shutdown. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-09-28 07:44:29 UTC (rev 2641) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-09-28 08:36:49 UTC (rev 2642) @@ -691,6 +691,10 @@ /** * Download simulation zip results. * + * MD5 control check sum if done, return null, if checkSum fail. + * + * File if configured to auto delete at JVM shutdown. + * * @throws SSHException if download fail (can happen if remote file doesn't exist * @throws IOException if download fail (can happen if remote file doesn't exist */ @@ -698,6 +702,7 @@ throws SSHException, IOException { File localFile = File.createTempFile("simulation-results", ".zip"); + localFile.deleteOnExit(); if (log.isDebugEnabled()) { log.debug("Downloading results in " + localFile.getAbsolutePath());

1 0

r2641 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 28 Sep '09

28 Sep '09

Author: chatellier Date: 2009-09-28 07:44:29 +0000 (Mon, 28 Sep 2009) New Revision: 2641 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java Log: Fix some debug log message Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-09-21 08:19:24 UTC (rev 2640) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-09-28 07:44:29 UTC (rev 2641) @@ -679,7 +679,7 @@ public Object removeSelectivity(Gear gear, Selectivity selectivity) { if (log.isTraceEnabled()) { - log.trace("removeTargetSpecies called: " + selectivity); + log.trace("removeSelectivity called: " + selectivity); } try { if (gear != null && selectivity != null) { @@ -718,9 +718,9 @@ return null; } - public Object removeSeasonInfo(Metier metier, MetierSeasonInfo info) { + /*public Object removeSeasonInfo(Metier metier, MetierSeasonInfo info) { if (log.isTraceEnabled()) { - log.trace("createSeasonInfo called"); + log.trace("removeSeasonInfo called"); } try { metier.removeMetierSeasonInfo(info); @@ -733,7 +733,7 @@ showMsgBox(eee); } return null; - } + }*/ public Object addTargetSpecies(Metier metier, MetierSeasonInfo m, Species species, String targetFactorEquationContent, boolean primaryCatch) { @@ -815,7 +815,7 @@ public Object removeEffortDescription(SetOfVessels sov, EffortDescription effort) { if (log.isTraceEnabled()) { - log.trace("remove called"); + log.trace("removeEffortDescription called"); } try { sov.removePossibleMetiers(effort); @@ -845,7 +845,7 @@ public Population createPopulation(TopiaContext context, Species species) { if (log.isTraceEnabled()) { - log.trace("create called"); + log.trace("createPopulation called"); } try { String name = "Population_new"; @@ -906,7 +906,7 @@ public void removePopulationSeasonInfo(Population pop, PopulationSeasonInfo populationSeasonInfo) { if (log.isDebugEnabled()) { - log.debug("removeSeasonInfo called"); + log.debug("removePopulationSeasonInfo called"); } try { pop.removePopulationSeasonInfo(populationSeasonInfo); @@ -922,7 +922,7 @@ public void createMetierSeasonInfo(Metier metier) { if (log.isDebugEnabled()) { - log.debug("createSeasonInfo called"); + log.debug("createMetierSeasonInfo called"); } try { MetierSeasonInfoDAO metierSeasonInfoPS = IsisFishDAOHelper @@ -942,7 +942,7 @@ public void removeMetierSeasonInfo(Metier metier, MetierSeasonInfo info) { if (log.isDebugEnabled()) { - log.debug("createSeasonInfo called"); + log.debug("removeMetierSeasonInfo called"); } try { metier.removeMetierSeasonInfo(info); @@ -957,7 +957,7 @@ public Object createRecruitmentDistribution(Population pop) { if (log.isTraceEnabled()) { - log.trace("createRecruitmentDistributionontext called: " + pop); + log.trace("createRecruitmentDistributionon called: " + pop); } try { String val = JOptionPane

1 0

r2640 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 21 Sep '09

21 Sep '09

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);

1 0