Author: echatellier Date: 2015-04-21 09:20:26 +0000 (Tue, 21 Apr 2015) New Revision: 353 Url: http://forge.codelutin.com/projects/isis-fish-data/repository/revisions/353 Log: fixes #6194: changement reproduction/recrutement Modified: trunk/pom.xml trunk/scripts/SiMatrix.java trunk/simulators/DefaultSimulator.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2015-04-16 16:43:41 UTC (rev 352) +++ trunk/pom.xml 2015-04-21 09:20:26 UTC (rev 353) @@ -74,7 +74,7 @@ <dependency> <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.4.0.0-SNAPSHOT</version> + <version>4.4.0.0-rc-1-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> Modified: trunk/scripts/SiMatrix.java =================================================================== --- trunk/scripts/SiMatrix.java 2015-04-16 16:43:41 UTC (rev 352) +++ trunk/scripts/SiMatrix.java 2015-04-21 09:20:26 UTC (rev 353) @@ -29,7 +29,6 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; -import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -1351,7 +1350,6 @@ //log.info("Recruitment_1 = " + RecruitmentMatrix); // Pour chaque pas de temps on recupere le recrutement - RecruitmentMatrix.setValue(pop, context.getPopulationMonitor().getRecruitment(step, pop).sumAll()); //log.info("RecruitmentMatrix_2 = " + RecruitmentMatrix); Modified: trunk/simulators/DefaultSimulator.java =================================================================== --- trunk/simulators/DefaultSimulator.java 2015-04-16 16:43:41 UTC (rev 352) +++ trunk/simulators/DefaultSimulator.java 2015-04-21 09:20:26 UTC (rev 353) @@ -382,8 +382,8 @@ // N is reassigned during computation resManager.addResult(step, pop, N); + MatrixND biomass = siMatrix.matrixBiomass(N, pop, step); if (resManager.isEnabled(ResultName.MATRIX_BIOMASS)) { - MatrixND biomass = siMatrix.matrixBiomass(N, pop, step); resManager.addResult(step, pop, biomass); } @@ -433,7 +433,7 @@ // ajout de la matrice R dans le suivi de la pop comme etant // la reproduction pour le mois courant. - popMon.setReproduction(step, pop, R); + popMon.setReproduction(step, pop, N, biomass, R); // recrutement MatrixND recruitment = popMon.getRecruitment(step, pop);