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

r160 - in trunk: exports sensitivity
by chatellier＠users.labs.libre-entreprise.org 20 Jul '09

20 Jul '09

Author: chatellier Date: 2009-07-20 13:38:52 +0000 (Mon, 20 Jul 2009) New Revision: 160 Modified: trunk/exports/Abundances.java trunk/exports/Biomasses.java trunk/exports/CapturesNombre.java trunk/exports/CapturesPoids.java trunk/exports/CellsDefinition.java trunk/exports/EffortsMetier.java trunk/exports/GrossValueOfLandingsOtherSpecies.java trunk/exports/MetierZone.java trunk/exports/NonActivite.java trunk/exports/OwnerMargin.java trunk/exports/RegionDefinition.java trunk/exports/RejetsNombre.java trunk/exports/RejetsPoids.java trunk/exports/SensitivityBiomassReferenceY9.java trunk/exports/SensitivityBiomassRelativeReferenceY12.java trunk/exports/SensitivityBiomassRelativeY6.java trunk/exports/SensitivityBiomassY3.java trunk/exports/SensitivityCapturesWeightReferenceY7.java trunk/exports/SensitivityCapturesWeightRelativeReferenceY10.java trunk/exports/SensitivityCapturesWeightRelativeY4.java trunk/exports/SensitivityCapturesWeightY1.java trunk/exports/SensitivityGenitorBiomassReferenceY8.java trunk/exports/SensitivityGenitorBiomassRelativeReferenceY11.java trunk/exports/SensitivityGenitorBiomassRelativeY5.java trunk/exports/SensitivityGenitorBiomassY2.java trunk/exports/VesselMargin.java trunk/exports/ZonesDefinition.java trunk/sensitivity/SensitivityCalculatorJavaExpandGrid.java trunk/sensitivity/SensitivityCalculatorRFast.java trunk/sensitivity/SensitivityCalculatorRFrF2.java trunk/sensitivity/SensitivityCalculatorRMorris.java trunk/sensitivity/SensitivityCalculatorROptimumLHS.java trunk/sensitivity/SensitivityCalculatorRRandomLHS.java trunk/sensitivity/SensitivityCalculatorRSobol.java Log: @Doc annotation is now field target only. Modified: trunk/exports/Abundances.java =================================================================== --- trunk/exports/Abundances.java 2009-07-20 12:26:03 UTC (rev 159) +++ trunk/exports/Abundances.java 2009-07-20 13:38:52 UTC (rev 160) @@ -14,10 +14,7 @@ import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.types.Date; 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 * @@ -29,7 +26,6 @@ * 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("..."); */ Modified: trunk/exports/Biomasses.java =================================================================== --- trunk/exports/Biomasses.java 2009-07-20 12:26:03 UTC (rev 159) +++ trunk/exports/Biomasses.java 2009-07-20 13:38:52 UTC (rev 160) @@ -15,10 +15,7 @@ import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.types.Date; 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 * @@ -30,7 +27,6 @@ * 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("..."); */ Modified: trunk/exports/CapturesNombre.java =================================================================== --- trunk/exports/CapturesNombre.java 2009-07-20 12:26:03 UTC (rev 159) +++ trunk/exports/CapturesNombre.java 2009-07-20 13:38:52 UTC (rev 160) @@ -17,7 +17,6 @@ import fr.ifremer.isisfish.entities.Zone; import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.types.Date; -import fr.ifremer.isisfish.util.Doc; /** * CapturesNombre.java @@ -29,7 +28,6 @@ * * 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("..."); */ Modified: trunk/exports/CapturesPoids.java =================================================================== --- trunk/exports/CapturesPoids.java 2009-07-20 12:26:03 UTC (rev 159) +++ trunk/exports/CapturesPoids.java 2009-07-20 13:38:52 UTC (rev 160) @@ -17,7 +17,6 @@ import fr.ifremer.isisfish.entities.Zone; import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.types.Date; -import fr.ifremer.isisfish.util.Doc; /** * CapturesPoids.java @@ -29,7 +28,6 @@ * * Last update: $Date: 2007-05-24 09:30:07 $ by : $Author: bpoussin $ */ -@Doc(value = "do the doc of class CapturesPoids") public class CapturesPoids implements Export { /** to use log facility, just put in your code: log.info("..."); */ Modified: trunk/exports/CellsDefinition.java =================================================================== --- trunk/exports/CellsDefinition.java 2009-07-20 12:26:03 UTC (rev 159) +++ trunk/exports/CellsDefinition.java 2009-07-20 13:38:52 UTC (rev 160) @@ -12,7 +12,6 @@ import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.entities.Cell; import fr.ifremer.isisfish.export.Export; -import fr.ifremer.isisfish.util.Doc; /** * CellsDefinition.java @@ -25,7 +24,6 @@ * Last update: $Date: 2007-05-24 09:30:07 $ * by : $Author: bpoussin $ */ -@Doc(value="do the doc of class CellsDefinition") public class CellsDefinition implements Export { /** to use log facility, just put in your code: log.info("..."); */ Modified: trunk/exports/EffortsMetier.java =================================================================== --- trunk/exports/EffortsMetier.java 2009-07-20 12:26:03 UTC (rev 159) +++ trunk/exports/EffortsMetier.java 2009-07-20 13:38:52 UTC (rev 160) @@ -15,10 +15,7 @@ import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.types.Date; 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) - /** * EffortsMetier.java * @@ -30,7 +27,6 @@ * Last update: $Date: 2007-05-24 09:30:07 $ * by : $Author: bpoussin $ */ - @Doc(value="do the doc of class EffortsMetier") public class EffortsMetier implements Export { /** to use log facility, just put in your code: log.info("..."); */ Modified: trunk/exports/GrossValueOfLandingsOtherSpecies.java =================================================================== --- trunk/exports/GrossValueOfLandingsOtherSpecies.java 2009-07-20 12:26:03 UTC (rev 159) +++ trunk/exports/GrossValueOfLandingsOtherSpecies.java 2009-07-20 13:38:52 UTC (rev 160) @@ -16,8 +16,6 @@ import fr.ifremer.isisfish.types.Date; import fr.ifremer.isisfish.datastore.SimulationStorage; -import fr.ifremer.isisfish.util.Doc; // pour pouvoir afficher une aide contextuelle (BUG#1605) - /** * GrossValueOfLandingsOtherSpecies.java * @@ -29,7 +27,6 @@ * Last update: $Date: 2007-05-24 09:30:07 $ * by : $Author: bpoussin $ */ -@Doc(value="do the doc of class VesselMargin") public class GrossValueOfLandingsOtherSpecies implements Export { /** to use log facility, just put in your code: log.info("..."); */ Modified: trunk/exports/MetierZone.java =================================================================== --- trunk/exports/MetierZone.java 2009-07-20 12:26:03 UTC (rev 159) +++ trunk/exports/MetierZone.java 2009-07-20 13:38:52 UTC (rev 160) @@ -16,8 +16,6 @@ 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) - /** * MetierZone.java * @@ -29,7 +27,6 @@ * Last update: $Date: 2007-05-24 09:30:07 $ * by : $Author: bpoussin $ */ - @Doc(value="do the doc of class MetierZone") public class MetierZone implements Export { /** to use log facility, just put in your code: log.info("..."); */ Modified: trunk/exports/NonActivite.java =================================================================== --- trunk/exports/NonActivite.java 2009-07-20 12:26:03 UTC (rev 159) +++ trunk/exports/NonActivite.java 2009-07-20 13:38:52 UTC (rev 160) @@ -17,8 +17,6 @@ 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) - /** * NonActivite.java * @@ -30,7 +28,6 @@ * Last update: $Date: 2007-05-24 09:30:07 $ * by : $Author: bpoussin $ */ - @Doc(value="do the doc of class NonActivite") public class NonActivite implements Export { /** to use log facility, just put in your code: log.info("..."); */ Modified: trunk/exports/OwnerMargin.java =================================================================== --- trunk/exports/OwnerMargin.java 2009-07-20 12:26:03 UTC (rev 159) +++ trunk/exports/OwnerMargin.java 2009-07-20 13:38:52 UTC (rev 160) @@ -17,8 +17,6 @@ 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) - /** * OwnerMargin.java * @@ -30,7 +28,6 @@ * Last update: $Date: 2007-05-24 09:30:07 $ * by : $Author: bpoussin $ */ - @Doc(value="do the doc of class OwnerMargin") public class OwnerMargin implements Export { /** to use log facility, just put in your code: log.info("..."); */ Modified: trunk/exports/RegionDefinition.java =================================================================== --- trunk/exports/RegionDefinition.java 2009-07-20 12:26:03 UTC (rev 159) +++ trunk/exports/RegionDefinition.java 2009-07-20 13:38:52 UTC (rev 160) @@ -12,8 +12,6 @@ import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.datastore.SimulationStorage; -import fr.ifremer.isisfish.util.Doc; // pour pouvoir afficher une aide contextuelle (BUG#1605) - /** * RegionDefinition.java * @@ -25,7 +23,6 @@ * Last update: $Date: 2007-05-24 10:05:22 $ * by : $Author: bpoussin $ */ -@Doc(value="do the doc of class RegionDefinition") public class RegionDefinition implements Export { /** to use log facility, just put in your code: log.info("..."); */ Modified: trunk/exports/RejetsNombre.java =================================================================== --- trunk/exports/RejetsNombre.java 2009-07-20 12:26:03 UTC (rev 159) +++ trunk/exports/RejetsNombre.java 2009-07-20 13:38:52 UTC (rev 160) @@ -17,7 +17,6 @@ import fr.ifremer.isisfish.entities.Zone; import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.types.Date; -import fr.ifremer.isisfish.util.Doc; /** * RejetsNombre.java @@ -29,7 +28,6 @@ * * Last update: $Date: 2007-05-24 09:30:07 $ by : $Author: bpoussin $ */ -@Doc(value = "do the doc of class RejetsNombre") public class RejetsNombre implements Export { /** to use log facility, just put in your code: log.info("..."); */ Modified: trunk/exports/RejetsPoids.java =================================================================== --- trunk/exports/RejetsPoids.java 2009-07-20 12:26:03 UTC (rev 159) +++ trunk/exports/RejetsPoids.java 2009-07-20 13:38:52 UTC (rev 160) @@ -17,7 +17,6 @@ import fr.ifremer.isisfish.entities.Zone; import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.types.Date; -import fr.ifremer.isisfish.util.Doc; /** * RejetsPoids.java @@ -29,7 +28,6 @@ * * Last update: $Date: 2007-05-24 09:30:07 $ by : $Author: bpoussin $ */ -@Doc(value = "do the doc of class RejetsPoids") public class RejetsPoids implements Export { /** to use log facility, just put in your code: log.info("..."); */ Modified: trunk/exports/SensitivityBiomassReferenceY9.java =================================================================== --- trunk/exports/SensitivityBiomassReferenceY9.java 2009-07-20 12:26:03 UTC (rev 159) +++ trunk/exports/SensitivityBiomassReferenceY9.java 2009-07-20 13:38:52 UTC (rev 160) @@ -17,7 +17,6 @@ import fr.ifremer.isisfish.types.Date; import fr.ifremer.isisfish.util.Doc; -@Doc("Doc for SensitivityBiomass") public class SensitivityBiomassReferenceY9 implements SensitivityExport { /** to use log facility, just put in your code: log.info("..."); */ Modified: trunk/exports/SensitivityBiomassRelativeReferenceY12.java =================================================================== --- trunk/exports/SensitivityBiomassRelativeReferenceY12.java 2009-07-20 12:26:03 UTC (rev 159) +++ trunk/exports/SensitivityBiomassRelativeReferenceY12.java 2009-07-20 13:38:52 UTC (rev 160) @@ -17,7 +17,6 @@ import fr.ifremer.isisfish.types.Date; import fr.ifremer.isisfish.util.Doc; -@Doc("Doc for SensitivityBiomass") public class SensitivityBiomassRelativeReferenceY12 implements SensitivityExport { Modified: trunk/exports/SensitivityBiomassRelativeY6.java =================================================================== --- trunk/exports/SensitivityBiomassRelativeY6.java 2009-07-20 12:26:03 UTC (rev 159) +++ trunk/exports/SensitivityBiomassRelativeY6.java 2009-07-20 13:38:52 UTC (rev 160) @@ -16,7 +16,6 @@ import fr.ifremer.isisfish.types.Date; import fr.ifremer.isisfish.util.Doc; -@Doc("Doc for SensitivityBiomass") public class SensitivityBiomassRelativeY6 implements SensitivityExport { /** to use log facility, just put in your code: log.info("..."); */ Modified: trunk/exports/SensitivityBiomassY3.java =================================================================== --- trunk/exports/SensitivityBiomassY3.java 2009-07-20 12:26:03 UTC (rev 159) +++ trunk/exports/SensitivityBiomassY3.java 2009-07-20 13:38:52 UTC (rev 160) @@ -16,7 +16,6 @@ import fr.ifremer.isisfish.types.Date; import fr.ifremer.isisfish.util.Doc; -@Doc("Doc for SensitivityBiomass") public class SensitivityBiomassY3 implements SensitivityExport { /** to use log facility, just put in your code: log.info("..."); */ Modified: trunk/exports/SensitivityCapturesWeightReferenceY7.java =================================================================== --- trunk/exports/SensitivityCapturesWeightReferenceY7.java 2009-07-20 12:26:03 UTC (rev 159) +++ trunk/exports/SensitivityCapturesWeightReferenceY7.java 2009-07-20 13:38:52 UTC (rev 160) @@ -17,7 +17,6 @@ import fr.ifremer.isisfish.types.Date; import fr.ifremer.isisfish.util.Doc; -@Doc("Doc for SensitivityCapturesPoids") public class SensitivityCapturesWeightReferenceY7 implements SensitivityExport { /** to use log facility, just put in your code: log.info("..."); */ Modified: trunk/exports/SensitivityCapturesWeightRelativeReferenceY10.java =================================================================== --- trunk/exports/SensitivityCapturesWeightRelativeReferenceY10.java 2009-07-20 12:26:03 UTC (rev 159) +++ trunk/exports/SensitivityCapturesWeightRelativeReferenceY10.java 2009-07-20 13:38:52 UTC (rev 160) @@ -17,7 +17,6 @@ import fr.ifremer.isisfish.types.Date; import fr.ifremer.isisfish.util.Doc; -@Doc("Doc for SensitivityCapturesPoids") public class SensitivityCapturesWeightRelativeReferenceY10 implements SensitivityExport { Modified: trunk/exports/SensitivityCapturesWeightRelativeY4.java =================================================================== --- trunk/exports/SensitivityCapturesWeightRelativeY4.java 2009-07-20 12:26:03 UTC (rev 159) +++ trunk/exports/SensitivityCapturesWeightRelativeY4.java 2009-07-20 13:38:52 UTC (rev 160) @@ -16,7 +16,6 @@ import fr.ifremer.isisfish.types.Date; import fr.ifremer.isisfish.util.Doc; -@Doc("Doc for SensitivityCapturesPoids") public class SensitivityCapturesWeightRelativeY4 implements SensitivityExport { /** to use log facility, just put in your code: log.info("..."); */ Modified: trunk/exports/SensitivityCapturesWeightY1.java =================================================================== --- trunk/exports/SensitivityCapturesWeightY1.java 2009-07-20 12:26:03 UTC (rev 159) +++ trunk/exports/SensitivityCapturesWeightY1.java 2009-07-20 13:38:52 UTC (rev 160) @@ -16,7 +16,6 @@ import fr.ifremer.isisfish.types.Date; import fr.ifremer.isisfish.util.Doc; -@Doc("Doc for SensitivityCapturesPoids") public class SensitivityCapturesWeightY1 implements SensitivityExport { /** to use log facility, just put in your code: log.info("..."); */ Modified: trunk/exports/SensitivityGenitorBiomassReferenceY8.java =================================================================== --- trunk/exports/SensitivityGenitorBiomassReferenceY8.java 2009-07-20 12:26:03 UTC (rev 159) +++ trunk/exports/SensitivityGenitorBiomassReferenceY8.java 2009-07-20 13:38:52 UTC (rev 160) @@ -19,7 +19,6 @@ import fr.ifremer.isisfish.types.Date; import fr.ifremer.isisfish.util.Doc; -@Doc("Doc for SensitivityBiomass") public class SensitivityGenitorBiomassReferenceY8 implements SensitivityExport { /** to use log facility, just put in your code: log.info("..."); */ Modified: trunk/exports/SensitivityGenitorBiomassRelativeReferenceY11.java =================================================================== --- trunk/exports/SensitivityGenitorBiomassRelativeReferenceY11.java 2009-07-20 12:26:03 UTC (rev 159) +++ trunk/exports/SensitivityGenitorBiomassRelativeReferenceY11.java 2009-07-20 13:38:52 UTC (rev 160) @@ -19,7 +19,6 @@ import fr.ifremer.isisfish.types.Date; import fr.ifremer.isisfish.util.Doc; -@Doc("Doc for SensitivityBiomass") public class SensitivityGenitorBiomassRelativeReferenceY11 implements SensitivityExport { Modified: trunk/exports/SensitivityGenitorBiomassRelativeY5.java =================================================================== --- trunk/exports/SensitivityGenitorBiomassRelativeY5.java 2009-07-20 12:26:03 UTC (rev 159) +++ trunk/exports/SensitivityGenitorBiomassRelativeY5.java 2009-07-20 13:38:52 UTC (rev 160) @@ -18,7 +18,6 @@ import fr.ifremer.isisfish.types.Date; import fr.ifremer.isisfish.util.Doc; -@Doc("Doc for SensitivityBiomass") public class SensitivityGenitorBiomassRelativeY5 implements SensitivityExport { /** to use log facility, just put in your code: log.info("..."); */ Modified: trunk/exports/SensitivityGenitorBiomassY2.java =================================================================== --- trunk/exports/SensitivityGenitorBiomassY2.java 2009-07-20 12:26:03 UTC (rev 159) +++ trunk/exports/SensitivityGenitorBiomassY2.java 2009-07-20 13:38:52 UTC (rev 160) @@ -18,7 +18,6 @@ import fr.ifremer.isisfish.types.Date; import fr.ifremer.isisfish.util.Doc; -@Doc("Doc for SensitivityBiomass") public class SensitivityGenitorBiomassY2 implements SensitivityExport { /** to use log facility, just put in your code: log.info("..."); */ Modified: trunk/exports/VesselMargin.java =================================================================== --- trunk/exports/VesselMargin.java 2009-07-20 12:26:03 UTC (rev 159) +++ trunk/exports/VesselMargin.java 2009-07-20 13:38:52 UTC (rev 160) @@ -17,8 +17,6 @@ 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) - /** * VesselMargin.java * @@ -30,7 +28,6 @@ * Last update: $Date: 2007-05-24 09:30:07 $ * by : $Author: bpoussin $ */ - @Doc(value="do the doc of class VesselMargin") public class VesselMargin implements Export { /** to use log facility, just put in your code: log.info("..."); */ Modified: trunk/exports/ZonesDefinition.java =================================================================== --- trunk/exports/ZonesDefinition.java 2009-07-20 12:26:03 UTC (rev 159) +++ trunk/exports/ZonesDefinition.java 2009-07-20 13:38:52 UTC (rev 160) @@ -14,8 +14,6 @@ import fr.ifremer.isisfish.types.Date; import fr.ifremer.isisfish.datastore.SimulationStorage; -import fr.ifremer.isisfish.util.Doc; // pour pouvoir afficher une aide contextuelle (BUG#1605) - /** * ZonesDefinition.java * @@ -27,7 +25,6 @@ * Last update: $Date: 2007-05-24 09:30:07 $ * by : $Author: bpoussin $ */ -@Doc(value="do the doc of class ZoneDefinition") public class ZonesDefinition implements Export { /** to use log facility, just put in your code: log.info("..."); */ Modified: trunk/sensitivity/SensitivityCalculatorJavaExpandGrid.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorJavaExpandGrid.java 2009-07-20 12:26:03 UTC (rev 159) +++ trunk/sensitivity/SensitivityCalculatorJavaExpandGrid.java 2009-07-20 13:38:52 UTC (rev 160) @@ -39,7 +39,6 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; -import fr.ifremer.isisfish.util.Doc; /** * Implementation of ExpandGrid method using Java @@ -48,7 +47,6 @@ * @version $Revision: 1.0 $ * */ -@Doc("ExpandGrid") public class SensitivityCalculatorJavaExpandGrid extends AbstractSensitivityCalculator { Modified: trunk/sensitivity/SensitivityCalculatorRFast.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorRFast.java 2009-07-20 12:26:03 UTC (rev 159) +++ trunk/sensitivity/SensitivityCalculatorRFast.java 2009-07-20 13:38:52 UTC (rev 160) @@ -61,7 +61,6 @@ * Last update : $Date: 2009-03-25 13:45:16 +0100 (mer., 25 mars 2009) $ By : * $Author: jcouteau $ */ - public class SensitivityCalculatorRFast extends AbstractSensitivityCalculator { /** to use log facility, just put in your code: log.info("..."); */ Modified: trunk/sensitivity/SensitivityCalculatorRFrF2.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorRFrF2.java 2009-07-20 12:26:03 UTC (rev 159) +++ trunk/sensitivity/SensitivityCalculatorRFrF2.java 2009-07-20 13:38:52 UTC (rev 160) @@ -52,7 +52,6 @@ * Last update : $Date: 2009-04-03 13:13:35 +0200 (ven., 03 avr. 2009) $ By : * $Author: chatellier $ */ -@Doc("FrF2 method, at least 4 factors need to be declared") public class SensitivityCalculatorRFrF2 extends AbstractSensitivityCalculator { /** to use log facility, just put in your code: log.info("..."); */ Modified: trunk/sensitivity/SensitivityCalculatorRMorris.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorRMorris.java 2009-07-20 12:26:03 UTC (rev 159) +++ trunk/sensitivity/SensitivityCalculatorRMorris.java 2009-07-20 13:38:52 UTC (rev 160) @@ -59,8 +59,6 @@ * Last update : $Date$ By : * $Author$ */ - -@Doc("Morris method") public class SensitivityCalculatorRMorris extends AbstractSensitivityCalculator { @Doc("Integer giving the number of repetitions of the design, i.e. the number of elementary effect computed per factor. (Default value : 4)") Modified: trunk/sensitivity/SensitivityCalculatorROptimumLHS.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorROptimumLHS.java 2009-07-20 12:26:03 UTC (rev 159) +++ trunk/sensitivity/SensitivityCalculatorROptimumLHS.java 2009-07-20 13:38:52 UTC (rev 160) @@ -55,9 +55,7 @@ * * @author jcouteau * @version $Revision: 1.0 $ - * */ -@Doc("Optimum Latin Hypercube") public class SensitivityCalculatorROptimumLHS extends AbstractSensitivityCalculator { Modified: trunk/sensitivity/SensitivityCalculatorRRandomLHS.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorRRandomLHS.java 2009-07-20 12:26:03 UTC (rev 159) +++ trunk/sensitivity/SensitivityCalculatorRRandomLHS.java 2009-07-20 13:38:52 UTC (rev 160) @@ -55,9 +55,7 @@ * * @author jcouteau * @version $Revision: 1.0 $ - * */ -@Doc("Random Latin Hypercube") public class SensitivityCalculatorRRandomLHS extends AbstractSensitivityCalculator { Modified: trunk/sensitivity/SensitivityCalculatorRSobol.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorRSobol.java 2009-07-20 12:26:03 UTC (rev 159) +++ trunk/sensitivity/SensitivityCalculatorRSobol.java 2009-07-20 13:38:52 UTC (rev 160) @@ -60,7 +60,6 @@ * Last update : $Date: 2009-03-25 13:45:16 +0100 (mer., 25 mars 2009) $ By : * $Author: jcouteau $ */ - public class SensitivityCalculatorRSobol extends AbstractSensitivityCalculator { /** to use log facility, just put in your code: log.info("..."); */

1 0

r159 - trunk
by chatellier＠users.labs.libre-entreprise.org 20 Jul '09

20 Jul '09

Author: chatellier Date: 2009-07-20 12:26:03 +0000 (Mon, 20 Jul 2009) New Revision: 159 Modified: trunk/pom.xml Log: Use new isis version Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-07-16 16:24:01 UTC (rev 158) +++ trunk/pom.xml 2009-07-20 12:26:03 UTC (rev 159) @@ -50,7 +50,7 @@ <dependency> <groupId>ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.2.0.5-rc1-SNAPSHOT</version> + <version>3.2.0.5-rc2-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies>

1 0

r158 - trunk
by chatellier＠users.labs.libre-entreprise.org 16 Jul '09

16 Jul '09

Author: chatellier Date: 2009-07-16 16:24:01 +0000 (Thu, 16 Jul 2009) New Revision: 158 Modified: trunk/pom.xml Log: Depend on never version Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-07-16 09:35:40 UTC (rev 157) +++ trunk/pom.xml 2009-07-16 16:24:01 UTC (rev 158) @@ -50,7 +50,7 @@ <dependency> <groupId>ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.2.0.5-SNAPSHOT</version> + <version>3.2.0.5-rc1-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies>

1 0

r157 - trunk/rules
by chatellier＠users.labs.libre-entreprise.org 16 Jul '09

16 Jul '09

Author: chatellier Date: 2009-07-16 09:35:40 +0000 (Thu, 16 Jul 2009) New Revision: 157 Modified: trunk/rules/ChangementParamControlablePresimu.java Log: Fix hibernate error : "Found shared references to a collection" Modified: trunk/rules/ChangementParamControlablePresimu.java =================================================================== --- trunk/rules/ChangementParamControlablePresimu.java 2009-07-16 08:26:37 UTC (rev 156) +++ trunk/rules/ChangementParamControlablePresimu.java 2009-07-16 09:35:40 UTC (rev 157) @@ -134,7 +134,8 @@ MetierSeasonInfo NouveauInfoSaison = infoDao.create(); NouveauInfoSaison.setMetier(NouveauMetier); NouveauInfoSaison.setMonths(sais); - NouveauInfoSaison.setZone(infsais.getZone()); + // EC : new ArrayList<Zone>() fix error "Found shared references to a collection" + NouveauInfoSaison.setZone(new ArrayList<Zone>(infsais.getZone())); NouveauInfoSaison.setComment("créé durant la simulation"); NouveauMetier.addMetierSeasonInfo(NouveauInfoSaison); }

1 0

r156 - trunk/simulators
by chatellier＠users.labs.libre-entreprise.org 16 Jul '09

16 Jul '09

Author: chatellier Date: 2009-07-16 08:26:37 +0000 (Thu, 16 Jul 2009) New Revision: 156 Modified: trunk/simulators/DefaultSimulator.java Log: Erreur, une seule fois pour toutes les regles (pas une fois par regles) Modified: trunk/simulators/DefaultSimulator.java =================================================================== --- trunk/simulators/DefaultSimulator.java 2009-07-16 08:19:21 UTC (rev 155) +++ trunk/simulators/DefaultSimulator.java 2009-07-16 08:26:37 UTC (rev 156) @@ -104,14 +104,15 @@ populationMonitor.setN(pop, N); } + // reload context parameters with context.getDB() context + param.reloadContextParameters(); + // // Rule initialisation // List<Rule> rules = param.getRules(); control.setText("Rules initialisation:" + rules); for (Rule rule : rules) { - // reload context parameters with context.getDB() context - param.reloadContextParameters(); rule.init(context); log.info("Rule " + rule.getClass().getSimpleName() + " initialized");

1 0

r155 - trunk/simulators
by chatellier＠users.labs.libre-entreprise.org 16 Jul '09

16 Jul '09

Author: chatellier Date: 2009-07-16 08:19:21 +0000 (Thu, 16 Jul 2009) New Revision: 155 Modified: trunk/simulators/DefaultSimulator.java Log: Il faut recharger les parametres apres un changement de context : - juste avant l'init() - apres un rollback Modified: trunk/simulators/DefaultSimulator.java =================================================================== --- trunk/simulators/DefaultSimulator.java 2009-06-30 08:19:59 UTC (rev 154) +++ trunk/simulators/DefaultSimulator.java 2009-07-16 08:19:21 UTC (rev 155) @@ -110,6 +110,8 @@ List<Rule> rules = param.getRules(); control.setText("Rules initialisation:" + rules); for (Rule rule : rules) { + // reload context parameters with context.getDB() context + param.reloadContextParameters(); rule.init(context); log.info("Rule " + rule.getClass().getSimpleName() + " initialized"); @@ -140,6 +142,7 @@ // Reload parameters for current step // control.setText(_("Reloading parameters")); + // reload context parameters with db.rollbackTransaction() context param.reloadContextParameters(); rules = param.getRules();

1 0