March 2016 - Isis-fish-community-commits - mailman.cloud.codelutin.com

r52 - trunk/scripts
by echatellier＠users.forge.codelutin.com 10 Mar '16

10 Mar '16

Author: echatellier Date: 2016-03-10 16:48:10 +0100 (Thu, 10 Mar 2016) New Revision: 52 Url: http://forge.codelutin.com/projects/isis-fish-community/repository/revision… Log: Add script example to update a region Added: trunk/scripts/RegionBatchScript.java Added: trunk/scripts/RegionBatchScript.java =================================================================== --- trunk/scripts/RegionBatchScript.java (rev 0) +++ trunk/scripts/RegionBatchScript.java 2016-03-10 15:48:10 UTC (rev 52) @@ -0,0 +1,132 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2016 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 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 scripts; + +import java.util.*; + +import org.nuiton.topia.TopiaContext; + +import fr.ifremer.isisfish.IsisFishDAOHelper; +import fr.ifremer.isisfish.datastore.RegionStorage; +import fr.ifremer.isisfish.entities.*; + +/** + * Ce script sert à modifier une region de facon informatique car il peut être très + * couteux en temps de cliquer à de nombreuses reprises dans l'interface graphique. + * + * @author Eric Chatellier + */ +public class RegionBatchScript { + + public void run() { + // ouverture d'une region par son nom + RegionStorage region = RegionStorage.getRegion("gdg2"); + + // ouverture d'une transaction pour effectuer toutes les modifications + TopiaContext tx = region.getStorage().beginTransaction(); + + // utilisation du contexte dans d'autre methodes + createRegionCells(tx); + updateAllZones(tx); + updateMetier(tx); + + // commit : valide les transactions en base de données + // roolback : annule les modifications en base de données (permet de tester le script) + //tx.commitTransaction(); + tx.rollbackTransaction(); + + // close region + tx.closeContext(); + } + + /** + * Exemple de creation de nombreuses cellules. + * + * @param tx transaction + */ + protected void createRegionCells(TopiaContext tx) { + CellDAO cellDAO = IsisFishDAOHelper.getCellDAO(tx); + + // creer 50 cellules + for (int i = 1; i < 50; i++) { + Cell cell = new CellImpl(); + cell.setName("test cells " + i); + cell.setLatitude(5.4f); + cell.setLongitude(2.4f); + cellDAO.create(cell); + } + } + + /** + * Mise à jour d'un paramètre de toutes les zones. + * + * @param tx transaction + */ + protected void updateAllZones(TopiaContext tx) { + ZoneDAO zoneDAO = IsisFishDAOHelper.getZoneDAO(tx); + CellDAO cellDAO = IsisFishDAOHelper.getCellDAO(tx); + + // modifie les zones par les cellules crées précédemment. + for (Zone zone : zoneDAO.findAll()) { + + List<Cell> cells = Arrays.asList( + cellDAO.findByName("test cell 1"), + cellDAO.findByName("test cell 2"), + cellDAO.findByName("test cell 3"), + cellDAO.findByName("test cell 4"), + cellDAO.findByName("test cell 5") + ); + + zone.setCell(cells); + } + } + + /** + * Modifie les metiers utilisé, les equations des TargetSpecies + * + * @param tx transaction + */ + protected void updateMetier(TopiaContext tx) { + MetierDAO metierDAO = IsisFishDAOHelper.getMetierDAO(tx); + + List<Metier> metiers = metierDAO.findAll(); + for (Metier metier : metiers) { + List<MetierSeasonInfo> msis = metier.getMetierSeasonInfo(); + for (MetierSeasonInfo msi : msis) { + Collection<TargetSpecies> stsList = msi.getSpeciesTargetSpecies(); + + for (TargetSpecies ts : stsList) { + ts.getTargetFactorEquation().setContent("return 1;"); + } + } + } + } + + /** + * Point d'entrée du script. + */ + public static void main(String[] args) { + RegionBatchScript script = new RegionBatchScript(); + script.run(); + System.out.println("Done: " + new Date()); + } +} Property changes on: trunk/scripts/RegionBatchScript.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

1 0

r51 - trunk/rules
by echatellier＠users.forge.codelutin.com 10 Mar '16

10 Mar '16

Author: echatellier Date: 2016-03-10 12:05:00 +0100 (Thu, 10 Mar 2016) New Revision: 51 Url: http://forge.codelutin.com/projects/isis-fish-community/repository/revision… Log: Fix script (a little) Modified: trunk/rules/TACpoids20012011.java trunk/rules/TACpoids20012011OgiveTriMerlu.java trunk/rules/TACpoids20012011TailleMin.java trunk/rules/TACpoidsPop.java trunk/rules/TACpoidsPop20082011.java trunk/rules/TACpoidsPop_PourHCR.java trunk/rules/TACpoidsTailleMin.java Modified: trunk/rules/TACpoids20012011.java =================================================================== --- trunk/rules/TACpoids20012011.java 2016-03-10 10:56:44 UTC (rev 50) +++ trunk/rules/TACpoids20012011.java 2016-03-10 11:05:00 UTC (rev 51) @@ -206,7 +206,7 @@ * * @param context la simulation pour lequel on utilise cette regle * @param step le pas de temps courant - * @param metier le metier concernÃƒÆ’Ã†â€™Ãƒâ€ Ã¢â‚¬â„¢ÃƒÆ’Ã¢â‚¬Å¡Ãƒâ€šÃ‚Â© + * @param metier le metier concerne */ @Override public void preAction(SimulationContext context, TimeStep step, Metier metier) @@ -368,7 +368,7 @@ + discardRegle); if (param_propSurvie > 0) { MatrixND eff = popMon.getN(pop); - //on rÃƒÆ’Ã†â€™Ãƒâ€ Ã¢â‚¬â„¢ÃƒÆ’Ã¢â‚¬Å¡Ãƒâ€šÃ‚Â©ajoute les survivants aux effectifs + //on reajoute les survivants aux effectifs for (MatrixIterator i = discardRegle.iterator(); i .next();) { Object[] coord = i.getSemanticsCoordinates(); Modified: trunk/rules/TACpoids20012011OgiveTriMerlu.java =================================================================== --- trunk/rules/TACpoids20012011OgiveTriMerlu.java 2016-03-10 10:56:44 UTC (rev 50) +++ trunk/rules/TACpoids20012011OgiveTriMerlu.java 2016-03-10 11:05:00 UTC (rev 51) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2012 Ifremer, CodeLutin + * Copyright (C) 2006 - 2016 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 @@ -23,9 +23,6 @@ import java.util.HashSet; import java.util.Set; -import java.util.List; -import java.util.ArrayList; -import java.util.Iterator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -35,16 +32,6 @@ import scripts.ResultName; import scripts.RuleUtil; import scripts.SiMatrix; -import fr.ifremer.isisfish.datastore.ResultStorage; -import fr.ifremer.isisfish.entities.EffortDescription; -import fr.ifremer.isisfish.entities.Metier; -import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.entities.Species; -import fr.ifremer.isisfish.entities.Strategy; -import fr.ifremer.isisfish.entities.StrategyMonthInfo; -import fr.ifremer.isisfish.entities.TargetSpecies; -import fr.ifremer.isisfish.entities.MetierSeasonInfo; -import fr.ifremer.isisfish.entities.PopulationGroup; import fr.ifremer.isisfish.entities.*; import fr.ifremer.isisfish.rule.AbstractRule; import fr.ifremer.isisfish.simulator.MetierMonitor; @@ -51,7 +38,6 @@ import fr.ifremer.isisfish.simulator.PopulationMonitor; import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.types.TimeStep; -import fr.ifremer.isisfish.types.Month; import fr.ifremer.isisfish.util.Doc; /** Modified: trunk/rules/TACpoids20012011TailleMin.java =================================================================== --- trunk/rules/TACpoids20012011TailleMin.java 2016-03-10 10:56:44 UTC (rev 50) +++ trunk/rules/TACpoids20012011TailleMin.java 2016-03-10 11:05:00 UTC (rev 51) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2012 Ifremer, CodeLutin + * Copyright (C) 2006 - 2016 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 @@ -23,9 +23,6 @@ import java.util.HashSet; import java.util.Set; -import java.util.List; -import java.util.ArrayList; -import java.util.Iterator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -35,16 +32,6 @@ import scripts.ResultName; import scripts.RuleUtil; import scripts.SiMatrix; -import fr.ifremer.isisfish.datastore.ResultStorage; -import fr.ifremer.isisfish.entities.EffortDescription; -import fr.ifremer.isisfish.entities.Metier; -import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.entities.Species; -import fr.ifremer.isisfish.entities.Strategy; -import fr.ifremer.isisfish.entities.StrategyMonthInfo; -import fr.ifremer.isisfish.entities.TargetSpecies; -import fr.ifremer.isisfish.entities.MetierSeasonInfo; -import fr.ifremer.isisfish.entities.PopulationGroup; import fr.ifremer.isisfish.entities.*; import fr.ifremer.isisfish.rule.AbstractRule; import fr.ifremer.isisfish.simulator.MetierMonitor; @@ -51,7 +38,6 @@ import fr.ifremer.isisfish.simulator.PopulationMonitor; import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.types.TimeStep; -import fr.ifremer.isisfish.types.Month; import fr.ifremer.isisfish.util.Doc; /** @@ -398,7 +384,7 @@ + discardRegle); if (param_propSurvie > 0) { MatrixND eff = popMon.getN(pop); - //on rÃƒÆ’Ã†â€™Ãƒâ€ Ã¢â‚¬â„¢ÃƒÆ’Ã¢â‚¬Â ÃƒÂ¢Ã¢â€šÂ¬Ã¢â€žÂ¢ÃƒÆ’Ã†â€™ÃƒÂ¢Ã¢â€šÂ¬Ã…Â¡ÃƒÆ’Ã¢â‚¬Å¡Ãƒâ€šÃ‚Â©ajoute les survivants aux effectifs + //on reajoute les survivants aux effectifs for (MatrixIterator i = discardRegle.iterator(); i .next();) { Object[] coord = i.getSemanticsCoordinates(); Modified: trunk/rules/TACpoidsPop.java =================================================================== --- trunk/rules/TACpoidsPop.java 2016-03-10 10:56:44 UTC (rev 50) +++ trunk/rules/TACpoidsPop.java 2016-03-10 11:05:00 UTC (rev 51) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2011 Ifremer, CodeLutin + * Copyright (C) 2006 - 2016 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 @@ -33,13 +33,7 @@ import scripts.RuleUtil; import scripts.SiMatrix; import fr.ifremer.isisfish.datastore.ResultStorage; -import fr.ifremer.isisfish.entities.EffortDescription; -import fr.ifremer.isisfish.entities.Metier; -import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.entities.Species; -import fr.ifremer.isisfish.entities.Strategy; -import fr.ifremer.isisfish.entities.StrategyMonthInfo; -import fr.ifremer.isisfish.entities.TargetSpecies; +import fr.ifremer.isisfish.entities.*; import fr.ifremer.isisfish.rule.AbstractRule; import fr.ifremer.isisfish.simulator.MetierMonitor; import fr.ifremer.isisfish.simulator.PopulationMonitor; Modified: trunk/rules/TACpoidsPop20082011.java =================================================================== --- trunk/rules/TACpoidsPop20082011.java 2016-03-10 10:56:44 UTC (rev 50) +++ trunk/rules/TACpoidsPop20082011.java 2016-03-10 11:05:00 UTC (rev 51) @@ -32,11 +32,9 @@ import scripts.ResultName; import scripts.RuleUtil; import scripts.SiMatrix; -import fr.ifremer.isisfish.datastore.ResultStorage; import fr.ifremer.isisfish.entities.EffortDescription; import fr.ifremer.isisfish.entities.Metier; import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.entities.Species; import fr.ifremer.isisfish.entities.Strategy; import fr.ifremer.isisfish.entities.StrategyMonthInfo; import fr.ifremer.isisfish.entities.TargetSpecies; @@ -45,7 +43,6 @@ import fr.ifremer.isisfish.simulator.PopulationMonitor; import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.types.TimeStep; -import fr.ifremer.isisfish.types.Month; import fr.ifremer.isisfish.util.Doc; /** Modified: trunk/rules/TACpoidsPop_PourHCR.java =================================================================== --- trunk/rules/TACpoidsPop_PourHCR.java 2016-03-10 10:56:44 UTC (rev 50) +++ trunk/rules/TACpoidsPop_PourHCR.java 2016-03-10 11:05:00 UTC (rev 51) @@ -32,22 +32,13 @@ import scripts.ResultName; import scripts.RuleUtil; import scripts.SiMatrix; -import rules.HCR_transition_MSY; // En a-t-on besoin ???? import fr.ifremer.isisfish.datastore.ResultStorage; -import fr.ifremer.isisfish.entities.EffortDescription; -import fr.ifremer.isisfish.entities.Metier; -import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.entities.Species; -import fr.ifremer.isisfish.entities.Strategy; -import fr.ifremer.isisfish.entities.StrategyMonthInfo; -import fr.ifremer.isisfish.entities.TargetSpecies; +import fr.ifremer.isisfish.entities.*; import fr.ifremer.isisfish.rule.AbstractRule; import fr.ifremer.isisfish.simulator.MetierMonitor; import fr.ifremer.isisfish.simulator.PopulationMonitor; import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.types.TimeStep; -import fr.ifremer.isisfish.types.Month; -import fr.ifremer.isisfish.util.Doc; /** * TAC peut-etre utilise pour les differents TAC, en proportion des effectifs Modified: trunk/rules/TACpoidsTailleMin.java =================================================================== --- trunk/rules/TACpoidsTailleMin.java 2016-03-10 10:56:44 UTC (rev 50) +++ trunk/rules/TACpoidsTailleMin.java 2016-03-10 11:05:00 UTC (rev 51) @@ -23,9 +23,6 @@ import java.util.HashSet; import java.util.Set; -import java.util.List; -import java.util.ArrayList; -import java.util.Iterator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -35,16 +32,6 @@ import scripts.ResultName; import scripts.RuleUtil; import scripts.SiMatrix; -import fr.ifremer.isisfish.datastore.ResultStorage; -import fr.ifremer.isisfish.entities.EffortDescription; -import fr.ifremer.isisfish.entities.Metier; -import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.entities.Species; -import fr.ifremer.isisfish.entities.Strategy; -import fr.ifremer.isisfish.entities.StrategyMonthInfo; -import fr.ifremer.isisfish.entities.TargetSpecies; -import fr.ifremer.isisfish.entities.MetierSeasonInfo; -import fr.ifremer.isisfish.entities.PopulationGroup; import fr.ifremer.isisfish.entities.*; import fr.ifremer.isisfish.rule.AbstractRule; import fr.ifremer.isisfish.simulator.MetierMonitor; @@ -299,12 +286,12 @@ } /** - * Si la condition est vrai alors cette action est executÃƒÆ’Ã‚Â©e apres le pas + * Si la condition est vrai alors cette action est executee apres le pas * de temps de la simulation. * * @param context La simulation pour lequel on utilise cette regle * @param step le pas de temps courant - * @param metier le metier concernÃƒÆ’Ã‚Â© + * @param metier le metier concerne */ @Override public void postAction(SimulationContext context, TimeStep step, Metier metier)

1 0

r50 - trunk
by echatellier＠users.forge.codelutin.com 10 Mar '16

10 Mar '16

Author: echatellier Date: 2016-03-10 11:56:44 +0100 (Thu, 10 Mar 2016) New Revision: 50 Url: http://forge.codelutin.com/projects/isis-fish-community/repository/revision… Log: Update plugins Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2015-04-23 11:48:01 UTC (rev 49) +++ trunk/pom.xml 2016-03-10 10:56:44 UTC (rev 50) @@ -36,7 +36,7 @@ <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> + <version>3.5.1</version> <configuration> <source>1.7</source> <target>1.7</target> @@ -49,7 +49,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> - <version>1.3.1</version> + <version>1.4.0</version> <executions> <execution> <goals>

1 0