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

r17 - trunk/exports
by tchemit＠users.labs.libre-entreprise.org 26 Feb '08

26 Feb '08

Author: tchemit Date: 2008-02-26 21:58:10 +0000 (Tue, 26 Feb 2008) New Revision: 17 Modified: trunk/exports/CapturesNombre.java Log: #1605 : add import and annotation Doc on class Modified: trunk/exports/CapturesNombre.java =================================================================== --- trunk/exports/CapturesNombre.java 2008-02-26 21:57:43 UTC (rev 16) +++ trunk/exports/CapturesNombre.java 2008-02-26 21:58:10 UTC (rev 17) @@ -17,6 +17,8 @@ import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.datastore.ResultStorage; +import fr.ifremer.isisfish.util.Doc; // pour pouvoir afficher une aide contextuelle (BUG#1605) + /** * CapturesNombre.java * @@ -28,6 +30,7 @@ * Last update: $Date: 2007-05-24 09:30:07 $ * by : $Author: bpoussin $ */ + @Doc(value="do the doc of class CaptureNombre") public class CapturesNombre implements Export { /** to use log facility, just put in your code: log.info("..."); */

1 0

r16 - trunk/exports
by tchemit＠users.labs.libre-entreprise.org 26 Feb '08

26 Feb '08

Author: tchemit Date: 2008-02-26 21:57:43 +0000 (Tue, 26 Feb 2008) New Revision: 16 Modified: trunk/exports/Biomasses.java Log: #1605 : add import and annotation Doc on class Modified: trunk/exports/Biomasses.java =================================================================== --- trunk/exports/Biomasses.java 2008-02-26 21:57:11 UTC (rev 15) +++ trunk/exports/Biomasses.java 2008-02-26 21:57:43 UTC (rev 16) @@ -17,6 +17,8 @@ import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.datastore.ResultStorage; +import fr.ifremer.isisfish.util.Doc; // pour pouvoir afficher une aide contextuelle (BUG#1605) + /** * Biomasses.java * @@ -28,6 +30,7 @@ * Last update: $Date: 2007-05-24 09:30:07 $ * by : $Author: bpoussin $ */ + @Doc(value="do the doc of class Biomasses") public class Biomasses implements Export { /** to use log facility, just put in your code: log.info("..."); */

1 0

r15 - trunk/exports
by tchemit＠users.labs.libre-entreprise.org 26 Feb '08

26 Feb '08

Author: tchemit Date: 2008-02-26 21:57:11 +0000 (Tue, 26 Feb 2008) New Revision: 15 Modified: trunk/exports/Abundances.java Log: #1605 : add import and annotation Doc on class Modified: trunk/exports/Abundances.java =================================================================== --- trunk/exports/Abundances.java 2008-02-12 14:06:53 UTC (rev 14) +++ trunk/exports/Abundances.java 2008-02-26 21:57:11 UTC (rev 15) @@ -16,6 +16,8 @@ import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.datastore.ResultStorage; +import fr.ifremer.isisfish.util.Doc; // pour pouvoir afficher une aide contextuelle (BUG#1605) + /** * Abundance.java * @@ -27,6 +29,7 @@ * Last update: $Date: 2007-05-24 09:30:07 $ * by : $Author: bpoussin $ */ +@Doc(value="do the doc of class Abundances") public class Abundances implements Export { /** to use log facility, just put in your code: log.info("..."); */

1 0

r14 - tags
by tchemit＠users.labs.libre-entreprise.org 12 Feb '08

12 Feb '08

Author: tchemit Date: 2008-02-12 14:06:53 +0000 (Tue, 12 Feb 2008) New Revision: 14 Added: tags/3.1.1/ Log: la version 3.1.1 Copied: tags/3.1.1 (from rev 13, trunk)

1 0

r13 - trunk/simulators
by bpoussin＠users.labs.libre-entreprise.org 21 Dec '07

21 Dec '07

Author: bpoussin Date: 2007-12-21 17:11:11 +0000 (Fri, 21 Dec 2007) New Revision: 13 Modified: trunk/simulators/DefaultSimulator.java Log: on ne cree pas le resultat non activity s'il n'y a pas de strategie Modified: trunk/simulators/DefaultSimulator.java =================================================================== --- trunk/simulators/DefaultSimulator.java 2007-12-18 20:22:27 UTC (rev 12) +++ trunk/simulators/DefaultSimulator.java 2007-12-21 17:11:11 UTC (rev 13) @@ -141,12 +141,15 @@ populationMonitor.clearCatch(); } - if (resManager.isEnabled(ResultName.MATRIX_NO_ACTIVITY)) { - MatrixND mat = metierMonitor.getOrCreateNoActivity(date, + // only if there are one or more strategy + if (siMatrix.getStrategies(date).size() > 0) { + if (resManager.isEnabled(ResultName.MATRIX_NO_ACTIVITY)) { + MatrixND mat = metierMonitor.getOrCreateNoActivity(date, ResultName.MATRIX_NO_ACTIVITY, siMatrix.getStrategies(date), siMatrix.getMetiers(date)); - resManager.addResult(date, mat); + resManager.addResult(date, mat); + } } //

1 0

r12 - trunk/scripts
by bpoussin＠users.labs.libre-entreprise.org 18 Dec '07

18 Dec '07

Author: bpoussin Date: 2007-12-18 20:22:27 +0000 (Tue, 18 Dec 2007) New Revision: 12 Modified: trunk/scripts/SiMatrix.java Log: ajout du throws exception, necessaire pour que ca compile Modified: trunk/scripts/SiMatrix.java =================================================================== --- trunk/scripts/SiMatrix.java 2007-12-18 20:17:04 UTC (rev 11) +++ trunk/scripts/SiMatrix.java 2007-12-18 20:22:27 UTC (rev 12) @@ -86,7 +86,7 @@ * @param context context simulation * @return SiMatrix or null if no SiMatrix created for simulation */ - public static SiMatrix getSiMatrix(SimulationContext context) { + public static SiMatrix getSiMatrix(SimulationContext context) throws TopiaException { SiMatrix result = (SiMatrix)context.getValue(SiMatrix.class.getName()); if (result == null) { result = new SiMatrix(context);

1 0

r11 - trunk/scripts
by bpoussin＠users.labs.libre-entreprise.org 18 Dec '07

18 Dec '07

Author: bpoussin Date: 2007-12-18 20:17:04 +0000 (Tue, 18 Dec 2007) New Revision: 11 Modified: trunk/scripts/SiMatrix.java Log: Correction erreur de recuperation de SiMatrix null Modified: trunk/scripts/SiMatrix.java =================================================================== --- trunk/scripts/SiMatrix.java 2007-12-13 10:46:20 UTC (rev 10) +++ trunk/scripts/SiMatrix.java 2007-12-18 20:17:04 UTC (rev 11) @@ -88,6 +88,9 @@ */ public static SiMatrix getSiMatrix(SimulationContext context) { SiMatrix result = (SiMatrix)context.getValue(SiMatrix.class.getName()); + if (result == null) { + result = new SiMatrix(context); + } return result; }

1 0

r7 - /
by tchemit＠users.labs.libre-entreprise.org 12 Dec '07

12 Dec '07

Author: tchemit Date: 2007-12-12 15:36:52 +0000 (Wed, 12 Dec 2007) New Revision: 7 Added: tags/ Log: ajout repertoire pour versions futures

1 0

r6 - /
by tchemit＠users.labs.libre-entreprise.org 12 Dec '07

12 Dec '07

Author: tchemit Date: 2007-12-12 15:35:12 +0000 (Wed, 12 Dec 2007) New Revision: 6 Removed: branches/ Log: suppression des branches comme demand?\195?\169

1 0

r5 - trunk/simulators
by bpoussin＠users.labs.libre-entreprise.org 07 Dec '07

07 Dec '07

Author: bpoussin Date: 2007-12-07 19:56:32 +0000 (Fri, 07 Dec 2007) New Revision: 5 Modified: trunk/simulators/DefaultSimulator.java Log: modification pour la nouvelle gestion des resultats Modified: trunk/simulators/DefaultSimulator.java =================================================================== --- trunk/simulators/DefaultSimulator.java 2007-12-06 17:51:13 UTC (rev 4) +++ trunk/simulators/DefaultSimulator.java 2007-12-07 19:56:32 UTC (rev 5) @@ -57,6 +57,7 @@ import fr.ifremer.isisfish.rule.Rule; import fr.ifremer.isisfish.simulator.MetierMonitor; import fr.ifremer.isisfish.simulator.PopulationMonitor; +import fr.ifremer.isisfish.simulator.ResultManager; import fr.ifremer.isisfish.simulator.RuleMonitor; import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.simulator.SimulationControl; @@ -87,10 +88,10 @@ Date date = control.getDate(); control.setProgressMax(lastDate); - ResultStorage resManager = context.getSimulationStorage().getResultStorage(); + ResultManager resManager = context.getResultManager(); TopiaContext db = context.getDB(); - SiMatrix siMatrix = new SiMatrix(context); + SiMatrix siMatrix = SiMatrix.getSiMatrix(context); GravityModel gravityModel = new GravityModel(context, siMatrix); PopulationMonitor populationMonitor = context.getPopulationMonitor(); @@ -434,7 +435,7 @@ * @throws IsisFishException * @throws TopiaException */ - private void saveGravityModel(Date date, ResultStorage resManager, GravityModel gravityModel) throws IsisFishException, TopiaException { + private void saveGravityModel(Date date, ResultManager resManager, GravityModel gravityModel) throws IsisFishException, TopiaException { if (resManager.isEnabled(ResultName.MATRIX_FISHING_TIME_PER_MONTH_PER_VESSEL)) { MatrixND mat = gravityModel.matrixFishingTimePerMonthPerVessel(date); resManager.addResult(date, mat);

1 0