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

r3734 - trunk/src/main/java/fr/ifremer/isisfish/aspect
by echatellier＠users.forge.codelutin.com 27 Aug '12

27 Aug '12

Author: echatellier Date: 2012-08-27 17:05:05 +0200 (Mon, 27 Aug 2012) New Revision: 3734 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3734 Log: Improve cache key length Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java 2012-08-27 15:04:12 UTC (rev 3733) +++ trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java 2012-08-27 15:05:05 UTC (rev 3734) @@ -25,6 +25,7 @@ package fr.ifremer.isisfish.aspect; +import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; @@ -44,9 +45,11 @@ import org.codehaus.aspectwerkz.joinpoint.JoinPoint; import org.codehaus.aspectwerkz.joinpoint.MethodRtti; import org.codehaus.aspectwerkz.joinpoint.MethodSignature; +import org.nuiton.topia.persistence.TopiaEntity; import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.simulator.SimulationContext; +import fr.ifremer.isisfish.types.TimeStep; import fr.ifremer.isisfish.util.Nocache; /** @@ -180,13 +183,20 @@ Method method = ((MethodSignature)jp.getSignature()).getMethod(); Object[] args = ((MethodRtti)jp.getRtti()).getParameterValues(); - String result = method.toString(); + //String result = method.toString(); + String result = method.getDeclaringClass().getSimpleName() + "." + + method.getName(); for (Object o : args) { result += ";"; if (o instanceof Number || o instanceof String) { result += o.toString(); + } else if (o instanceof TimeStep) { + result += ((TimeStep)o).getStep(); + } else if (o instanceof TopiaEntity) { + result += ((TopiaEntity)o).getTopiaId().replaceAll("fr.ifremer.isisfish.entities.", ""); } else { result += ObjectUtils.identityToString(o); + result = result.replaceAll("org.nuiton.math.matrix.", ""); } }

1 0

r3733 - in trunk/src/main: java/fr/ifremer/isisfish/simulator java/fr/ifremer/isisfish/simulator/launcher java/fr/ifremer/isisfish/ui/sensitivity java/fr/ifremer/isisfish/ui/simulator resources/i18n
by echatellier＠users.forge.codelutin.com 27 Aug '12

27 Aug '12

Author: echatellier Date: 2012-08-27 17:04:12 +0200 (Mon, 27 Aug 2012) New Revision: 3733 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3733 Log: fixes #1420: Add option to delete sensitivity analysis result Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterCache.java trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx trunk/src/main/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2012-08-27 12:11:46 UTC (rev 3732) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2012-08-27 15:04:12 UTC (rev 3733) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010 - 2011 Ifremer, Code Lutin, Chatellier Eric + * Copyright (C) 2010 - 2012 Ifremer, Code Lutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -96,30 +96,30 @@ * * @return Description property. */ - public abstract String getDescription(); + public String getDescription(); /** * Set simulation description. * * @param description the description to set. */ - public abstract void setDescription(String description); + public void setDescription(String description); /** * Load region corresponding to {@link #getRegionName()}. * * @return the region */ - public abstract RegionStorage getRegion(); + public RegionStorage getRegion(); - public abstract MatrixND getNumberOf(Population pop); + public MatrixND getNumberOf(Population pop); /** * Get extra rules list. * * @return Returns the extraRules. */ - public abstract List<String> getExtraRules(); + public List<String> getExtraRules(); /** * Add extra rules. @@ -129,19 +129,19 @@ * * @param extraRules extra rules to add */ - public abstract void addExtraRules(String... extraRules); + public void addExtraRules(String... extraRules); /** * Get instantiated population list. * * @return Returns the populations. */ - public abstract List<Population> getPopulations(); + public List<Population> getPopulations(); /** * @param populations The populations to set. */ - public abstract void setPopulations(List<Population> populations); + public void setPopulations(List<Population> populations); /** * Get instantiated strategies list. @@ -150,21 +150,21 @@ * * @return Returns the strategies. */ - public abstract List<Strategy> getStrategies(); + public List<Strategy> getStrategies(); /** * Set strategies list. * * @param strategies strategies list to set */ - public abstract void setStrategies(List<Strategy> strategies); + public void setStrategies(List<Strategy> strategies); /** * Add new simulation plan. * * @param plan simulation plan to add */ - public abstract void addSimulationPlan(SimulationPlan plan); + public void addSimulationPlan(SimulationPlan plan); /** * Remove a plan. @@ -172,7 +172,7 @@ * @param plan * @return {@code true} if this list contained the specified element */ - public abstract boolean removeSimulationPlan(SimulationPlan plan); + public boolean removeSimulationPlan(SimulationPlan plan); /** * Get instantiated simulation plan list. @@ -181,32 +181,32 @@ * * @return the plans. */ - public abstract List<SimulationPlan> getSimulationPlans(); + public List<SimulationPlan> getSimulationPlans(); /** * Set plans list. * * @param plans plans to set */ - public abstract void setSimulationPlans(List<SimulationPlan> plans); + public void setSimulationPlans(List<SimulationPlan> plans); /** * Return {@code true} if simulation is composed of independent plan only. * * @return {@code true} if all {@link SimulationPlan} are {@link SimulationPlanIndependent} */ - public abstract boolean isIndependentPlan(); + public boolean isIndependentPlan(); /** * Clear plan list. */ - public abstract void clearPlans(); + public void clearPlans(); /** * Add new rule to rules list. * @param rule rule to add */ - public abstract void addRule(Rule rule); + public void addRule(Rule rule); /** * Remove a rule. @@ -214,26 +214,26 @@ * @param rule rule to remove * @return {@code true} if this list contained the specified element */ - public abstract boolean removeRule(Rule rule); + public boolean removeRule(Rule rule); /** * Get parameters rules list. * * @return the rules */ - public abstract List<Rule> getRules(); + public List<Rule> getRules(); /** * Set simulation rules. * * @param rules rules to set */ - public abstract void setRules(List<Rule> rules); + public void setRules(List<Rule> rules); /** * Clear rule list. */ - public abstract void clearRules(); + public void clearRules(); /** * Return if optimization sould be used. @@ -242,14 +242,14 @@ * * @return use optimization */ - public abstract boolean getUseOptimization(); + public boolean getUseOptimization(); /** * Change use optimization parameter. * * @param useOptimization use optimization to set */ - public abstract void setUseOptimization(boolean useOptimization); + public void setUseOptimization(boolean useOptimization); /** * Return if statistic sould be used. @@ -258,28 +258,28 @@ * * @return use statistic */ - public abstract boolean getUseStatistic(); + public boolean getUseStatistic(); /** * Change use statistic property. * * @param useStatistic use statistic to set */ - public abstract void setUseStatistic(boolean useStatistic); + public void setUseStatistic(boolean useStatistic); /** * Get export names list. * * @return export names list */ - public abstract List<String> getExportNames(); + public List<String> getExportNames(); /** * Set export names list. * * @param exportNames export names list to set */ - public abstract void setExportNames(List<String> exportNames); + public void setExportNames(List<String> exportNames); /** * Get number of sensitivity simulation. @@ -288,44 +288,59 @@ * * @return the numberOfSensitivitySimulation */ - public abstract int getNumberOfSensitivitySimulation(); + public int getNumberOfSensitivitySimulation(); /** * Set number of sensitivity simulation. * * @param numberOfSensitivitySimulation number of sensitivity simulation to set */ - public abstract void setNumberOfSensitivitySimulation( + public void setNumberOfSensitivitySimulation( int numberOfSensitivitySimulation); /** - * Get instantiated sensitivity calculator. + * Get instantiated sensitivity analysis. * * Default to : null. * * @return the sensitivityAnalysis */ - public abstract SensitivityAnalysis getSensitivityAnalysis(); + public SensitivityAnalysis getSensitivityAnalysis(); /** * @param sensitivityAnalysis the sensitivityAnalysis to set */ - public abstract void setSensitivityAnalysis( - SensitivityAnalysis sensitivityAnalysis); + public void setSensitivityAnalysis(SensitivityAnalysis sensitivityAnalysis); + + /** + * Get only keep first result policy. + * + * @return only keep first result policy + * @since 4.1.1.0 + */ + public boolean isSensitivityAnalysisOnlyKeepFirst(); /** + * Change only keep first result policy. + * + * @param onlyKeepFirst only keep first result policy + * @since 4.1.1.0 + */ + public void setSensitivityAnalysisOnlyKeepFirst(boolean onlyKeepFirst); + + /** * Return loaded sensitivity export. * * If exports are null or empty, try to load it from last ready parameters. * * @return the sensitivityExportNames */ - public abstract List<SensitivityExport> getSensitivityExport(); + public List<SensitivityExport> getSensitivityExport(); /** * @param sensitivityExport the sensitivityExportNames to set */ - public abstract void setSensitivityExport( + public void setSensitivityExport( List<SensitivityExport> sensitivityExport); /** @@ -333,42 +348,42 @@ * * @return use simulation plan. */ - public abstract boolean getUseSimulationPlan(); + public boolean getUseSimulationPlan(); /** * Set use simulation plans property. * * @param useSimulationPlan use simulation plan to set */ - public abstract void setUseSimulationPlan(boolean useSimulationPlan); + public void setUseSimulationPlan(boolean useSimulationPlan); /** * Get simulation number in simulation plan. * * @return simulation number in simulation plan */ - public abstract int getSimulationPlanNumber(); + public int getSimulationPlanNumber(); /** * Set simulation number in simulation plan. * * @param simulationPlanNumber simulation plan number to set */ - public abstract void setSimulationPlanNumber(int simulationPlanNumber); + public void setSimulationPlanNumber(int simulationPlanNumber); /** * Get number of year to run to simulate. * * @return number of year */ - public abstract int getNumberOfYear(); + public int getNumberOfYear(); /** * Set number of year to run to simulate. * * @param numberOfYear number of year to set */ - public abstract void setNumberOfYear(int numberOfYear); + public void setNumberOfYear(int numberOfYear); /** * Get use prescript. @@ -377,70 +392,70 @@ * * @return Returns the usePreScript. */ - public abstract boolean getUsePreScript(); + public boolean getUsePreScript(); /** * Set use prescript property * * @param usePreScript use preScript to set */ - public abstract void setUsePreScript(boolean usePreScript); + public void setUsePreScript(boolean usePreScript); /** * Get prescript content. * * @return preScript content */ - public abstract String getPreScript(); + public String getPreScript(); /** * Set pre script content. * * @param preScript prescript content */ - public abstract void setPreScript(String preScript); + public void setPreScript(String preScript); /** * Get region name. * * @return region name */ - public abstract String getRegionName(); + public String getRegionName(); /** * Set region name. * * @param regionName region name to set */ - public abstract void setRegionName(String regionName); + public void setRegionName(String regionName); /** * Set simulator name. * * @return simulator name. */ - public abstract String getSimulatorName(); + public String getSimulatorName(); /** * Set simulator name. * * @param simulatorName simulator name to set */ - public abstract void setSimulatorName(String simulatorName); + public void setSimulatorName(String simulatorName); /** * Get enabled result names list. * * @return enabled result names list */ - public abstract Collection<String> getResultEnabled(); + public Collection<String> getResultEnabled(); /** * Set enabled result names list. * * @param resultEnabled enabled result names list */ - public abstract void setResultEnabled(Collection<String> resultEnabled); + public void setResultEnabled(Collection<String> resultEnabled); /** * Get tag values. @@ -449,14 +464,14 @@ * * @return Returns the tagValue. */ - public abstract Map<String, String> getTagValue(); + public Map<String, String> getTagValue(); /** * Set tag values. * * @param tagValue tagValues to set. */ - public abstract void setTagValue(Map<String, String> tagValue); + public void setTagValue(Map<String, String> tagValue); /** * Get simulator log level. @@ -465,14 +480,14 @@ * * @return simualtor log level */ - public abstract String getSimulLogLevel(); + public String getSimulLogLevel(); /** * Set simulator log level. * * @param logLevel simulator log level */ - public abstract void setSimulLogLevel(String logLevel); + public void setSimulLogLevel(String logLevel); /** * Get script log level. @@ -481,14 +496,14 @@ * * @return script log level */ - public abstract String getScriptLogLevel(); + public String getScriptLogLevel(); /** * Set script log level. * * @param logLevel script log level */ - public abstract void setScriptLogLevel(String logLevel); + public void setScriptLogLevel(String logLevel); /** * Get librairies log level. @@ -497,38 +512,38 @@ * * @return librairies log level */ - public abstract String getLibLogLevel(); + public String getLibLogLevel(); /** * Set lib log level. * * @param logLevel */ - public abstract void setLibLogLevel(String logLevel); + public void setLibLogLevel(String logLevel); - public abstract boolean isSimulErrorLevel(); + public boolean isSimulErrorLevel(); - public abstract boolean isSimulWarnLevel(); + public boolean isSimulWarnLevel(); - public abstract boolean isSimulInfoLevel(); + public boolean isSimulInfoLevel(); - public abstract boolean isSimulDebugLevel(); + public boolean isSimulDebugLevel(); - public abstract boolean isScriptErrorLevel(); + public boolean isScriptErrorLevel(); - public abstract boolean isScriptWarnLevel(); + public boolean isScriptWarnLevel(); - public abstract boolean isScriptInfoLevel(); + public boolean isScriptInfoLevel(); - public abstract boolean isScriptDebugLevel(); + public boolean isScriptDebugLevel(); - public abstract boolean isLibErrorLevel(); + public boolean isLibErrorLevel(); - public abstract boolean isLibWarnLevel(); + public boolean isLibWarnLevel(); - public abstract boolean isLibInfoLevel(); + public boolean isLibInfoLevel(); - public abstract boolean isLibDebugLevel(); + public boolean isLibDebugLevel(); /** * Permet d'ajouter des parametres directement à partir de leur @@ -551,7 +566,7 @@ * * @return a copy of this instance */ - public abstract SimulationParameter copy(); + public SimulationParameter copy(); /** * Make a deep copy of current parameters. @@ -561,14 +576,14 @@ * * @return new parameters instance */ - public abstract SimulationParameter deepCopy(); + public SimulationParameter deepCopy(); /** * The toString() method call getters. * * So make instances of rules/export/plans... */ - public abstract String toString(); + public String toString(); /** * Permet de convertir l'objet SimulationParameter en un objet Properties @@ -586,14 +601,14 @@ * @return L'objet Properties representant les parametres * @see #fromProperties(Properties) */ - public abstract Properties toProperties(); + public Properties toProperties(); /** * Load properties from file. * * @param props property to read */ - public abstract void fromProperties(Properties props); + public void fromProperties(Properties props); /** * Reload parameters du to context change. @@ -604,6 +619,6 @@ * * @throws TopiaException */ - public abstract void reloadContextParameters() throws TopiaException; + public void reloadContextParameters() throws TopiaException; } \ No newline at end of file Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterCache.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterCache.java 2012-08-27 12:11:46 UTC (rev 3732) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterCache.java 2012-08-27 15:04:12 UTC (rev 3733) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010 Ifremer, Code Lutin, Benjamin Poussin, Chatellier Eric + * Copyright (C) 2010 - 2012 Ifremer, Code Lutin, Benjamin Poussin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -533,9 +533,21 @@ SimulationParameter param = getParam(); param.setSimulationPlanNumber(simulationPlanNumber); store(param); - } + @Override + public boolean isSensitivityAnalysisOnlyKeepFirst() { + SimulationParameter param = getParam(); + return param.isSensitivityAnalysisOnlyKeepFirst(); + } + + @Override + public void setSensitivityAnalysisOnlyKeepFirst(boolean onlyKeepFirst) { + SimulationParameter param = getParam(); + param.setSensitivityAnalysisOnlyKeepFirst(onlyKeepFirst); + store(param); + } + /* * @see fr.ifremer.isisfish.simulator.SimulationParameter#getNumberOfYear() */ Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2012-08-27 12:11:46 UTC (rev 3732) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2012-08-27 15:04:12 UTC (rev 3733) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2010 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2006 - 2012 Ifremer, Code Lutin, Cédric Pineau, 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 @@ -141,7 +141,7 @@ /** Utilisation du plan de simulation. */ protected Boolean useSimulationPlan; - /** + /** * Le numero de sequence de la liste des plans de simulation. Le premier * élement du plan doit etre 0. Si la simulation ne fait pas partie d'un * plan la valeur est -1. */ @@ -160,6 +160,14 @@ */ protected Integer numberOfSensitivitySimulation; + /** + * Dans une analyze de sensibilite, conserver les résultats de toutes + * les simulations est inutile, seule les résultats de la premières + * sont nécéssaires. Les resultats peuvent être supprimés après les + * export de données. + */ + protected Boolean sensitivityAnalysisOnlyKeepFirst; + /** Script utilisé pour les analyses de sensibilités. */ protected SensitivityAnalysis sensitivityAnalysis; @@ -866,7 +874,7 @@ useSimulationPlan = Boolean.FALSE; } } - return this.useSimulationPlan; + return useSimulationPlan; } /* @@ -892,7 +900,7 @@ } } - return this.simulationPlanNumber.intValue(); + return simulationPlanNumber.intValue(); } /* @@ -903,6 +911,25 @@ this.simulationPlanNumber = simulationPlanNumber; } + @Override + public boolean isSensitivityAnalysisOnlyKeepFirst() { + if (sensitivityAnalysisOnlyKeepFirst == null) { + + if (propertiesParameters != null) { + sensitivityAnalysisOnlyKeepFirst = Boolean.valueOf(propertiesParameters.getProperty("sensitivityAnalysisOnlyKeepFirst", "-1")); + } else { + sensitivityAnalysisOnlyKeepFirst = Boolean.FALSE; + } + } + + return sensitivityAnalysisOnlyKeepFirst.booleanValue(); + } + + @Override + public void setSensitivityAnalysisOnlyKeepFirst(boolean onlyKeepFirst) { + sensitivityAnalysisOnlyKeepFirst = onlyKeepFirst; + } + /* * @see fr.ifremer.isisfish.simulator.SimulationParameter#getNumberOfYear() */ @@ -1620,6 +1647,9 @@ } } + // sensitivity params + result.setProperty("sensitivityAnalysisOnlyKeepFirst", String.valueOf(isSensitivityAnalysisOnlyKeepFirst())); + result.setProperty("usePreScript", String.valueOf(getUsePreScript())); result.setProperty("preScript", getPreScript()); result.setProperty("useSimulationPlan", String.valueOf(getUseSimulationPlan())); Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2012-08-27 12:11:46 UTC (rev 3732) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2012-08-27 15:04:12 UTC (rev 3733) @@ -48,6 +48,7 @@ import org.nuiton.util.FileUtil; import org.nuiton.util.ObjectUtil; import org.nuiton.util.StringUtil; +import org.nuiton.util.ZipUtil; import fr.ifremer.isisfish.IsisConfig; import fr.ifremer.isisfish.IsisFish; @@ -425,6 +426,12 @@ // quand date =progressMax control.setProgress(control.getProgress() + 1); + // suppression des résultats si l'utilisateur a demande à ne conserver + // que les resultats de seulement la première simulation d'une AS + if (parameters.isSensitivityAnalysisOnlyKeepFirst() && !control.getId().endsWith("_0")) { + context.getDbResult().clear(true); + } + } catch (OutOfMemoryError eee) { log.error(_("isisfish.error.during.simulation"), eee); simulation.getInformation().setException(eee); @@ -479,7 +486,7 @@ log.debug("Delete simulation build directory : " + simulationBuildDirectory.getAbsolutePath()); } FileUtil.deleteRecursively(simulationBuildDirectory); - + // context is used in Trace.printStatistiqueAndClear() SimulationContext.remove(); } Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2012-08-27 12:11:46 UTC (rev 3732) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2012-08-27 15:04:12 UTC (rev 3733) @@ -414,14 +414,7 @@ if (resultArchiveFile != null) { - // FIXME big hacks here, only extract non first simulation - // only for AS - if (control.getId().startsWith("as_") && !control.getId().endsWith("_0")) { - ZipUtil.uncompressFiltred(resultArchiveFile, SimulationStorage.getSimulationDirectory(), ".*/data/.*"); - } - else { - ZipUtil.uncompressFiltred(resultArchiveFile, SimulationStorage.getSimulationDirectory()); - } + ZipUtil.uncompressFiltred(resultArchiveFile, SimulationStorage.getSimulationDirectory()); if (log.isDebugEnabled()) { log.debug("Simulation imported : " + resultArchiveFile.getAbsolutePath()); Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2012-08-27 12:11:46 UTC (rev 3732) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2012-08-27 15:04:12 UTC (rev 3733) @@ -223,7 +223,9 @@ } /** - * @return les SimulatorLauncher et leurs noms + * Retour les lanceurs ayant un executor. + * + * @return les SimulatorLauncher */ public List<SimulatorLauncher> getSimulationLaunchers() { List<SimulatorLauncher> result = new ArrayList<SimulatorLauncher>( Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2012-08-27 12:11:46 UTC (rev 3732) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2012-08-27 15:04:12 UTC (rev 3733) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2011 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2012 Ifremer, CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2012-08-27 12:11:46 UTC (rev 3732) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2012-08-27 15:04:12 UTC (rev 3733) @@ -135,19 +135,19 @@ }); } } -protected void setPreScript() { +protected void initSimulationParams() { if (!isSensitivity()){ + // prescript String preScript = simulAction.getSimulationParameter().getPreScript(); fieldUseSimulPreScripts.setSelected(preScript != null && !preScript.isEmpty()); getParentContainer(SimulUI.class).getPreScriptUI().getFieldSimulPreScript().setText(preScript); - } -} -protected void setSimulationPlan() { - if (!isSensitivity()){ + + // simulation plan fieldSimulUseSimulationPlan.setSelected(simulAction.getSimulationParameter().getUseSimulationPlan()); getParentContainer(SimulUI.class).getSensUI().refresh(); } } + protected void setSensitivityTabRegion() { if (isSensitivity()) { try { @@ -167,24 +167,19 @@ } } } -protected void setFactor() { +protected void initSensitivityParams() { if (isSensitivity()) { + getParentContainer(SensitivityUI.class).getSensitivityChooserUI().refreshSelectedSensitivityAnalysis(); getParentContainer(SensitivityUI.class).getSensitivityTabUI().setFactorModel(); - } -} -protected void setExportSens() { - if (isSensitivity()) { getParentContainer(SensitivityUI.class).getSensitivityChooserUI().setSensitivityExportListModel(); + sensitivityOnlyKeepFirstResultCheckBox.setSelected(simulAction.getSimulationParameter().isSensitivityAnalysisOnlyKeepFirst()); } } -protected void setSensitivityAnalysis() { - if (isSensitivity()){ - getParentContainer(SensitivityUI.class).getSensitivityChooserUI().refreshSelectedSensitivityAnalysis(); - } -} + public void setSimulationParameter(SimulAction simulAction){ simulAction.setSimulationParameter(simulAction.getSimulationParameter()); } + protected void loadOldSimulation() { final String selected = fieldSimulParamsSelect.getSelectedItem().toString(); // le premier item est " " pour ne pas avoir de selection par defaut @@ -198,11 +193,8 @@ fieldSimulParamsRegion.setSelectedItem(getContextValue(SimulAction.class).getSimulationParameter().getRegionName()); // mise a jour des années fieldSimulParamsNbAnnees.setText(String.valueOf(simulAction.getNumberOfYear())); - setPreScript(); - setSimulationPlan(); - setExportSens(); - setSensitivityAnalysis(); - setFactor(); + initSimulationParams(); + initSensitivityParams(); // regles ruleChooser.setRulesList(simulAction.getSimulationParameter().getRules()); @@ -502,14 +494,14 @@ <cell fill="horizontal" weightx="1.0"> <Table> <row> - <cell fill="horizontal" weightx="0.3"> + <cell fill="horizontal" weightx="1"> <JCheckBox text="isisfish.params.usePreSimulationScript" id="fieldUseSimulPreScripts" selected='{simulAction.getSimulationParameter().getUsePreScript()}' visible='{!isSensitivity()}' onItemStateChanged='enablePreScript()' /> </cell> - <cell fill="horizontal" weightx="0.3"> + <cell fill="horizontal" weightx="1"> <JCheckBox text="isisfish.params.useSimulationPlan" id="fieldSimulUseSimulationPlan" selected='{simulAction.getSimulationParameter().getUseSimulationPlan()}' @@ -517,6 +509,14 @@ onItemStateChanged='enableSimulationPlan()' enabled="{getRegionStorage() != null}" /> </cell> + <cell fill="horizontal" weightx="1"> + <JCheckBox text="isisfish.params.sensitivityOnlyKeepFirstResult" + id="sensitivityOnlyKeepFirstResultCheckBox" + selected='{simulAction.getSimulationParameter().isSensitivityAnalysisOnlyKeepFirst()}' + visible='{isSensitivity()}' + onItemStateChanged='simulAction.getSimulationParameter().setSensitivityAnalysisOnlyKeepFirst(sensitivityOnlyKeepFirstResultCheckBox.isSelected())' + enabled="{getRegionStorage() != null}" /> + </cell> </row> </Table> </cell> Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2012-08-27 12:11:46 UTC (rev 3732) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2012-08-27 15:04:12 UTC (rev 3733) @@ -628,6 +628,7 @@ isisfish.params.rules.availables=Available rules isisfish.params.rules.selected=Selected rules isisfish.params.sensitivityName=Sensitivity name +isisfish.params.sensitivityOnlyKeepFirstResult=Only keep results for first simulation isisfish.params.simulationLauncher=Simulation launcher isisfish.params.simulationName=Simulation name isisfish.params.stategiesAndPopulations=Strategies and populations Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2012-08-27 12:11:46 UTC (rev 3732) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2012-08-27 15:04:12 UTC (rev 3733) @@ -628,6 +628,7 @@ isisfish.params.rules.availables=Règles disponibles isisfish.params.rules.selected=Règles sélectionnées isisfish.params.sensitivityName=Nom de l'analyse de sensibilité +isisfish.params.sensitivityOnlyKeepFirstResult=Ne conserver les résultats que pour la première simulation. isisfish.params.simulationLauncher=Lanceur de simulation isisfish.params.simulationName=Nom de la simulation isisfish.params.stategiesAndPopulations=Stratégies et populations

1 0

r3732 - in trunk: . src/main/java/fr/ifremer/isisfish
by echatellier＠users.forge.codelutin.com 27 Aug '12

27 Aug '12

Author: echatellier Date: 2012-08-27 14:11:46 +0200 (Mon, 27 Aug 2012) New Revision: 3732 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3732 Log: Update next isis version. Modified: trunk/pom.xml trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-25 06:38:45 UTC (rev 3731) +++ trunk/pom.xml 2012-08-27 12:11:46 UTC (rev 3732) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.1.0.4-SNAPSHOT</version> + <version>4.1.1.0-SNAPSHOT</version>  <dependencies> Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2012-08-25 06:38:45 UTC (rev 3731) +++ trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2012-08-27 12:11:46 UTC (rev 3732) @@ -119,7 +119,7 @@ * migration de donnees demande automatiquement un changement de version * d'application. */ - protected final static Version version = new Version(4, 1, 0, 3); + protected final static Version version = new Version(4, 1, 1, 0); protected final static Version majorVersion = new Version(version.getNumber(0)); protected final static Version databaseVersion = new Version(

1 0

r3731 - trunk/src/main/java/fr/ifremer/isisfish/datastore
by echatellier＠users.forge.codelutin.com 25 Aug '12

25 Aug '12

Author: echatellier Date: 2012-08-25 08:38:45 +0200 (Sat, 25 Aug 2012) New Revision: 3731 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3731 Log: Fix code style Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java 2012-08-25 06:38:26 UTC (rev 3730) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java 2012-08-25 06:38:45 UTC (rev 3731) @@ -48,9 +48,9 @@ * by : $Author$ */ public class SimulatorStorage extends JavaSourceStorage { - + public static final String SIMULATOR_PATH = "simulators"; - + /** Template freemarker pour les scripts. */ public static final String SIMULATOR_TEMPLATE = "templates/script/simulator.ftl";

1 0

r3730 - trunk
by echatellier＠users.forge.codelutin.com 25 Aug '12

25 Aug '12

Author: echatellier Date: 2012-08-25 08:38:26 +0200 (Sat, 25 Aug 2012) New Revision: 3730 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3730 Log: Use performances improvements in nuiton matrix. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-24 12:57:23 UTC (rev 3729) +++ trunk/pom.xml 2012-08-25 06:38:26 UTC (rev 3730) @@ -62,14 +62,14 @@ <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix</artifactId> - <version>2.3</version> + <version>2.3.1-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix-gui</artifactId> - <version>2.3</version> + <version>2.3.1-SNAPSHOT</version> <scope>compile</scope> </dependency>

1 0

r3729 - in trunk/src/main/java/fr/ifremer/isisfish: aspect util
by echatellier＠users.forge.codelutin.com 24 Aug '12

24 Aug '12

Author: echatellier Date: 2012-08-24 14:57:23 +0200 (Fri, 24 Aug 2012) New Revision: 3729 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3729 Log: fixes #1411 : Add annotation to not cache method or class call Added: trunk/src/main/java/fr/ifremer/isisfish/util/Nocache.java Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java 2012-08-24 12:19:40 UTC (rev 3728) +++ trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java 2012-08-24 12:57:23 UTC (rev 3729) @@ -47,6 +47,7 @@ import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.simulator.SimulationContext; +import fr.ifremer.isisfish.util.Nocache; /** * Cache aspect. @@ -61,7 +62,7 @@ */ @Aspect("perJVM") public class Cache { - + /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(Cache.class); @@ -117,23 +118,32 @@ @Around("scriptsMethod") public Object call(final JoinPoint jp) throws Throwable { totalCall++; - Object key = computeKey(jp); - Object result = cache.get(key); - if (result == null) { - - // computation increment (/ by 0) - // FIXME need to be called, but fail with empty stack - //Method method = ((MethodSignature)jp.getSignature()).getMethod(); - //getTrace().traceAfterComputation(method); + Object result = null; + Method method = ((MethodSignature)jp.getSignature()).getMethod(); + if (method.getAnnotation(Nocache.class) != null || + method.getDeclaringClass().getAnnotation(Nocache.class) != null) { result = realCall(jp); -// addListenerFor(key); // pas necessaire car on a la date et pour une date donnée rien ne peut changer - if (result != null) { // util pour les methodes retournant void, ne fonctionne pas si on met AND !execute(void *(..)) dans l'aspect. En fait fonction seulement si utilisé avec les traces :( - cache.put(key, result); + } else { + Object key = computeKey(jp); + result = cache.get(key); + if (result == null) { + + // computation increment (/ by 0) + // FIXME need to be called, but fail with empty stack + //Method method = ((MethodSignature)jp.getSignature()).getMethod(); + //getTrace().traceAfterComputation(method); + + result = realCall(jp); + // addListenerFor(key); // pas necessaire car on a la date et pour une date donnée rien ne peut changer + if (result != null) { // util pour les methodes retournant void, ne fonctionne pas si on met AND !execute(void *(..)) dans l'aspect. En fait fonction seulement si utilisé avec les traces :( + cache.put(key, result); + } + } else { + cacheUsed++; } - } else { - cacheUsed++; } + if (log.isTraceEnabled()) { log.trace(((MethodSignature)jp.getSignature()).getMethod() + " args " + Arrays.toString(((MethodRtti)jp.getRtti()).getParameterValues()) Added: trunk/src/main/java/fr/ifremer/isisfish/util/Nocache.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/Nocache.java (rev 0) +++ trunk/src/main/java/fr/ifremer/isisfish/util/Nocache.java 2012-08-24 12:57:23 UTC (rev 3729) @@ -0,0 +1,47 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Ifremer, Code Lutin, Chatellier Eric + * %% + * 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, see + * <http://www.gnu.org/licenses/gpl-2.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.util; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Annotation pour specifier à l'aspect du cache que l'on ne souhaite ne pas + * mettre en cache l'appel d'une méthode ou des méthodes d'une classe. + * + * @author echatellier + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +(a)Retention(RetentionPolicy.RUNTIME) +(a)Target({ElementType.METHOD, ElementType.TYPE}) +public @interface Nocache { + +} Property changes on: trunk/src/main/java/fr/ifremer/isisfish/util/Nocache.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r3728 - trunk/src/main/java/fr/ifremer/isisfish/util
by echatellier＠users.forge.codelutin.com 24 Aug '12

24 Aug '12

Author: echatellier Date: 2012-08-24 14:19:40 +0200 (Fri, 24 Aug 2012) New Revision: 3728 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3728 Log: fixes #1415 : ConverterUtil#getConverter must be cached to return only one instance instead of one for each call Modified: trunk/src/main/java/fr/ifremer/isisfish/util/ConverterUtil.java Modified: trunk/src/main/java/fr/ifremer/isisfish/util/ConverterUtil.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/ConverterUtil.java 2012-08-16 13:05:04 UTC (rev 3727) +++ trunk/src/main/java/fr/ifremer/isisfish/util/ConverterUtil.java 2012-08-24 12:19:40 UTC (rev 3728) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2010 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2006 - 2012 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -36,6 +36,8 @@ import fr.ifremer.isisfish.types.Month; import fr.ifremer.isisfish.types.RangeOfValues; import fr.ifremer.isisfish.types.TimeUnit; +import java.util.Map; +import java.util.WeakHashMap; /** * ConverterUtil. @@ -50,28 +52,43 @@ */ public class ConverterUtil { + static protected Map<TopiaContext, ConvertUtilsBean> cache = new WeakHashMap<TopiaContext, ConvertUtilsBean>(); + static protected ConvertUtilsBean nullConverter = getConverterNoCache(null); + public static ConvertUtilsBean getConverter(TopiaContext context) { - BeanUtilsBean result = BeanUtilsBean.getInstance(); - ConvertUtilsBean cub = result.getConvertUtils(); + ConvertUtilsBean result; + if (context == null) { + result = nullConverter; + } else { + result = cache.get(context); + if (result == null) { + result = getConverterNoCache(context); + } + } + return result; + } + protected static ConvertUtilsBean getConverterNoCache(TopiaContext context) { + BeanUtilsBean bub = BeanUtilsBean.getInstance(); + ConvertUtilsBean result = bub.getConvertUtils(); + cache.put(context, result); + // mise en place de converter de string vers des objet ... - cub.register(new TopiaEntityConverter(context), TopiaEntity.class); - cub.register(new TimeStepConverter(), TimeStep.class); - cub.register(new MonthConverter(), Month.class); - cub.register(new TimeUnitConverter(), TimeUnit.class); - cub.register(new RangeOfValuesConverter(), RangeOfValues.class); - + result.register(new TopiaEntityConverter(context), TopiaEntity.class); + result.register(new TimeStepConverter(), TimeStep.class); + result.register(new MonthConverter(), Month.class); + result.register(new TimeUnitConverter(), TimeUnit.class); + result.register(new RangeOfValuesConverter(), RangeOfValues.class); + // Not used since mexico file format use // Still used in sensivity analysis prescript - cub.register(new MatrixConverter(), MatrixND.class); + result.register(new MatrixConverter(), MatrixND.class); // dans les prescripts generé on a MatrixNDImpl.class // c'est tres étrange, mais ca ne fonctionne pas par MatrixND.class - cub.register(new MatrixConverter(), MatrixNDImpl.class); + result.register(new MatrixConverter(), MatrixNDImpl.class); // ... et inversement - cub.register(new StringConverter(), String.class); - - return cub; + result.register(new StringConverter(), String.class); + return result; } - }

1 0

r3727 - trunk/src/main/java/fr/ifremer/isisfish/ui/script
by echatellier＠users.forge.codelutin.com 16 Aug '12

16 Aug '12

Author: echatellier Date: 2012-08-16 15:05:04 +0200 (Thu, 16 Aug 2012) New Revision: 3727 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3727 Log: fixes #1406 : Can't create SimulationPlan Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2012-08-10 16:12:54 UTC (rev 3726) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2012-08-16 13:05:04 UTC (rev 3727) @@ -292,7 +292,7 @@ Language.JAVA); break; case CommunitySimulationPlan: - script = SimulationPlanStorage.getSimulationPlan(fileName, Location.COMMUNITY); + script = SimulationPlanStorage.createSimulationPlan(fileName, Location.COMMUNITY); break; case CommunityExport: script = ExportStorage.createExport(fileName, Location.COMMUNITY);

1 0

r3726 - trunk
by maven-release＠users.forge.codelutin.com 10 Aug '12

10 Aug '12

Author: maven-release Date: 2012-08-10 18:12:54 +0200 (Fri, 10 Aug 2012) New Revision: 3726 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3726 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-10 16:12:47 UTC (rev 3725) +++ trunk/pom.xml 2012-08-10 16:12:54 UTC (rev 3726) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.1.0.3</version> + <version>4.1.0.4-SNAPSHOT</version>  <dependencies> @@ -730,9 +730,9 @@   <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.1.0.3</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.1.0.3</developerConnection> - <url>http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.1.0.3</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</developerConnection> + <url>http://svn.forge.codelutin.com/svn/isis-fish/trunk</url> </scm> <repositories>

1 0

r3725 - in tags: . isis-fish-4.1.0.3
by maven-release＠users.forge.codelutin.com 10 Aug '12

10 Aug '12

Author: maven-release Date: 2012-08-10 18:12:47 +0200 (Fri, 10 Aug 2012) New Revision: 3725 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3725 Log: [maven-release-plugin] copy for tag isis-fish-4.1.0.3 Added: tags/isis-fish-4.1.0.3/ Property changes on: tags/isis-fish-4.1.0.3 ___________________________________________________________________ Added: svn:ignore + maven.log target velocity.log .classpath .project isis-fish.ipr isis-fish.iws isis-fish.iml .settings bin nbproject Inputs_Langoustine Added: svn:mergeinfo + /branches/4.1:3601-3670

1 0