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

Jenkins build is unstable: isis-fish » IsisFish #1
by admin+ci-forge.codelutin.com＠codelutin.com 13 Feb '14

13 Feb '14

See <http://ci-ng.forge.codelutin.com/jenkins/job/isis-fish/fr.ifremer$isis-fish…>

2 3

Jenkins build is unstable: isis-fish #1
by admin+ci-forge.codelutin.com＠codelutin.com 13 Feb '14

13 Feb '14

See <http://ci-ng.forge.codelutin.com/jenkins/job/isis-fish/1/>

2 3

r3885 - trunk/src/main/java/fr/ifremer/isisfish/datastore
by bpoussin＠users.forge.codelutin.com 13 Feb '14

13 Feb '14

Author: bpoussin Date: 2014-02-13 23:24:45 +0100 (Thu, 13 Feb 2014) New Revision: 3885 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3885 Log: add new ResultStorage only in memory Added: trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageInMemory.java Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java Copied: trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageInMemory.java (from rev 3884, trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultDatabaseStorage.java) =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageInMemory.java (rev 0) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageInMemory.java 2014-02-13 22:24:45 UTC (rev 3885) @@ -0,0 +1,497 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2011 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 + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.datastore; + +import static org.nuiton.i18n.I18n._; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.math.matrix.MatrixFactory; +import org.nuiton.math.matrix.MatrixIterator; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.topia.TopiaContext; +import org.nuiton.util.ArrayUtil; +import org.nuiton.util.HashList; + +import fr.ifremer.isisfish.IsisFishException; +import fr.ifremer.isisfish.entities.Population; +import fr.ifremer.isisfish.export.Export; +import fr.ifremer.isisfish.export.SensitivityExport; +import fr.ifremer.isisfish.rule.Rule; +import fr.ifremer.isisfish.simulator.SimulationContext; +import fr.ifremer.isisfish.simulator.SimulationException; +import fr.ifremer.isisfish.simulator.SimulationPlan; +import fr.ifremer.isisfish.simulator.SimulationResultGetter; +import fr.ifremer.isisfish.types.TimeStep; +import fr.ifremer.isisfish.types.Month; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.Map; + +/** + * Cette classe permet de conserver des résultats de simulation. Elle permet + * ensuite de les récupérer. Les résultats sont stockés en mémoire. + * + * Created: 29 sept. 2004 + * + * @author Benjamin Poussin <poussin(a)codelutin.com> + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ +public class ResultStorageInMemory implements SimulationResultGetter, ResultStorage { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(ResultStorageInMemory.class); + + final static public String MAX_TIME_STEP = "ResultStorageInMemory.maxTimeStep"; + protected int maxTimeStep = 12; // default to 1 year + protected SimulationStorage simulation = null; + + LinkedHashMap<TimeStep, Map<String, MatrixND>> data = new LinkedHashMap<TimeStep, Map<String, MatrixND>>() { + private static final long serialVersionUID = 1L; + @Override + protected boolean removeEldestEntry(Map.Entry eldest) { + return size() > maxTimeStep; + } + }; + + LinkedHashMap<TimeStep, List<Rule>> rules = new LinkedHashMap<TimeStep, List<Rule>>() { + private static final long serialVersionUID = 1L; + @Override + protected boolean removeEldestEntry(Map.Entry eldest) { + return size() > maxTimeStep; + } + }; + + + /** result enabled */ + transient protected Set<String> enabledResult = null; + + /** + * Les ResultStorage ne doivent pas etre instancier directement, mais + * recuperer a partir d'un + * {@link fr.ifremer.isisfish.datastore.SimulationStorage#getResultStorage()} + * + * @param simulation storage to get result + */ + public ResultStorageInMemory(SimulationStorage simulation) { + this.simulation = simulation; + maxTimeStep = Integer.parseInt(simulation.getParameter().getTagValue().get(MAX_TIME_STEP)); + } + + @Override + public void delete() { + data.clear(); + } + + @Override + public void close() { + // do nothing, closed by simulation storage closing + } + + /* (non-Javadoc) + * @see fr.ifremer.isisfish.datastore.ResultStorage#isEnabled(java.lang.String) + */ + @Override + public boolean isEnabled(String name) { + name = name.trim(); + if (enabledResult == null) { + enabledResult = new HashSet<String>(); + + 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) { + ExportStorage storage = ExportStorage.getExport(exportName); + try { + Export export = storage.getNewExportInstance(); + for (String resultName : export.getNecessaryResult()) { + enabledResult.add(resultName); + } + } catch (IsisFishException eee) { + if (log.isWarnEnabled()) { + log.warn(_("isisfish.error.instanciate.export", + exportName), eee); + } + } + } + } + + // 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) { + for (String resultName : rule.getNecessaryResult()) { + enabledResult.add(resultName); + } + } + } + + // test on plans + List<SimulationPlan> plans = simulation.getParameter().getSimulationPlans(); + if (plans != null) { + for (SimulationPlan plan : plans) { + for (String resultName : plan.getNecessaryResult()) { + enabledResult.add(resultName); + } + } + } + log.info("Enabled result: " + enabledResult); + } + boolean result = enabledResult.contains(name); + return result; + } + + /* (non-Javadoc) + * @see fr.ifremer.isisfish.datastore.ResultStorage#addResult(fr.ifremer.isisfish.types.TimeStep, org.nuiton.math.matrix.MatrixND) + */ + @Override + public void addResult(TimeStep step, MatrixND mat) throws IsisFishException { + addResult(false, step, mat.getName(), mat); + } + + /* (non-Javadoc) + * @see fr.ifremer.isisfish.datastore.ResultStorage#addResult(fr.ifremer.isisfish.types.TimeStep, fr.ifremer.isisfish.entities.Population, org.nuiton.math.matrix.MatrixND) + */ + @Override + public void addResult(TimeStep step, Population pop, MatrixND mat) throws IsisFishException { + addResult(false, step, mat.getName(), pop, mat); + } + + /* (non-Javadoc) + * @see fr.ifremer.isisfish.datastore.ResultStorage#addResult(boolean, fr.ifremer.isisfish.types.TimeStep, org.nuiton.math.matrix.MatrixND) + */ + @Override + public void addResult(boolean force, TimeStep step, MatrixND mat) throws IsisFishException { + addResult(force, step, mat.getName(), mat); + } + + /* (non-Javadoc) + * @see fr.ifremer.isisfish.datastore.ResultStorage#addResult(boolean, fr.ifremer.isisfish.types.TimeStep, fr.ifremer.isisfish.entities.Population, org.nuiton.math.matrix.MatrixND) + */ + @Override + public void addResult(boolean force, TimeStep step, Population pop, MatrixND mat) throws IsisFishException { + addResult(force, step, mat.getName(), pop, mat); + } + + /* (non-Javadoc) + * @see fr.ifremer.isisfish.datastore.ResultStorage#addResult(fr.ifremer.isisfish.types.TimeStep, java.lang.String, fr.ifremer.isisfish.entities.Population, org.nuiton.math.matrix.MatrixND) + */ + @Override + public void addResult(TimeStep step, String name, Population pop, MatrixND mat) throws IsisFishException { + addResult(false, step, name, pop, mat); + } + + /* (non-Javadoc) + * @see fr.ifremer.isisfish.datastore.ResultStorage#addResult(fr.ifremer.isisfish.types.TimeStep, java.lang.String, org.nuiton.math.matrix.MatrixND) + */ + @Override + public void addResult(TimeStep step, String name, MatrixND mat) throws IsisFishException { + addResult(false, step, name, mat); + } + + /* (non-Javadoc) + * @see fr.ifremer.isisfish.datastore.ResultStorage#addResult(boolean, fr.ifremer.isisfish.types.TimeStep, java.lang.String, fr.ifremer.isisfish.entities.Population, org.nuiton.math.matrix.MatrixND) + */ + @Override + public void addResult(boolean force, TimeStep step, String name, Population pop, MatrixND mat) throws IsisFishException { + if (force || isEnabled(name)) { + doAddResult(step, name + " " + pop, mat); + } + } + + /* (non-Javadoc) + * @see fr.ifremer.isisfish.datastore.ResultStorage#addResult(boolean, fr.ifremer.isisfish.types.TimeStep, java.lang.String, org.nuiton.math.matrix.MatrixND) + */ + @Override + public void addResult(boolean force, TimeStep step, String name, MatrixND mat) throws IsisFishException { + if (force || isEnabled(name)) { + doAddResult(step, name, mat); + } + } + + protected void doAddResult(TimeStep step, String name, MatrixND mat) throws IsisFishException { + // si la matrice n'a pas de semantique on refuse + for (int i = 0; i < mat.getDimCount(); i++) { + // la semantique n'est pas bonne des qu'il y a un null dedans + if (mat.getSemantic(i).contains(null)) { + throw new SimulationException( + "Erreur le résultat que vous souhaitez enregistrer n'a pas d'information convenable pour la dimension: " + + i + " " + mat.getDimensionName(i)); + } + } + + // on fait une copie pour avoir reellement des resultats independant + // FIXME echatellier 20120829 : faire une copie optimiser + // suivant l'implementation du vector plutot qu'un parcourt + // via un iterateur de semantiques (plus couteux) + MatrixND newMat = mat.copy(); + Map<String, MatrixND> mats = data.get(step); + if (mats == null) { + mats = new HashMap<String, MatrixND>(); + data.put(step, mats); + } + + mats.put(name, newMat); + } + + /* (non-Javadoc) + * @see fr.ifremer.isisfish.datastore.ResultStorage#addActiveRule(fr.ifremer.isisfish.types.TimeStep, fr.ifremer.isisfish.rule.Rule) + */ + @Override + public void addActiveRule(TimeStep step, Rule rule) throws IsisFishException { + List<Rule> list = rules.get(step); + if (list == null) { + list = new LinkedList<Rule>(); + rules.put(step, list); + } + + list.add(rule); + +// result.setActiveRuleStep(step); +// result.setName(RuleStorage.getName(rule)); +// result.setParam(RuleStorage.getParamAsString(rule)); + } + + /* (non-Javadoc) + * @see fr.ifremer.isisfish.datastore.ResultStorage#getResultName() + */ + @Override + public List<String> getResultName() { + + Set<String> result = new HashSet<String>(); + + for (Map<String, MatrixND> mats : data.values()) { + result.addAll(mats.keySet()); + } + + return new ArrayList<String>(result); + } + + /* (non-Javadoc) + * @see fr.ifremer.isisfish.datastore.ResultStorage#getMatrix(fr.ifremer.isisfish.types.TimeStep, fr.ifremer.isisfish.entities.Population, java.lang.String) + */ + @Override + public MatrixND getMatrix(TimeStep step, Population pop, String name) { + String newName = name + " " + pop; + return getMatrix(step, newName); + } + + /* (non-Javadoc) + * @see fr.ifremer.isisfish.datastore.ResultStorage#getMatrix(fr.ifremer.isisfish.types.TimeStep, java.lang.String) + */ + @Override + public MatrixND getMatrix(TimeStep step, String name) { + MatrixND result = null; + Map<String, MatrixND> mats = data.get(step); + if (mats != null) { + result = mats.get(name); + } + return result; + } + + @Override + public MatrixND getMatrix(TimeStep step, String name, TopiaContext tx) { + return getMatrix(step, name); + } + + /* (non-Javadoc) + * @see fr.ifremer.isisfish.datastore.ResultStorage#getMatrix(fr.ifremer.isisfish.entities.Population, java.lang.String) + */ + @Override + public MatrixND getMatrix(Population pop, String name) { + String newName = name + " " + pop; + return getMatrix(newName); + } + + /* (non-Javadoc) + * @see fr.ifremer.isisfish.datastore.ResultStorage#getMatrix(fr.ifremer.isisfish.entities.Population, java.lang.String, org.nuiton.topia.TopiaContext) + */ + @Override + public MatrixND getMatrix(Population pop, String name, TopiaContext tx) { + String newName = name + " " + pop; + return getMatrix(newName, tx); + } + + /* (non-Javadoc) + * @see fr.ifremer.isisfish.datastore.ResultStorage#getMatrix(java.lang.String) + */ + @Override + public MatrixND getMatrix(String name) { + MatrixND result = null; + + List<TimeStep> steps = new ArrayList<TimeStep>(); + Map<TimeStep, MatrixND> mats = new LinkedHashMap<TimeStep, MatrixND>(); + MatrixND matExample = null; + for (Map.Entry<TimeStep, Map<String, MatrixND>> e : data.entrySet()) { + TimeStep ts = e.getKey(); + MatrixND mat = e.getValue().get(name); + if (mat != null) { + steps.add(ts); + mats.put(ts, mat); + matExample = mat; + } + } + + if (mats.size() > 0) { + // recuperation des noms des dimensions + String[] dimNames = new String[1 + matExample.getDimCount()]; + dimNames[0] = _("isisfish.common.date"); + for (int i = 1; i < dimNames.length; i++) { + dimNames[i] = matExample.getDimensionName(i - 1); + } + + // creation de la semantique pour la matrice resultat. +1 pour les dates + List[] sem = new List[1 + matExample.getDimCount()]; + sem[0] = steps; + + for (int i = 1; i < sem.length; i++) { + sem[i] = new HashList(); + } + + for (MatrixND mattmp : mats.values()) { + if (log.isTraceEnabled()) { + log.trace("Ajout de la semantics: " + + Arrays.asList(mattmp.getSemantics())); + } + + for (int s = 0; s < mattmp.getDimCount(); s++) { + sem[s + 1].addAll(mattmp.getSemantic(s)); + } + } + + if (log.isTraceEnabled()) { + log.trace("La semantique final est: " + Arrays.asList(sem)); + } + + // creation de la matrice resultat + result = MatrixFactory.getInstance().create(name, sem, dimNames); + + // recuperation du resultat pour chaque date de la simulation, de Date(0) à lastDate + for (Map.Entry<TimeStep, MatrixND> e : mats.entrySet()) { + TimeStep d = e.getKey(); + MatrixND mat = e.getValue(); + // on recupere dans la matrice resultat l'endroit on il faut + // mettre la matrice + MatrixND submat = result.getSubMatrix(0, d, 1); + // on met les valeur de mat dans la sous matrice extraite + for (MatrixIterator mi = mat.iterator(); mi.next();) { + submat.setValue( + ArrayUtil.concat(new Object[] { d }, + mi.getSemanticsCoordinates()), mi.getValue()); + } + } + } + + return result; + } + + /* (non-Javadoc) + * @see fr.ifremer.isisfish.datastore.ResultStorage#getMatrix(java.lang.String, org.nuiton.topia.TopiaContext) + */ + @Override + public MatrixND getMatrix(String name, TopiaContext tx) { + return getMatrix(name); + } + + /* (non-Javadoc) + * @see fr.ifremer.isisfish.datastore.ResultStorage#getLastStep() + */ + @Override + public TimeStep getLastStep() { + int monthNumber = simulation.getParameter().getNumberOfYear() + * Month.NUMBER_OF_MONTH; + TimeStep result = new TimeStep(monthNumber - 1); // -1 because date begin at 0 + return result; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationResultListener#addResult(fr.ifremer.isisfish.simulator.SimulationContext, fr.ifremer.isisfish.types.TimeStep, java.lang.String, org.nuiton.math.matrix.MatrixND) + */ + @Override + public void addResult(SimulationContext context, TimeStep step, String name, + MatrixND mat) throws IsisFishException { + doAddResult(step, name, mat); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationResultGetter#getMatrix(fr.ifremer.isisfish.simulator.SimulationContext, fr.ifremer.isisfish.types.TimeStep, java.lang.String) + */ + @Override + public MatrixND getMatrix(SimulationContext context, TimeStep step, String name) { + MatrixND result = getMatrix(step, name); + return result; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationResultGetter#getMatrix(fr.ifremer.isisfish.simulator.SimulationContext, java.lang.String) + */ + @Override + public MatrixND getMatrix(SimulationContext context, String name) { + MatrixND result = getMatrix(name); + return result; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationListener#afterSimulation(fr.ifremer.isisfish.simulator.SimulationContext) + */ + @Override + public void afterSimulation(SimulationContext context) { + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationListener#beforeSimulation(fr.ifremer.isisfish.simulator.SimulationContext) + */ + @Override + public void beforeSimulation(SimulationContext context) { + } + +} Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2014-02-05 11:01:15 UTC (rev 3884) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2014-02-13 22:24:45 UTC (rev 3885) @@ -475,10 +475,17 @@ if (simuVersion.before(version4200)) { resultStorage = new ResultDatabaseStorage(this); } else { - try { - resultStorage = new ResultMappedStorage(this); - } catch (IOException ex) { - throw new StorageException("Can't get storage", ex); + // if user ask for ResultStorageInMemory, used it + String maxTimeStep = param.getTagValue().get(ResultStorageInMemory.MAX_TIME_STEP); + if (maxTimeStep != null) { + // use in memory with max time step + resultStorage = new ResultStorageInMemory(this); + } else { + try { + resultStorage = new ResultMappedStorage(this); + } catch (IOException ex) { + throw new StorageException("Can't get storage", ex); + } } } }

1 0

r3884 - branches/4.0.1
by echatellier＠users.forge.codelutin.com 05 Feb '14

05 Feb '14

Author: echatellier Date: 2014-02-05 12:01:15 +0100 (Wed, 05 Feb 2014) New Revision: 3884 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3884 Log: Remove all javassist (relocation) Modified: branches/4.0.1/pom.xml Modified: branches/4.0.1/pom.xml =================================================================== --- branches/4.0.1/pom.xml 2014-02-05 11:00:49 UTC (rev 3883) +++ branches/4.0.1/pom.xml 2014-02-05 11:01:15 UTC (rev 3884) @@ -36,6 +36,12 @@ <artifactId>nuiton-validator</artifactId> <version>3.0-alpha-2</version> <scope>compile</scope> + <exclusions> + <exclusion> + <artifactId>javassist</artifactId> + <groupId>javassist</groupId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -50,6 +56,12 @@ <artifactId>topia-persistence</artifactId> <version>${topiaVersion}</version> <scope>compile</scope> + <exclusions> + <exclusion> + <artifactId>javassist</artifactId> + <groupId>javassist</groupId> + </exclusion> + </exclusions> </dependency> <dependency>

1 0

r3883 - in branches/4.0.1/src: license main/java/fr/ifremer/isisfish/ui/sensitivity/wizard
by echatellier＠users.forge.codelutin.com 05 Feb '14

05 Feb '14

Author: echatellier Date: 2014-02-05 12:00:49 +0100 (Wed, 05 Feb 2014) New Revision: 3883 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3883 Log: Fix licenses Modified: branches/4.0.1/src/license/THIRD-PARTY.properties branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/ContinuousPanel.java Modified: branches/4.0.1/src/license/THIRD-PARTY.properties =================================================================== --- branches/4.0.1/src/license/THIRD-PARTY.properties 2014-02-05 10:46:03 UTC (rev 3882) +++ branches/4.0.1/src/license/THIRD-PARTY.properties 2014-02-05 11:00:49 UTC (rev 3883) @@ -1,23 +1,25 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - ASM License -# - Apache Software License -# - Apache Software License, Version 2.0 +# - Apache License 2.0 # - BSD License # - BSD-style license # - Bouncy Castle License # - CDDL # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License # - Common Public License Version 1.0 +# - Eclipse Public License - v 1.0 # - GNU General Public License - Version 2 with the class path exception +# - GNU General Public License, Version 2 with the Classpath Exception # - GNU Lesser General Public Licence +# - GNU Lesser General Public License, version 2.1 # - GNU Library or Lesser General Public License # - GPL # - GPL (with dual licensing option) +# - GPLv2 # - GPLv2+CE # - Indiana University Extreme! Lab Software License, vesion 1.1.1 -# - Java Transaction API (JTA) License # - LGPL, version 2.1 # - Lesser General Public License (LGPL v. 2.1) # - Lesser General Public License (LGPL) @@ -26,12 +28,12 @@ # - Lesser General Public License (LPGL) v 2.1 # - MIT License # - MPL 1.1 +# - Modified BSD License # - Mozilla Public License # - New BSD License # - OpenMap Software License Agreement # - Revised BSD # - Sequence Library License -# - Sun's Binary Code License # - TMate Open Source License (with dual licensing option) # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 @@ -42,24 +44,12 @@ # Please fill the missing licenses for dependencies : # # -#Mon Mar 11 14:26:22 CET 2013 -antlr--antlr--2.7.6=BSD License -aspectwerkz--aspectwerkz--2.0=GNU Lesser General Public License -aspectwerkz--aspectwerkz-core--2.0=GNU Lesser General Public License -aspectwerkz--aspectwerkz-jdk5--2.0=GNU Lesser General Public License -com.sun--tools--1.6.0.16=Sun's Binary Code License +#Wed Feb 05 11:48:25 CET 2014 commons-jxpath--commons-jxpath--1.3=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License javax.activation--activation--1.1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -javax.transaction--jta--1.1=Java Transaction API (JTA) License -jrexx--jrexx--1.1.1=Apache Software License org.antlr--antlr-runtime--3.4=BSD License org.nuiton.thirdparty--JRI--0.8-4=Lesser General Public License (LGPL v. 2.1) org.nuiton.thirdparty--REngine--0.6-1=Lesser General Public License (LGPL v. 2.1) org.nuiton.thirdparty--Rserve--0.6-1=Lesser General Public License (LGPL v. 2.1) -org.nuiton.thirdparty--asm--1.5.4-snapshot=ASM License -org.nuiton.thirdparty--asm-attrs--1.5.4-snapshot=ASM License -org.nuiton.thirdparty--asm-util--1.5.4-snapshot=ASM License -qdox--qdox--1.4=Apache Software License, Version 2.0 -trove--trove--1.0.2=Lesser General Public License (LGPL) Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/ContinuousPanel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/ContinuousPanel.java 2014-02-05 10:46:03 UTC (rev 3882) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/ContinuousPanel.java 2014-02-05 11:00:49 UTC (rev 3883) @@ -1,25 +1,23 @@ /* * #%L - * - * * $Id$ * $HeadURL$ * %% * Copyright (C) 2012 Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */

1 0

r3882 - in branches/4.0.1: . src/main/java/fr/ifremer/isisfish/entities src/main/java/fr/ifremer/isisfish/equation src/main/java/fr/ifremer/isisfish/simulator src/main/java/fr/ifremer/isisfish/simulator/launcher src/main/java/fr/ifremer/isisfish/util src/test/java/fr/ifremer/isisfish/util
by echatellier＠users.forge.codelutin.com 05 Feb '14

05 Feb '14

Author: echatellier Date: 2014-02-05 11:46:03 +0100 (Wed, 05 Feb 2014) New Revision: 3882 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3882 Log: refs #4289: Remove beanshell and compile prescript instead Added: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScriptListener.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/EvaluatorHelperTest.java Removed: branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/EvaluateHelperTest.java Modified: branches/4.0.1/pom.xml branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/Language.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScript.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java Modified: branches/4.0.1/pom.xml =================================================================== --- branches/4.0.1/pom.xml 2014-02-05 09:05:56 UTC (rev 3881) +++ branches/4.0.1/pom.xml 2014-02-05 10:46:03 UTC (rev 3882) @@ -232,27 +232,13 @@ </exclusions> </dependency> -  <dependency> - <groupId>org.beanshell</groupId> - <artifactId>bsh</artifactId> - <version>2.0b4</version> - <scope>compile</scope> - </dependency> - - <dependency> <groupId>com.bbn</groupId> <artifactId>openmap</artifactId> <version>5.0</version> <scope>compile</scope> </dependency> -  - <dependency> <groupId>com.jcraft</groupId> <artifactId>jsch</artifactId> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java 2014-02-05 09:05:56 UTC (rev 3881) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java 2014-02-05 10:46:03 UTC (rev 3882) @@ -30,7 +30,6 @@ import java.util.HashMap; import java.util.Map; -import bsh.Interpreter; import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.datastore.FormuleStorage; import fr.ifremer.isisfish.equation.Language; @@ -66,20 +65,7 @@ param.put("context", SimulationContext.get()); // default is BSH - if (Language.BSH.equals(getLanguage()) - || (("".equals(getLanguage()) || getLanguage() == null) && getJavaInterface() == null)) { - Interpreter bsh = new Interpreter(); - for (Map.Entry<String, Object> e : param.entrySet()) { - bsh.set(e.getKey(), e.getValue()); - } - Object val = bsh.eval(eq); - if (val instanceof Number) { - double result = ((Number) val).doubleValue(); - return result; - } else { - throw new IsisFishRuntimeException(_("isisfish.error.equation.return.number", eq)); - } - } else if (Language.JAVA.equals(getLanguage()) + if (Language.JAVA.equals(getLanguage()) || getJavaInterface() != null) { // default Java if there are javaInterface Object val = EvaluatorHelper.evaluate( Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/Language.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/Language.java 2014-02-05 09:05:56 UTC (rev 3881) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/Language.java 2014-02-05 10:46:03 UTC (rev 3882) @@ -40,8 +40,6 @@ /** Java language. */ final static public String JAVA = "java"; - /** Bean shell language. */ - final static public String BSH = "BSH"; /** ECMAScript language. */ final static public String ECMASCRIPT = "ECMAScript"; /** GROOVY language. */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScript.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScript.java 2014-02-05 09:05:56 UTC (rev 3881) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScript.java 2014-02-05 10:46:03 UTC (rev 3882) @@ -3,9 +3,9 @@ * IsisFish * * $Id$ - * $HeadURL$ + * $HeadURL: http://svn.forge.codelutin.com/svn/isis-fish/branches/4.0.1/src/main/java/f… $ * %% - * Copyright (C) 2007 - 2010 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2014 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 @@ -22,71 +22,26 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ - package fr.ifremer.isisfish.simulator; -import static org.nuiton.i18n.I18n._; +import fr.ifremer.isisfish.util.Args; -import org.nuiton.topia.TopiaContext; - -import fr.ifremer.isisfish.datastore.SimulationStorage; - -import bsh.Interpreter; - /** - * SimulationPreScript. + * Interface d'utilisation d'un prescript. * - * Created: 14 nov. 07 00:06:18 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * @author Eric Chatellier */ -public class SimulationPreScript implements SimulationListener { +public interface SimulationPreScript { - /* - * @see fr.ifremer.isisfish.simulator.SimulationListener#afterSimulation(fr.ifremer.isisfish.simulator.SimulationContext) + /** + * Compute prescript + * + * @param context simulation context + * @param db database context + * @return equation result + * @throws Exception */ - @Override - public void afterSimulation(SimulationContext context) { - } + @Args({"context"}) + public void compute(SimulationContext context) throws Exception; - /* - * @see fr.ifremer.isisfish.simulator.SimulationListener#beforeSimulation(fr.ifremer.isisfish.simulator.SimulationContext) - */ - @Override - public void beforeSimulation(SimulationContext context) { - try { - context.message(_("isisfish.message.presimulation.script.execution")); - - SimulationStorage simulation = context.getSimulationStorage(); - SimulationParameter parameters = simulation.getParameter(); - String presimulationScript = parameters.getPreScript(); - if ((parameters.getUsePreScript() || parameters.getUseSimulationPlan()) - && presimulationScript != null - && !"".equals(presimulationScript)) { - - // utilisation de la db en memoire que l'on commitera - TopiaContext tx = context.getDB(); - - Interpreter bsh = new Interpreter(); - bsh.set("context", context); - bsh.set("db", tx); - bsh.eval("import org.nuiton.topia.*;"); - bsh.eval("import org.nuiton.topia.persistence.*;"); - bsh.eval("import fr.ifremer.isisfish.*;"); - bsh.eval("import fr.ifremer.isisfish.types.*;"); - bsh.eval("import fr.ifremer.isisfish.entities.*;"); - bsh.eval("import java.util.*;"); - bsh.eval(presimulationScript); - - tx.commitTransaction(); - } - } catch (Exception eee) { - throw new SimulationException( - _("Can't evaluate simulation prescript"), eee); - } - } } Copied: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScriptListener.java (from rev 3860, branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScript.java) =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScriptListener.java (rev 0) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScriptListener.java 2014-02-05 10:46:03 UTC (rev 3882) @@ -0,0 +1,88 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 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 + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.simulator; + +import static org.nuiton.i18n.I18n._; + +import java.util.HashMap; +import java.util.Map; + +import org.apache.commons.lang.StringUtils; +import org.nuiton.topia.TopiaContext; + +import fr.ifremer.isisfish.datastore.SimulationStorage; +import fr.ifremer.isisfish.util.EvaluatorHelper; + +/** + * SimulationPreScript. + * + * Created: 14 nov. 07 00:06:18 + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class SimulationPreScriptListener implements SimulationListener { + + /* + * @see fr.ifremer.isisfish.simulator.SimulationListener#afterSimulation(fr.ifremer.isisfish.simulator.SimulationContext) + */ + @Override + public void afterSimulation(SimulationContext context) { + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationListener#beforeSimulation(fr.ifremer.isisfish.simulator.SimulationContext) + */ + @Override + public void beforeSimulation(SimulationContext context) { + try { + context.message(_("isisfish.message.presimulation.script.execution")); + + SimulationStorage simulation = context.getSimulationStorage(); + SimulationParameter parameters = simulation.getParameter(); + String presimulationScript = parameters.getPreScript(); + if ((parameters.getUsePreScript() || parameters.getUseSimulationPlan()) + && StringUtils.isNotBlank(presimulationScript)) { + + // utilisation de la db en memoire que l'on commitera + TopiaContext tx = context.getDB(); + + Map<String, Object> args = new HashMap<>(); + args.put("context", context); + EvaluatorHelper.evaluate(SimulationPreScript.class.getPackage().getName(), + "PreScript", SimulationPreScript.class, presimulationScript, args); + + tx.commitTransaction(); + } + } catch (Exception eee) { + throw new SimulationException( + _("Can't evaluate simulation prescript"), eee); + } + } +} 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-02-05 09:05:56 UTC (rev 3881) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2014-02-05 10:46:03 UTC (rev 3882) @@ -66,7 +66,7 @@ import fr.ifremer.isisfish.simulator.SimulationExportResultWrapper; import fr.ifremer.isisfish.simulator.SimulationListener; import fr.ifremer.isisfish.simulator.SimulationParameter; -import fr.ifremer.isisfish.simulator.SimulationPreScript; +import fr.ifremer.isisfish.simulator.SimulationPreScriptListener; import fr.ifremer.isisfish.simulator.Simulator; import fr.ifremer.isisfish.types.Month; import fr.ifremer.isisfish.types.TimeStep; @@ -515,7 +515,7 @@ // enregistrement des listeners de simulation // - prescript (before simulation) // - export (after simulation) - context.addSimulationListener(new SimulationPreScript()); + context.addSimulationListener(new SimulationPreScriptListener()); // si le simulateur est de type SimulationStep il faut ajouter les regles context.addSimulationListener(new SimulationExportResultWrapper()); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2014-02-05 09:05:56 UTC (rev 3881) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2014-02-05 10:46:03 UTC (rev 3882) @@ -73,9 +73,6 @@ /** Logger for this class. */ private static final Log log = LogFactory.getLog(CompileHelper.class); - - /** CP detector proxy. */ - //protected static CodepageDetectorProxy detector; /** * Recherche tous les fichiers qui un source plus recent que la version compilé. 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-02-05 09:05:56 UTC (rev 3881) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java 2014-02-05 10:46:03 UTC (rev 3882) @@ -71,7 +71,7 @@ } /** - * Verifie si une equation est syntaxiquement correcte. + * Verifie si un script (prescript/equation) est syntaxiquement correct. * * @param javaInterface * @param script @@ -173,9 +173,6 @@ // if Java file is newer than class file, compile java file if (!fileDest.exists() || FileUtils.isFileNewer(fileSrc, fileDest)) { try { - // does'nt contains isisdatabase-3 directory - //int compileResult = CompileHelper.compile(fileRootSrc, fileSrc, fileRootSrc, null); - List<File> classpath = new ArrayList<File>(); classpath.add(fileRootSrc.getAbsoluteFile()); classpath.add(IsisFish.config.getDatabaseDirectory().getAbsoluteFile()); @@ -203,28 +200,31 @@ } /** - * Generate equation content. + * Generate script content. * - * Warning, content are always on a unique single line (without \n) for - * debuging purpose. + * Warning, content are always on a unique single line (without \n) for debugging purpose. * * @param packageName * @param className * @param interfaceMethod * @param script - * @return equation return + * @return script return (or null) */ protected static String generateContent(String packageName, String className, Method interfaceMethod, String script) { String content = ""; if (packageName != null && !"".equals(packageName)) { content += "package " + packageName + ";"; } + + // add common used imports + content += "import java.util.*;"; + content += "import java.io.*;"; content += "import fr.ifremer.isisfish.entities.*;"; + content += "import fr.ifremer.isisfish.types.*;"; content += "import org.nuiton.math.matrix.*;"; - content += "import fr.ifremer.isisfish.types.*;"; - content += "import org.apache.commons.logging.Log;"; - content += "import org.apache.commons.logging.LogFactory;"; - content += "import java.util.*;"; + content += "import org.apache.commons.logging.*;"; + + // generate content (do not add \n here, this help debug) content += "public class " + className + " implements " + interfaceMethod.getDeclaringClass().getName() + " {"; content += "private static Log log = LogFactory.getLog(" + className + ".class);"; content += "public " + interfaceMethod.getReturnType().getName() + " " + interfaceMethod.getName() + "("; Deleted: branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/EvaluateHelperTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/EvaluateHelperTest.java 2014-02-05 09:05:56 UTC (rev 3881) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/EvaluateHelperTest.java 2014-02-05 10:46:03 UTC (rev 3882) @@ -1,175 +0,0 @@ -/* - * #%L - * IsisFish - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2010 Ifremer, Code Lutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 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-3.0.html>. - * #L% - */ - -package fr.ifremer.isisfish.util; - -import java.lang.reflect.Method; -import java.util.HashMap; -import java.util.Map; - -import org.junit.Assert; -import org.junit.Test; - -import fr.ifremer.isisfish.AbstractIsisFishTest; -import fr.ifremer.isisfish.equation.EmigrationEquation; -import fr.ifremer.isisfish.equation.PopulationGrowth; -import fr.ifremer.isisfish.equation.PopulationGrowthReverse; -import fr.ifremer.isisfish.equation.PopulationReproductionEquation; - -/** - * Test class for {@link EvaluatorHelper}. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class EvaluateHelperTest extends AbstractIsisFishTest { - - /** - * Test #normalizeClassName(). - */ - @Test - public void testNormalizeClassName() { - Assert.assertEquals("Test", EvaluatorHelper.normalizeClassName("Test")); - Assert.assertEquals("Te_t", EvaluatorHelper.normalizeClassName("Te/t")); - Assert.assertEquals("org_test_Test", EvaluatorHelper - .normalizeClassName("org.test.Test")); - } - - /** - * Test #check(). - */ - @Test - public void testCheck() { - String equationContent = "return 12.0;"; - - int result = EvaluatorHelper.check(EmigrationEquation.class, - equationContent, null); - Assert.assertEquals(0, result); - } - - /** - * Test #evaluate(). - */ - @Test - public void testEvaluate() { - String equationContent = "return age * 2.0;"; - - Map<String, Object> args = new HashMap<String, Object>(); - args.put("context", null); - args.put("age", 2.0); - args.put("group", null); - Object result = EvaluatorHelper.evaluate("fr.isisfish.equation", - "TestEvaluate", PopulationGrowth.class, equationContent, args); - - Assert.assertNotNull(result); - Assert.assertEquals("4.0", result.toString()); - } - - /** - * Test #evaluate() but twice to check that previous - * class don't stay in class loader. - */ - @Test - public void testDoubleContentEvaluate() { - - Map<String, Object> args = new HashMap<String, Object>(); - args.put("context", null); - args.put("length", 2.0); - args.put("group", null); - - String equationContent = "return length * 2.0;"; - Object result = EvaluatorHelper.evaluate("fr.isisfish.equation", - "TestDoubleContentEvaluate", PopulationGrowthReverse.class, - equationContent, args); - Assert.assertNotNull(result); - Assert.assertEquals("4.0", result.toString()); - - equationContent = "return length * 3.0;"; - result = EvaluatorHelper.evaluate("fr.isisfish.equation", - "TestDoubleContentEvaluate", PopulationGrowthReverse.class, - equationContent, args); - Assert.assertNotNull(result); - Assert.assertEquals("6.0", result.toString()); - } - - /** - * Test que le repertoire des scripts en bien présent - * dans le classpath de compilation. - */ - @Test - public void testEquationWithDatabaseContent() { - Map<String, Object> args = new HashMap<String, Object>(); - args.put("context", null); - args.put("length", 2.0); - args.put("group", null); - - String equationContent = "String name = scripts.ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP;"; - equationContent += "return length * 2.0;"; - Object result = EvaluatorHelper.evaluate("fr.isisfish.equation", - "TestEquationWithDatabaseContent", PopulationGrowthReverse.class, - equationContent, args); - Assert.assertNotNull(result); - Assert.assertEquals("4.0", result.toString()); - } - - /** - * Test that commons logging logger in present for use in equation. - */ - @Test - public void testEquationWithLogger() { - Map<String, Object> args = new HashMap<String, Object>(); - args.put("context", null); - args.put("length", 2.0); - args.put("group", null); - - String equationContent = "log.info(\"Test logger\");"; - equationContent += "return 1.0;"; - Object result = EvaluatorHelper.evaluate("fr.isisfish.equation", - "TestEquationWithDatabaseContent", PopulationGrowthReverse.class, - equationContent, args); - Assert.assertNotNull(result); - Assert.assertEquals("1.0", result.toString()); - } - - /** - * Test que le contenu du fichier java correspondant à l'equation est - * corectement généré. - * Notemment suite à l'utilsation de paranamer et aux retrait des - * annotations. - */ - @Test - public void testGenerateContent() { - Class clazz = PopulationReproductionEquation.class; - Method method = clazz.getDeclaredMethods()[0]; - String content = EvaluatorHelper.generateContent("fr.ifremer.isisfish.equation", - "Test", method, "return 42.0;"); - - Assert.assertTrue(content.contains("fr.ifremer.isisfish.simulator.SimulationContext context")); - Assert.assertTrue(content.contains("java.util.List<PopulationGroup> groups")); - } -} Copied: branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/EvaluatorHelperTest.java (from rev 3860, branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/EvaluateHelperTest.java) =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/EvaluatorHelperTest.java (rev 0) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/EvaluatorHelperTest.java 2014-02-05 10:46:03 UTC (rev 3882) @@ -0,0 +1,191 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 Ifremer, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.util; + +import java.lang.reflect.Method; +import java.util.HashMap; +import java.util.Map; + +import org.junit.Assert; +import org.junit.Test; + +import fr.ifremer.isisfish.AbstractIsisFishTest; +import fr.ifremer.isisfish.equation.EmigrationEquation; +import fr.ifremer.isisfish.equation.PopulationGrowth; +import fr.ifremer.isisfish.equation.PopulationGrowthReverse; +import fr.ifremer.isisfish.equation.PopulationReproductionEquation; +import fr.ifremer.isisfish.simulator.SimulationContext; +import fr.ifremer.isisfish.simulator.SimulationPreScript; + +/** + * Test class for {@link EvaluatorHelper}. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class EvaluatorHelperTest extends AbstractIsisFishTest { + + /** + * Test #normalizeClassName(). + */ + @Test + public void testNormalizeClassName() { + Assert.assertEquals("Test", EvaluatorHelper.normalizeClassName("Test")); + Assert.assertEquals("Te_t", EvaluatorHelper.normalizeClassName("Te/t")); + Assert.assertEquals("org_test_Test", EvaluatorHelper + .normalizeClassName("org.test.Test")); + } + + /** + * Test #check(). + */ + @Test + public void testCheck() { + String equationContent = "return 12.0;"; + + int result = EvaluatorHelper.check(EmigrationEquation.class, + equationContent, null); + Assert.assertEquals(0, result); + } + + /** + * Test #evaluate(). + */ + @Test + public void testEvaluate() { + String equationContent = "return age * 2.0;"; + + Map<String, Object> args = new HashMap<String, Object>(); + args.put("context", null); + args.put("age", 2.0); + args.put("group", null); + Object result = EvaluatorHelper.evaluate("fr.isisfish.equation", + "TestEvaluate", PopulationGrowth.class, equationContent, args); + + Assert.assertNotNull(result); + Assert.assertEquals("4.0", result.toString()); + } + + /** + * Test #evaluate() but twice to check that previous + * class don't stay in class loader. + */ + @Test + public void testDoubleContentEvaluate() { + + Map<String, Object> args = new HashMap<String, Object>(); + args.put("context", null); + args.put("length", 2.0); + args.put("group", null); + + String equationContent = "return length * 2.0;"; + Object result = EvaluatorHelper.evaluate("fr.isisfish.equation", + "TestDoubleContentEvaluate", PopulationGrowthReverse.class, + equationContent, args); + Assert.assertNotNull(result); + Assert.assertEquals("4.0", result.toString()); + + equationContent = "return length * 3.0;"; + result = EvaluatorHelper.evaluate("fr.isisfish.equation", + "TestDoubleContentEvaluate", PopulationGrowthReverse.class, + equationContent, args); + Assert.assertNotNull(result); + Assert.assertEquals("6.0", result.toString()); + } + + /** + * Test que le repertoire des scripts en bien présent + * dans le classpath de compilation. + */ + @Test + public void testEquationWithDatabaseContent() { + Map<String, Object> args = new HashMap<String, Object>(); + args.put("context", null); + args.put("length", 2.0); + args.put("group", null); + + String equationContent = "String name = scripts.ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP;"; + equationContent += "return length * 2.0;"; + Object result = EvaluatorHelper.evaluate("fr.isisfish.equation", + "TestEquationWithDatabaseContent", PopulationGrowthReverse.class, + equationContent, args); + Assert.assertNotNull(result); + Assert.assertEquals("4.0", result.toString()); + } + + /** + * Test that commons logging logger in present for use in equation. + */ + @Test + public void testEquationWithLogger() { + Map<String, Object> args = new HashMap<String, Object>(); + args.put("context", null); + args.put("length", 2.0); + args.put("group", null); + + String equationContent = "log.info(\"Test logger\");"; + equationContent += "return 1.0;"; + Object result = EvaluatorHelper.evaluate("fr.isisfish.equation", + "TestEquationWithDatabaseContent", PopulationGrowthReverse.class, + equationContent, args); + Assert.assertNotNull(result); + Assert.assertEquals("1.0", result.toString()); + } + + /** + * Test que le contenu du fichier java correspondant à l'equation est + * corectement généré. + * Notemment suite à l'utilsation de paranamer et aux retrait des + * annotations. + */ + @Test + public void testGenerateContent() { + Class clazz = PopulationReproductionEquation.class; + Method method = clazz.getDeclaredMethods()[0]; + String content = EvaluatorHelper.generateContent("fr.ifremer.isisfish.equation", + "Test", method, "return 42.0;"); + + Assert.assertTrue(content.contains("fr.ifremer.isisfish.simulator.SimulationContext context")); + Assert.assertTrue(content.contains("java.util.List<PopulationGroup> groups")); + } + + /** + * Test d'execution d'un prescript. + */ + @Test + public void testPrescriptContent() { + String content = "if (context != null) {\n" + + " // test\n" + + "}\n"; + Map<String, Object> args = new HashMap<>(); + args.put("context", SimulationContext.get()); + EvaluatorHelper.evaluate("fr.isisfish.prescript", + "TestPrescript", SimulationPreScript.class, content, args); + } +}

1 0

r3881 - branches/4.0.1
by echatellier＠users.forge.codelutin.com 05 Feb '14

05 Feb '14

Author: echatellier Date: 2014-02-05 10:05:56 +0100 (Wed, 05 Feb 2014) New Revision: 3881 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3881 Log: Update libs Modified: branches/4.0.1/pom.xml Modified: branches/4.0.1/pom.xml =================================================================== --- branches/4.0.1/pom.xml 2014-02-03 14:06:12 UTC (rev 3880) +++ branches/4.0.1/pom.xml 2014-02-05 09:05:56 UTC (rev 3881) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>4.3</version> + <version>4.7</version> </parent> <groupId>fr.ifremer</groupId> @@ -289,7 +289,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.174</version> + <version>1.3.175</version> <scope>compile</scope> </dependency> @@ -328,7 +328,7 @@ <dependency> <groupId>org.tmatesoft.svnkit</groupId> <artifactId>svnkit</artifactId> - <version>1.7.8</version> + <version>1.8.3</version> <scope>compile</scope> </dependency>  @@ -483,10 +483,10 @@ <signatureVersion>1.0</signatureVersion>  - <jaxxVersion>2.5.30</jaxxVersion> + <jaxxVersion>2.6</jaxxVersion> <eugeneVersion>2.6.3</eugeneVersion> <topiaVersion>2.8.1.3</topiaVersion> - <hibernateVersion>4.2.7.SP1</hibernateVersion> + <hibernateVersion>4.2.8.Final</hibernateVersion> <nuitonI18nVersion>2.5.2</nuitonI18nVersion> <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion> @@ -528,13 +528,6 @@ <artifactId>i18n-maven-plugin</artifactId> <version>${nuitonI18nVersion}</version> </plugin> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - </configuration> - </plugin> <plugin> <artifactId>maven-jar-plugin</artifactId>

1 0

r3880 - trunk/src/main/resources/i18n
by echatellier＠users.forge.codelutin.com 03 Feb '14

03 Feb '14

Author: echatellier Date: 2014-02-03 15:06:12 +0100 (Mon, 03 Feb 2014) New Revision: 3880 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3880 Log: Fix i18n Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-02-03 13:57:57 UTC (rev 3879) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-02-03 14:06:12 UTC (rev 3880) @@ -961,12 +961,12 @@ isisfish.strategy.inactivity=Equation d'inactivité isisfish.strategy.inactivityEquationUsed=Utiliser une équation d'inactivité isisfish.strategy.name=Nom -isisfish.strategy.proportionMetier=Proportion metier -isisfish.strategy.proportionMetierLabel=Proportion metier \: +isisfish.strategy.proportionMetier=Proportion métier +isisfish.strategy.proportionMetierLabel=Proportion métier \: isisfish.strategy.proportionSetOfVessels=Proportion de la flottille isisfish.strategy.title=Caractéristiques isisfish.strategyMonthInfo.metier=Métier -isisfish.strategyMonthInfo.minInactivityDays=Jour minimums d'inactivité +isisfish.strategyMonthInfo.minInactivityDays=Jours minimums d'inactivité isisfish.strategyMonthInfo.numberOfTrips=Nombre de trajets isisfish.strategyMonthInfo.proportion=Proportion isisfish.strategyMonthInfo.title=Saisie des mois

1 0

r3879 - trunk/src/main/resources/i18n
by echatellier＠users.forge.codelutin.com 03 Feb '14

03 Feb '14

Author: echatellier Date: 2014-02-03 14:57:57 +0100 (Mon, 03 Feb 2014) New Revision: 3879 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3879 Log: Fix Flotille > Flottille Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2013-12-20 16:00:44 UTC (rev 3878) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-02-03 13:57:57 UTC (rev 3879) @@ -126,7 +126,7 @@ isisfish.common.saveModel=Sauver comme modèle isisfish.common.saveNextSimulation=Sauver pour la prochaine simulation isisfish.common.season=Saison -isisfish.common.setOfVessels=Flotille +isisfish.common.setOfVessels=Flottille isisfish.common.simulate=Simuler isisfish.common.strategies=Stratégies isisfish.common.sum=somme

1 0