October 2012 - Isis-fish-community-commits - mailman.cloud.codelutin.com

r20 - trunk/exports
by smahevas＠users.forge.codelutin.com 23 Oct '12

23 Oct '12

Author: smahevas Date: 2012-10-23 15:40:08 +0200 (Tue, 23 Oct 2012) New Revision: 20 Url: http://forge.codelutin.com/repositories/revision/isis-fish-community/20 Log: necessary results ajout des matrices Modified: trunk/exports/MortalitePecheTotale.java Modified: trunk/exports/MortalitePecheTotale.java =================================================================== --- trunk/exports/MortalitePecheTotale.java 2012-10-23 13:39:55 UTC (rev 19) +++ trunk/exports/MortalitePecheTotale.java 2012-10-23 13:40:08 UTC (rev 20) @@ -51,7 +51,10 @@ /** to use log facility, just put in your code: log.info("..."); */ static private Log log = LogFactory.getLog(MortalitePecheTotale.class); - protected String[] necessaryResult = { ResultName.MATRIX_TOTAL_FISHING_MORTALITY }; + protected String[] necessaryResult = { ResultName.MATRIX_TOTAL_FISHING_MORTALITY, + ResultName.MATRIX_FISHING_MORTALITY_PER_GROUP, + ResultName.MATRIX_CATCH_PER_STRATEGY_MET_PER_ZONE_POP, + ResultName.MATRIX_ABUNDANCE }; @Override public String[] getNecessaryResult() {

1 0

r19 - trunk/exports
by smahevas＠users.forge.codelutin.com 23 Oct '12

23 Oct '12

Author: smahevas Date: 2012-10-23 15:39:55 +0200 (Tue, 23 Oct 2012) New Revision: 19 Url: http://forge.codelutin.com/repositories/revision/isis-fish-community/19 Log: necessary results ajout des matrices Modified: trunk/exports/MortalitePecheGroupe.java Modified: trunk/exports/MortalitePecheGroupe.java =================================================================== --- trunk/exports/MortalitePecheGroupe.java 2012-10-19 15:05:57 UTC (rev 18) +++ trunk/exports/MortalitePecheGroupe.java 2012-10-23 13:39:55 UTC (rev 19) @@ -51,7 +51,10 @@ /** to use log facility, just put in your code: log.info("..."); */ static private Log log = LogFactory.getLog(MortalitePecheGroupe.class); - protected String[] necessaryResult = { ResultName.MATRIX_FISHING_MORTALITY_PER_GROUP }; + protected String[] necessaryResult = { ResultName.MATRIX_FISHING_MORTALITY_PER_GROUP, + ResultName.MATRIX_CATCH_PER_STRATEGY_MET_PER_ZONE_POP, + ResultName.MATRIX_ABUNDANCE, + }; @Override public String[] getNecessaryResult() {

1 0

r18 - trunk/exports
by smahevas＠users.forge.codelutin.com 19 Oct '12

19 Oct '12

Author: smahevas Date: 2012-10-19 17:05:57 +0200 (Fri, 19 Oct 2012) New Revision: 18 Url: http://forge.codelutin.com/repositories/revision/isis-fish-community/18 Log: nouveauscript Added: trunk/exports/MortalitePecheTotale.java Added: trunk/exports/MortalitePecheTotale.java =================================================================== --- trunk/exports/MortalitePecheTotale.java (rev 0) +++ trunk/exports/MortalitePecheTotale.java 2012-10-19 15:05:57 UTC (rev 18) @@ -0,0 +1,102 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2006 - 2011 Ifremer, CodeLutin + * %% + * 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 2 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-2.0.html>. + * #L% + */ +package exports; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.io.Writer; + +import static org.nuiton.i18n.I18n._; +import org.nuiton.math.matrix.*; + +import scripts.ResultName; + +import fr.ifremer.isisfish.entities.*; +import fr.ifremer.isisfish.export.Export; +import fr.ifremer.isisfish.types.TimeStep; +import fr.ifremer.isisfish.datastore.SimulationStorage; + +/** + * FishingMortality.java + * + * Created: 19 Avril 2012 + * + * @author anonymous <anonymous(a)labs.libre-entreprise.org> + * @version $Revision: 0.1 $ + * + * Last update: $Date: 0000-00-00 00:00:00 $ by : $Author: $ + */ +public class MortalitePecheTotale implements Export { + + /** to use log facility, just put in your code: log.info("..."); */ + static private Log log = LogFactory.getLog(MortalitePecheTotale.class); + + protected String[] necessaryResult = { ResultName.MATRIX_TOTAL_FISHING_MORTALITY }; + + @Override + public String[] getNecessaryResult() { + return this.necessaryResult; + } + + @Override + public String getExportFilename() { + return "MortalitePecheTotale"; + } + + @Override + public String getExtensionFilename() { + return ".csv"; + } + + @Override + public String getDescription() { + return _("Exporte la mortalite par peche totale de la simulation par population (Fpop par an calcule en decembre)"); + } + + @Override + public void export(SimulationStorage simulation, Writer out) + throws Exception { + TimeStep lastStep = simulation.getResultStorage().getLastStep(); + + for (Population pop : simulation.getParameter().getPopulations()) { + for (TimeStep step = new TimeStep(0); !step.after(lastStep); step = step + .next()) { + + MatrixND mat = simulation.getResultStorage().getMatrix(step, + pop, ResultName.MATRIX_TOTAL_FISHING_MORTALITY); + + if (mat != null) { // can be null if simulation is stopped before last year simulation + for (MatrixIterator i = mat.iterator(); i.hasNext();) { + i.next(); + Object[] sems = i.getSemanticsCoordinates(); + double val = i.getValue(); + + out.write(pop.getName() + ";" + step.getStep() + ";" + val + "\n"); + } + } + } + } + } + } + +

1 0

r17 - trunk/exports
by smahevas＠users.forge.codelutin.com 19 Oct '12

19 Oct '12

Author: smahevas Date: 2012-10-19 17:05:42 +0200 (Fri, 19 Oct 2012) New Revision: 17 Url: http://forge.codelutin.com/repositories/revision/isis-fish-community/17 Log: nouveauscript Added: trunk/exports/MortalitePecheGroupe.java Added: trunk/exports/MortalitePecheGroupe.java =================================================================== --- trunk/exports/MortalitePecheGroupe.java (rev 0) +++ trunk/exports/MortalitePecheGroupe.java 2012-10-19 15:05:42 UTC (rev 17) @@ -0,0 +1,104 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2006 - 2011 Ifremer, CodeLutin + * %% + * 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 2 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-2.0.html>. + * #L% + */ +package exports; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.io.Writer; + +import static org.nuiton.i18n.I18n._; +import org.nuiton.math.matrix.*; + +import scripts.ResultName; + +import fr.ifremer.isisfish.entities.*; +import fr.ifremer.isisfish.export.Export; +import fr.ifremer.isisfish.types.TimeStep; +import fr.ifremer.isisfish.datastore.SimulationStorage; + +/** + * FishingMortality.java + * + * Created: 19 Avril 2012 + * + * @author anonymous <anonymous(a)labs.libre-entreprise.org> + * @version $Revision: 0.1 $ + * + * Last update: $Date: 0000-00-00 00:00:00 $ by : $Author: $ + */ +public class MortalitePecheGroupe implements Export { + + /** to use log facility, just put in your code: log.info("..."); */ + static private Log log = LogFactory.getLog(MortalitePecheGroupe.class); + + protected String[] necessaryResult = { ResultName.MATRIX_FISHING_MORTALITY_PER_GROUP }; + + @Override + public String[] getNecessaryResult() { + return this.necessaryResult; + } + + @Override + public String getExportFilename() { + return "MortalitePecheGroupe"; + } + + @Override + public String getExtensionFilename() { + return ".csv"; + } + + @Override + public String getDescription() { + return _("Exporte la mortalite par peche par groupe et par population de la simulation (Fgroup par an calcule en decembre)"); + } + + @Override + public void export(SimulationStorage simulation, Writer out) + throws Exception { + TimeStep lastStep = simulation.getResultStorage().getLastStep(); + + for (Population pop : simulation.getParameter().getPopulations()) { +// for (PopulationGroup group : pop.getPopulationGroup()) { // Rajouter une boucle sur les groupes ?? + for (TimeStep step = new TimeStep(0); !step.after(lastStep); step = step.next()) { + + MatrixND mat = simulation.getResultStorage().getMatrix(step, + pop, ResultName.MATRIX_FISHING_MORTALITY_PER_GROUP); // group + + if (mat != null) { // can be null if simulation is stopped before last year simulation + for (MatrixIterator i = mat.iterator(); i.hasNext();) { + i.next(); + Object[] sems = i.getSemanticsCoordinates(); + PopulationGroup group = (PopulationGroup)sems[1]; + double val = i.getValue(); + + out.write(pop.getName() + ";" + step.getStep() + ";" + group.getAge() + ";" + val + "\n"); // + ";" + group.getAge() + } + } + } + //} + } + } + } + +

1 0

r16 - trunk/rules
by smahevas＠users.forge.codelutin.com 16 Oct '12

16 Oct '12

Author: smahevas Date: 2012-10-16 17:47:45 +0200 (Tue, 16 Oct 2012) New Revision: 16 Url: http://forge.codelutin.com/repositories/revision/isis-fish-community/16 Log: correction erreur Metier dans postAction Modified: trunk/rules/Ogive_de_Tri_Merlu.java Modified: trunk/rules/Ogive_de_Tri_Merlu.java =================================================================== --- trunk/rules/Ogive_de_Tri_Merlu.java 2012-10-16 15:47:17 UTC (rev 15) +++ trunk/rules/Ogive_de_Tri_Merlu.java 2012-10-16 15:47:45 UTC (rev 16) @@ -152,7 +152,7 @@ // la matrice de captures a une dimension metier - donc a cette etape, toutes // les captures de tous les metiers sont connues // Ne doit pas s'appliquer pour chaque metier de la boucle mais une seule fois! - // affectation est mis ÃƒÂ true ÃƒÂ la fin de la boucle sur les pop + // affectation est mis ÃƒÆ’Ã†â€™Ãƒâ€šÃ‚Â true ÃƒÆ’Ã†â€™Ãƒâ€šÃ‚Â la fin de la boucle sur les pop if (affectation) { log.info("deb de affecterCaptureRejetSelonOgive"); @@ -166,8 +166,8 @@ for (MatrixIterator i = discard.iterator(); i.next();) { Object[] coordonnees = i.getSemanticsCoordinates(); PopulationGroup group = (PopulationGroup) coordonnees[2]; - - if (metier.getName().equals("metier lang simp Sud")||metier.getName().equals("metier lang simp Nord")||metier.getName().equals("metier lang simple")||metier.getName().equals("metier lang jum Nord")||metier.getName().equals("metier lang jum Sud")||metier.getName().equals("metier lang jum")) { + Metier met = (Metier) coordonnees[1]; + if (met.getName().equals("metier lang simp Sud")||met.getName().equals("metier lang simp Nord")||met.getName().equals("metier lang simple")||met.getName().equals("metier lang jum Nord")||met.getName().equals("metier lang jum Sud")||met.getName().equals("metier lang jum")) { double propTrie = 1 / (1 + Math.exp(-(group.getLength() - param_Retention_L50)/ param_Retention_slope)); double propRejet = 1 - propTrie; @@ -175,17 +175,25 @@ double value = i.getValue() * propRejet; log.info("VALUE" + value); i.setValue(value); + if (param_propSurvie >0) { + //ajout de la survie aux effectifs + eff.setValue(coordonnees[2], coordonnees[3], + eff.getValue(coordonnees[2], + coordonnees[3]) + i.getValue() * + param_propSurvie); + } }else if (group.getLength() >= param_TailleMin) { i.setValue(0); // initialise discard si pas de rejet (ie taille>=TailleMin et pas metierLangoustine) - } - if (param_propSurvie >0) { + } else{ // group.getLength() < param_TailleMin + if (param_propSurvie >0) { //ajout de la survie aux effectifs eff.setValue(coordonnees[2], coordonnees[3], eff.getValue(coordonnees[2], coordonnees[3]) + i.getValue() * param_propSurvie); - } + } + } } discard.setName(ResultName.MATRIX_DISCARDS_PER_STR_MET_PER_ZONE_POP); popMon.addDiscard(step, pop, discard);

1 0

r15 - trunk/rules
by smahevas＠users.forge.codelutin.com 16 Oct '12

16 Oct '12

Author: smahevas Date: 2012-10-16 17:47:17 +0200 (Tue, 16 Oct 2012) New Revision: 15 Url: http://forge.codelutin.com/repositories/revision/isis-fish-community/15 Log: corrections erreur metier dans postAction Modified: trunk/rules/TACpoids20012011OgiveTriMerlu.java Modified: trunk/rules/TACpoids20012011OgiveTriMerlu.java =================================================================== --- trunk/rules/TACpoids20012011OgiveTriMerlu.java 2012-09-06 10:41:07 UTC (rev 14) +++ trunk/rules/TACpoids20012011OgiveTriMerlu.java 2012-10-16 15:47:17 UTC (rev 15) @@ -93,29 +93,30 @@ public double param_TailleMin = 27.0; /** TAC in tonnes */ @Doc("TAC in tons 2001") - public double param_tacInTons2001 = 4000.0; + public double param_tacInTons2001 =8452; @Doc("TAC in tons 2002") - public double param_tacInTons2002 = 3200.0; + public double param_tacInTons2002 = 10098; @Doc("TAC in tons 2003") - public double param_tacInTons2003 = 3000.0; + public double param_tacInTons2003 = 11220; @Doc("TAC in tons 2004") - public double param_tacInTons2004 = 3150.0; + public double param_tacInTons2004 = 14623; @Doc("TAC in tons 2005") - public double param_tacInTons2005 = 3100.0; + public double param_tacInTons2005 = 15932; @Doc("TAC in tons 2006") - public double param_tacInTons2006 = 4000.0; + public double param_tacInTons2006 = 16412; @Doc("TAC in tons 2007") - public double param_tacInTons2007 = 4320.0; + public double param_tacInTons2007 = 19701; @Doc("TAC in tons 2008") - public double param_tacInTons2008 = 4320.0; + public double param_tacInTons2008 = 20196; @Doc("TAC in tons 2009") - public double param_tacInTons2009 = 4100.0; + public double param_tacInTons2009 = 19261; @Doc("TAC in tons 2010") - public double param_tacInTons2010 = 3900.0; + public double param_tacInTons2010 = 20609; @Doc("TAC in tons 2011") - public double param_tacInTons2011 = 3900.0; + public double param_tacInTons2011 = 20609; + @@ -179,7 +180,7 @@ TargetSpecies ts = metier.getMetierSeasonInfo(step.getMonth()) .getSpeciesTargetSpecies(param_species); boolean result = false; - if (ts != null) { // on n'applique la regle que si espece capturÃƒÆ’Ã†â€™Ãƒâ€šÃ‚Â©e par ce metier + if (ts != null) { // on n'applique la regle que si espece capturÃƒÆ’Ã†â€™Ãƒâ€ Ã¢â‚¬â„¢ÃƒÆ’Ã¢â‚¬Â ÃƒÂ¢Ã¢â€šÂ¬Ã¢â€žÂ¢ÃƒÆ’Ã†â€™ÃƒÂ¢Ã¢â€šÂ¬Ã‚Â ÃƒÆ’Ã‚Â¢ÃƒÂ¢Ã¢â‚¬Å¡Ã‚Â¬ÃƒÂ¢Ã¢â‚¬Å¾Ã‚Â¢ÃƒÆ’Ã†â€™Ãƒâ€ Ã¢â‚¬â„¢ÃƒÆ’Ã‚Â¢ÃƒÂ¢Ã¢â‚¬Å¡Ã‚Â¬Ãƒâ€šÃ‚Â ÃƒÆ’Ã†â€™Ãƒâ€šÃ‚Â¢ÃƒÆ’Ã‚Â¢ÃƒÂ¢Ã¢â€šÂ¬Ã…Â¡Ãƒâ€šÃ‚Â¬ÃƒÆ’Ã‚Â¢ÃƒÂ¢Ã¢â€šÂ¬Ã…Â¾Ãƒâ€šÃ‚Â¢ÃƒÆ’Ã†â€™Ãƒâ€ Ã¢â‚¬â„¢ÃƒÆ’Ã¢â‚¬Â ÃƒÂ¢Ã¢â€šÂ¬Ã¢â€žÂ¢ÃƒÆ’Ã†â€™Ãƒâ€šÃ‚Â¢ÃƒÆ’Ã‚Â¢ÃƒÂ¢Ã¢â€šÂ¬Ã…Â¡Ãƒâ€šÃ‚Â¬ÃƒÆ’Ã¢â‚¬Â¦Ãƒâ€šÃ‚Â¡ÃƒÆ’Ã†â€™Ãƒâ€ Ã¢â‚¬â„¢ÃƒÆ’Ã‚Â¢ÃƒÂ¢Ã¢â‚¬Å¡Ã‚Â¬Ãƒâ€¦Ã‚Â¡ÃƒÆ’Ã†â€™ÃƒÂ¢Ã¢â€šÂ¬Ã…Â¡ÃƒÆ’Ã¢â‚¬Å¡Ãƒâ€šÃ‚Â©e par ce metier double param_tacInTons = 0; if (step.getYear()>10) { //si on est apres 2011 @@ -367,15 +368,15 @@ // la matrice de captures a une dimension metier - donc a cette etape, toutes // les captures de tous les metiers sont connues // Ne doit pas s'appliquer pour chaque metier de la boucle mais une seule fois! - // affectation est mis ÃƒÆ’Ã†â€™Ãƒâ€šÃ‚Â true ÃƒÆ’Ã†â€™Ãƒâ€šÃ‚Â la fin de la boucle sur les pop + // affectation est mis ÃƒÆ’Ã†â€™Ãƒâ€ Ã¢â‚¬â„¢ÃƒÆ’Ã¢â‚¬Â ÃƒÂ¢Ã¢â€šÂ¬Ã¢â€žÂ¢ÃƒÆ’Ã†â€™ÃƒÂ¢Ã¢â€šÂ¬Ã‚Â ÃƒÆ’Ã‚Â¢ÃƒÂ¢Ã¢â‚¬Å¡Ã‚Â¬ÃƒÂ¢Ã¢â‚¬Å¾Ã‚Â¢ÃƒÆ’Ã†â€™Ãƒâ€ Ã¢â‚¬â„¢ÃƒÆ’Ã‚Â¢ÃƒÂ¢Ã¢â‚¬Å¡Ã‚Â¬Ãƒâ€šÃ‚Â ÃƒÆ’Ã†â€™Ãƒâ€šÃ‚Â¢ÃƒÆ’Ã‚Â¢ÃƒÂ¢Ã¢â€šÂ¬Ã…Â¡Ãƒâ€šÃ‚Â¬ÃƒÆ’Ã‚Â¢ÃƒÂ¢Ã¢â€šÂ¬Ã…Â¾Ãƒâ€šÃ‚Â¢ÃƒÆ’Ã†â€™Ãƒâ€ Ã¢â‚¬â„¢ÃƒÆ’Ã¢â‚¬Â ÃƒÂ¢Ã¢â€šÂ¬Ã¢â€žÂ¢ÃƒÆ’Ã†â€™Ãƒâ€šÃ‚Â¢ÃƒÆ’Ã‚Â¢ÃƒÂ¢Ã¢â€šÂ¬Ã…Â¡Ãƒâ€šÃ‚Â¬ÃƒÆ’Ã¢â‚¬Â¦Ãƒâ€šÃ‚Â¡ÃƒÆ’Ã†â€™Ãƒâ€ Ã¢â‚¬â„¢ÃƒÆ’Ã‚Â¢ÃƒÂ¢Ã¢â‚¬Å¡Ã‚Â¬Ãƒâ€¦Ã‚Â¡ÃƒÆ’Ã†â€™ÃƒÂ¢Ã¢â€šÂ¬Ã…Â¡ÃƒÆ’Ã¢â‚¬Å¡Ãƒâ€šÃ‚Â true ÃƒÆ’Ã†â€™Ãƒâ€ Ã¢â‚¬â„¢ÃƒÆ’Ã¢â‚¬Â ÃƒÂ¢Ã¢â€šÂ¬Ã¢â€žÂ¢ÃƒÆ’Ã†â€™ÃƒÂ¢Ã¢â€šÂ¬Ã‚Â ÃƒÆ’Ã‚Â¢ÃƒÂ¢Ã¢â‚¬Å¡Ã‚Â¬ÃƒÂ¢Ã¢â‚¬Å¾Ã‚Â¢ÃƒÆ’Ã†â€™Ãƒâ€ Ã¢â‚¬â„¢ÃƒÆ’Ã‚Â¢ÃƒÂ¢Ã¢â‚¬Å¡Ã‚Â¬Ãƒâ€šÃ‚Â ÃƒÆ’Ã†â€™Ãƒâ€šÃ‚Â¢ÃƒÆ’Ã‚Â¢ÃƒÂ¢Ã¢â€šÂ¬Ã…Â¡Ãƒâ€šÃ‚Â¬ÃƒÆ’Ã‚Â¢ÃƒÂ¢Ã¢â€šÂ¬Ã…Â¾Ãƒâ€šÃ‚Â¢ÃƒÆ’Ã†â€™Ãƒâ€ Ã¢â‚¬â„¢ÃƒÆ’Ã¢â‚¬Â ÃƒÂ¢Ã¢â€šÂ¬Ã¢â€žÂ¢ÃƒÆ’Ã†â€™Ãƒâ€šÃ‚Â¢ÃƒÆ’Ã‚Â¢ÃƒÂ¢Ã¢â€šÂ¬Ã…Â¡Ãƒâ€šÃ‚Â¬ÃƒÆ’Ã¢â‚¬Â¦Ãƒâ€šÃ‚Â¡ÃƒÆ’Ã†â€™Ãƒâ€ Ã¢â‚¬â„¢ÃƒÆ’Ã‚Â¢ÃƒÂ¢Ã¢â‚¬Å¡Ã‚Â¬Ãƒâ€¦Ã‚Â¡ÃƒÆ’Ã†â€™ÃƒÂ¢Ã¢â€šÂ¬Ã…Â¡ÃƒÆ’Ã¢â‚¬Å¡Ãƒâ€šÃ‚Â la fin de la boucle sur les pop // la preaction ne tourne que si le TAC est atteint if (tacAtteint) { //postAction de la regle TAC dans ce cas TailleMin ne s'applique pas log.info("[TAC] postAction for: " + metier); PopulationMonitor popMon = context.getPopulationMonitor(); - log.info("popMon biomass" + popMon.getBiomass(param_species)); - for (Population pop : param_species.getPopulation()) { + log.info("popMon biomass" + popMon.getBiomass(param_species)); + for (Population pop : param_species.getPopulation()) { log.info("pop : " + pop.getName()); // si on a deja une matrice rejet on le vide (elle vient @@ -396,7 +397,7 @@ + discardRegle); if (param_propSurvie > 0) { MatrixND eff = popMon.getN(pop); - //on rÃƒÆ’Ã†â€™Ãƒâ€ Ã¢â‚¬â„¢ÃƒÆ’Ã¢â‚¬Â ÃƒÂ¢Ã¢â€šÂ¬Ã¢â€žÂ¢ÃƒÆ’Ã†â€™ÃƒÂ¢Ã¢â€šÂ¬Ã…Â¡ÃƒÆ’Ã¢â‚¬Å¡Ãƒâ€šÃ‚Â©ajoute les survivants aux effectifs + //on rÃƒÆ’Ã†â€™Ãƒâ€ Ã¢â‚¬â„¢ÃƒÆ’Ã¢â‚¬Â ÃƒÂ¢Ã¢â€šÂ¬Ã¢â€žÂ¢ÃƒÆ’Ã†â€™ÃƒÂ¢Ã¢â€šÂ¬Ã‚Â ÃƒÆ’Ã‚Â¢ÃƒÂ¢Ã¢â‚¬Å¡Ã‚Â¬ÃƒÂ¢Ã¢â‚¬Å¾Ã‚Â¢ÃƒÆ’Ã†â€™Ãƒâ€ Ã¢â‚¬â„¢ÃƒÆ’Ã‚Â¢ÃƒÂ¢Ã¢â‚¬Å¡Ã‚Â¬Ãƒâ€šÃ‚Â ÃƒÆ’Ã†â€™Ãƒâ€šÃ‚Â¢ÃƒÆ’Ã‚Â¢ÃƒÂ¢Ã¢â€šÂ¬Ã…Â¡Ãƒâ€šÃ‚Â¬ÃƒÆ’Ã‚Â¢ÃƒÂ¢Ã¢â€šÂ¬Ã…Â¾Ãƒâ€šÃ‚Â¢ÃƒÆ’Ã†â€™Ãƒâ€ Ã¢â‚¬â„¢ÃƒÆ’Ã¢â‚¬Â ÃƒÂ¢Ã¢â€šÂ¬Ã¢â€žÂ¢ÃƒÆ’Ã†â€™Ãƒâ€šÃ‚Â¢ÃƒÆ’Ã‚Â¢ÃƒÂ¢Ã¢â€šÂ¬Ã…Â¡Ãƒâ€šÃ‚Â¬ÃƒÆ’Ã¢â‚¬Å¡Ãƒâ€šÃ‚Â ÃƒÆ’Ã†â€™Ãƒâ€ Ã¢â‚¬â„¢ÃƒÆ’Ã¢â‚¬Å¡Ãƒâ€šÃ‚Â¢ÃƒÆ’Ã†â€™Ãƒâ€šÃ‚Â¢ÃƒÆ’Ã‚Â¢ÃƒÂ¢Ã¢â‚¬Å¡Ã‚Â¬Ãƒâ€¦Ã‚Â¡ÃƒÆ’Ã¢â‚¬Å¡Ãƒâ€šÃ‚Â¬ÃƒÆ’Ã†â€™Ãƒâ€šÃ‚Â¢ÃƒÆ’Ã‚Â¢ÃƒÂ¢Ã¢â‚¬Å¡Ã‚Â¬Ãƒâ€¦Ã‚Â¾ÃƒÆ’Ã¢â‚¬Å¡Ãƒâ€šÃ‚Â¢ÃƒÆ’Ã†â€™Ãƒâ€ Ã¢â‚¬â„¢ÃƒÆ’Ã¢â‚¬Â ÃƒÂ¢Ã¢â€šÂ¬Ã¢â€žÂ¢ÃƒÆ’Ã†â€™ÃƒÂ¢Ã¢â€šÂ¬Ã‚Â ÃƒÆ’Ã‚Â¢ÃƒÂ¢Ã¢â‚¬Å¡Ã‚Â¬ÃƒÂ¢Ã¢â‚¬Å¾Ã‚Â¢ÃƒÆ’Ã†â€™Ãƒâ€ Ã¢â‚¬â„¢ÃƒÆ’Ã¢â‚¬Å¡Ãƒâ€šÃ‚Â¢ÃƒÆ’Ã†â€™Ãƒâ€šÃ‚Â¢ÃƒÆ’Ã‚Â¢ÃƒÂ¢Ã¢â‚¬Å¡Ã‚Â¬Ãƒâ€¦Ã‚Â¡ÃƒÆ’Ã¢â‚¬Å¡Ãƒâ€šÃ‚Â¬ÃƒÆ’Ã†â€™ÃƒÂ¢Ã¢â€šÂ¬Ã…Â¡ÃƒÆ’Ã¢â‚¬Å¡Ãƒâ€šÃ‚Â ÃƒÆ’Ã†â€™Ãƒâ€ Ã¢â‚¬â„¢ÃƒÆ’Ã¢â‚¬Â ÃƒÂ¢Ã¢â€šÂ¬Ã¢â€žÂ¢ÃƒÆ’Ã†â€™ÃƒÂ¢Ã¢â€šÂ¬Ã…Â¡ÃƒÆ’Ã¢â‚¬Å¡Ãƒâ€šÃ‚Â¢ÃƒÆ’Ã†â€™Ãƒâ€ Ã¢â‚¬â„¢ÃƒÆ’Ã¢â‚¬Å¡Ãƒâ€šÃ‚Â¢ÃƒÆ’Ã†â€™Ãƒâ€šÃ‚Â¢ÃƒÆ’Ã‚Â¢ÃƒÂ¢Ã¢â€šÂ¬Ã…Â¡Ãƒâ€šÃ‚Â¬ÃƒÆ’Ã¢â‚¬Â¦Ãƒâ€šÃ‚Â¡ÃƒÆ’Ã†â€™ÃƒÂ¢Ã¢â€šÂ¬Ã…Â¡ÃƒÆ’Ã¢â‚¬Å¡Ãƒâ€šÃ‚Â¬ÃƒÆ’Ã†â€™Ãƒâ€ Ã¢â‚¬â„¢ÃƒÆ’Ã¢â‚¬Å¡Ãƒâ€šÃ‚Â¢ÃƒÆ’Ã†â€™Ãƒâ€šÃ‚Â¢ÃƒÆ’Ã‚Â¢ÃƒÂ¢Ã¢â€šÂ¬Ã…Â¡Ãƒâ€šÃ‚Â¬ÃƒÆ’Ã¢â‚¬Â¦Ãƒâ€šÃ‚Â¾ÃƒÆ’Ã†â€™ÃƒÂ¢Ã¢â€šÂ¬Ã…Â¡ÃƒÆ’Ã¢â‚¬Å¡Ãƒâ€šÃ‚Â¢ÃƒÆ’Ã†â€™Ãƒâ€ Ã¢â‚¬â„¢ÃƒÆ’Ã¢â‚¬Â ÃƒÂ¢Ã¢â€šÂ¬Ã¢â€žÂ¢ÃƒÆ’Ã†â€™ÃƒÂ¢Ã¢â€šÂ¬Ã‚Â ÃƒÆ’Ã‚Â¢ÃƒÂ¢Ã¢â‚¬Å¡Ã‚Â¬ÃƒÂ¢Ã¢â‚¬Å¾Ã‚Â¢ÃƒÆ’Ã†â€™Ãƒâ€ Ã¢â‚¬â„¢ÃƒÆ’Ã‚Â¢ÃƒÂ¢Ã¢â‚¬Å¡Ã‚Â¬Ãƒâ€šÃ‚Â ÃƒÆ’Ã†â€™Ãƒâ€šÃ‚Â¢ÃƒÆ’Ã‚Â¢ÃƒÂ¢Ã¢â€šÂ¬Ã…Â¡Ãƒâ€šÃ‚Â¬ÃƒÆ’Ã‚Â¢ÃƒÂ¢Ã¢â€šÂ¬Ã…Â¾Ãƒâ€šÃ‚Â¢ÃƒÆ’Ã†â€™Ãƒâ€ Ã¢â‚¬â„¢ÃƒÆ’Ã¢â‚¬Â ÃƒÂ¢Ã¢â€šÂ¬Ã¢â€žÂ¢ÃƒÆ’Ã†â€™ÃƒÂ¢Ã¢â€šÂ¬Ã…Â¡ÃƒÆ’Ã¢â‚¬Å¡Ãƒâ€šÃ‚Â¢ÃƒÆ’Ã†â€™Ãƒâ€ Ã¢â‚¬â„¢ÃƒÆ’Ã¢â‚¬Å¡Ãƒâ€šÃ‚Â¢ÃƒÆ’Ã†â€™Ãƒâ€šÃ‚Â¢ÃƒÆ’Ã‚Â¢ÃƒÂ¢Ã¢â€šÂ¬Ã…Â¡Ãƒâ€šÃ‚Â¬ÃƒÆ’Ã¢â‚¬Â¦Ãƒâ€šÃ‚Â¡ÃƒÆ’Ã†â€™ÃƒÂ¢Ã¢â€šÂ¬Ã…Â¡ÃƒÆ’Ã¢â‚¬Å¡Ãƒâ€šÃ‚Â¬ÃƒÆ’Ã†â€™Ãƒâ€ Ã¢â‚¬â„¢ÃƒÆ’Ã‚Â¢ÃƒÂ¢Ã¢â‚¬Å¡Ã‚Â¬Ãƒâ€šÃ‚Â¦ÃƒÆ’Ã†â€™ÃƒÂ¢Ã¢â€šÂ¬Ã…Â¡ÃƒÆ’Ã¢â‚¬Å¡Ãƒâ€šÃ‚Â¡ÃƒÆ’Ã†â€™Ãƒâ€ Ã¢â‚¬â„¢ÃƒÆ’Ã¢â‚¬Â ÃƒÂ¢Ã¢â€šÂ¬Ã¢â€žÂ¢ÃƒÆ’Ã†â€™ÃƒÂ¢Ã¢â€šÂ¬Ã‚Â ÃƒÆ’Ã‚Â¢ÃƒÂ¢Ã¢â‚¬Å¡Ã‚Â¬ÃƒÂ¢Ã¢â‚¬Å¾Ã‚Â¢ÃƒÆ’Ã†â€™Ãƒâ€ Ã¢â‚¬â„¢ÃƒÆ’Ã¢â‚¬Å¡Ãƒâ€šÃ‚Â¢ÃƒÆ’Ã†â€™Ãƒâ€šÃ‚Â¢ÃƒÆ’Ã‚Â¢ÃƒÂ¢Ã¢â‚¬Å¡Ã‚Â¬Ãƒâ€¦Ã‚Â¡ÃƒÆ’Ã¢â‚¬Å¡Ãƒâ€šÃ‚Â¬ÃƒÆ’Ã†â€™ÃƒÂ¢Ã¢â€šÂ¬Ã‚Â¦ÃƒÆ’Ã¢â‚¬Å¡Ãƒâ€šÃ‚Â¡ÃƒÆ’Ã†â€™Ãƒâ€ Ã¢â‚¬â„¢ÃƒÆ’Ã¢â‚¬Â ÃƒÂ¢Ã¢â€šÂ¬Ã¢â€žÂ¢ÃƒÆ’Ã†â€™Ãƒâ€šÃ‚Â¢ÃƒÆ’Ã‚Â¢ÃƒÂ¢Ã¢â€šÂ¬Ã…Â¡Ãƒâ€šÃ‚Â¬ÃƒÆ’Ã¢â‚¬Â¦Ãƒâ€šÃ‚Â¡ÃƒÆ’Ã†â€™Ãƒâ€ Ã¢â‚¬â„¢ÃƒÆ’Ã‚Â¢ÃƒÂ¢Ã¢â‚¬Å¡Ã‚Â¬Ãƒâ€¦Ã‚Â¡ÃƒÆ’Ã†â€™ÃƒÂ¢Ã¢â€šÂ¬Ã…Â¡ÃƒÆ’Ã¢â‚¬Å¡Ãƒâ€šÃ‚Â©ajoute les survivants aux effectifs for (MatrixIterator i = discardRegle.iterator(); i .next();) { Object[] coord = i.getSemanticsCoordinates(); @@ -411,15 +412,15 @@ log.info("deb de affecterCaptureRejetSelonOgive"); PopulationMonitor popMon = context.getPopulationMonitor(); - for (Population pop : param_species.getPopulation()) { + for (Population pop : param_species.getPopulation()) { MatrixND discard = popMon.getCatch(pop).copy(); MatrixND eff = popMon.getN(pop); for (MatrixIterator i = discard.iterator(); i.next();) { Object[] coordonnees = i.getSemanticsCoordinates(); PopulationGroup group = (PopulationGroup) coordonnees[2]; - - if (metier.getName().equals("metier lang simp Sud")||metier.getName().equals("metier lang simp Nord")||metier.getName().equals("metier lang simple")||metier.getName().equals("metier lang jum Nord")||metier.getName().equals("metier lang jum Sud")||metier.getName().equals("metier lang jum")) { + Metier met = (Metier) coordonnees[1]; + if (met.getName().equals("metier lang simp Sud")||met.getName().equals("metier lang simp Nord")||met.getName().equals("metier lang simple")||met.getName().equals("metier lang jum Nord")||met.getName().equals("metier lang jum Sud")||met.getName().equals("metier lang jum")) { double propTrie = 1 / (1 + Math.exp(-(group.getLength() - param_Retention_L50)/ param_Retention_slope)); double propRejet = 1 - propTrie; @@ -427,18 +428,27 @@ double value = i.getValue() * propRejet; log.info("VALUE" + value); i.setValue(value); + if (param_propSurvie >0) { + //ajout de la survie aux effectifs + eff.setValue(coordonnees[2], coordonnees[3], + eff.getValue(coordonnees[2], + coordonnees[3]) + i.getValue() * + param_propSurvie); + } }else if (group.getLength() >= param_TailleMin) { i.setValue(0); // initialise discard si pas de rejet (ie taille>=TailleMin et pas metierLangoustine) - } - if (param_propSurvie >0) { + + } else { //si group.getLength() < param_TailleMin + if (param_propSurvie >0) { //ajout de la survie aux effectifs eff.setValue(coordonnees[2], coordonnees[3], - eff.getValue(coordonnees[2], - coordonnees[3]) + i.getValue() * - param_propSurvie); - } - } + eff.getValue(coordonnees[2], + coordonnees[3]) + i.getValue() *param_propSurvie); + } + + } + } discard.setName(ResultName.MATRIX_DISCARDS_PER_STR_MET_PER_ZONE_POP); popMon.addDiscard(step, pop, discard); }

1 0