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

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

r49 - trunk
by echatellier＠users.forge.codelutin.com 23 Apr '15

23 Apr '15

Author: echatellier Date: 2015-04-23 11:48:01 +0000 (Thu, 23 Apr 2015) New Revision: 49 Url: http://forge.codelutin.com/projects/isis-fish-community/repository/revision… Log: Update isis repo names Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2015-04-23 11:47:17 UTC (rev 48) +++ trunk/pom.xml 2015-04-23 11:48:01 UTC (rev 49) @@ -8,7 +8,7 @@  <groupId>fr.ifremer</groupId> <artifactId>isis-fish-community</artifactId> - <name>ISISI-Fish Community repository</name> + <name>ISIS-Fish Community repository</name>  <packaging>jar</packaging>

1 0

r48 - trunk
by echatellier＠users.forge.codelutin.com 23 Apr '15

23 Apr '15

Author: echatellier Date: 2015-04-23 11:47:17 +0000 (Thu, 23 Apr 2015) New Revision: 48 Url: http://forge.codelutin.com/projects/isis-fish-community/repository/revision… Log: Update isis repo names Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-08-21 15:21:15 UTC (rev 47) +++ trunk/pom.xml 2015-04-23 11:47:17 UTC (rev 48) @@ -8,7 +8,7 @@  <groupId>fr.ifremer</groupId> <artifactId>isis-fish-community</artifactId> - <name>IsisFish community data</name> + <name>ISISI-Fish Community repository</name>  <packaging>jar</packaging>

1 0

r47 - trunk/rules
by echatellier＠users.forge.codelutin.com 21 Aug '14

21 Aug '14

Author: echatellier Date: 2014-08-21 17:21:15 +0200 (Thu, 21 Aug 2014) New Revision: 47 Url: http://forge.codelutin.com/projects/isis-fish-community/repository/revision… Log: Utilisation des iser au lieu des getter 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 2014-08-11 13:54:24 UTC (rev 46) +++ trunk/rules/TACpoids20012011.java 2014-08-21 15:21:15 UTC (rev 47) @@ -217,7 +217,7 @@ log.info(" TAC atteint [TAC] preAction for: " + metier); TargetSpecies ts = metier.getMetierSeasonInfo(step.getMonth()) .getSpeciesTargetSpecies(param_species); - if (ts != null && ts.getPrimaryCatch()) { + if (ts != null && ts.isPrimaryCatch()) { // recupere tous les metiers qui ont l'espece en capture principale =>metiers vises // aimedMetiers ne fonctionne pas je ne sais pas pourquoi ! mais au final forbiddenMetier aura le meme effet Modified: trunk/rules/TACpoids20012011OgiveTriMerlu.java =================================================================== --- trunk/rules/TACpoids20012011OgiveTriMerlu.java 2014-08-11 13:54:24 UTC (rev 46) +++ trunk/rules/TACpoids20012011OgiveTriMerlu.java 2014-08-21 15:21:15 UTC (rev 47) @@ -238,7 +238,7 @@ log.info(" TAC atteint [TAC] preAction for: " + metier); TargetSpecies ts = metier.getMetierSeasonInfo(step.getMonth()) .getSpeciesTargetSpecies(param_species); - if (ts != null && ts.getPrimaryCatch()) { + if (ts != null && ts.isPrimaryCatch()) { // recupere tous les metiers qui ont l'espece en capture principale =>metiers vises // aimedMetiers ne fonctionne pas je ne sais pas pourquoi ! mais au final forbiddenMetier aura le meme effet Modified: trunk/rules/TACpoids20012011TailleMin.java =================================================================== --- trunk/rules/TACpoids20012011TailleMin.java 2014-08-11 13:54:24 UTC (rev 46) +++ trunk/rules/TACpoids20012011TailleMin.java 2014-08-21 15:21:15 UTC (rev 47) @@ -237,7 +237,7 @@ log.info(" TAC atteint [TAC] preAction for: " + metier); TargetSpecies ts = metier.getMetierSeasonInfo(step.getMonth()) .getSpeciesTargetSpecies(param_species); - if (ts != null && ts.getPrimaryCatch()) { + if (ts != null && ts.isPrimaryCatch()) { // recupere tous les metiers qui ont l'espece en capture principale =>metiers vises // aimedMetiers ne fonctionne pas je ne sais pas pourquoi ! mais au final forbiddenMetier aura le meme effet Modified: trunk/rules/TACpoidsPop.java =================================================================== --- trunk/rules/TACpoidsPop.java 2014-08-11 13:54:24 UTC (rev 46) +++ trunk/rules/TACpoidsPop.java 2014-08-21 15:21:15 UTC (rev 47) @@ -192,7 +192,7 @@ log.info(" TAC atteint [TAC] preAction for: " + metier); TargetSpecies ts = metier.getMetierSeasonInfo(step.getMonth()) .getSpeciesTargetSpecies(param_population.getSpecies()); - if (ts != null && ts.getPrimaryCatch()) { + if (ts != null && ts.isPrimaryCatch()) { // recupere tous les metiers qui ont l'espece en capture principale =>metiers vises // aimedMetiers ne fonctionne pas je ne sais pas pourquoi ! mais au final forbiddenMetier aura le meme effet Modified: trunk/rules/TACpoidsPop20082011.java =================================================================== --- trunk/rules/TACpoidsPop20082011.java 2014-08-11 13:54:24 UTC (rev 46) +++ trunk/rules/TACpoidsPop20082011.java 2014-08-21 15:21:15 UTC (rev 47) @@ -191,7 +191,7 @@ log.info(" TAC atteint [TAC] preAction for: " + metier); TargetSpecies ts = metier.getMetierSeasonInfo(step.getMonth()) .getSpeciesTargetSpecies(param_population.getSpecies()); - if (ts != null && ts.getPrimaryCatch()) { + if (ts != null && ts.isPrimaryCatch()) { // recupere tous les metiers qui ont l'espece en capture principale =>metiers vises // aimedMetiers ne fonctionne pas je ne sais pas pourquoi ! mais au final forbiddenMetier aura le meme effet Modified: trunk/rules/TACpoidsPop_PourHCR.java =================================================================== --- trunk/rules/TACpoidsPop_PourHCR.java 2014-08-11 13:54:24 UTC (rev 46) +++ trunk/rules/TACpoidsPop_PourHCR.java 2014-08-21 15:21:15 UTC (rev 47) @@ -194,7 +194,7 @@ log.info(" TAC atteint [TAC] preAction for: " + metier); TargetSpecies ts = metier.getMetierSeasonInfo(step.getMonth()) .getSpeciesTargetSpecies(param_population.getSpecies()); - if (ts != null && ts.getPrimaryCatch()) { + if (ts != null && ts.isPrimaryCatch()) { // recupere tous les metiers qui ont l'espece en capture principale =>metiers vises // aimedMetiers ne fonctionne pas je ne sais pas pourquoi ! mais au final forbiddenMetier aura le meme effet Modified: trunk/rules/TACpoidsTailleMin.java =================================================================== --- trunk/rules/TACpoidsTailleMin.java 2014-08-11 13:54:24 UTC (rev 46) +++ trunk/rules/TACpoidsTailleMin.java 2014-08-21 15:21:15 UTC (rev 47) @@ -194,7 +194,7 @@ log.info(" TAC atteint [TAC] preAction for: " + metier); TargetSpecies ts = metier.getMetierSeasonInfo(step.getMonth()) .getSpeciesTargetSpecies(param_species); - if (ts != null && ts.getPrimaryCatch()) { + if (ts != null && ts.isPrimaryCatch()) { // recupere tous les metiers qui ont l'espece en capture principale =>metiers vises // aimedMetiers ne fonctionne pas je ne sais pas pourquoi ! mais au final forbiddenMetier aura le meme effet

1 0

r46 - trunk/scripts
by echatellier＠users.forge.codelutin.com 11 Aug '14

11 Aug '14

Author: echatellier Date: 2014-08-11 15:54:24 +0200 (Mon, 11 Aug 2014) New Revision: 46 Url: http://forge.codelutin.com/projects/isis-fish-community/repository/revision… Log: Commit error Modified: trunk/scripts/RunExportOnManySimulationResult.java Modified: trunk/scripts/RunExportOnManySimulationResult.java =================================================================== --- trunk/scripts/RunExportOnManySimulationResult.java 2014-08-11 13:51:18 UTC (rev 45) +++ trunk/scripts/RunExportOnManySimulationResult.java 2014-08-11 13:54:24 UTC (rev 46) @@ -60,7 +60,7 @@ for (int index = 0; index <= simulationCount; index++) { // get current simulation - String currentSimulationName = simulationPrefix/* + index*/; + String currentSimulationName = simulationPrefix + index; SimulationStorage currentSimulation = SimulationStorage.getSimulation(currentSimulationName); // temp fix for matrix semantics decorations (no opened transaction)

1 0

r45 - trunk/scripts
by echatellier＠users.forge.codelutin.com 11 Aug '14

11 Aug '14

Author: echatellier Date: 2014-08-11 15:51:18 +0200 (Mon, 11 Aug 2014) New Revision: 45 Url: http://forge.codelutin.com/projects/isis-fish-community/repository/revision… Log: Fix simulation in thread local Modified: trunk/scripts/RunExportOnManySimulationResult.java Modified: trunk/scripts/RunExportOnManySimulationResult.java =================================================================== --- trunk/scripts/RunExportOnManySimulationResult.java 2014-08-11 13:04:05 UTC (rev 44) +++ trunk/scripts/RunExportOnManySimulationResult.java 2014-08-11 13:51:18 UTC (rev 45) @@ -31,6 +31,7 @@ import exports.Abundances; import exports.Biomasses; import fr.ifremer.isisfish.datastore.SimulationStorage; +import fr.ifremer.isisfish.simulator.*; import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.export.ExportHelper; @@ -59,9 +60,12 @@ for (int index = 0; index <= simulationCount; index++) { // get current simulation - String currentSimulationName = simulationPrefix + index; + String currentSimulationName = simulationPrefix/* + index*/; SimulationStorage currentSimulation = SimulationStorage.getSimulation(currentSimulationName); - + + // temp fix for matrix semantics decorations (no opened transaction) + SimulationContext.get().setSimulationStorage(currentSimulation); + // run each export for this simulation File rootDirectory = currentSimulation.getDirectory(); File exportDir = SimulationStorage.getResultExportDirectory(rootDirectory);

1 0

r44 - trunk/scripts
by echatellier＠users.forge.codelutin.com 11 Aug '14

11 Aug '14

Author: echatellier Date: 2014-08-11 15:04:05 +0200 (Mon, 11 Aug 2014) New Revision: 44 Url: http://forge.codelutin.com/projects/isis-fish-community/repository/revision… Log: Fix script and add doc Modified: trunk/scripts/RunExportOnManySimulationResult.java Modified: trunk/scripts/RunExportOnManySimulationResult.java =================================================================== --- trunk/scripts/RunExportOnManySimulationResult.java 2014-07-07 10:20:35 UTC (rev 43) +++ trunk/scripts/RunExportOnManySimulationResult.java 2014-08-11 13:04:05 UTC (rev 44) @@ -38,18 +38,20 @@ * Ce script sert à rejouer des exports sur un grand nombre de simulation en lisant le * ResultStrage et en rejouant les fonctions d'export. * + * Ce script peut être lancé via l'option "Evaluer" depuis l'interface des scripts d'Isis. + * * @author Eric Chatellier */ public class RunExportOnManySimulationResult { - // nom des exports a rejouer + // nom des exports a rejouer (à modifier selon le besoin) protected List<Export> exports = Arrays.asList( new Abundances(), new Biomasses() ); public void doAllExports() throws TopiaException { - // prefix des noms de simulations + // prefix des noms de simulations (à configurer) String simulationPrefix = "as_test_"; int simulationCount = 2000; @@ -57,7 +59,7 @@ for (int index = 0; index <= simulationCount; index++) { // get current simulation - String currentSimulationName = simulationPrefix + simulationCount; + String currentSimulationName = simulationPrefix + index; SimulationStorage currentSimulation = SimulationStorage.getSimulation(currentSimulationName); // run each export for this simulation

1 0

r43 - trunk/scripts
by echatellier＠users.forge.codelutin.com 07 Jul '14

07 Jul '14

Author: echatellier Date: 2014-07-07 12:20:35 +0200 (Mon, 07 Jul 2014) New Revision: 43 Url: http://forge.codelutin.com/projects/isis-fish-community/repository/revision… Log: Ajout d'un script pour rejouer un grand nombre d'export Added: trunk/scripts/RunExportOnManySimulationResult.java Added: trunk/scripts/RunExportOnManySimulationResult.java =================================================================== --- trunk/scripts/RunExportOnManySimulationResult.java (rev 0) +++ trunk/scripts/RunExportOnManySimulationResult.java 2014-07-07 10:20:35 UTC (rev 43) @@ -0,0 +1,78 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2014 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.io.File; +import java.util.Arrays; +import java.util.List; + +import org.nuiton.topia.TopiaException; + +import exports.Abundances; +import exports.Biomasses; +import fr.ifremer.isisfish.datastore.SimulationStorage; +import fr.ifremer.isisfish.export.Export; +import fr.ifremer.isisfish.export.ExportHelper; + +/** + * Ce script sert à rejouer des exports sur un grand nombre de simulation en lisant le + * ResultStrage et en rejouant les fonctions d'export. + * + * @author Eric Chatellier + */ +public class RunExportOnManySimulationResult { + + // nom des exports a rejouer + protected List<Export> exports = Arrays.asList( + new Abundances(), + new Biomasses() + ); + + public void doAllExports() throws TopiaException { + // prefix des noms de simulations + String simulationPrefix = "as_test_"; + int simulationCount = 2000; + + // parcourt de chaque simualtion + for (int index = 0; index <= simulationCount; index++) { + + // get current simulation + String currentSimulationName = simulationPrefix + simulationCount; + SimulationStorage currentSimulation = SimulationStorage.getSimulation(currentSimulationName); + + // run each export for this simulation + File rootDirectory = currentSimulation.getDirectory(); + File exportDir = SimulationStorage.getResultExportDirectory(rootDirectory); + ExportHelper.doExport(currentSimulation, exportDir, exports, rootDirectory); + System.out.println("Exports done on simulation " + currentSimulationName); + + // close all + currentSimulation.closeStorage(); + } + } + + public static void main(String[] args) throws TopiaException { + RunExportOnManySimulationResult runExportJob = new RunExportOnManySimulationResult(); + runExportJob.doAllExports(); + } +} Property changes on: trunk/scripts/RunExportOnManySimulationResult.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r42 - trunk
by echatellier＠users.forge.codelutin.com 16 Jun '14

16 Jun '14

Author: echatellier Date: 2014-06-16 12:34:49 +0200 (Mon, 16 Jun 2014) New Revision: 42 Url: http://forge.codelutin.com/projects/isis-fish-community/repository/revision… Log: Fix deploy Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-16 10:22:41 UTC (rev 41) +++ trunk/pom.xml 2014-06-16 10:34:49 UTC (rev 42) @@ -86,9 +86,17 @@ </dependencies> <distributionManagement> + <repository> + <id>nuiton-nexus-deploy</id> + <url>https://nexus.nuiton.org/nexus/content/repositories/other-releases</url> + </repository> + <snapshotRepository> + <id>nuiton-nexus-deploy</id> + <url>https://nexus.nuiton.org/nexus/content/repositories/snapshots</url> + </snapshotRepository> <site> - <id>forge.codelutin.com</id> - <url>scp://forge.codelutin.com/var/lib/redmine-forge.codelutin.com/project-site/…</url> + <id>forge.codelutin.com</id> + <url>scp://forge.codelutin.com/var/lib/doc/codelutin.com/isis-fish-community</url> </site> </distributionManagement>

1 0