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

r4335 - branches
by echatellier＠users.forge.codelutin.com March 1, 2016

March 1, 2016

Author: echatellier Date: 2016-03-01 18:12:56 +0100 (Tue, 01 Mar 2016) New Revision: 4335 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4335 Log: remove old branch Removed: branches/isis-fish-4.3.1.x/

1 0

r4334 - trunk
by echatellier＠users.forge.codelutin.com March 1, 2016

March 1, 2016

Author: echatellier Date: 2016-03-01 17:38:21 +0100 (Tue, 01 Mar 2016) New Revision: 4334 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4334 Log: Fix parent pom bug Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2016-03-01 15:28:04 UTC (rev 4333) +++ trunk/pom.xml 2016-03-01 16:38:21 UTC (rev 4334) @@ -569,10 +569,11 @@ <releaseEmailDomain>forge.codelutin.com</releaseEmailDomain> <releaseEmail>noreply(a)forge.codelutin.com</releaseEmail> -  +  <javadocPluginVersion>2.10.3</javadocPluginVersion> <animalSnifferPluginVersion>1.14</animalSnifferPluginVersion> <redmine.url>https://forge.${platform}</redmine.url> + <maven.javadoc.skip>false</maven.javadoc.skip> <!-- jnlp (disabled until retested) <keystorepath>${codelutin.keystorepath}</keystorepath>

1 0

r4333 - trunk
by echatellier＠users.forge.codelutin.com March 1, 2016

March 1, 2016

Author: echatellier Date: 2016-03-01 16:28:04 +0100 (Tue, 01 Mar 2016) New Revision: 4333 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4333 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2016-03-01 15:28:02 UTC (rev 4332) +++ trunk/pom.xml 2016-03-01 15:28:04 UTC (rev 4333) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.4.0.0</version> + <version>4.4.0.1-SNAPSHOT</version>  <dependencies> @@ -770,9 +770,9 @@   <scm> - <connection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.4.0.0</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.4.0.0</developerConnection> - <url>https://svn.codelutin.com/isis-fish/tags/isis-fish-4.4.0.0</url> + <connection>scm:svn:https://svn.codelutin.com/isis-fish/trunk</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/trunk</developerConnection> + <url>https://svn.codelutin.com/isis-fish/trunk</url> </scm> <repositories>

1 0

r4332 - tags
by echatellier＠users.forge.codelutin.com March 1, 2016

March 1, 2016

Author: echatellier Date: 2016-03-01 16:28:02 +0100 (Tue, 01 Mar 2016) New Revision: 4332 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4332 Log: [maven-release-plugin] copy for tag isis-fish-4.4.0.0 Added: tags/isis-fish-4.4.0.0/

1 0

r4331 - trunk
by echatellier＠users.forge.codelutin.com March 1, 2016

March 1, 2016

Author: echatellier Date: 2016-03-01 16:27:24 +0100 (Tue, 01 Mar 2016) New Revision: 4331 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4331 Log: [maven-release-plugin] prepare release isis-fish-4.4.0.0 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2016-03-01 11:03:13 UTC (rev 4330) +++ trunk/pom.xml 2016-03-01 15:27:24 UTC (rev 4331) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.4.0.0-SNAPSHOT</version> + <version>4.4.0.0</version>  <dependencies> @@ -770,9 +770,9 @@   <scm> - <connection>scm:svn:https://svn.codelutin.com/isis-fish/trunk</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/trunk</developerConnection> - <url>https://svn.codelutin.com/isis-fish/trunk</url> + <connection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.4.0.0</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.4.0.0</developerConnection> + <url>https://svn.codelutin.com/isis-fish/tags/isis-fish-4.4.0.0</url> </scm> <repositories>

1 0

r4330 - in trunk: . src/main/resources/i18n
by echatellier＠users.forge.codelutin.com March 1, 2016

March 1, 2016

Author: echatellier Date: 2016-03-01 12:03:13 +0100 (Tue, 01 Mar 2016) New Revision: 4330 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4330 Log: Clean i18n files Modified: trunk/ trunk/src/main/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties Index: trunk =================================================================== --- trunk 2016-03-01 10:58:01 UTC (rev 4329) +++ trunk 2016-03-01 11:03:13 UTC (rev 4330) Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore ## -11,3 +11,5 ## nbproject Inputs_Langoustine .idea +build +.gradle Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2016-03-01 10:58:01 UTC (rev 4329) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2016-03-01 11:03:13 UTC (rev 4330) @@ -284,7 +284,6 @@ isisfish.error.change.classloader=Can't change classloader because can't create URL from file %1$s isisfish.error.change.equation=Can't change equation isisfish.error.compile.documentationerror=This script contains compile errors \! -isisfish.error.compile.fileerror=File %s can't be compiled \! isisfish.error.compile.script=Can't compile script\: %1$s isisfish.error.compiled.parameter=Can't get rule parameter from compiled class isisfish.error.create.equation=Can't create equation @@ -375,7 +374,6 @@ isisfish.error.script.delete=Can't delete file %1$s for reason %2$s isisfish.error.script.load=Can't load file %1$s for reason %2$s isisfish.error.script.save=Can't save file %1$s for reason %2$s -isisfish.error.simulation.getresultname=Can't get result names list isisfish.error.simulation.importparameter=Can't import simulation parameters isisfish.error.simulation.launchsimulation=Can't launch simulation isisfish.error.simulation.listpopulation=Can't get population list @@ -668,8 +666,6 @@ isisfish.population.zones=Zones isisfish.populationBasics.confirmCreateGroups=Warning, running groups creation wizard will delete all existing groups and objects which depend on it.\nDo you want to re-create groups ? isisfish.populationBasics.geographicID=Geographic identifier -isisfish.populationBasics.groupMax=Fbar max group -isisfish.populationBasics.groupMin=Fbar min group isisfish.populationBasics.growth=Growth isisfish.populationBasics.growthReverse=Reverse growth isisfish.populationBasics.name=Name @@ -824,7 +820,6 @@ isisfish.script.menu.save=Save isisfish.script.menu.txtNewEquationModel=New equation model isisfish.script.menu.txtNewExport=New export -isisfish.script.menu.txtNewExportStep=New export per Step isisfish.script.menu.txtNewObjective=New objective function isisfish.script.menu.txtNewOptimization=New optimization script isisfish.script.menu.txtNewResultInfo=New result Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2016-03-01 10:58:01 UTC (rev 4329) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2016-03-01 11:03:13 UTC (rev 4330) @@ -284,7 +284,6 @@ isisfish.error.change.classloader=Can't change classloader because can't create URL from file %1$s isisfish.error.change.equation=Can't change equation isisfish.error.compile.documentationerror=Ce script contient des erreurs de compilation \! -isisfish.error.compile.fileerror=Le fichier %s contient des erreurs \! isisfish.error.compile.script=Impossible de compiler le script \: %s isisfish.error.compiled.parameter=Can't get rule parameter from compiled class isisfish.error.create.equation=Can't create equation @@ -375,7 +374,6 @@ isisfish.error.script.delete=N'a pas pu supprimer le fichier %1$s pour la raison suivante %2$s isisfish.error.script.load=N'a pas pu charger le fichier %1$s pour la raison suivante %2$s isisfish.error.script.save=N'a pas pu sauver le fichier %1$s pour la raison suivante %2$s -isisfish.error.simulation.getresultname=Impossible d'obtenir la liste des résultat isisfish.error.simulation.importparameter=Impossible d'importer les paramètres de simulation isisfish.error.simulation.launchsimulation=Impossible de lancer la simulation isisfish.error.simulation.listpopulation=Impossible d'obtenir la liste des populations @@ -668,8 +666,6 @@ isisfish.population.zones=Zones isisfish.populationBasics.confirmCreateGroups=Attention, la re-création des groupes supprimera les groupes existants et tous les objets qui en dépendent.\nÊtes vous sur de vouloir re-créer les groupes ? isisfish.populationBasics.geographicID=Identifiant géographique -isisfish.populationBasics.groupMax=Fbar group max -isisfish.populationBasics.groupMin=Fbar group min isisfish.populationBasics.growth=Croissance isisfish.populationBasics.growthReverse=Croissance inverse isisfish.populationBasics.name=Nom @@ -824,7 +820,6 @@ isisfish.script.menu.save=Sauver isisfish.script.menu.txtNewEquationModel=Nouvelle formule isisfish.script.menu.txtNewExport=Nouveau script d'export -isisfish.script.menu.txtNewExportStep=Nouveau script d'export par pas de temps isisfish.script.menu.txtNewObjective=Nouvelle fonction d'objectif isisfish.script.menu.txtNewOptimization=Nouveau script d'optimisation isisfish.script.menu.txtNewResultInfo=Nouveau résultat

1 0

r4329 - in trunk/src: main/java/fr/ifremer/isisfish/datastore main/java/fr/ifremer/isisfish/ui/script main/resources/templates/script test/java/fr/ifremer/isisfish/datastore
by echatellier＠users.forge.codelutin.com March 1, 2016

March 1, 2016

Author: echatellier Date: 2016-03-01 11:58:01 +0100 (Tue, 01 Mar 2016) New Revision: 4329 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4329 Log: Remove option to create export non step Removed: trunk/src/main/resources/templates/script/exportStep.ftl Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx trunk/src/main/resources/templates/script/equation.ftl trunk/src/main/resources/templates/script/export.ftl trunk/src/main/resources/templates/script/objective.ftl trunk/src/main/resources/templates/script/optimization.ftl trunk/src/main/resources/templates/script/resultinfo.ftl trunk/src/main/resources/templates/script/rule.ftl trunk/src/main/resources/templates/script/script.ftl trunk/src/main/resources/templates/script/sensitivityanalysis.ftl trunk/src/main/resources/templates/script/sensitivityexport.ftl trunk/src/main/resources/templates/script/simulationplan.ftl trunk/src/main/resources/templates/script/simulator.ftl trunk/src/test/java/fr/ifremer/isisfish/datastore/ExportStepStorageTest.java Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java 2016-03-01 10:57:05 UTC (rev 4328) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java 2016-03-01 10:58:01 UTC (rev 4329) @@ -61,8 +61,6 @@ /** Template freemarker pour les scripts d'export . */ public static final String EXPORT_TEMPLATE = "templates/script/export.ftl"; - /** Template freemarker pour les scripts d'export . */ - public static final String EXPORT_STEP_TEMPLATE = "templates/script/exportStep.ftl"; /** Instance cache. */ private static Map<String, ExportStorage> exportCache = new ReferenceMap<String, ExportStorage>(); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptHandler.java 2016-03-01 10:57:05 UTC (rev 4328) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptHandler.java 2016-03-01 10:58:01 UTC (rev 4329) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2015 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, Chatellier Eric + * Copyright (C) 2006 - 2016 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 @@ -331,7 +331,6 @@ script = SimulationPlanStorage.createSimulationPlan(fileName, Location.COMMUNITY); break; case CommunityExport: - case CommunityExportStep: script = ExportStorage.createExport(fileName, Location.COMMUNITY); break; case CommunityObjective: @@ -489,7 +488,6 @@ script = SimulationPlanStorage.getSimulationPlan(file.getName(), Location.OFFICIAL); break; case Export: - case ExportStep: script = ExportStorage.getExport(file.getName(), Location.OFFICIAL); break; case Script: @@ -520,7 +518,6 @@ script = SimulationPlanStorage.getSimulationPlan(file.getName(), Location.COMMUNITY); break; case CommunityExport: - case CommunityExportStep: script = ExportStorage.getExport(file.getName(), Location.COMMUNITY); break; case CommunityScript: @@ -967,9 +964,6 @@ Export( ExportStorage.getExportDirectory(), ExportStorage.EXPORT_TEMPLATE, true), - ExportStep( - ExportStorage.getExportDirectory(), - ExportStorage.EXPORT_STEP_TEMPLATE, true), Rule( RuleStorage.getRuleDirectory(), RuleStorage.RULE_TEMPLATE, true), @@ -1004,9 +998,6 @@ CommunityExport( ExportStorage.getCommunityExportDirectory(), ExportStorage.EXPORT_TEMPLATE), - CommunityExportStep( - ExportStorage.getCommunityExportDirectory(), - ExportStorage.EXPORT_STEP_TEMPLATE), CommunityObjective( ObjectiveStorage.getCommunityObjectiveDirectory(), ObjectiveStorage.OBJECTIVE_TEMPLATE), Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2016-03-01 10:57:05 UTC (rev 4328) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2016-03-01 10:58:01 UTC (rev 4329) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2015 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2016 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 @@ -51,8 +51,6 @@ onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunitySimulator)' icon="script/script.png" /> <JMenuItem id="miNewExport" text="isisfish.script.menu.txtNewExport" onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunityExport)' icon="script/script.png" /> - <JMenuItem id="miNewExportStep" text="isisfish.script.menu.txtNewExportStep" - onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunityExportStep)' icon="script/script.png" /> <JMenuItem id="miNewRule" text="isisfish.script.menu.txtNewRule" onActionPerformed='handler.newScript(ScriptHandler.ScriptMapping.CommunityRule)' icon="script/script.png" /> <JMenuItem id="miNewResultInfo" text="isisfish.script.menu.txtNewResultInfo" Modified: trunk/src/main/resources/templates/script/equation.ftl =================================================================== --- trunk/src/main/resources/templates/script/equation.ftl 2016-03-01 10:57:05 UTC (rev 4328) +++ trunk/src/main/resources/templates/script/equation.ftl 2016-03-01 10:58:01 UTC (rev 4329) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2014 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2016 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/resources/templates/script/export.ftl =================================================================== --- trunk/src/main/resources/templates/script/export.ftl 2016-03-01 10:57:05 UTC (rev 4328) +++ trunk/src/main/resources/templates/script/export.ftl 2016-03-01 10:58:01 UTC (rev 4329) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2015 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2014 - 2016 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 @@ -39,64 +39,136 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. */ - package exports; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - import java.io.Writer; import org.nuiton.math.matrix.*; - import resultinfos.*; import fr.ifremer.isisfish.util.Doc; import fr.ifremer.isisfish.entities.*; -import fr.ifremer.isisfish.export.Export; +import fr.ifremer.isisfish.export.ExportStep; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.simulator.ResultManager; +import fr.ifremer.isisfish.types.TimeStep; /** * ${name}.java - * - * Created: ${date?date?string.long} - * - * @author ${author} <${email}> - * @version $Revision$ - * - * Last update: $Date${date?date?string.long} $ - * by : $Author${author} $ */ -public class ${name} implements Export { +public class ${name} implements ExportStep { - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** to use log facility, just put in your code: log.info(\"...\"); */ private static Log log = LogFactory.getLog(${name}.class); protected String[] necessaryResult = { - // put here all necessary result for this rule - // example: - // MatrixBiomass.NAME, - // MatrixNetValueOfLandingsPerStrategyMet.NAME, - }; + // put here all necessary result for this rule + // example: + // MatrixBiomass.NAME, + // MatrixNetValueOfLandingsPerStrategyMet.NAME, + }; + /** + * Necessary results names for export execution. + * + * @return the necessaryResult name + */ + @Override public String[] getNecessaryResult() { return this.necessaryResult; } + /** + * Return Export description. + * + * @return string displayable to the end user + */ + @Override public String getExportFilename() { return "${name}"; } + /** + * Return filename used to contains export data. + * + * @return filename by example "myexport" + */ + @Override public String getExtensionFilename() { return ".csv"; } + /** + * Return extension used as filename name extension. + * + * @return extension by example ".csv" + */ + @Override public String getDescription() { return "TODO export description"; } - public void export(SimulationStorage simulation, Writer out) throws Exception { - // put your code here, and write export with: out.write("...") + /** + * Appeler au début de l'export + * + * @param simulation la simulation dont on souhaite exporter les resultats + * @param out la sortie sur lequel il faut ecrire l'export + * @throws Exception if export fail + */ + public void exportBegin(SimulationStorage simulation, Writer out) + throws Exception { + // if you need to do something at the begin of export, put your code here } + + /** + * Exporte les resultats, cette methode est appellee a la fin de chaque pas + * de temps. Elle peut ecrire dans le fichier via le parametre out, + * ou collecter les informations et les ecrires a la fin de la simulation + * lorsque la methode {@link #export(fr.ifremer.isisfish.datastore.SimulationStorage, java.io.Writer) + * est appelee. + * + * @param simulation la simulation dont on souhaite exporter les resultats + * @param step le pas de temps courant de la simulation + * @param out la sortie sur lequel il faut ecrire l'export + * @throws Exception if export fail + */ + @Override + public void export(SimulationStorage simulation, TimeStep step, Writer out) + throws Exception { + // If your export can be done by step, write your code here. + // You can collect data and write result in exportEnd method. + // If you need to access database during simulation + // you can use: TopiaContext tx = SimulationContext.get().getDB() + + // example: + // MatrixND mat = simulation.getResultStorage().getMatrix(step, + // MatrixBiomass.class.getSimpleName()); + // if (mat != null) { // can be null if no result for this step + // for (MatrixIterator i = mat.iterator(); i.hasNext();) { + // i.next(); + // Object[] sems = i.getSemanticsCoordinates(); + // Strategy strategy = (Strategy) sems[0]; + // Metier metier = (Metier) sems[1]; + // + // double val = i.getValue(); + // out.write(step.getStep() + strategy.getName() + ";" + // + metier.getName() + val + "\n"); + // } + // } + } + + /** + * Appeler a la fin de l'export + * + * @param simulation la simulation dont on souhaite exporter les resultats + * @param out la sortie sur lequel il faut ecrire l'export + * @throws Exception if export fail + */ + public void exportEnd(SimulationStorage simulation, Writer out) + throws Exception { + // if you need to do something at the end of export, put your code here + } + } Deleted: trunk/src/main/resources/templates/script/exportStep.ftl =================================================================== --- trunk/src/main/resources/templates/script/exportStep.ftl 2016-03-01 10:57:05 UTC (rev 4328) +++ trunk/src/main/resources/templates/script/exportStep.ftl 2016-03-01 10:58:01 UTC (rev 4329) @@ -1,183 +0,0 @@ -<#-- - #%L - IsisFish - - $Id: export.ftl 4156 2014-12-09 11:27:18Z echatellier $ - $HeadURL: http://svn.forge.codelutin.com/svn/isis-fish/trunk/src/main/resources/templ… $ - %% - Copyright (C) 2014 - 2016 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 - 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% ---> -/* - * Copyright (C) ${date?date?string("yyyy")} ${author} - * - * 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>. - */ - -package exports; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import java.io.Writer; - -import org.nuiton.math.matrix.*; -import resultinfos.*; - -import fr.ifremer.isisfish.util.Doc; -import fr.ifremer.isisfish.entities.*; -import fr.ifremer.isisfish.export.ExportStep; -import fr.ifremer.isisfish.datastore.SimulationStorage; -import fr.ifremer.isisfish.simulator.ResultManager; -import fr.ifremer.isisfish.types.TimeStep; - -/** - * ${name}.java - * - * Created: ${date?date?string.long} - * - * @author ${author} <${email}> - * @version $Revision: 4156 $ - * - * Last update: $Date: 2014-12-09 12:27:18 +0100 (mar. 09 déc. 2014) ${date?date?string.long} $ - * by : $Author: echatellier ${author} $ - */ -public class ${name} implements ExportStep { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - private static Log log = LogFactory.getLog(${name}.class); - - protected String[] necessaryResult = { - // put here all necessary result for this rule - // example: - // MatrixBiomass.NAME, - // MatrixNetValueOfLandingsPerStrategyMet.NAME, - }; - - /** - * Necessary results names for export execution. - * - * @return the necessaryResult name - */ - @Override - public String[] getNecessaryResult() { - return this.necessaryResult; - } - - /** - * Return Export description. - * - * @return string displayable to the end user - */ - @Override - public String getExportFilename() { - return "${name}"; - } - - /** - * Return filename used to contains export data. - * - * @return filename by example "myexport" - */ - @Override - public String getExtensionFilename() { - return ".csv"; - } - - /** - * Return extension used as filename name extension. - * - * @return extension by example ".csv" - */ - @Override - public String getDescription() { - return "TODO export description"; - } - - /** - * Appeler au début de l'export - * - * @param simulation la simulation dont on souhaite exporter les resultats - * @param out la sortie sur lequel il faut ecrire l'export - * @throws Exception if export fail - */ - public void exportBegin(SimulationStorage simulation, Writer out) - throws Exception { - // if you need to do something at the begin of export, put your code here - } - - /** - * Exporte les resultats, cette methode est appellee a la fin de chaque pas - * de temps. Elle peut ecrire dans le fichier via le parametre out, - * ou collecter les informations et les ecrires a la fin de la simulation - * lorsque la methode {@link #export(fr.ifremer.isisfish.datastore.SimulationStorage, java.io.Writer) - * est appelee. - * - * @param simulation la simulation dont on souhaite exporter les resultats - * @param step le pas de temps courant de la simulation - * @param out la sortie sur lequel il faut ecrire l'export - * @throws Exception if export fail - */ - @Override - public void export(SimulationStorage simulation, TimeStep step, Writer out) - throws Exception { - // If your export can be done by step, write your code here. - // You can collect data and write result in exportEnd method. - // If you need to access database during simulation - // you can use: TopiaContext tx = SimulationContext.get().getDB() - - // example: - // MatrixND mat = simulation.getResultStorage().getMatrix(step, - // MatrixBiomass.class.getSimpleName()); - // if (mat != null) { // can be null if no result for this step - // for (MatrixIterator i = mat.iterator(); i.hasNext();) { - // i.next(); - // Object[] sems = i.getSemanticsCoordinates(); - // Strategy strategy = (Strategy) sems[0]; - // Metier metier = (Metier) sems[1]; - // - // double val = i.getValue(); - // out.write(step.getStep() + strategy.getName() + ";" - // + metier.getName() + val + "\n"); - // } - // } - } - - /** - * Appeler a la fin de l'export - * - * @param simulation la simulation dont on souhaite exporter les resultats - * @param out la sortie sur lequel il faut ecrire l'export - * @throws Exception if export fail - */ - public void exportEnd(SimulationStorage simulation, Writer out) - throws Exception { - // if you need to do something at the end of export, put your code here - } - -} Modified: trunk/src/main/resources/templates/script/objective.ftl =================================================================== --- trunk/src/main/resources/templates/script/objective.ftl 2016-03-01 10:57:05 UTC (rev 4328) +++ trunk/src/main/resources/templates/script/objective.ftl 2016-03-01 10:58:01 UTC (rev 4329) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2014 - 2016 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 @@ -39,7 +39,6 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. */ - package objectives; import org.apache.commons.logging.Log; @@ -60,13 +59,6 @@ /** * ${name}.java - * - * Created: ${date?date?string.long} - * - * @author ${author} <${email}> - * @version $Revision$ - * Last update: $Date${date?date?string.long} $ - * by : $Author${author} $ */ public class ${name} implements Objective { Modified: trunk/src/main/resources/templates/script/optimization.ftl =================================================================== --- trunk/src/main/resources/templates/script/optimization.ftl 2016-03-01 10:57:05 UTC (rev 4328) +++ trunk/src/main/resources/templates/script/optimization.ftl 2016-03-01 10:58:01 UTC (rev 4329) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2014 - 2016 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 @@ -39,7 +39,6 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. */ - package optimizations; import org.apache.commons.logging.Log; @@ -61,13 +60,6 @@ /** * ${name}.java - * - * Created: ${date?date?string.long} - * - * @author ${author} <${email}> - * @version $Revision$ - * Last update: $Date${date?date?string.long} $ - * by : $Author${author} $ */ public class ${name} implements Optimization { Modified: trunk/src/main/resources/templates/script/resultinfo.ftl =================================================================== --- trunk/src/main/resources/templates/script/resultinfo.ftl 2016-03-01 10:57:05 UTC (rev 4328) +++ trunk/src/main/resources/templates/script/resultinfo.ftl 2016-03-01 10:58:01 UTC (rev 4329) @@ -5,7 +5,7 @@ $Id: rule.ftl 4277 2015-06-21 17:24:03Z echatellier $ $HeadURL: http://svn.codelutin.com/isis-fish/trunk/src/main/resources/templates/scrip… $ %% - Copyright (C) 2015 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2015 - 2016 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 @@ -39,7 +39,6 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. */ - package resultinfos; import fr.ifremer.isisfish.result.AbstractResultInfo; @@ -46,8 +45,6 @@ /** * ${name}.java - * - * Created: ${date?date?string.long} */ public class ${name} extends AbstractResultInfo { Modified: trunk/src/main/resources/templates/script/rule.ftl =================================================================== --- trunk/src/main/resources/templates/script/rule.ftl 2016-03-01 10:57:05 UTC (rev 4328) +++ trunk/src/main/resources/templates/script/rule.ftl 2016-03-01 10:58:01 UTC (rev 4329) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2015 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2016 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 @@ -39,7 +39,6 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. */ - package rules; import org.apache.commons.logging.Log; @@ -59,13 +58,6 @@ /** * ${name}.java - * - * Created: ${date?date?string.long} - * - * @author ${author} <${email}> - * @version $Revision$ - * Last update: $Date${date?date?string.long} $ - * by : $Author${author} $ */ public class ${name} extends AbstractRule { Modified: trunk/src/main/resources/templates/script/script.ftl =================================================================== --- trunk/src/main/resources/templates/script/script.ftl 2016-03-01 10:57:05 UTC (rev 4328) +++ trunk/src/main/resources/templates/script/script.ftl 2016-03-01 10:58:01 UTC (rev 4329) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2014 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2016 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 @@ -39,7 +39,6 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. */ - package scripts; import org.apache.commons.logging.Log; @@ -51,14 +50,6 @@ /** * ${name}.java - * - * Created: ${date?date?string.long} - * - * @author ${author} <${email}> - * @version $Revision$ - * - * Last update: $Date${date?date?string.long} $ - * by : $Author${author} $ */ public class ${name} { Modified: trunk/src/main/resources/templates/script/sensitivityanalysis.ftl =================================================================== --- trunk/src/main/resources/templates/script/sensitivityanalysis.ftl 2016-03-01 10:57:05 UTC (rev 4328) +++ trunk/src/main/resources/templates/script/sensitivityanalysis.ftl 2016-03-01 10:58:01 UTC (rev 4329) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2014 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2016 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 @@ -39,7 +39,6 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. */ - package sensitivityanalysis; import java.util.List; @@ -58,14 +57,6 @@ /** * ${name}.java - * - * Created: ${date?date?string.long} - * - * @author ${author} <${email}> - * @version $Revision$ - * - * Last update: $Date${date?date?string.long} $ - * by : $Author${author} $ */ public class ${name} extends AbstractSensitivityAnalysis { Modified: trunk/src/main/resources/templates/script/sensitivityexport.ftl =================================================================== --- trunk/src/main/resources/templates/script/sensitivityexport.ftl 2016-03-01 10:57:05 UTC (rev 4328) +++ trunk/src/main/resources/templates/script/sensitivityexport.ftl 2016-03-01 10:58:01 UTC (rev 4329) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2014 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2016 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 @@ -57,14 +57,6 @@ /** * ${name}.java - * - * Created: ${date?date?string.long} - * - * @author ${author} <${email}> - * @version $Revision$ - * - * Last update: $Date${date?date?string.long} $ - * by : $Author${author} $ */ public class ${name} implements SensitivityExport { Modified: trunk/src/main/resources/templates/script/simulationplan.ftl =================================================================== --- trunk/src/main/resources/templates/script/simulationplan.ftl 2016-03-01 10:57:05 UTC (rev 4328) +++ trunk/src/main/resources/templates/script/simulationplan.ftl 2016-03-01 10:58:01 UTC (rev 4329) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2014 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2016 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 @@ -39,7 +39,6 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. */ - package simulationplans; import org.apache.commons.logging.Log; @@ -64,13 +63,6 @@ /** * ${name}.java - * - * Created: ${date?date?string.long} - * - * @author ${author} <${email}> - * @version $Revision$ - * Last update: $Date${date?date?string.long} $ - * by : $Author${author} $ */ public class ${name} implements SimulationPlan { Modified: trunk/src/main/resources/templates/script/simulator.ftl =================================================================== --- trunk/src/main/resources/templates/script/simulator.ftl 2016-03-01 10:57:05 UTC (rev 4328) +++ trunk/src/main/resources/templates/script/simulator.ftl 2016-03-01 10:58:01 UTC (rev 4329) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2014 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2016 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 @@ -39,7 +39,6 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. */ - package simulators; import org.apache.commons.logging.Log; @@ -54,14 +53,6 @@ /** * ${name}.java - * - * Created: ${date?date?string.long} - * - * @author ${author} <${email}> - * @version $Revision$ - * - * Last update $Date ${date?date?string.long} $ - * by : $Author${author} $ */ public class ${name} implements Simulator { Modified: trunk/src/test/java/fr/ifremer/isisfish/datastore/ExportStepStorageTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/datastore/ExportStepStorageTest.java 2016-03-01 10:57:05 UTC (rev 4328) +++ trunk/src/test/java/fr/ifremer/isisfish/datastore/ExportStepStorageTest.java 2016-03-01 10:58:01 UTC (rev 4329) @@ -70,7 +70,7 @@ // get template Template template = freemarkerConfiguration - .getTemplate(ExportStorage.EXPORT_STEP_TEMPLATE); + .getTemplate(ExportStorage.EXPORT_TEMPLATE); // context values Map<String, Object> root = new HashMap<String, Object>();

1 0

r4328 - trunk
by echatellier＠users.forge.codelutin.com March 1, 2016

March 1, 2016

Author: echatellier Date: 2016-03-01 11:57:05 +0100 (Tue, 01 Mar 2016) New Revision: 4328 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4328 Log: Update libs Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2016-02-12 10:23:52 UTC (rev 4327) +++ trunk/pom.xml 2016-03-01 10:57:05 UTC (rev 4328) @@ -237,7 +237,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.7.14</version> + <version>1.7.18</version> <scope>runtime</scope> </dependency> @@ -392,7 +392,7 @@ <dependency> <groupId>org.eclipse.jdt.core.compiler</groupId> <artifactId>ecj</artifactId> - <version>4.4.2</version> + <version>4.5.1</version> </dependency> <dependency> @@ -561,7 +561,7 @@ <eugeneVersion>2.14</eugeneVersion> <topiaVersion>2.11</topiaVersion> <hibernateVersion>4.3.11.Final</hibernateVersion> - <nuitonI18nVersion>3.3</nuitonI18nVersion> + <nuitonI18nVersion>3.4</nuitonI18nVersion> <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion> <redmine.releaseFiles>target/isis-fish-${project.version}-bin.zip</redmine.releaseFiles>

1 0