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

r3953 - branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher
by echatellier＠users.forge.codelutin.com April 15, 2014

April 15, 2014

Author: echatellier Date: 2014-04-15 16:17:48 +0200 (Tue, 15 Apr 2014) New Revision: 3953 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3953 Log: Set version after deep copy for migration Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2014-04-15 07:31:55 UTC (rev 3952) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2014-04-15 14:17:48 UTC (rev 3953) @@ -62,6 +62,7 @@ import org.nuiton.util.ObjectUtil; import org.nuiton.util.ZipUtil; +import fr.ifremer.isisfish.IsisConfig; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.datastore.ExportStorage; @@ -375,6 +376,9 @@ // make deep copy, ui, still work with // copy need to be deep for simulation plan to reload SimulationParameter localParameters = param.deepCopy(); + + // for migration purpose, we need to override IsisFishVersion here + localParameters.setIsisFishVersion(IsisConfig.getVersion()); // on l'ajoute tout de suite a la liste des simulations demandee SimulationControl control = new SimulationControl(id); @@ -425,6 +429,9 @@ // copy need to be deep for simulation plan to reload SimulationParameter localParameters = param.deepCopy(); + // for migration purpose, we need to override IsisFishVersion here + localParameters.setIsisFishVersion(IsisConfig.getVersion()); + try { // build master sensitivity export directory

1 0

r3952 - branches/4.0.1/src/main/resources/templates/script
by bpoussin＠users.forge.codelutin.com April 15, 2014

April 15, 2014

Author: bpoussin Date: 2014-04-15 09:31:55 +0200 (Tue, 15 Apr 2014) New Revision: 3952 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3952 Log: mise a jour de la javadoc Modified: branches/4.0.1/src/main/resources/templates/script/optimization.ftl Modified: branches/4.0.1/src/main/resources/templates/script/optimization.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/optimization.ftl 2014-04-14 10:50:44 UTC (rev 3951) +++ branches/4.0.1/src/main/resources/templates/script/optimization.ftl 2014-04-15 07:31:55 UTC (rev 3952) @@ -106,7 +106,7 @@ /** * La premiere generation doit etre construite dans cette methode - * via des appels a context.addSimulation(...) + * via des appels a context.newSimulation(...) * * @param context */ @@ -116,7 +116,7 @@ /** * Génère une nouvelle série de simulation suivant le context d'optimisation. - * Pour cela vous devez appeler context.addSimulation(...) pour ajouter + * Pour cela vous devez appeler context.newSimulation(...) pour ajouter * des simulations pour la prochaine generation. * * @param context context @@ -127,7 +127,7 @@ /** * Cette methode est appelee après chaque serie de simulation - * soit apres startSimulation et nextSimulation + * soit apres firstSimulation et nextSimulation * @param context */ public void endSimulation(OptimizationContext context) { @@ -136,7 +136,7 @@ /** * Cette methode est appelee lorsqu'il n'y a plus de simulation a faire - * (init ou getNextSimulation n'ont pas fait appel a context.addSimulation) + * (firstSimulation ou nextSimulation n'ont pas fait appel a context.newSimulation) * @param context */ public void finish(OptimizationContext context) throws Exception;

1 0

r3951 - branches/4.0.1
by echatellier＠users.forge.codelutin.com April 14, 2014

April 14, 2014

Author: echatellier Date: 2014-04-14 12:50:44 +0200 (Mon, 14 Apr 2014) New Revision: 3951 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3951 Log: Update libs and use nuiton-matrix snapshot Modified: branches/4.0.1/pom.xml Modified: branches/4.0.1/pom.xml =================================================================== --- branches/4.0.1/pom.xml 2014-04-11 15:21:43 UTC (rev 3950) +++ branches/4.0.1/pom.xml 2014-04-14 10:50:44 UTC (rev 3951) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>5.0.4</version> + <version>5.0.5</version> </parent> <groupId>fr.ifremer</groupId> @@ -81,14 +81,14 @@ <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix</artifactId> - <version>2.3.2</version> + <version>2.4-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix-gui</artifactId> - <version>2.3.2</version> + <version>2.4-SNAPSHOT</version> <scope>compile</scope> </dependency> @@ -166,6 +166,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> + <version>3.3.2</version> </dependency> <dependency>

1 0

r3950 - branches/4.0.1/src/main/java/fr/ifremer/isisfish/util
by echatellier＠users.forge.codelutin.com April 11, 2014

April 11, 2014

Author: echatellier Date: 2014-04-11 17:21:43 +0200 (Fri, 11 Apr 2014) New Revision: 3950 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3950 Log: Improve file access performance during simulation Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java 2014-04-11 15:18:59 UTC (rev 3949) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java 2014-04-11 15:21:43 UTC (rev 3950) @@ -196,16 +196,12 @@ File fileRootSrc = IsisFish.config.getCompileDirectory(); File fileCheckSum = new File(fileRootSrc, packageName + File.separator + className + ".hashCode"); File fileSrc = new File(fileRootSrc, packageName + File.separator + className + ".java"); - File fileDest = new File(fileRootSrc, packageName + File.separator + className + ".class"); + //File fileDest = new File(fileRootSrc, packageName + File.separator + className + ".class"); - boolean checkSumEquals = false; - // if equation's Java file exists, check the checksum - if (fileSrc.exists() && fileCheckSum.exists()) { - String oldCheckSum = getHashCache(fileCheckSum); - String newCheckSum = Integer.toString(script.hashCode()); - checkSumEquals = newCheckSum.equals(oldCheckSum); - } + String oldCheckSum = getHashCache(fileCheckSum); + String newCheckSum = Integer.toString(script.hashCode()); + boolean checkSumEquals = newCheckSum.equals(oldCheckSum); // if Java file's checkSum is not equals to script's checkSum // generate new Java file @@ -220,10 +216,7 @@ } catch (IOException zzz) { throw new IsisFishRuntimeException(t("isisfish.error.save.script.compilation", fileSrc), zzz); } - } - // if Java file is newer than class file, compile java file - if (!fileDest.exists() || FileUtils.isFileNewer(fileSrc, fileDest)) { try { List<File> classpath = new ArrayList<File>(); classpath.add(fileRootSrc.getAbsoluteFile()); @@ -242,8 +235,26 @@ try { ClassLoader cl = IsisFish.config.getScriptClassLoader(); clazz = cl.loadClass(classname); - } catch (Exception zzz) { - throw new IsisFishRuntimeException(t("isisfish.error.load.class", classname), zzz); + } catch (Exception ex) { + + // force to compile it again; may happen if hashcode + // is correct, but .class file can't be loaded + try { + List<File> classpath = new ArrayList<File>(); + classpath.add(fileRootSrc.getAbsoluteFile()); + classpath.add(IsisFish.config.getDatabaseDirectory().getAbsoluteFile()); + int compileResult = CompileHelper.compile(classpath, Collections.singletonList(fileSrc), fileRootSrc, null); + + if (compileResult != 0) { + throw new IsisFishRuntimeException(t("isisfish.error.compile.script", compileResult, fileSrc)); + } + + // second load + ClassLoader cl = IsisFish.config.getScriptClassLoader(); + clazz = cl.loadClass(classname); + } catch (Exception ex2) { + throw new IsisFishRuntimeException(t("isisfish.error.compile.script", fileSrc), ex2); + } } result = invoke(clazz, interfaceMethod, args);

1 0

r3949 - branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator
by echatellier＠users.forge.codelutin.com April 11, 2014

April 11, 2014

Author: echatellier Date: 2014-04-11 17:18:59 +0200 (Fri, 11 Apr 2014) New Revision: 3949 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3949 Log: Reduce useless log messages Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java 2014-04-11 15:09:51 UTC (rev 3948) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java 2014-04-11 15:18:59 UTC (rev 3949) @@ -28,6 +28,7 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; +import java.util.Objects; import java.util.Properties; import org.apache.commons.logging.Log; @@ -198,7 +199,8 @@ * @param text The text to set. */ public void setText(String text) { - if (log.isInfoEnabled()) { + // pevent multiples logging of same string during remote simulations + if (!Objects.equals(this.text, text) && log.isInfoEnabled()) { log.info(text); } String oldValue = this.text;

1 0

r3948 - branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities
by echatellier＠users.forge.codelutin.com April 11, 2014

April 11, 2014

Author: echatellier Date: 2014-04-11 17:09:51 +0200 (Fri, 11 Apr 2014) New Revision: 3948 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3948 Log: Improve groupLength compute Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java 2014-04-11 13:56:35 UTC (rev 3947) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java 2014-04-11 15:09:51 UTC (rev 3948) @@ -51,6 +51,9 @@ /** serialVersionUID. */ private static final long serialVersionUID = 1L; + /** Equation computing result cache to not compute equation at each call to improve performances. */ + protected transient Double groupLength; + /* * @see fr.ifremer.isisfish.entities.PopulationGroup#getAge() */ @@ -73,16 +76,17 @@ */ @Override public double getLength() { - double result = 0; - if (getPopulation() != null && getPopulation().getSpecies() != null) { - if (!getPopulation().getSpecies().getAgeGroupType()) { - result = (getMinLength() + getMaxLength()) / 2.0; - } else { - result = getPopulation().getLength( - getAge() * Month.NUMBER_OF_MONTH, this); + if (groupLength == null) { + if (getPopulation() != null && getPopulation().getSpecies() != null) { + if (!getPopulation().getSpecies().getAgeGroupType()) { + groupLength = (getMinLength() + getMaxLength()) / 2.0; + } else { + groupLength = getPopulation().getLength( + getAge() * Month.NUMBER_OF_MONTH, this); + } } } - return result; + return groupLength; } @Override

1 0

r3947 - branches/4.0.1/src/main/java/fr/ifremer/isisfish/util
by echatellier＠users.forge.codelutin.com April 11, 2014

April 11, 2014

Author: echatellier Date: 2014-04-11 15:56:35 +0200 (Fri, 11 Apr 2014) New Revision: 3947 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3947 Log: Merge trunk Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java 2014-04-11 12:28:28 UTC (rev 3946) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java 2014-04-11 13:56:35 UTC (rev 3947) @@ -44,7 +44,9 @@ import fr.ifremer.isisfish.IsisFishRuntimeException; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.nuiton.util.FileUtil; +import fr.ifremer.isisfish.simulator.SimulationContext; +import java.util.HashMap; +import org.apache.commons.lang3.StringUtils; /** * Permet d'evaluer les equations ecritent en Java @@ -69,7 +71,55 @@ */ static protected Pattern grepImportPattern = Pattern.compile("(?:^\\s*|(?<=;)\\s*)(import[^;]+;)", Pattern.DOTALL + Pattern.MULTILINE); + private static final String HASH_CACHE_KEY = "__hashCache__"; + protected static String getHashCache(File fileCheckSum) { + String result = ""; + + SimulationContext context = SimulationContext.get(); + if (context == null) { + // on est pas dans une simulation + // on verifie dans le fichier + if (fileCheckSum.exists()) { + try { + result = FileUtils.readFileToString(fileCheckSum); + } catch (IOException eee) { + log.info("Can't read old checkSum: " + fileCheckSum, eee); + } + } + } else { + // on est dans une simulation, on verifie dans le cache de la simulation + String key = "__hashCache__"; + Map<String, String> cache = (Map<String, String>)context.getValue(key); + if (cache != null) { + result = StringUtils.defaultString(cache.get(fileCheckSum.getPath())); + } + } + + return result; + } + + protected static void setHashCache(File fileCheckSum, String hashcode) { + SimulationContext context = SimulationContext.get(); + if (context == null) { + // on est pas dans une simulation + // on ecrit dans le fichier + try { + FileUtils.writeStringToFile(fileCheckSum, hashcode); + } catch (IOException eee) { + log.info("Can't write checkSum: " + fileCheckSum, eee); + } + } else { + // on est dans une simulation, on verifie dans le cache de la simulation + Map<String, String> cache = (Map<String, String>)context.getValue(HASH_CACHE_KEY); + if (cache == null) { + context.setValue(HASH_CACHE_KEY, cache = new HashMap<String, String>()); + } + + cache.put(fileCheckSum.getPath(), hashcode); + } + } + protected static String normalizeClassName(String name) { StringBuilder result = new StringBuilder(name); for (int i=0; i<result.length(); i++) { @@ -152,12 +202,7 @@ // if equation's Java file exists, check the checksum if (fileSrc.exists() && fileCheckSum.exists()) { - String oldCheckSum = ""; - try { - oldCheckSum = FileUtils.readFileToString(fileCheckSum); - } catch (IOException eee) { - log.info("Can't read old checkSum: " + fileCheckSum, eee); - } + String oldCheckSum = getHashCache(fileCheckSum); String newCheckSum = Integer.toString(script.hashCode()); checkSumEquals = newCheckSum.equals(oldCheckSum); } @@ -171,14 +216,10 @@ // force writing to UTF-8 // fix compilation issue : unmappable characters FileUtils.writeStringToFile(fileSrc, content, "utf-8"); + setHashCache(fileCheckSum, Integer.toString(script.hashCode())); } catch (IOException zzz) { throw new IsisFishRuntimeException(t("isisfish.error.save.script.compilation", fileSrc), zzz); } - try { - FileUtils.writeStringToFile(fileCheckSum, Integer.toString(script.hashCode()), "utf-8"); - } catch (IOException zzz) { - throw new IsisFishRuntimeException(t("isisfish.error.save.checkSum.compilation", fileSrc), zzz); - } } // if Java file is newer than class file, compile java file

1 0

r3946 - branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher
by echatellier＠users.forge.codelutin.com April 11, 2014

April 11, 2014

Author: echatellier Date: 2014-04-11 14:28:28 +0200 (Fri, 11 Apr 2014) New Revision: 3946 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3946 Log: Fix useCache and useOptimization parameters Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2014-04-10 15:53:28 UTC (rev 3945) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2014-04-11 12:28:28 UTC (rev 3946) @@ -350,13 +350,13 @@ // // Activation de l'OAP demandée // - if (parameters.getUseStatistic() || parameters.getUseOptimization()) { + if (parameters.getUseStatistic() || parameters.getUseCache()) { if (parameters.getUseStatistic()) { message(control, t("isisfish.message.setting.trace.aspects")); classLoader.deploy(TraceAspect.class); } - if (parameters.getUseOptimization()) { + if (parameters.getUseCache()) { message(control, t("isisfish.message.setting.cache.aspects")); classLoader.deploy(CacheAspect.class); }

1 0

r3945 - branches/4.0.1/src/main/resources/templates/script
by echatellier＠users.forge.codelutin.com April 10, 2014

April 10, 2014

Author: echatellier Date: 2014-04-10 17:53:28 +0200 (Thu, 10 Apr 2014) New Revision: 3945 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3945 Log: Remove _ use in scripts Modified: branches/4.0.1/src/main/resources/templates/script/equation.ftl branches/4.0.1/src/main/resources/templates/script/export.ftl branches/4.0.1/src/main/resources/templates/script/objective.ftl branches/4.0.1/src/main/resources/templates/script/optimization.ftl branches/4.0.1/src/main/resources/templates/script/rule.ftl branches/4.0.1/src/main/resources/templates/script/script.ftl branches/4.0.1/src/main/resources/templates/script/sensitivityanalysis.ftl branches/4.0.1/src/main/resources/templates/script/sensitivityexport.ftl branches/4.0.1/src/main/resources/templates/script/simulationplan.ftl branches/4.0.1/src/main/resources/templates/script/simulator.ftl Modified: branches/4.0.1/src/main/resources/templates/script/equation.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/equation.ftl 2014-04-10 15:42:42 UTC (rev 3944) +++ branches/4.0.1/src/main/resources/templates/script/equation.ftl 2014-04-10 15:53:28 UTC (rev 3945) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2013 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2014 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: branches/4.0.1/src/main/resources/templates/script/export.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/export.ftl 2014-04-10 15:42:42 UTC (rev 3944) +++ branches/4.0.1/src/main/resources/templates/script/export.ftl 2014-04-10 15:53:28 UTC (rev 3945) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2013 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2014 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 @@ -47,7 +47,6 @@ import java.io.Writer; -import static org.nuiton.i18n.I18n._; import org.nuiton.math.matrix.*; import scripts.ResultName; @@ -94,7 +93,7 @@ } public String getDescription() { - return _("TODO export description"); + return "TODO export description"; } public void export(SimulationStorage simulation, Writer out) throws Exception { Modified: branches/4.0.1/src/main/resources/templates/script/objective.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/objective.ftl 2014-04-10 15:42:42 UTC (rev 3944) +++ branches/4.0.1/src/main/resources/templates/script/objective.ftl 2014-04-10 15:53:28 UTC (rev 3945) @@ -42,8 +42,6 @@ package objectives; -import static org.nuiton.i18n.I18n._; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -94,7 +92,7 @@ @Override public String getDescription() throws Exception { // TODO change description - return _("TODO ${name} description plan"); + return "TODO ${name} description plan"; } /** Modified: branches/4.0.1/src/main/resources/templates/script/optimization.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/optimization.ftl 2014-04-10 15:42:42 UTC (rev 3944) +++ branches/4.0.1/src/main/resources/templates/script/optimization.ftl 2014-04-10 15:53:28 UTC (rev 3945) @@ -42,8 +42,6 @@ package optimizations; -import static org.nuiton.i18n.I18n._; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -94,7 +92,7 @@ @Override public String getDescription() throws Exception { // TODO change description - return _("TODO ${name} description plan"); + return "TODO ${name} description plan"; } /** Modified: branches/4.0.1/src/main/resources/templates/script/rule.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/rule.ftl 2014-04-10 15:42:42 UTC (rev 3944) +++ branches/4.0.1/src/main/resources/templates/script/rule.ftl 2014-04-10 15:53:28 UTC (rev 3945) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2013 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2014 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 @@ -42,8 +42,6 @@ package rules; -import static org.nuiton.i18n.I18n._; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -93,7 +91,7 @@ */ public String getDescription() throws Exception { // TODO - return _("TODO description rule"); + return "TODO description rule"; } /** Modified: branches/4.0.1/src/main/resources/templates/script/script.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/script.ftl 2014-04-10 15:42:42 UTC (rev 3944) +++ branches/4.0.1/src/main/resources/templates/script/script.ftl 2014-04-10 15:53:28 UTC (rev 3945) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2013 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2014 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: branches/4.0.1/src/main/resources/templates/script/sensitivityanalysis.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/sensitivityanalysis.ftl 2014-04-10 15:42:42 UTC (rev 3944) +++ branches/4.0.1/src/main/resources/templates/script/sensitivityanalysis.ftl 2014-04-10 15:53:28 UTC (rev 3945) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2013 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2014 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 @@ -42,8 +42,6 @@ package sensitivityanalysis; -import static org.nuiton.i18n.I18n._; - import java.util.List; import org.apache.commons.logging.Log; @@ -82,7 +80,7 @@ */ public String getDescription() { // TODO change descrition - return _("TODO ${name} description plan"); + return "TODO ${name} description plan"; } /** @@ -102,7 +100,7 @@ * scenarios à prendre en compte pour les simulations. * * @param plan plan a analyser - * @param outputdirectory master sensitivity export directory + * @param outputDirectory master sensitivity export directory * * @return un {@link SensitivityScenarios} * @throws SensitivityException if calculator impl fail to execute @@ -111,7 +109,7 @@ * @see Scenario * @see SensitivityScenarios */ - public SensitivityScenarios compute(DesignPlan plan, File outputdirectory) + public SensitivityScenarios compute(DesignPlan plan, File outputDirectory) throws SensitivityException { SensitivityScenarios sensitivityScenarios = new SensitivityScenarios(); @@ -128,14 +126,14 @@ * @param simulationStorages * ensemble des {@link SimulationStorage} qui ont résultés des * simulations - * @param outputdirectory master sensitivity export directory + * @param outputDirectory master sensitivity export directory * @throws SensitivityException * if calculator impl fail to execute * * @see SensitivityScenarios */ public void analyzeResult(List<SimulationStorage> simulationStorages, - File outputdirectory) throws SensitivityException { + File outputDirectory) throws SensitivityException { } } Modified: branches/4.0.1/src/main/resources/templates/script/sensitivityexport.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/sensitivityexport.ftl 2014-04-10 15:42:42 UTC (rev 3944) +++ branches/4.0.1/src/main/resources/templates/script/sensitivityexport.ftl 2014-04-10 15:53:28 UTC (rev 3945) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2013 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2014 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 @@ -47,7 +47,6 @@ import java.io.Writer; -import static org.nuiton.i18n.I18n._; import org.nuiton.math.matrix.*; import scripts.ResultName; @@ -94,7 +93,7 @@ } public String getDescription() { - return _("TODO export description"); + return "TODO export description"; } public void export(SimulationStorage simulation, Writer out) throws Exception { Modified: branches/4.0.1/src/main/resources/templates/script/simulationplan.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/simulationplan.ftl 2014-04-10 15:42:42 UTC (rev 3944) +++ branches/4.0.1/src/main/resources/templates/script/simulationplan.ftl 2014-04-10 15:53:28 UTC (rev 3945) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2013 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2014 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 @@ -42,8 +42,6 @@ package simulationplans; -import static org.nuiton.i18n.I18n._; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -99,7 +97,7 @@ @Override public String getDescription() throws Exception { // TODO change description - return _("TODO ${name} description plan"); + return "TODO ${name} description plan"; } /** Modified: branches/4.0.1/src/main/resources/templates/script/simulator.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/simulator.ftl 2014-04-10 15:42:42 UTC (rev 3944) +++ branches/4.0.1/src/main/resources/templates/script/simulator.ftl 2014-04-10 15:53:28 UTC (rev 3945) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2013 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2014 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

1 0

r3944 - branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator
by bpoussin＠users.forge.codelutin.com April 10, 2014

April 10, 2014

Author: bpoussin Date: 2014-04-10 17:42:42 +0200 (Thu, 10 Apr 2014) New Revision: 3944 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3944 Log: only one discard per step Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java 2014-04-09 15:47:18 UTC (rev 3943) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java 2014-04-10 15:42:42 UTC (rev 3944) @@ -25,6 +25,7 @@ package fr.ifremer.isisfish.simulator; +import fr.ifremer.isisfish.IsisFishRuntimeException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -43,6 +44,7 @@ import fr.ifremer.isisfish.entities.Zone; import fr.ifremer.isisfish.types.TimeStep; import fr.ifremer.isisfish.types.Month; +import java.util.AbstractMap; import java.util.Collections; /** @@ -73,7 +75,7 @@ /** reproduction key: <date, pop> value:<MatrixND> */ protected Map<Population, Map<TimeStep, MatrixND>> reproductions = new HashMap<Population, Map<TimeStep, MatrixND>>(); /** discard key: <date, pop> value:<MatrixND> */ - protected Map<Population, Map<TimeStep, MatrixND>> discards = new HashMap<Population, Map<TimeStep, MatrixND>>(); + protected Map<Population, Map.Entry<TimeStep, MatrixND>> discards = new HashMap<Population, Map.Entry<TimeStep, MatrixND>>(); /** catch per population, only last catch is remaining */ protected Map<Population, MatrixND> catchs = new HashMap<Population, MatrixND>(); /** catch per population, only last catch is remaining */ @@ -97,7 +99,6 @@ .unmodifiableList(new ArrayList<Population>(pops)); for (Population pop : this.pops) { reproductions.put(pop, new HashMap<TimeStep, MatrixND>()); - discards.put(pop, new HashMap<TimeStep, MatrixND>()); } } @@ -395,12 +396,21 @@ * @return le discard */ public MatrixND getDiscard(TimeStep step, Population pop) { - MatrixND result = discards.get(pop).get(step); + checkStep(step, "You can only get discard for current step simulation, for old discard you must use ResultStorage"); + + MatrixND result = null; + // seul le discard de l'annee en cours est disponible, sinon on doit + // aller le chercher dans les resultats + Map.Entry<TimeStep, MatrixND> discard = discards.get(pop); + if (discard != null && discard.getValue().equals(step)) { + result = discard.getValue(); + } return result; } /** * Set discard. + * Only work for current step simulation * * Force discard at date for population. * @@ -409,33 +419,37 @@ * @param discard le discard */ public void setDiscard(TimeStep step, Population pop, MatrixND discard) { - Map<TimeStep, MatrixND> oneDiscard = discards.get(pop); - synchronized (oneDiscard) { - // meme si discards.get(pop) != null - // replace toujours le précédent - MatrixND tmp = discard.copy(); - discards.get(pop).put(step, tmp); - } + checkStep(step, "You can only change discard for current step simulation"); + // meme si discards.get(pop) != null + // replace toujours le précédent + MatrixND tmp = discard.copy(); + discards.put(pop, new AbstractMap.SimpleEntry<TimeStep, MatrixND>(step, tmp)); } /** - * FIXME: discards n'est jamais vider, on le conserve pour toutes les annees - * il serait bon de faire un peu le menage de temps en temps. + * Only work for current step simulation * * @param step * @param pop * @param discard */ public void addDiscard(TimeStep step, Population pop, MatrixND discard) { - Map<TimeStep, MatrixND> oneDiscard = discards.get(pop); - synchronized (oneDiscard) { - MatrixND tmp = oneDiscard.get(step); - if (tmp == null) { - tmp = discard.copy(); - discards.get(pop).put(step, tmp); - } else { - tmp.add(discard); - } + checkStep(step, "You can only add discard for current step simulation"); + + MatrixND oneDiscard = getDiscard(step, pop); + if (oneDiscard == null) { + oneDiscard = discard.copy(); + } else { + oneDiscard.add(discard); } + setDiscard(step, pop, oneDiscard); } + + public void checkStep(TimeStep step, String msg) { + SimulationContext sim = SimulationContext.get(); + TimeStep simStep = sim.getSimulationControl().getStep(); + if (!step.equals(simStep )) { + throw new IsisFishRuntimeException(msg); + } + } }

1 0