Author: echatellier Date: 2020-10-26 13:19:26 +0100 (Mon, 26 Oct 2020) New Revision: 422 Url: http://forge.codelutin.com/projects/isis-fish-data/repository/revisions/422 Log: Merge branch 4.4.5 Added: trunk/resultinfos/MatrixNumberOfEggsLaid.java trunk/resultinfos/MatrixRecruitmentPerZone.java Modified: trunk/ trunk/simulators/DefaultSimulator.java Index: trunk =================================================================== --- trunk 2020-10-26 10:46:23 UTC (rev 421) +++ trunk 2020-10-26 12:19:26 UTC (rev 422) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -1,2 +1,3 ## /branches/4.2.2:305-317 -/branches/4.4.0-resultnames:358-369 \ No newline at end of property +/branches/4.4.0-resultnames:358-369 +/tags/4.4.5:418-421 \ No newline at end of property Copied: trunk/resultinfos/MatrixNumberOfEggsLaid.java (from rev 421, tags/4.4.5/resultinfos/MatrixNumberOfEggsLaid.java) =================================================================== --- trunk/resultinfos/MatrixNumberOfEggsLaid.java (rev 0) +++ trunk/resultinfos/MatrixNumberOfEggsLaid.java 2020-10-26 12:19:26 UTC (rev 422) @@ -0,0 +1,39 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2020 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 resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with two dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Zone (semantics : Dimension 1) + */ +public class MatrixNumberOfEggsLaid extends AbstractResultInfo { + + public static final String NAME = "MatrixNumberOfEggsLaid"; + + @Override + public String getDescription() { + return "do the doc of Result MatrixNumberOfEggsLaid"; + } +} Copied: trunk/resultinfos/MatrixRecruitmentPerZone.java (from rev 421, tags/4.4.5/resultinfos/MatrixRecruitmentPerZone.java) =================================================================== --- trunk/resultinfos/MatrixRecruitmentPerZone.java (rev 0) +++ trunk/resultinfos/MatrixRecruitmentPerZone.java 2020-10-26 12:19:26 UTC (rev 422) @@ -0,0 +1,40 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2020 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 resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with two dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Group (semantics : Dimension 1) + * Dimension 3 : Zone (semantics : Dimension 2) + */ +public class MatrixRecruitmentPerZone extends AbstractResultInfo { + + public static final String NAME = "MatrixRecruitmentPerZone"; + + @Override + public String getDescription() { + return "do the doc of Result MatrixRecruitmentPerZone"; + } +} Modified: trunk/simulators/DefaultSimulator.java =================================================================== --- trunk/simulators/DefaultSimulator.java 2020-10-26 10:46:23 UTC (rev 421) +++ trunk/simulators/DefaultSimulator.java 2020-10-26 12:19:26 UTC (rev 422) @@ -456,15 +456,23 @@ // reproduction MatrixND R = info.getReproductionMatrix(month, N); + R.setName(MatrixNumberOfEggsLaid.NAME); log.debug("R: " + R); // ajout de la matrice R dans le suivi de la pop comme etant // la reproduction pour le mois courant. popMon.setReproduction(step, pop, N, biomass, R); + if (resManager.isEnabled(MatrixNumberOfEggsLaid.NAME)) { + resManager.addResult(step, pop, R); + } // recrutement MatrixND recruitment = popMon.getRecruitment(step, pop); + recruitment.setName(MatrixRecruitmentPerZone.NAME); log.debug("recruitment: " + recruitment); + if (resManager.isEnabled(MatrixRecruitmentPerZone.NAME)) { + resManager.addResult(step, pop, recruitment); + } // mortalite de la reproduction popMon.applyReproductionMortality(pop);