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

r2926 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 20 Jan '10

20 Jan '10

Author: chatellier Date: 2010-01-20 14:25:46 +0000 (Wed, 20 Jan 2010) New Revision: 2926 Modified: isis-fish/trunk/pom.xml Log: Update eugene, topia, nuiton-utils. Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-01-20 12:24:34 UTC (rev 2925) +++ isis-fish/trunk/pom.xml 2010-01-20 14:25:46 UTC (rev 2926) @@ -432,9 +432,9 @@ <properties>  <jaxx.version>1.7.1</jaxx.version> - <eugene.version>2.0.0-beta-2</eugene.version> - <topia.version>2.3.0-beta-3</topia.version> - <nuiton-utils.version>1.1.3-SNAPSHOT</nuiton-utils.version> + <eugene.version>2.0.0-beta-3</eugene.version> + <topia.version>2.3.0-beta-5</topia.version> + <nuiton-utils.version>1.1.3</nuiton-utils.version> <nuiton-i18n.version>1.0.1</nuiton-i18n.version> <nuiton-widgets.version>1.0.1-SNAPSHOT</nuiton-widgets.version> <jrst.version>1.0.0</jrst.version>

1 0

r2925 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 20 Jan '10

20 Jan '10

Author: chatellier Date: 2010-01-20 12:24:34 +0000 (Wed, 20 Jan 2010) New Revision: 2925 Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Misc fixes Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-01-20 12:12:12 UTC (rev 2924) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-01-20 12:24:34 UTC (rev 2925) @@ -255,11 +255,11 @@ isisfish.error.empty.species.name=le nom d'espece est vide isisfish.error.empty.unit=l'unit\u00E9 de mesure est vide isisfish.error.equation.openeditor=Impossible d'ouvrir l'editeur d'\u00E9quation -isisfish.error.equation.return.number=EquationImpl must retun a number\: %1$s +isisfish.error.equation.return.number=EquationImpl doit retourner un nombre \: %1$s isisfish.error.equation.savemodel=Impossible de sauver l'\u00E9quation en tant que mod\u00E8le isisfish.error.errorpane.htmlmessage=<html>IsisFish a d\u00E9tect\u00E9 une erreur \: %s</html> isisfish.error.errorpane.title=Erreur -isisfish.error.evaluate.equation=Can't evaluate equation\: %1$s +isisfish.error.evaluate.equation=Impossible d'\u00E9valuer l'\u00E9quation\: %1$s isisfish.error.evaluate.preplan.script= isisfish.error.evalute.plan.script=Can't evaluate plan script isisfish.error.factor.invalid=Le facteur n'est pas valide @@ -287,7 +287,7 @@ isisfish.error.invalid.interval.reproduction.recruitment=interval entre la reproduction et le recrutement invalide isisfish.error.invalid.mean.weight=poids moyen invalide isisfish.error.invalid.natural.death=mortalit\u00E9 naturelle sur les classes naissantes invalide -isisfish.error.invalid.nullequation=L'equation %s n'existe pas \! +isisfish.error.invalid.nullequation=L'\u00E9quation %s n'existe pas \! isisfish.error.invalid.number=le nombre est invalide isisfish.error.invalid.range=La gamme possible n'a pas de valeur acceptable isisfish.error.invalid.values.params=Param\u00E8tre controlable hors valeurs possibles @@ -618,7 +618,7 @@ isisfish.message.removing.region=Suppression de la r\u00E9gion %1$s... isisfish.message.result.verif.region=R\u00E9sultat de la v\u00E9rification de la r\u00E9gion isisfish.message.save.finished=Sauvegarde termin\u00E9e -isisfish.message.saveModel.dialog=Entrez le nom du mod\u00E8le d'equation +isisfish.message.saveModel.dialog=Entrez le nom du mod\u00E8le d'\u00E9quation isisfish.message.saveModel.finished=Sauvegarde du mod\u00E8le termin\u00E9e isisfish.message.script.commit=Indiquez un message pour committer les modifications fa\u00EEtes sur %s isisfish.message.setting.cache.aspects=Mise en place des aspects Cache

1 0

r2924 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish/mexico/export resources
by chatellier＠users.labs.libre-entreprise.org 20 Jan '10

20 Jan '10

Author: chatellier Date: 2010-01-20 12:12:12 +0000 (Wed, 20 Jan 2010) New Revision: 2924 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java isis-fish/trunk/src/main/resources/sensitivity.properties Log: TargetSpecies.targetFactorEquation is now an enabled factor. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java 2010-01-20 11:24:52 UTC (rev 2923) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java 2010-01-20 12:12:12 UTC (rev 2924) @@ -35,6 +35,7 @@ import fr.ifremer.isisfish.entities.PopulationSeasonInfo; import fr.ifremer.isisfish.entities.Selectivity; import fr.ifremer.isisfish.entities.StrategyMonthInfo; +import fr.ifremer.isisfish.entities.TargetSpecies; import fr.ifremer.isisfish.mexico.MexicoHelper; import fr.ifremer.isisfish.types.RangeOfValues; import fr.ifremer.isisfish.types.TimeUnit; @@ -221,13 +222,21 @@ exportFactorName = factorClass + "." + newEntity.getStrategy().getName() + "."; exportFactorName += newEntity.getMonth() + "." + propertyName; } - // example : Selectivity.Senne.Anchois_long + // example : Selectivity.Senne.Anchois_long.equation else if (entity instanceof Selectivity) { // association class with no name attribute Selectivity newEntity = (Selectivity)entity; exportFactorName = factorClass + "." + newEntity.getGear().getName(); - exportFactorName += "." + newEntity.getPopulation().getName(); + exportFactorName += "." + newEntity.getPopulation().getName() + "." + propertyName; } + // example : TargetSpecies.Anchois_long.janvier-decembre. + else if (entity instanceof TargetSpecies) { + // association class with no name attribute + TargetSpecies newEntity = (TargetSpecies)entity; + exportFactorName = factorClass + "." + newEntity.getSpecies().getName() + "."; + exportFactorName += newEntity.getMetierSeasonInfo().getFirstMonth() + "." + newEntity.getMetierSeasonInfo().getLastMonth(); + exportFactorName += "." + propertyName + "." + RandomStringUtils.randomAlphanumeric(8); + } } return exportFactorName; Modified: isis-fish/trunk/src/main/resources/sensitivity.properties =================================================================== --- isis-fish/trunk/src/main/resources/sensitivity.properties 2010-01-20 11:24:52 UTC (rev 2923) +++ isis-fish/trunk/src/main/resources/sensitivity.properties 2010-01-20 12:12:12 UTC (rev 2924) @@ -35,6 +35,7 @@ StrategyMonthInfo.minInactivityDays StrategyMonthInfo.proportionMetier Strategy.proportionSetOfVessels +TargetSpecies.targetFactorEquation TripType.minTimeBetweenTrip TripType.tripDuration VesselType.activityRange

1 0

r2923 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator
by chatellier＠users.labs.libre-entreprise.org 20 Jan '10

20 Jan '10

Author: chatellier Date: 2010-01-20 11:24:52 +0000 (Wed, 20 Jan 2010) New Revision: 2923 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java Log: Fix factor list reset on old simulation reloading. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2010-01-19 10:57:45 UTC (rev 2922) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2010-01-20 11:24:52 UTC (rev 2923) @@ -270,7 +270,20 @@ /** * Load old simulation. - * + * + * Reset some field to empty default values: + * <ul> + * <li>params</li> + * <li>analyse plans</li> + * <li>factors list</li> + * <ul> + * + * Open old simulation: + * <ul> + * <li>params copy</li> + * <li>factors</li> + * </ul> + * * @param simulName name of simulation to load */ public void loadOldSimulation(String simulName) { @@ -293,6 +306,8 @@ }*/ // Chargement des facteurs + // clear list even if mexico file doesn't exists + factors.clear(); File f = SimulationStorage.getMexicoDesignPlan(SimulationStorage.getSimulationDirectory(simulName)); if (f != null && f.canRead()) { if (log.isInfoEnabled()) { @@ -300,7 +315,6 @@ } TopiaContext topiaContext = regionStorage.getStorage(); designPlan = MexicoHelper.getDesignPlanFromXML(f, topiaContext); - factors.clear(); for (Factor factor : designPlan.getFactors()) { if (log.isDebugEnabled()) { log.debug("Find factor : " + factor.getName());

1 0

r2922 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator
by chatellier＠users.labs.libre-entreprise.org 19 Jan '10

19 Jan '10

Author: chatellier Date: 2010-01-19 10:57:45 +0000 (Tue, 19 Jan 2010) New Revision: 2922 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java Log: Remove a possible huge preScript string. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java 2010-01-19 09:52:51 UTC (rev 2921) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java 2010-01-19 10:57:45 UTC (rev 2922) @@ -1,3 +1,21 @@ +/* *##% + * Copyright (C) 2007 Ifremer, Code Lutin, Benjamin Poussin + * + * 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.simulator; import static org.nuiton.i18n.I18n._; @@ -6,6 +24,7 @@ import java.io.File; import java.io.FileReader; import java.io.IOException; +import java.io.Reader; import java.util.Properties; import org.apache.commons.io.IOUtils; @@ -15,7 +34,7 @@ import fr.ifremer.isisfish.datastore.SimulationStorage; /** - * this class contains all usefull informations about a simulation. + * This class contains all usefull informations about a simulation. * * This is used for filter or search a simulation. * @@ -43,15 +62,20 @@ loadProperties(SimulationStorage.getSimulationInformationFile(simulationDirectory)); } - private void loadProperties(File file) { if (file.exists()) { - BufferedReader reader = null; + Reader reader = null; try { reader = new BufferedReader(new FileReader(file)); - this.data.load(reader); + data.load(reader); + + // FIXME fix a memory leak with huge prescript + data.remove("preScript"); + } catch (IOException e) { - log.warn(_("isisfish.error.load.file", file)); + if (log.isWarnEnabled()) { + log.warn(_("isisfish.error.load.file", file)); + } } finally { IOUtils.closeQuietly(reader); }

1 0

r2921 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator
by chatellier＠users.labs.libre-entreprise.org 19 Jan '10

19 Jan '10

Author: chatellier Date: 2010-01-19 09:52:51 +0000 (Tue, 19 Jan 2010) New Revision: 2921 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java Log: Add buffered reader to read property file. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java 2010-01-18 09:08:50 UTC (rev 2920) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java 2010-01-19 09:52:51 UTC (rev 2921) @@ -2,16 +2,18 @@ import static org.nuiton.i18n.I18n._; -import fr.ifremer.isisfish.datastore.SimulationStorage; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - +import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.io.IOException; import java.util.Properties; +import org.apache.commons.io.IOUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import fr.ifremer.isisfish.datastore.SimulationStorage; + /** * this class contains all usefull informations about a simulation. * @@ -44,22 +46,14 @@ private void loadProperties(File file) { if (file.exists()) { - FileReader reader = null; - + BufferedReader reader = null; try { - reader = new FileReader(file); + reader = new BufferedReader(new FileReader(file)); this.data.load(reader); } catch (IOException e) { log.warn(_("isisfish.error.load.file", file)); } finally { - if (reader != null) { - try { - reader.close(); - } catch (IOException e) { - //TODO - } - } - + IOUtils.closeQuietly(reader); } } }

1 0

r2920 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 18 Jan '10

18 Jan '10

Author: chatellier Date: 2010-01-18 09:08:50 +0000 (Mon, 18 Jan 2010) New Revision: 2920 Modified: isis-fish/trunk/pom.xml Log: Update h2 Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-01-15 15:45:05 UTC (rev 2919) +++ isis-fish/trunk/pom.xml 2010-01-18 09:08:50 UTC (rev 2920) @@ -212,7 +212,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.2.126</version> + <version>1.2.127</version> <scope>compile</scope> </dependency>

1 0

r2919 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/datastore
by chatellier＠users.labs.libre-entreprise.org 15 Jan '10

15 Jan '10

Author: chatellier Date: 2010-01-15 15:45:05 +0000 (Fri, 15 Jan 2010) New Revision: 2919 Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java Log: Check if result is enabled by getNecessaryResult on SensitivityExport too Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2010-01-15 09:41:59 UTC (rev 2918) +++ isis-fish/trunk/changelog.txt 2010-01-15 15:45:05 UTC (rev 2919) @@ -1,5 +1,6 @@ isis-fish (3.3.0.0) stable; urgency=low + * Check if result is enabled by getNecessaryResult on SensitivityExport * Use mexico export format for matrix * Restore simulation tests at integration-test phase * Add region factorisable value export (mexico) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java 2010-01-15 09:41:59 UTC (rev 2918) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java 2010-01-15 15:45:05 UTC (rev 2919) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2002-2009 + * Copyright (C) 2002-2010 * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or @@ -47,6 +47,7 @@ import fr.ifremer.isisfish.entities.Result; import fr.ifremer.isisfish.entities.ResultDAO; import fr.ifremer.isisfish.export.Export; +import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.rule.Rule; import fr.ifremer.isisfish.simulator.AnalysePlan; import fr.ifremer.isisfish.simulator.SimulationContext; @@ -187,6 +188,14 @@ * Permet de savoir si lorsque l'on ajoutera ce resultat, il sera * sauvé ou non. * + * Check for result name returned by : + * <ul> + * <li>{@link Export#getNecessaryResult()}</li> + * <li>{@link SensitivityExport#getNecessaryResult()}</li> + * <li>{@link Rule#getNecessaryResult()}</li> + * <li>{@link AnalysePlan#getNecessaryResult()}</li> + * </ul> + * * @param name result name * @return {@code true} if result is enabled */ @@ -197,6 +206,8 @@ Collection<String> resultEnabled = simulation.getParameter().getResultEnabled(); enabledResult.addAll(resultEnabled); + + // test on export List<String> exportNames = simulation.getParameter().getExportNames(); if (exportNames != null) { for (String exportName : exportNames) { @@ -213,6 +224,18 @@ } } } + + // test on sensitivity export + List<SensitivityExport> sensitivityExports = simulation.getParameter().getSensitivityExport(); + if (sensitivityExports != null) { + for (SensitivityExport sensitivityExport : sensitivityExports) { + for (String resultName : sensitivityExport.getNecessaryResult()) { + enabledResult.add(resultName); + } + } + } + + // test on rules List<Rule> rules = simulation.getParameter().getRules(); if (rules != null) { for (Rule rule : rules) { @@ -221,6 +244,8 @@ } } } + + // test on plans List<AnalysePlan> plans = simulation.getParameter().getAnalysePlans(); if (plans != null) { for (AnalysePlan plan : plans) {

1 0

r2918 - isis-fish/trunk
by jcouteau＠users.labs.libre-entreprise.org 15 Jan '10

15 Jan '10

Author: jcouteau Date: 2010-01-15 09:41:59 +0000 (Fri, 15 Jan 2010) New Revision: 2918 Modified: isis-fish/trunk/pom.xml Log: Use nuiton utils 1.1.3-SNAPSHOT Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-01-14 16:06:54 UTC (rev 2917) +++ isis-fish/trunk/pom.xml 2010-01-15 09:41:59 UTC (rev 2918) @@ -434,7 +434,7 @@ <jaxx.version>1.7.1</jaxx.version> <eugene.version>2.0.0-beta-2</eugene.version> <topia.version>2.3.0-beta-3</topia.version> - <nuiton-utils.version>1.1.2</nuiton-utils.version> + <nuiton-utils.version>1.1.3-SNAPSHOT</nuiton-utils.version> <nuiton-i18n.version>1.0.1</nuiton-i18n.version> <nuiton-widgets.version>1.0.1-SNAPSHOT</nuiton-widgets.version> <jrst.version>1.0.0</jrst.version>

1 0

r2917 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 14 Jan '10

14 Jan '10

Author: chatellier Date: 2010-01-14 16:06:54 +0000 (Thu, 14 Jan 2010) New Revision: 2917 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx Log: Disable "next" button. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2010-01-14 15:59:19 UTC (rev 2916) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2010-01-14 16:06:54 UTC (rev 2917) @@ -211,5 +211,6 @@ ]]></script> <JPanel id='body' constraints='BorderLayout.CENTER'/> - <JButton id='next' text='{getButtonTitle()}' constraints='BorderLayout.SOUTH' visible='{getNextPath() != null}' onActionPerformed='goTo()'/> + <JButton id='next' text='{getButtonTitle()}' constraints='BorderLayout.SOUTH' + visible='{getNextPath() != null}' onActionPerformed='goTo()' decorator='boxed'/> </JPanel>

1 0