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

r4323 - in trunk/src/main: java/fr/ifremer/isisfish/export java/fr/ifremer/isisfish/simulator java/fr/ifremer/isisfish/simulator/launcher resources/templates/script
by echatellier＠users.forge.codelutin.com 05 Feb '16

05 Feb '16

Author: echatellier Date: 2016-02-05 16:46:33 +0100 (Fri, 05 Feb 2016) New Revision: 4323 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4323 Log: fixes #7934: Ajouter une m?\195?\169thode "exportBegin" dans les exports par pas de temps Modified: trunk/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java trunk/src/main/java/fr/ifremer/isisfish/export/ExportStep.java trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java trunk/src/main/resources/templates/script/exportStep.ftl Modified: trunk/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java 2016-02-05 15:42:40 UTC (rev 4322) +++ trunk/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java 2016-02-05 15:46:33 UTC (rev 4323) @@ -193,6 +193,7 @@ if (exportInfo instanceof ExportStep) { ExportStep exportStep = (ExportStep)exportInfo; + exportStep.exportBegin(simulationStorage, out); TimeStep lastStep = simulationStorage.getResultStorage().getLastStep(); for (TimeStep step = new TimeStep(0); !step.after(lastStep); step = step.next()) { exportStep.export(simulationStorage, step, out); Modified: trunk/src/main/java/fr/ifremer/isisfish/export/ExportStep.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/export/ExportStep.java 2016-02-05 15:42:40 UTC (rev 4322) +++ trunk/src/main/java/fr/ifremer/isisfish/export/ExportStep.java 2016-02-05 15:46:33 UTC (rev 4323) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2014 Ifremer, Code Lutin, Benjamin Poussin + * Copyright (C) 2006 - 2016 Ifremer, Code Lutin, Benjamin Poussin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -47,6 +47,16 @@ public interface ExportStep extends ExportInfo { /** + * Appelée au début de la simulation. + * + * @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; + + /** * 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 Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java 2016-02-05 15:42:40 UTC (rev 4322) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java 2016-02-05 15:46:33 UTC (rev 4323) @@ -130,6 +130,7 @@ out = new PrintWriter(new BufferedWriter( new OutputStreamWriter(os, IsisConfig.charset))); + } return out; } @@ -138,6 +139,14 @@ this.time += time; } + public void exportBegin(SimulationStorage simulation) throws Exception { + if (export instanceof ExportStep) { + long timeStart = System.nanoTime(); + ((ExportStep)export).exportBegin(simulation, getOut()); + addTime(System.nanoTime() - timeStart); + } + } + public void export(SimulationStorage simulation, TimeStep step) throws Exception { if (export instanceof ExportStep) { long timeStart = System.nanoTime(); @@ -219,7 +228,19 @@ allExports.put(export, new ExportContext(export, exportDir)); } } - + + // call exportBegin for exportStep + for (ExportContext e : allExports.values()) { + try { + // pour les ExportStep + e.exportBegin(simulation); + } catch (Exception eee) { + if (log.isErrorEnabled()) { + log.error("Can't export results", eee); + } + e.setException(eee); + } + } } @Override Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2016-02-05 15:42:40 UTC (rev 4322) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2016-02-05 15:46:33 UTC (rev 4323) @@ -814,7 +814,7 @@ for (String name : param.getExportNames()) { // new instance ExportStorage exportStorage = ExportStorage.getExport(name); - Export export = exportStorage.getNewInstance(); + ExportInfo export = exportStorage.getNewInstance(); // copy name = name.endsWith(".java") ? name : name + ".java"; Modified: trunk/src/main/resources/templates/script/exportStep.ftl =================================================================== --- trunk/src/main/resources/templates/script/exportStep.ftl 2016-02-05 15:42:40 UTC (rev 4322) +++ trunk/src/main/resources/templates/script/exportStep.ftl 2016-02-05 15:46:33 UTC (rev 4323) @@ -5,7 +5,7 @@ $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 - 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 @@ -120,6 +120,18 @@ } /** + * 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 @@ -168,5 +180,4 @@ // if you need to do something at the end of export, put your code here } - }

1 0

r4322 - trunk
by echatellier＠users.forge.codelutin.com 05 Feb '16

05 Feb '16

Author: echatellier Date: 2016-02-05 16:42:40 +0100 (Fri, 05 Feb 2016) New Revision: 4322 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4322 Log: Update libs Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2016-01-22 16:28:29 UTC (rev 4321) +++ trunk/pom.xml 2016-02-05 15:42:40 UTC (rev 4322) @@ -237,7 +237,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.7.13</version> + <version>1.7.14</version> <scope>runtime</scope> </dependency> @@ -298,7 +298,7 @@ <dependency> <groupId>com.bbn</groupId> <artifactId>openmap</artifactId> - <version>5.1.10</version> + <version>5.1.13</version> <scope>compile</scope> </dependency> @@ -333,7 +333,7 @@ <dependency> <groupId>net.sourceforge</groupId> <artifactId>jdistlib</artifactId> - <version>0.3.9</version> + <version>0.4.1</version> </dependency>  @@ -557,7 +557,7 @@ <redmine.statusIds>3,10,11,18,19</redmine.statusIds>  - <jaxxVersion>2.28.1</jaxxVersion> + <jaxxVersion>2.28.2</jaxxVersion> <eugeneVersion>2.14</eugeneVersion> <topiaVersion>2.11</topiaVersion> <hibernateVersion>4.3.11.Final</hibernateVersion>

1 0

r4321 - trunk/src/main/assembly
by echatellier＠users.forge.codelutin.com 22 Jan '16

22 Jan '16

Author: echatellier Date: 2016-01-22 17:28:29 +0100 (Fri, 22 Jan 2016) New Revision: 4321 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4321 Log: Fix xsd Modified: trunk/src/main/assembly/bin.xml Modified: trunk/src/main/assembly/bin.xml =================================================================== --- trunk/src/main/assembly/bin.xml 2016-01-22 16:28:15 UTC (rev 4320) +++ trunk/src/main/assembly/bin.xml 2016-01-22 16:28:29 UTC (rev 4321) @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 1999 - 2014 Ifremer, CodeLutin, Eric Chatellier + Copyright (C) 1999 - 2016 Ifremer, CodeLutin, Eric Chatellier %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -24,9 +24,9 @@ #L% --> -<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd"> <id>bin</id> <formats> <format>zip</format>

1 0

r4320 - trunk/src/main/resources/i18n
by echatellier＠users.forge.codelutin.com 22 Jan '16

22 Jan '16

Author: echatellier Date: 2016-01-22 17:28:15 +0100 (Fri, 22 Jan 2016) New Revision: 4320 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4320 Log: Replace "catachbility" with "accessibility" Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2016-01-22 16:27:47 UTC (rev 4319) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2016-01-22 16:28:15 UTC (rev 4320) @@ -106,7 +106,7 @@ isisfish.common.add=Add isisfish.common.apply=Apply isisfish.common.cancel=Cancel -isisfish.common.capturability=Catchability +isisfish.common.capturability=Accessibility isisfish.common.check=Check isisfish.common.clear=Clear isisfish.common.close=Close @@ -655,7 +655,7 @@ isisfish.params.useOptimization=Use optimization method isisfish.params.usePreSimulationScript=Use pre simulation script isisfish.params.useSimulationPlan=Use simulation plan -isisfish.population.capturability=Catchability +isisfish.population.capturability=Accessibility isisfish.population.comments=Comments isisfish.population.group=Group isisfish.population.groups=Groups @@ -680,8 +680,8 @@ isisfish.populationBasics.title=Population structure isisfish.populationCapturability.comments=Comments isisfish.populationCapturability.selectCoefficient=Select a coefficient per season and per class -isisfish.populationCapturability.title=Catchability -isisfish.populationCapturability.useCapturabilityEquation=Use catchability equation +isisfish.populationCapturability.title=Accessibility +isisfish.populationCapturability.useCapturabilityEquation=Use accessibility equation isisfish.populationEquation.MaturityOgive=Maturity ogive isisfish.populationEquation.fishingMortalityOtherFleets=Fishing mortality other fleets isisfish.populationEquation.meanWeight=Mean weight Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2016-01-22 16:27:47 UTC (rev 4319) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2016-01-22 16:28:15 UTC (rev 4320) @@ -106,7 +106,7 @@ isisfish.common.add=Ajouter isisfish.common.apply=Appliquer isisfish.common.cancel=Annuler -isisfish.common.capturability=Capturabilité +isisfish.common.capturability=Accessibilité isisfish.common.check=Vérifier isisfish.common.clear=Effacer isisfish.common.close=Fermer @@ -655,7 +655,7 @@ isisfish.params.useOptimization=Utiliser une méthode d'optimisation isisfish.params.usePreSimulationScript=Utiliser un script de pré-simulation isisfish.params.useSimulationPlan=Utiliser un plan de simulation -isisfish.population.capturability=Capturabilité +isisfish.population.capturability=Accessibilité isisfish.population.comments=Commentaires isisfish.population.group=Groupe isisfish.population.groups=Groupes @@ -680,8 +680,8 @@ isisfish.populationBasics.title=Structure population isisfish.populationCapturability.comments=Commentaires isisfish.populationCapturability.selectCoefficient=Sélectionnez un coefficient par saison et par classe -isisfish.populationCapturability.title=Capturabilité -isisfish.populationCapturability.useCapturabilityEquation=Utiliser une équation de capturabilité +isisfish.populationCapturability.title=Accessibilité +isisfish.populationCapturability.useCapturabilityEquation=Utiliser une équation d'accessibilité isisfish.populationEquation.MaturityOgive=Ogive de maturité isisfish.populationEquation.fishingMortalityOtherFleets=Mortalité par pêche Other isisfish.populationEquation.meanWeight=Poids moyen

1 0

r4319 - trunk
by echatellier＠users.forge.codelutin.com 22 Jan '16

22 Jan '16

Author: echatellier Date: 2016-01-22 17:27:47 +0100 (Fri, 22 Jan 2016) New Revision: 4319 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4319 Log: Fix assembly lib scope Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2016-01-20 11:23:38 UTC (rev 4318) +++ trunk/pom.xml 2016-01-22 16:27:47 UTC (rev 4319) @@ -546,7 +546,6 @@ <platform>codelutin.com</platform> <siteLocales>fr,en</siteLocales> <siteDeployClassifier /> - <maven.jar.main.class>fr.ifremer.isisfish.IsisFish</maven.jar.main.class> <license.licenseName>gpl_v3</license.licenseName> <license.organizationName>Ifremer, Codelutin</license.organizationName> <maven.compiler.source>1.7</maven.compiler.source> @@ -632,7 +631,7 @@ <archive> <manifest> <addClasspath>true</addClasspath> - <mainClass>${maven.jar.main.class}</mainClass> + <mainClass>fr.ifremer.isisfish.IsisFish</mainClass> <classpathPrefix>lib/</classpathPrefix> </manifest> </archive> @@ -753,6 +752,7 @@ <silent>true</silent> <outputDirectory>${project.build.directory}/lib</outputDirectory> <useBaseVersion>false</useBaseVersion> + <includeScope>runtime</includeScope> </configuration> <goals> <goal>copy-dependencies</goal>

1 0

r4318 - trunk
by echatellier＠users.forge.codelutin.com 20 Jan '16

20 Jan '16

Author: echatellier Date: 2016-01-20 12:23:38 +0100 (Wed, 20 Jan 2016) New Revision: 4318 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4318 Log: Update libs Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2016-01-06 16:56:59 UTC (rev 4317) +++ trunk/pom.xml 2016-01-20 11:23:38 UTC (rev 4318) @@ -20,7 +20,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>3.0-rc-10</version> + <version>3.0-rc-11</version> <scope>compile</scope> </dependency> @@ -27,7 +27,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> - <version>3.0-rc-2</version> + <version>3.0-rc-3</version> <scope>compile</scope> </dependency> @@ -327,7 +327,7 @@ <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjweaver</artifactId> - <version>1.8.7</version> + <version>1.8.8</version> </dependency> <dependency> @@ -558,7 +558,7 @@ <redmine.statusIds>3,10,11,18,19</redmine.statusIds>  - <jaxxVersion>2.26</jaxxVersion> + <jaxxVersion>2.28.1</jaxxVersion> <eugeneVersion>2.14</eugeneVersion> <topiaVersion>2.11</topiaVersion> <hibernateVersion>4.3.11.Final</hibernateVersion>

1 0

r4317 - branches/isis-fish-4.3.1.x
by echatellier＠users.forge.codelutin.com 06 Jan '16

06 Jan '16

Author: echatellier Date: 2016-01-06 17:56:59 +0100 (Wed, 06 Jan 2016) New Revision: 4317 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4317 Log: [maven-release-plugin] prepare for next development iteration Modified: branches/isis-fish-4.3.1.x/pom.xml Modified: branches/isis-fish-4.3.1.x/pom.xml =================================================================== --- branches/isis-fish-4.3.1.x/pom.xml 2016-01-06 16:56:55 UTC (rev 4316) +++ branches/isis-fish-4.3.1.x/pom.xml 2016-01-06 16:56:59 UTC (rev 4317) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.3.1.3</version> + <version>4.3.1.4-SNAPSHOT</version>  <dependencies> @@ -693,9 +693,9 @@   <scm> - <connection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.1.3</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.1.3</developerConnection> - <url>https://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.1.3</url> + <connection>scm:svn:https://svn.codelutin.com/isis-fish/branches/isis-fish-4.3.1.x</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/branches/isis-fish-4.3.1.x</developerConnection> + <url>https://svn.codelutin.com/isis-fish/branches/isis-fish-4.3.1.x</url> </scm> <repositories>

1 0

r4316 - tags
by echatellier＠users.forge.codelutin.com 06 Jan '16

06 Jan '16

Author: echatellier Date: 2016-01-06 17:56:55 +0100 (Wed, 06 Jan 2016) New Revision: 4316 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4316 Log: [maven-release-plugin] copy for tag isis-fish-4.3.1.3 Added: tags/isis-fish-4.3.1.3/

1 0

r4315 - branches/isis-fish-4.3.1.x
by echatellier＠users.forge.codelutin.com 06 Jan '16

06 Jan '16

Author: echatellier Date: 2016-01-06 17:52:40 +0100 (Wed, 06 Jan 2016) New Revision: 4315 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4315 Log: [maven-release-plugin] prepare release isis-fish-4.3.1.3 Modified: branches/isis-fish-4.3.1.x/pom.xml Modified: branches/isis-fish-4.3.1.x/pom.xml =================================================================== --- branches/isis-fish-4.3.1.x/pom.xml 2016-01-06 16:48:06 UTC (rev 4314) +++ branches/isis-fish-4.3.1.x/pom.xml 2016-01-06 16:52:40 UTC (rev 4315) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.3.1.3-SNAPSHOT</version> + <version>4.3.1.3</version>  <dependencies> @@ -693,9 +693,9 @@   <scm> - <connection>scm:svn:https://svn.codelutin.com/isis-fish/branches/isis-fish-4.3.1.x</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/branches/isis-fish-4.3.1.x</developerConnection> - <url>https://svn.codelutin.com/isis-fish/branches/isis-fish-4.3.1.x</url> + <connection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.1.3</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.1.3</developerConnection> + <url>https://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.1.3</url> </scm> <repositories>

1 0

r4314 - branches/isis-fish-4.3.1.x
by echatellier＠users.forge.codelutin.com 06 Jan '16

06 Jan '16

Author: echatellier Date: 2016-01-06 17:48:06 +0100 (Wed, 06 Jan 2016) New Revision: 4314 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4314 Log: Update version Modified: branches/isis-fish-4.3.1.x/pom.xml Modified: branches/isis-fish-4.3.1.x/pom.xml =================================================================== --- branches/isis-fish-4.3.1.x/pom.xml 2016-01-06 16:04:02 UTC (rev 4313) +++ branches/isis-fish-4.3.1.x/pom.xml 2016-01-06 16:48:06 UTC (rev 4314) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.3.1.3</version> + <version>4.3.1.3-SNAPSHOT</version>  <dependencies>

1 0