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

r413 - trunk
by echatellier＠users.forge.codelutin.com 28 Jan '20

28 Jan '20

Author: echatellier Date: 2020-01-28 10:48:37 +0100 (Tue, 28 Jan 2020) New Revision: 413 Url: http://forge.codelutin.com/projects/isis-fish-data/repository/revisions/413 Log: next version Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2020-01-28 09:46:26 UTC (rev 412) +++ trunk/pom.xml 2020-01-28 09:48:37 UTC (rev 413) @@ -14,7 +14,7 @@ <packaging>jar</packaging>  - <version>4.4.4</version> + <version>4.4.5-SNAPSHOT</version>  <description>Data for Isis-fish</description> @@ -65,7 +65,7 @@ <dependency> <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.4.4.0</version> + <version>4.4.5.0-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies>

1 0

r412 - tags
by echatellier＠users.forge.codelutin.com 28 Jan '20

28 Jan '20

Author: echatellier Date: 2020-01-28 10:46:26 +0100 (Tue, 28 Jan 2020) New Revision: 412 Url: http://forge.codelutin.com/projects/isis-fish-data/repository/revisions/412 Log: Tag 4.4.4 Added: tags/4.4.4/

1 0

r411 - trunk
by echatellier＠users.forge.codelutin.com 28 Jan '20

28 Jan '20

Author: echatellier Date: 2020-01-28 10:44:17 +0100 (Tue, 28 Jan 2020) New Revision: 411 Url: http://forge.codelutin.com/projects/isis-fish-data/repository/revisions/411 Log: Prepare release Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2020-01-27 09:45:24 UTC (rev 410) +++ trunk/pom.xml 2020-01-28 09:44:17 UTC (rev 411) @@ -14,7 +14,7 @@ <packaging>jar</packaging>  - <version>4.4.2-SNAPSHOT</version> + <version>4.4.4</version>  <description>Data for Isis-fish</description> @@ -65,7 +65,7 @@ <dependency> <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.5.0.0-SNAPSHOT</version> + <version>4.4.4.0</version> <scope>compile</scope> </dependency> </dependencies>

1 0

r410 - in trunk: objectives optimizations rules scripts sensitivityanalysis sensitivityexports simulationplans
by echatellier＠users.forge.codelutin.com 27 Jan '20

27 Jan '20

Author: echatellier Date: 2020-01-27 10:45:24 +0100 (Mon, 27 Jan 2020) New Revision: 410 Url: http://forge.codelutin.com/projects/isis-fish-data/repository/revisions/410 Log: Utilisation des annotations non d?\195?\169pr?\195?\169ci?\195?\169es. Modified: trunk/objectives/ObjectiveIterationCount.java trunk/optimizations/ExampleOptimization.java trunk/rules/Cantonnement.java trunk/rules/CantonnementPreSimu.java trunk/rules/ChangementParamControlablePresimu.java trunk/rules/EffortReduction.java trunk/rules/InterdictionEngin.java trunk/rules/InterdictionEnginPreSimu.java trunk/rules/TACpoids.java trunk/rules/TailleMin.java trunk/scripts/MinimisationUtil.java trunk/scripts/ObjectiveFunctionBaranov.java trunk/scripts/ResultName.java trunk/scripts/SiMatrix.java trunk/scripts/SiMatrixEffortByCell.java trunk/sensitivityanalysis/DOptimal.java trunk/sensitivityanalysis/Fast.java trunk/sensitivityanalysis/Morris.java trunk/sensitivityanalysis/OptimumLHS.java trunk/sensitivityanalysis/RandomLHS.java trunk/sensitivityanalysis/RegularExpandGrid.java trunk/sensitivityanalysis/RegularFractions.java trunk/sensitivityanalysis/Sobol.java trunk/sensitivityexports/SensitivityBiomassReferenceY9.java trunk/sensitivityexports/SensitivityBiomassRelativeReferenceY12.java trunk/sensitivityexports/SensitivityBiomassRelativeY6.java trunk/sensitivityexports/SensitivityBiomassY3.java trunk/sensitivityexports/SensitivityCatchWeightReferenceY7.java trunk/sensitivityexports/SensitivityCatchWeightRelativeReferenceY10.java trunk/sensitivityexports/SensitivityCatchWeightRelativeY4.java trunk/sensitivityexports/SensitivityCatchWeightY1.java trunk/sensitivityexports/SensitivityLbarJanvierY1.java trunk/sensitivityexports/SensitivityRecruitmentY1.java trunk/sensitivityexports/SensitivitySpawningBiomassReferenceY8.java trunk/sensitivityexports/SensitivitySpawningBiomassRelativeReferenceY11.java trunk/sensitivityexports/SensitivitySpawningBiomassRelativeY5.java trunk/sensitivityexports/SensitivitySpawningBiomassY2.java trunk/simulationplans/CalibrationSimplexePasVariable2Capturabilite.java trunk/simulationplans/SimulationNumberRestriction.java Modified: trunk/objectives/ObjectiveIterationCount.java =================================================================== --- trunk/objectives/ObjectiveIterationCount.java 2020-01-13 14:20:28 UTC (rev 409) +++ trunk/objectives/ObjectiveIterationCount.java 2020-01-27 09:45:24 UTC (rev 410) @@ -22,7 +22,7 @@ import org.nuiton.math.matrix.*; import resultinfos.*; -import fr.ifremer.isisfish.util.Doc; +import fr.ifremer.isisfish.annotations.Doc; import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.types.TimeStep; import fr.ifremer.isisfish.entities.*; Modified: trunk/optimizations/ExampleOptimization.java =================================================================== --- trunk/optimizations/ExampleOptimization.java 2020-01-13 14:20:28 UTC (rev 409) +++ trunk/optimizations/ExampleOptimization.java 2020-01-27 09:45:24 UTC (rev 410) @@ -22,7 +22,7 @@ import org.nuiton.math.matrix.*; import resultinfos.*; -import fr.ifremer.isisfish.util.Doc; +import fr.ifremer.isisfish.annotations.Doc; import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.types.TimeStep; import fr.ifremer.isisfish.entities.*; Modified: trunk/rules/Cantonnement.java =================================================================== --- trunk/rules/Cantonnement.java 2020-01-13 14:20:28 UTC (rev 409) +++ trunk/rules/Cantonnement.java 2020-01-27 09:45:24 UTC (rev 410) @@ -41,7 +41,7 @@ import fr.ifremer.isisfish.entities.*; import fr.ifremer.isisfish.rule.AbstractRule; -import fr.ifremer.isisfish.util.Doc; +import fr.ifremer.isisfish.annotations.Doc; import resultinfos.MatrixNoActivity; /** Modified: trunk/rules/CantonnementPreSimu.java =================================================================== --- trunk/rules/CantonnementPreSimu.java 2020-01-13 14:20:28 UTC (rev 409) +++ trunk/rules/CantonnementPreSimu.java 2020-01-27 09:45:24 UTC (rev 410) @@ -41,7 +41,7 @@ import fr.ifremer.isisfish.entities.*; import fr.ifremer.isisfish.rule.AbstractRule; -import fr.ifremer.isisfish.util.Doc; +import fr.ifremer.isisfish.annotations.Doc; import resultinfos.MatrixNoActivity; /** Modified: trunk/rules/ChangementParamControlablePresimu.java =================================================================== --- trunk/rules/ChangementParamControlablePresimu.java 2020-01-13 14:20:28 UTC (rev 409) +++ trunk/rules/ChangementParamControlablePresimu.java 2020-01-27 09:45:24 UTC (rev 410) @@ -45,7 +45,7 @@ import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.types.TimeStep; import fr.ifremer.isisfish.types.Month; -import fr.ifremer.isisfish.util.Doc; +import fr.ifremer.isisfish.annotations.Doc; /** * ChangementParamControlablePresimu.java Modified: trunk/rules/EffortReduction.java =================================================================== --- trunk/rules/EffortReduction.java 2020-01-13 14:20:28 UTC (rev 409) +++ trunk/rules/EffortReduction.java 2020-01-27 09:45:24 UTC (rev 410) @@ -32,7 +32,7 @@ import fr.ifremer.isisfish.rule.AbstractRule; import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.types.TimeStep; -import fr.ifremer.isisfish.util.Doc; +import fr.ifremer.isisfish.annotations.Doc; /** * EffortReduction.java Modified: trunk/rules/InterdictionEngin.java =================================================================== --- trunk/rules/InterdictionEngin.java 2020-01-13 14:20:28 UTC (rev 409) +++ trunk/rules/InterdictionEngin.java 2020-01-27 09:45:24 UTC (rev 410) @@ -39,7 +39,7 @@ import fr.ifremer.isisfish.entities.*; import fr.ifremer.isisfish.rule.AbstractRule; -import fr.ifremer.isisfish.util.Doc; +import fr.ifremer.isisfish.annotations.Doc; import resultinfos.MatrixNoActivity; /** Modified: trunk/rules/InterdictionEnginPreSimu.java =================================================================== --- trunk/rules/InterdictionEnginPreSimu.java 2020-01-13 14:20:28 UTC (rev 409) +++ trunk/rules/InterdictionEnginPreSimu.java 2020-01-27 09:45:24 UTC (rev 410) @@ -40,7 +40,7 @@ import fr.ifremer.isisfish.rule.AbstractRule; import fr.ifremer.isisfish.datastore.RegionStorage; -import fr.ifremer.isisfish.util.Doc; +import fr.ifremer.isisfish.annotations.Doc; import resultinfos.MatrixNoActivity; /** Modified: trunk/rules/TACpoids.java =================================================================== --- trunk/rules/TACpoids.java 2020-01-13 14:20:28 UTC (rev 409) +++ trunk/rules/TACpoids.java 2020-01-27 09:45:24 UTC (rev 410) @@ -45,7 +45,7 @@ import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.types.TimeStep; import fr.ifremer.isisfish.types.Month; -import fr.ifremer.isisfish.util.Doc; +import fr.ifremer.isisfish.annotations.Doc; import resultinfos.MatrixDiscardsPerStrMetPerZonePop; import resultinfos.MatrixNoActivity; Modified: trunk/rules/TailleMin.java =================================================================== --- trunk/rules/TailleMin.java 2020-01-13 14:20:28 UTC (rev 409) +++ trunk/rules/TailleMin.java 2020-01-27 09:45:24 UTC (rev 410) @@ -37,7 +37,7 @@ import fr.ifremer.isisfish.simulator.PopulationMonitor; import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.types.TimeStep; -import fr.ifremer.isisfish.util.Doc; +import fr.ifremer.isisfish.annotations.Doc; import resultinfos.MatrixDiscardsPerStrMetPerZonePop; import java.util.List; @@ -115,13 +115,6 @@ } - /** - * @param context - * @param date - * @param param_species - * @param metier - * @return - */ private boolean isCaptureDate(TimeStep step, Species species, Metier metier) { MetierSeasonInfo info = metier.getMetierSeasonInfo(step.getMonth()); TargetSpecies target = info.getSpeciesTargetSpecies(species); Modified: trunk/scripts/MinimisationUtil.java =================================================================== --- trunk/scripts/MinimisationUtil.java 2020-01-13 14:20:28 UTC (rev 409) +++ trunk/scripts/MinimisationUtil.java 2020-01-27 09:45:24 UTC (rev 410) @@ -25,7 +25,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import fr.ifremer.isisfish.util.Nocache; +import fr.ifremer.isisfish.annotations.Nocache; public class MinimisationUtil { Modified: trunk/scripts/ObjectiveFunctionBaranov.java =================================================================== --- trunk/scripts/ObjectiveFunctionBaranov.java 2020-01-13 14:20:28 UTC (rev 409) +++ trunk/scripts/ObjectiveFunctionBaranov.java 2020-01-27 09:45:24 UTC (rev 410) @@ -22,7 +22,7 @@ package scripts; -import fr.ifremer.isisfish.util.Nocache; +import fr.ifremer.isisfish.annotations.Nocache; /** * FonctionObjectif_Baranov.java Modified: trunk/scripts/ResultName.java =================================================================== --- trunk/scripts/ResultName.java 2020-01-13 14:20:28 UTC (rev 409) +++ trunk/scripts/ResultName.java 2020-01-27 09:45:24 UTC (rev 410) @@ -22,7 +22,7 @@ package scripts; -import fr.ifremer.isisfish.util.Doc; +import fr.ifremer.isisfish.annotations.Doc; import resultinfos.*; /** Modified: trunk/scripts/SiMatrix.java =================================================================== --- trunk/scripts/SiMatrix.java 2020-01-13 14:20:28 UTC (rev 409) +++ trunk/scripts/SiMatrix.java 2020-01-27 09:45:24 UTC (rev 410) @@ -44,7 +44,7 @@ import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.types.Month; import fr.ifremer.isisfish.types.TimeStep; -import fr.ifremer.isisfish.util.Nocache; +import fr.ifremer.isisfish.annotations.Nocache; import resultinfos.*; /** @@ -352,11 +352,10 @@ * @param str * @param metier * @param step - * @param zone + * @param zonePop * @return */ - private double effortPerZonePop(Strategy str, Metier metier, MetierSeasonInfo infoMet, TimeStep step, - Zone zonePop) { + private double effortPerZonePop(Strategy str, Metier metier, MetierSeasonInfo infoMet, TimeStep step, Zone zonePop) { Collection<Zone> zoneMet = infoMet.getZone(); double inter = nbCellInter(zoneMet, zonePop); @@ -475,12 +474,9 @@ * * @param step * @param matrixFishingMortality - * @param group - * @param zone * @return */ - private MatrixND totalFishingMortality(TimeStep step, - MatrixND matrixFishingMortality) { + private MatrixND totalFishingMortality(TimeStep step, MatrixND matrixFishingMortality) { MatrixND result = matrixFishingMortality.sumOverDim(0); result = result.sumOverDim(1); result = result.reduceDims(0, 1); @@ -739,11 +735,6 @@ return result; } - /** - * @param zoneMetier - * @param maille - * @return - */ private double distance(Collection<Zone> zones, Cell cell) { double result = 0; List<Cell> cells = getCells(zones); @@ -769,11 +760,6 @@ return result; } - /** - * @param c - * @param cell - * @return - */ private double distance(Cell m1, Cell m2) { double earthRadius = 6378.388; double p = 180 / Math.PI; @@ -830,11 +816,6 @@ return result; } - /** - * @param setOfVessels - * @param metier - * @return - */ private double stdEffortPerHour(TimeStep step, SetOfVessels sov, Metier metier) { double result = 0; EffortDescription ed = sov.getPossibleMetiers(metier); Modified: trunk/scripts/SiMatrixEffortByCell.java =================================================================== --- trunk/scripts/SiMatrixEffortByCell.java 2020-01-13 14:20:28 UTC (rev 409) +++ trunk/scripts/SiMatrixEffortByCell.java 2020-01-27 09:45:24 UTC (rev 410) @@ -488,12 +488,11 @@ * @param step * @param group * @param zone - * @param totalFishingMortality + * @param totalFishingMortalityPerCell * @return * @throws TopiaException */ - private double totalCatchRatePerCell(TimeStep step, PopulationGroup group, - Zone zone, double totalFishingMortalityPerCell) + private double totalCatchRatePerCell(TimeStep step, PopulationGroup group, Zone zone, double totalFishingMortalityPerCell) throws TopiaException { double M = getTotalDeathRate(step, group, zone) / Month.NUMBER_OF_MONTH; if (M == 0) { Modified: trunk/sensitivityanalysis/DOptimal.java =================================================================== --- trunk/sensitivityanalysis/DOptimal.java 2020-01-13 14:20:28 UTC (rev 409) +++ trunk/sensitivityanalysis/DOptimal.java 2020-01-27 09:45:24 UTC (rev 410) @@ -28,7 +28,7 @@ import fr.ifremer.isisfish.simulator.sensitivity.*; import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; -import fr.ifremer.isisfish.util.Doc; +import fr.ifremer.isisfish.annotations.Doc; import org.apache.commons.lang3.StringUtils; import org.nuiton.j2r.REngine; import org.nuiton.j2r.RException; Modified: trunk/sensitivityanalysis/Fast.java =================================================================== --- trunk/sensitivityanalysis/Fast.java 2020-01-13 14:20:28 UTC (rev 409) +++ trunk/sensitivityanalysis/Fast.java 2020-01-27 09:45:24 UTC (rev 410) @@ -33,7 +33,7 @@ import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.simulator.SimulationParameter; -import fr.ifremer.isisfish.util.Doc; +import fr.ifremer.isisfish.annotations.Doc; import org.nuiton.j2r.types.RDataFrame; Modified: trunk/sensitivityanalysis/Morris.java =================================================================== --- trunk/sensitivityanalysis/Morris.java 2020-01-13 14:20:28 UTC (rev 409) +++ trunk/sensitivityanalysis/Morris.java 2020-01-27 09:45:24 UTC (rev 410) @@ -27,7 +27,7 @@ import fr.ifremer.isisfish.simulator.SimulationParameter; import fr.ifremer.isisfish.simulator.sensitivity.*; import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; -import fr.ifremer.isisfish.util.Doc; +import fr.ifremer.isisfish.annotations.Doc; import org.apache.commons.lang3.StringUtils; import org.nuiton.j2r.REngine; Modified: trunk/sensitivityanalysis/OptimumLHS.java =================================================================== --- trunk/sensitivityanalysis/OptimumLHS.java 2020-01-13 14:20:28 UTC (rev 409) +++ trunk/sensitivityanalysis/OptimumLHS.java 2020-01-27 09:45:24 UTC (rev 410) @@ -31,7 +31,7 @@ import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.simulator.SimulationParameter; import fr.ifremer.isisfish.simulator.sensitivity.*; -import fr.ifremer.isisfish.util.Doc; +import fr.ifremer.isisfish.annotations.Doc; import org.nuiton.j2r.types.RDataFrame; Modified: trunk/sensitivityanalysis/RandomLHS.java =================================================================== --- trunk/sensitivityanalysis/RandomLHS.java 2020-01-13 14:20:28 UTC (rev 409) +++ trunk/sensitivityanalysis/RandomLHS.java 2020-01-27 09:45:24 UTC (rev 410) @@ -33,7 +33,7 @@ import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.simulator.SimulationParameter; import fr.ifremer.isisfish.simulator.sensitivity.*; -import fr.ifremer.isisfish.util.Doc; +import fr.ifremer.isisfish.annotations.Doc; /** * Implementation of Random Latin Hypercube method using R. Modified: trunk/sensitivityanalysis/RegularExpandGrid.java =================================================================== --- trunk/sensitivityanalysis/RegularExpandGrid.java 2020-01-13 14:20:28 UTC (rev 409) +++ trunk/sensitivityanalysis/RegularExpandGrid.java 2020-01-27 09:45:24 UTC (rev 410) @@ -28,7 +28,7 @@ import fr.ifremer.isisfish.simulator.sensitivity.*; import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; -import fr.ifremer.isisfish.util.Doc; +import fr.ifremer.isisfish.annotations.Doc; import org.apache.commons.lang3.StringUtils; import org.nuiton.j2r.REngine; Modified: trunk/sensitivityanalysis/RegularFractions.java =================================================================== --- trunk/sensitivityanalysis/RegularFractions.java 2020-01-13 14:20:28 UTC (rev 409) +++ trunk/sensitivityanalysis/RegularFractions.java 2020-01-27 09:45:24 UTC (rev 410) @@ -34,7 +34,7 @@ import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.simulator.SimulationParameter; import fr.ifremer.isisfish.simulator.sensitivity.*; -import fr.ifremer.isisfish.util.Doc; +import fr.ifremer.isisfish.annotations.Doc; public class RegularFractions extends AbstractSensitivityAnalysis { Modified: trunk/sensitivityanalysis/Sobol.java =================================================================== --- trunk/sensitivityanalysis/Sobol.java 2020-01-13 14:20:28 UTC (rev 409) +++ trunk/sensitivityanalysis/Sobol.java 2020-01-27 09:45:24 UTC (rev 410) @@ -33,7 +33,7 @@ import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.simulator.SimulationParameter; -import fr.ifremer.isisfish.util.Doc; +import fr.ifremer.isisfish.annotations.Doc; import org.nuiton.j2r.types.RDataFrame; Modified: trunk/sensitivityexports/SensitivityBiomassReferenceY9.java =================================================================== --- trunk/sensitivityexports/SensitivityBiomassReferenceY9.java 2020-01-13 14:20:28 UTC (rev 409) +++ trunk/sensitivityexports/SensitivityBiomassReferenceY9.java 2020-01-27 09:45:24 UTC (rev 410) @@ -34,7 +34,7 @@ import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.types.TimeStep; -import fr.ifremer.isisfish.util.Doc; +import fr.ifremer.isisfish.annotations.Doc; import resultinfos.MatrixBiomass; public class SensitivityBiomassReferenceY9 implements SensitivityExport { Modified: trunk/sensitivityexports/SensitivityBiomassRelativeReferenceY12.java =================================================================== --- trunk/sensitivityexports/SensitivityBiomassRelativeReferenceY12.java 2020-01-13 14:20:28 UTC (rev 409) +++ trunk/sensitivityexports/SensitivityBiomassRelativeReferenceY12.java 2020-01-27 09:45:24 UTC (rev 410) @@ -34,7 +34,7 @@ import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.types.TimeStep; -import fr.ifremer.isisfish.util.Doc; +import fr.ifremer.isisfish.annotations.Doc; import resultinfos.MatrixBiomass; public class SensitivityBiomassRelativeReferenceY12 implements Modified: trunk/sensitivityexports/SensitivityBiomassRelativeY6.java =================================================================== --- trunk/sensitivityexports/SensitivityBiomassRelativeY6.java 2020-01-13 14:20:28 UTC (rev 409) +++ trunk/sensitivityexports/SensitivityBiomassRelativeY6.java 2020-01-27 09:45:24 UTC (rev 410) @@ -32,7 +32,7 @@ import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.types.TimeStep; -import fr.ifremer.isisfish.util.Doc; +import fr.ifremer.isisfish.annotations.Doc; import resultinfos.MatrixBiomass; public class SensitivityBiomassRelativeY6 implements SensitivityExport { Modified: trunk/sensitivityexports/SensitivityBiomassY3.java =================================================================== --- trunk/sensitivityexports/SensitivityBiomassY3.java 2020-01-13 14:20:28 UTC (rev 409) +++ trunk/sensitivityexports/SensitivityBiomassY3.java 2020-01-27 09:45:24 UTC (rev 410) @@ -32,7 +32,7 @@ import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.types.TimeStep; -import fr.ifremer.isisfish.util.Doc; +import fr.ifremer.isisfish.annotations.Doc; import resultinfos.MatrixBiomass; public class SensitivityBiomassY3 implements SensitivityExport { Modified: trunk/sensitivityexports/SensitivityCatchWeightReferenceY7.java =================================================================== --- trunk/sensitivityexports/SensitivityCatchWeightReferenceY7.java 2020-01-13 14:20:28 UTC (rev 409) +++ trunk/sensitivityexports/SensitivityCatchWeightReferenceY7.java 2020-01-27 09:45:24 UTC (rev 410) @@ -34,7 +34,7 @@ import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.types.TimeStep; -import fr.ifremer.isisfish.util.Doc; +import fr.ifremer.isisfish.annotations.Doc; import resultinfos.MatrixCatchWeightPerStrategyMetPerZonePop; public class SensitivityCatchWeightReferenceY7 implements SensitivityExport { Modified: trunk/sensitivityexports/SensitivityCatchWeightRelativeReferenceY10.java =================================================================== --- trunk/sensitivityexports/SensitivityCatchWeightRelativeReferenceY10.java 2020-01-13 14:20:28 UTC (rev 409) +++ trunk/sensitivityexports/SensitivityCatchWeightRelativeReferenceY10.java 2020-01-27 09:45:24 UTC (rev 410) @@ -34,7 +34,7 @@ import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.types.TimeStep; -import fr.ifremer.isisfish.util.Doc; +import fr.ifremer.isisfish.annotations.Doc; import resultinfos.MatrixCatchWeightPerStrategyMetPerZonePop; public class SensitivityCatchWeightRelativeReferenceY10 implements SensitivityExport { Modified: trunk/sensitivityexports/SensitivityCatchWeightRelativeY4.java =================================================================== --- trunk/sensitivityexports/SensitivityCatchWeightRelativeY4.java 2020-01-13 14:20:28 UTC (rev 409) +++ trunk/sensitivityexports/SensitivityCatchWeightRelativeY4.java 2020-01-27 09:45:24 UTC (rev 410) @@ -32,7 +32,7 @@ import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.types.TimeStep; -import fr.ifremer.isisfish.util.Doc; +import fr.ifremer.isisfish.annotations.Doc; import resultinfos.MatrixCatchWeightPerStrategyMetPerZonePop; public class SensitivityCatchWeightRelativeY4 implements SensitivityExport { Modified: trunk/sensitivityexports/SensitivityCatchWeightY1.java =================================================================== --- trunk/sensitivityexports/SensitivityCatchWeightY1.java 2020-01-13 14:20:28 UTC (rev 409) +++ trunk/sensitivityexports/SensitivityCatchWeightY1.java 2020-01-27 09:45:24 UTC (rev 410) @@ -32,7 +32,7 @@ import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.types.TimeStep; -import fr.ifremer.isisfish.util.Doc; +import fr.ifremer.isisfish.annotations.Doc; import resultinfos.MatrixCatchWeightPerStrategyMetPerZonePop; public class SensitivityCatchWeightY1 implements SensitivityExport { Modified: trunk/sensitivityexports/SensitivityLbarJanvierY1.java =================================================================== --- trunk/sensitivityexports/SensitivityLbarJanvierY1.java 2020-01-13 14:20:28 UTC (rev 409) +++ trunk/sensitivityexports/SensitivityLbarJanvierY1.java 2020-01-27 09:45:24 UTC (rev 410) @@ -32,7 +32,7 @@ import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.types.TimeStep; -import fr.ifremer.isisfish.util.Doc; +import fr.ifremer.isisfish.annotations.Doc; import resultinfos.MatrixLbar; public class SensitivityLbarJanvierY1 implements SensitivityExport { Modified: trunk/sensitivityexports/SensitivityRecruitmentY1.java =================================================================== --- trunk/sensitivityexports/SensitivityRecruitmentY1.java 2020-01-13 14:20:28 UTC (rev 409) +++ trunk/sensitivityexports/SensitivityRecruitmentY1.java 2020-01-27 09:45:24 UTC (rev 410) @@ -32,7 +32,7 @@ import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.types.TimeStep; -import fr.ifremer.isisfish.util.Doc; +import fr.ifremer.isisfish.annotations.Doc; import resultinfos.MatrixRecruitment; public class SensitivityRecruitmentY1 implements SensitivityExport { Modified: trunk/sensitivityexports/SensitivitySpawningBiomassReferenceY8.java =================================================================== --- trunk/sensitivityexports/SensitivitySpawningBiomassReferenceY8.java 2020-01-13 14:20:28 UTC (rev 409) +++ trunk/sensitivityexports/SensitivitySpawningBiomassReferenceY8.java 2020-01-27 09:45:24 UTC (rev 410) @@ -27,7 +27,7 @@ import fr.ifremer.isisfish.entities.PopulationGroup; import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.types.TimeStep; -import fr.ifremer.isisfish.util.Doc; +import fr.ifremer.isisfish.annotations.Doc; import resultinfos.MatrixBiomass; import org.apache.commons.logging.Log; Modified: trunk/sensitivityexports/SensitivitySpawningBiomassRelativeReferenceY11.java =================================================================== --- trunk/sensitivityexports/SensitivitySpawningBiomassRelativeReferenceY11.java 2020-01-13 14:20:28 UTC (rev 409) +++ trunk/sensitivityexports/SensitivitySpawningBiomassRelativeReferenceY11.java 2020-01-27 09:45:24 UTC (rev 410) @@ -27,7 +27,7 @@ import fr.ifremer.isisfish.entities.PopulationGroup; import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.types.TimeStep; -import fr.ifremer.isisfish.util.Doc; +import fr.ifremer.isisfish.annotations.Doc; import resultinfos.MatrixBiomass; import org.apache.commons.logging.Log; Modified: trunk/sensitivityexports/SensitivitySpawningBiomassRelativeY5.java =================================================================== --- trunk/sensitivityexports/SensitivitySpawningBiomassRelativeY5.java 2020-01-13 14:20:28 UTC (rev 409) +++ trunk/sensitivityexports/SensitivitySpawningBiomassRelativeY5.java 2020-01-27 09:45:24 UTC (rev 410) @@ -27,7 +27,7 @@ import fr.ifremer.isisfish.entities.PopulationGroup; import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.types.TimeStep; -import fr.ifremer.isisfish.util.Doc; +import fr.ifremer.isisfish.annotations.Doc; import resultinfos.MatrixBiomass; import org.apache.commons.logging.Log; Modified: trunk/sensitivityexports/SensitivitySpawningBiomassY2.java =================================================================== --- trunk/sensitivityexports/SensitivitySpawningBiomassY2.java 2020-01-13 14:20:28 UTC (rev 409) +++ trunk/sensitivityexports/SensitivitySpawningBiomassY2.java 2020-01-27 09:45:24 UTC (rev 410) @@ -27,7 +27,7 @@ import fr.ifremer.isisfish.entities.PopulationGroup; import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.types.TimeStep; -import fr.ifremer.isisfish.util.Doc; +import fr.ifremer.isisfish.annotations.Doc; import resultinfos.MatrixBiomass; import org.apache.commons.logging.Log; Modified: trunk/simulationplans/CalibrationSimplexePasVariable2Capturabilite.java =================================================================== --- trunk/simulationplans/CalibrationSimplexePasVariable2Capturabilite.java 2020-01-13 14:20:28 UTC (rev 409) +++ trunk/simulationplans/CalibrationSimplexePasVariable2Capturabilite.java 2020-01-27 09:45:24 UTC (rev 410) @@ -40,7 +40,7 @@ import fr.ifremer.isisfish.entities.PopulationGroup; import fr.ifremer.isisfish.simulator.SimulationPlan; import fr.ifremer.isisfish.simulator.SimulationPlanContext; -import fr.ifremer.isisfish.util.Doc; +import fr.ifremer.isisfish.annotations.Doc; import fr.ifremer.isisfish.util.ScriptUtil; import resultinfos.MatrixCatchWeightPerStrategyMetPerZonePop; Modified: trunk/simulationplans/SimulationNumberRestriction.java =================================================================== --- trunk/simulationplans/SimulationNumberRestriction.java 2020-01-13 14:20:28 UTC (rev 409) +++ trunk/simulationplans/SimulationNumberRestriction.java 2020-01-27 09:45:24 UTC (rev 410) @@ -27,7 +27,7 @@ import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.simulator.SimulationPlanContext; import fr.ifremer.isisfish.simulator.SimulationPlanIndependent; -import fr.ifremer.isisfish.util.Doc; +import fr.ifremer.isisfish.annotations.Doc; /** * ExempleSimulationsIndependantes.java

1 0

r409 - in trunk: . objectives
by echatellier＠users.forge.codelutin.com 13 Jan '20

13 Jan '20

Author: echatellier Date: 2020-01-13 15:20:28 +0100 (Mon, 13 Jan 2020) New Revision: 409 Url: http://forge.codelutin.com/projects/isis-fish-data/repository/revisions/409 Log: #9225: Dans la m?\195?\169thode "Objective.eval" Ajouter 2?\195?\168me param?\195?\168tre SimulationStorage Modified: trunk/objectives/ObjectiveIterationCount.java trunk/pom.xml Modified: trunk/objectives/ObjectiveIterationCount.java =================================================================== --- trunk/objectives/ObjectiveIterationCount.java 2019-11-19 15:13:10 UTC (rev 408) +++ trunk/objectives/ObjectiveIterationCount.java 2020-01-13 14:20:28 UTC (rev 409) @@ -59,11 +59,12 @@ * Effectue une evaluation entre les exports et les observations. * * @param context optimization context + * @param simulation current simulation * @param exports exports - * @param observation observation + * @param observations observation * @return double value */ - public double eval(OptimizationContext context, List<MatrixND> exports, List<MatrixND> observations) { + public double eval(OptimizationContext context, SimulationStorage simulation, List<MatrixND> exports, List<MatrixND> observations) { double result = 0; if (context.getCurrentGeneration() == param_iterationCount - 1) { // because starts at 0 result = -1; Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2019-11-19 15:13:10 UTC (rev 408) +++ trunk/pom.xml 2020-01-13 14:20:28 UTC (rev 409) @@ -65,7 +65,7 @@ <dependency> <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.4.2.0-SNAPSHOT</version> + <version>4.5.0.0-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies>

1 0