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

r4313 - branches/isis-fish-4.3.1.x
by echatellier＠users.forge.codelutin.com Jan. 6, 2016

Jan. 6, 2016

Author: echatellier Date: 2016-01-06 17:04:02 +0100 (Wed, 06 Jan 2016) New Revision: 4313 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4313 Log: #7868: IsisFish n'execute pas les simulations sous Java 8 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 15:07:00 UTC (rev 4312) +++ branches/isis-fish-4.3.1.x/pom.xml 2016-01-06 16:04:02 UTC (rev 4313) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.3.1.2</version> + <version>4.3.1.3</version>  <dependencies> @@ -291,7 +291,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.176</version> + <version>1.3.176_autocommitpatch</version> <scope>compile</scope> </dependency> @@ -693,9 +693,9 @@   <scm> - <connection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.1.2</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.1.2</developerConnection> - <url>https://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.1.2</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

r4312 - branches
by echatellier＠users.forge.codelutin.com Jan. 6, 2016

Jan. 6, 2016

Author: echatellier Date: 2016-01-06 16:07:00 +0100 (Wed, 06 Jan 2016) New Revision: 4312 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4312 Log: Create branch for small fix Added: branches/isis-fish-4.3.1.x/

1 0

r4311 - trunk
by echatellier＠users.forge.codelutin.com Jan. 6, 2016

Jan. 6, 2016

Author: echatellier Date: 2016-01-06 11:21:19 +0100 (Wed, 06 Jan 2016) New Revision: 4311 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4311 Log: Update libs Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2016-01-06 10:05:36 UTC (rev 4310) +++ trunk/pom.xml 2016-01-06 10:21:19 UTC (rev 4311) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>6.1</version> + <version>7</version> </parent> <groupId>fr.ifremer</groupId> @@ -20,7 +20,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>3.0-rc-8</version> + <version>3.0-rc-10</version> <scope>compile</scope> </dependency> @@ -143,7 +143,7 @@ <dependency> <groupId>com.sun.mail</groupId> <artifactId>javax.mail</artifactId> - <version>1.5.4</version> + <version>1.5.5</version> <scope>compile</scope> </dependency> @@ -224,7 +224,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-math3</artifactId> - <version>3.5</version> + <version>3.6</version> <scope>runtime</scope>  </dependency> @@ -250,7 +250,7 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> - <version>2.4.1</version> + <version>2.5</version> <scope>compile</scope> </dependency> @@ -257,7 +257,7 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> - <version>2.4.1</version> + <version>2.5</version> <scope>compile</scope> </dependency> @@ -264,7 +264,7 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> - <version>2.4.1</version> + <version>2.5</version> <scope>runtime</scope> </dependency> @@ -271,7 +271,7 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> - <version>2.4.1</version> + <version>2.5</version> <scope>runtime</scope> </dependency> @@ -398,7 +398,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>18.0</version> + <version>19.0</version> </dependency>

1 0

r4310 - trunk/src/main/resources/i18n
by echatellier＠users.forge.codelutin.com Jan. 6, 2016

Jan. 6, 2016

Author: echatellier Date: 2016-01-06 11:05:36 +0100 (Wed, 06 Jan 2016) New Revision: 4310 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4310 Log: Happy new year 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 2015-11-30 10:11:56 UTC (rev 4309) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2016-01-06 10:05:36 UTC (rev 4310) @@ -85,7 +85,7 @@ dhyper= directory\ %s\ must\ be\ a\ directory= dlnorm= -isisfish.about.abouthtmltext=<html>ISIS-Fish (%s) Copyright IFREMER-MAERHA 2000-2015. <a href\="http\://www.isis-fish.org">http\://www.isis-fish.org</a> Please, report any bug you can found.<html> +isisfish.about.abouthtmltext=<html>ISIS-Fish (%s) Copyright IFREMER-MAERHA 2000-2016. <a href\="http\://www.isis-fish.org">http\://www.isis-fish.org</a> Please, report any bug you can found.<html> isisfish.about.licensetext=You can modify and redistribute the program under the conditions of the GNU General Public License (version 2 or later). A copy of the GPL is in the file "LICENSE.txt" provided with ISIS-Fish. All rights reserved. No guarantees are provided for use of this program. isisfish.about.title=About ISIS-Fish... isisfish.advancedParameters.title=Advanced parameters Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2015-11-30 10:11:56 UTC (rev 4309) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2016-01-06 10:05:36 UTC (rev 4310) @@ -85,7 +85,7 @@ dhyper= directory\ %s\ must\ be\ a\ directory= dlnorm= -isisfish.about.abouthtmltext=<html>ISIS-Fish (%s) Copyright IFREMER-MAERHA 2000-2015. <a href\="http\://www.isis-fish.org">http\://www.isis-fish.org</a> Merci de rapporter les bugs.<html> +isisfish.about.abouthtmltext=<html>ISIS-Fish (%s) Copyright IFREMER-MAERHA 2000-2016. <a href\="http\://www.isis-fish.org">http\://www.isis-fish.org</a> Merci de rapporter les bugs.<html> isisfish.about.licensetext=Vous pouvez modifier et redistribuer ce programme sous les conditions énoncées par la licence GNU GPL (version 2 ou ultérieure). Une copie de la licence GPL est dans le fichier « LICENSE.txt » fourni avec ISIS-Fish. Tous droits réservés. Aucune garantie n'est fournie pour l'utilisation de ce programme. isisfish.about.title=À propos de ISIS-Fish... isisfish.advancedParameters.title=Paramètres avancés

1 0

r4309 - trunk
by echatellier＠users.forge.codelutin.com Nov. 30, 2015

Nov. 30, 2015

Author: echatellier Date: 2015-11-30 11:11:56 +0100 (Mon, 30 Nov 2015) New Revision: 4309 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4309 Log: Update libs Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2015-10-27 09:59:03 UTC (rev 4308) +++ trunk/pom.xml 2015-11-30 10:11:56 UTC (rev 4309) @@ -206,7 +206,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> - <version>4.0</version> + <version>4.1</version> </dependency> <dependency> @@ -237,7 +237,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.7.12</version> + <version>1.7.13</version> <scope>runtime</scope> </dependency>

1 0

r4308 - trunk/src/main/java/fr/ifremer/isisfish/entities
by echatellier＠users.forge.codelutin.com Oct. 27, 2015

Oct. 27, 2015

Author: echatellier Date: 2015-10-27 10:59:03 +0100 (Tue, 27 Oct 2015) New Revision: 4308 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4308 Log: Fix copy/paste error Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2015-10-22 11:43:34 UTC (rev 4307) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2015-10-27 09:59:03 UTC (rev 4308) @@ -322,7 +322,7 @@ eq.setCategory("FishingMortalityOtherFleets"); eq.setJavaInterface(PopulationFishingMortalityOtherFleets.class); eq.setLanguage(Language.JAVA); - setNaturalDeathRate(eq); + setFishingMortalityOtherFleets(eq); } eq.setName(getName());

1 0

r4307 - in trunk/src/main: java/fr/ifremer/isisfish/datastore/migration java/fr/ifremer/isisfish/entities java/fr/ifremer/isisfish/equation java/fr/ifremer/isisfish/ui/input/population resources resources/i18n xmi
by echatellier＠users.forge.codelutin.com Oct. 22, 2015

Oct. 22, 2015

Author: echatellier Date: 2015-10-22 13:43:34 +0200 (Thu, 22 Oct 2015) New Revision: 4307 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4307 Log: fixes #7666: Ajouter l'?\195?\169quation de mortalit?\195?\169 par p?\195?\170che Other Added: trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationFishingMortalityOtherFleets.java Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV43V44.java trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationNaturalDeathRate.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationStockUI.jaxx trunk/src/main/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties trunk/src/main/resources/sensitivity.properties trunk/src/main/xmi/isis-fish.zargo Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java 2015-10-21 13:52:40 UTC (rev 4306) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java 2015-10-22 11:43:34 UTC (rev 4307) @@ -111,7 +111,8 @@ tx.executeSQL("alter table POPULATION add column IF NOT EXISTS RecruitmentEQUATION VARCHAR(255);"); tx.executeSQL("alter table POPULATION add column IF NOT EXISTS abundanceReferenceMonth integer default null;"); tx.executeSQL("alter table POPULATION add column IF NOT EXISTS computeFOnLandings BIT default false;"); - + tx.executeSQL("alter table POPULATION add column IF NOT EXISTS FishingMortalityOtherFleets VARCHAR(255);"); + // build new equation for maturity group for (Object[] maturityRow : maturityGroupResult) { String population = (String)maturityRow[0]; Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV43V44.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV43V44.java 2015-10-21 13:52:40 UTC (rev 4306) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV43V44.java 2015-10-22 11:43:34 UTC (rev 4307) @@ -77,6 +77,8 @@ tx.executeSQL("alter table POPULATION alter column groupMax RENAME TO fbarGroupMax;"); // add representativeAbundanceMonth field tx.executeSQL("alter table POPULATION add column IF NOT EXISTS computeFOnLandings BIT default false;"); + // add recruitment equation + tx.executeSQL("alter table POPULATION add column IF NOT EXISTS FishingMortalityOtherFleets VARCHAR(255);"); // build new equation for maturity group and reproduction rate Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java 2015-10-21 13:52:40 UTC (rev 4306) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java 2015-10-22 11:43:34 UTC (rev 4307) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2011 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, Chatellier Eric + * Copyright (C) 2006 - 2015 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 @@ -90,9 +90,6 @@ return result; } - /* - * @see fr.ifremer.isisfish.entities.PopulationGroup#getMeanWeight() - */ @Override public double getMeanWeight() { double result = 0; @@ -110,9 +107,6 @@ return result; } - /* - * @see fr.ifremer.isisfish.entities.PopulationGroup#getNaturalDeathRate() - */ @Override public double getNaturalDeathRate(Zone zone) { double result = 0; @@ -133,6 +127,26 @@ return result; } + @Override + public double getFishingMortalityOtherFleets(Zone zone) { + double result = 0; + try { + Equation eq = getPopulation().getFishingMortalityOtherFleets(); + if (eq != null) { + result = eq.evaluate("pop", this.getPopulation(), "group", + this, "zone", zone); + } + } catch (Exception eee) { + if (log.isWarnEnabled()) { + log.warn("Error in fishing mortality other fleets equation"); + } + if (log.isDebugEnabled()) { + log.debug("StackTrace", eee); + } + } + return result; + } + /* * @see fr.ifremer.isisfish.entities.PopulationGroup#getPrice() */ Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2015-10-21 13:52:40 UTC (rev 4306) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2015-10-22 11:43:34 UTC (rev 4307) @@ -44,6 +44,7 @@ import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.equation.Language; import fr.ifremer.isisfish.equation.PopulationCapturabilityEquation; +import fr.ifremer.isisfish.equation.PopulationFishingMortalityOtherFleets; import fr.ifremer.isisfish.equation.PopulationGrowth; import fr.ifremer.isisfish.equation.PopulationGrowthReverse; import fr.ifremer.isisfish.equation.PopulationMaturityOgiveEquation; @@ -308,7 +309,39 @@ t("isisfish.error.change.equation"), eee); } } + + public void setFishingMortalityOtherFleetsContent(String content) { + try { + Equation eq = getFishingMortalityOtherFleets(); + if (eq == null) { + EquationDAO dao = IsisFishDAOHelper + .getEquationDAO(getTopiaContext()); + // create equation + eq = dao.create(); + eq.setCategory("FishingMortalityOtherFleets"); + eq.setJavaInterface(PopulationFishingMortalityOtherFleets.class); + eq.setLanguage(Language.JAVA); + setNaturalDeathRate(eq); + } + + eq.setName(getName()); + + // Fire + String _oldValue = eq.getContent(); + fireOnPreWrite("content", _oldValue, content); + + eq.setContent(content); + eq.update(); + + fireOnPostWrite("content", _oldValue, content); + + } catch (TopiaException eee) { + throw new IsisFishRuntimeException( + t("isisfish.error.change.equation"), eee); + } + } + public void setMeanWeightContent(String content) { try { Equation eq = getMeanWeight(); @@ -483,7 +516,34 @@ return result; } + + /** + * Return Matrix [groups x zones] of Fishing mortality other fleets. + * + * @return a matrix + */ + @Override + public MatrixND getFishingMortalityOtherFleetsMatrix() { + List<PopulationGroup> groups = getPopulationGroup(); + List<Zone> zones = getPopulationZone(); + MatrixND result = MatrixFactory.getInstance().create( + "Fishing mortality other fleets", new List[] { groups, zones }, + new String[] { "Groups", "Zones" }); + + for (MatrixIterator i = result.iterator(); i.hasNext();) { + i.next(); + PopulationGroup group = (PopulationGroup) i + .getSemanticsCoordinates()[0]; + Zone zone = (Zone) i.getSemanticsCoordinates()[1]; + + double value = group.getFishingMortalityOtherFleets(zone); + i.setValue(value); + } + + return result; + } + @Override public PopulationSeasonInfo getPopulationSeasonInfo(Month month) { Collection<PopulationSeasonInfo> all = getPopulationSeasonInfo(); Added: trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationFishingMortalityOtherFleets.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationFishingMortalityOtherFleets.java (rev 0) +++ trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationFishingMortalityOtherFleets.java 2015-10-22 11:43:34 UTC (rev 4307) @@ -0,0 +1,62 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 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.equation; + +import fr.ifremer.isisfish.entities.Population; +import fr.ifremer.isisfish.entities.PopulationGroup; +import fr.ifremer.isisfish.entities.Zone; +import fr.ifremer.isisfish.simulator.SimulationContext; +import fr.ifremer.isisfish.util.Args; + +/** + * Equation de mortalité par pêche Other. + * + * @author echatellier + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public interface PopulationFishingMortalityOtherFleets { + + /** + * Compute fishing mortality other fleets. + * + * @param context simulation context + * @param pop la population pour lequel il faut calculer la mortalité + * @param group le groupe pour lequel il faut calculer la mortalité + * null, si on souhaite la mortalité naturelle du group des naissances + * @param zone la zone du groupe pour lequel on souhaite la mortalité + * seulement utilisé pour la mortalité naturelle du group des naissances, + * sinon null + * @return equation result + * @throws Exception + */ + @Args({"context", "pop", "group", "zone"}) + public double compute(SimulationContext context, + Population pop, PopulationGroup group, Zone zone) throws Exception; + +} Property changes on: trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationFishingMortalityOtherFleets.java ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Author Date Id Revision HeadURL \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Modified: trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationNaturalDeathRate.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationNaturalDeathRate.java 2015-10-21 13:52:40 UTC (rev 4306) +++ trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationNaturalDeathRate.java 2015-10-22 11:43:34 UTC (rev 4307) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2011 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, Chatellier Eric + * Copyright (C) 2006 - 2015 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 @@ -54,7 +54,7 @@ * @param zone la zone du groupe pour lequel on souhaite la mortalité natrurelle * seulement utilisé pour la mortalité naturelle du group des naissances, * sinon null - * @return eqaution result + * @return equation result * @throws Exception */ @Args({"context", "pop", "group", "zone"}) Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationStockUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationStockUI.jaxx 2015-10-21 13:52:40 UTC (rev 4306) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationStockUI.jaxx 2015-10-22 11:43:34 UTC (rev 4307) @@ -92,6 +92,15 @@ </cell> </row> <row> + <cell columns="2" fill='both' weighty='1.0'> + <fr.ifremer.isisfish.ui.input.equation.InputOneEquationUI id='fishingMortalityOtherFleets' constructorParams='this' + text='isisfish.populationEquation.fishingMortalityOtherFleets' active="{isActive()}" + bean='{getBean()}' formuleCategory='FishingMortalityOtherFleets' beanProperty='FishingMortalityOtherFleets' + clazz='{fr.ifremer.isisfish.equation.PopulationFishingMortalityOtherFleets.class}' + decorator='boxed' _sensitivityBean='{Population.class}' _sensitivityMethod='"FishingMortalityOtherFleets"'/> + </cell> + </row> + <row> <cell columns="2" fill='horizontal' anchor="south" weightx='1.0' weighty='1.0'> <Table> <row> Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2015-10-21 13:52:40 UTC (rev 4306) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2015-10-22 11:43:34 UTC (rev 4307) @@ -683,6 +683,7 @@ isisfish.populationCapturability.title=Catchability isisfish.populationCapturability.useCapturabilityEquation=Use catchability equation isisfish.populationEquation.MaturityOgive=Maturity ogive +isisfish.populationEquation.fishingMortalityOtherFleets=Fishing mortality other fleets isisfish.populationEquation.meanWeight=Mean weight isisfish.populationEquation.naturalDeathRate=Natural death rate isisfish.populationEquation.price=Price Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2015-10-21 13:52:40 UTC (rev 4306) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2015-10-22 11:43:34 UTC (rev 4307) @@ -683,6 +683,7 @@ isisfish.populationCapturability.title=Capturabilité isisfish.populationCapturability.useCapturabilityEquation=Utiliser une équation de capturabilité isisfish.populationEquation.MaturityOgive=Ogive de maturité +isisfish.populationEquation.fishingMortalityOtherFleets=Mortalité par pêche Other isisfish.populationEquation.meanWeight=Poids moyen isisfish.populationEquation.naturalDeathRate=Taux de mortalité naturelle isisfish.populationEquation.price=Prix Modified: trunk/src/main/resources/sensitivity.properties =================================================================== --- trunk/src/main/resources/sensitivity.properties 2015-10-21 13:52:40 UTC (rev 4306) +++ trunk/src/main/resources/sensitivity.properties 2015-10-22 11:43:34 UTC (rev 4307) @@ -47,6 +47,7 @@ Population.meanWeight Population.monthGapBetweenReproRecrutement Population.naturalDeathRate +Population.fishingMortalityOtherFleets Population.price Population.recruitmentDistribution Population.recruitmentEquation Modified: trunk/src/main/xmi/isis-fish.zargo =================================================================== (Binary files differ)

1 0

r4306 - trunk/src/main/java/fr/ifremer/isisfish/simulator
by echatellier＠users.forge.codelutin.com Oct. 21, 2015

Oct. 21, 2015

Author: echatellier Date: 2015-10-21 15:52:40 +0200 (Wed, 21 Oct 2015) New Revision: 4306 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4306 Log: refs #6194: correspond des donn?\195?\169es fournies associ?\195?\169es au mois de reproduction Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java 2015-10-15 08:34:41 UTC (rev 4305) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java 2015-10-21 13:52:40 UTC (rev 4306) @@ -281,26 +281,17 @@ recruitmentInputMap = new RecruitmentInputMap(monthCount); int pos = reproductionSeasonInfo.getMonths().indexOf(reproMonth); - // on remplit toutes les données relativement à la position où la reproduction a été trouvée - // exemple: si on trouve la reproduction directement sur le mois m = 2 - // on remplit la données (0) avec t + 2 - // on remplit la données (1) avec t + 1 - // on remplit la données (2) avec t - // exemple 2: si m = 1 - // on remplit la données (0) avec t + 1 - // on remplit la données (1) avec t - // on remplit la données (2) avec t - 1 - // exemple 3: si m = 0 (directement sur le premier mois) - // on remplit la données (0) avec t - // on remplit la données (1) avec t - 1 - // on remplit la données (2) avec t - 2 + // on remplit toutes les données relativement à la position où la reproduction a été calculé + // donc, c'est toujours: + // - données 0 : données pour le premier mois de repro + // - données 1 : données pour le deuxieme mois de repro + // etc... for (int p = 0; p < monthCount; p++) { - TimeStep t2 = new TimeStep(t.getStep() - p + pos); + TimeStep t2 = new TimeStep(t.getStep() + p - pos); ReproductionData reproductionData2 = reproductions.get(pop).get(t2); RecruitmentInput recruitmentInput2 = reproductionData2 != null ? new RecruitmentInput(reproductionData2) : new RecruitmentInput(); // recruitmentInput2#recuitementContribution must be null // this is the key "null information here" - // on remplit les case passées (-) recruitmentInputMap.put(p, recruitmentInput2); } }

1 0

r4305 - trunk
by echatellier＠users.forge.codelutin.com Oct. 15, 2015

Oct. 15, 2015

Author: echatellier Date: 2015-10-15 10:34:41 +0200 (Thu, 15 Oct 2015) New Revision: 4305 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4305 Log: Use java7 deps Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2015-10-15 08:27:49 UTC (rev 4304) +++ trunk/pom.xml 2015-10-15 08:34:41 UTC (rev 4305) @@ -412,21 +412,15 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-swing</artifactId> - <version>3.0.0</version> + <version>2.2.0</version> <scope>test</scope> </dependency> <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-swing-junit</artifactId> - <version>3.0.0</version> + <version>2.2.0</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.easytesting</groupId> - <artifactId>fest-reflect</artifactId> - <version>1.4.1</version> - <scope>test</scope> - </dependency> </dependencies>

1 0

r4304 - trunk/src/main/java/fr/ifremer/isisfish/simulator
by echatellier＠users.forge.codelutin.com Oct. 15, 2015

Oct. 15, 2015

Author: echatellier Date: 2015-10-15 10:27:49 +0200 (Thu, 15 Oct 2015) New Revision: 4304 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4304 Log: Fix mistake Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java 2015-10-15 08:05:06 UTC (rev 4303) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java 2015-10-15 08:27:49 UTC (rev 4304) @@ -315,7 +315,7 @@ // les données avec recuitementContribution à nul RecruitmentInput recruitmentInput = recruitmentInputMap.get(pos); Double contribution = matEtalement.getValue(e); - recruitmentInput.setRecuitementContribution(contribution); + recruitmentInput.setRecruitementContribution(contribution); } }

1 0