Isis-fish-data-commits

Download

isis-fish-data-commits@list.isis-fish.org

February 2016

1 participants
1 discussions

r382 - in trunk: exports rules scripts simulationplans simulators
by echatellier＠users.forge.codelutin.com 12 Feb '16

12 Feb '16

Author: echatellier Date: 2016-02-12 11:12:36 +0100 (Fri, 12 Feb 2016) New Revision: 382 Url: http://forge.codelutin.com/projects/isis-fish-data/repository/revisions/382 Log: Fix javadoc on java 8 Modified: trunk/exports/Abundances.java trunk/exports/Biomasses.java trunk/exports/CapturesNombre.java trunk/exports/CapturesNombreStrategies.java trunk/exports/CapturesPoids.java trunk/exports/CapturesPoidsStrategies.java trunk/exports/CellsDefinition.java trunk/exports/EffortsMetier.java trunk/exports/Lbar.java trunk/exports/MetierZone.java trunk/exports/NonActivite.java trunk/exports/OwnerMargin.java trunk/exports/Recruitment.java trunk/exports/RegionDefinition.java trunk/exports/RejetsNombre.java trunk/exports/RejetsPoids.java trunk/exports/VesselMargin.java trunk/exports/ZonesDefinition.java trunk/rules/Cantonnement.java trunk/rules/CantonnementPreSimu.java trunk/rules/ChangementParamControlablePresimu.java trunk/rules/EffortReduction.java trunk/rules/GraviteVPUE1.java trunk/rules/InterdictionEngin.java trunk/rules/InterdictionEnginPreSimu.java trunk/rules/TACpoids.java trunk/scripts/ObjectiveFunctionBaranov.java trunk/scripts/RuleUtil.java trunk/simulationplans/SimulationNumberRestriction.java trunk/simulators/DefaultSimulator.java Modified: trunk/exports/Abundances.java =================================================================== --- trunk/exports/Abundances.java 2016-01-18 09:39:47 UTC (rev 381) +++ trunk/exports/Abundances.java 2016-02-12 10:12:36 UTC (rev 382) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2015 Ifremer, CodeLutin, Chatellier Eric + * Copyright (C) 2006 - 2016 Ifremer, CodeLutin, 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 @@ -39,7 +39,7 @@ * * Created: 1 septembre 2006 * - * @author anonymous <anonymous(a)labs.libre-entreprise.org> + * @author anonymous <anonymous(a)labs.libre-entreprise.org> * @version $Revision: 1.3 $ * * Last update: $Date: 2007-05-24 09:30:07 $ Modified: trunk/exports/Biomasses.java =================================================================== --- trunk/exports/Biomasses.java 2016-01-18 09:39:47 UTC (rev 381) +++ trunk/exports/Biomasses.java 2016-02-12 10:12:36 UTC (rev 382) @@ -39,7 +39,7 @@ * * Created: 23 novembre 2006 * - * @author anonymous <anonymous(a)labs.libre-entreprise.org> + * @author anonymous <anonymous(a)labs.libre-entreprise.org> * @version $Revision: 1.3 $ * * Last update: $Date: 2007-05-24 09:30:07 $ Modified: trunk/exports/CapturesNombre.java =================================================================== --- trunk/exports/CapturesNombre.java 2016-01-18 09:39:47 UTC (rev 381) +++ trunk/exports/CapturesNombre.java 2016-02-12 10:12:36 UTC (rev 382) @@ -43,7 +43,7 @@ * Export des captures en nombre de la forme : * Population ; Métier ; Groupe ; Zone ; Pas de temps ; Valeur * - * @author anonymous <anonymous(a)labs.libre-entreprise.org> + * @author anonymous <anonymous(a)labs.libre-entreprise.org> * @version $Revision: 1.4 $ * * Last update: $Date: 2007-05-24 09:30:07 $ by : $Author: bpoussin $ Modified: trunk/exports/CapturesNombreStrategies.java =================================================================== --- trunk/exports/CapturesNombreStrategies.java 2016-01-18 09:39:47 UTC (rev 381) +++ trunk/exports/CapturesNombreStrategies.java 2016-02-12 10:12:36 UTC (rev 382) @@ -44,7 +44,7 @@ * Export des captures en nombre de la forme : * Population ; Stratégie ; Métier ; Groupe ; Zone ; Pas de temps ; Valeur * - * @author anonymous <anonymous(a)labs.libre-entreprise.org> + * @author anonymous <anonymous(a)labs.libre-entreprise.org> * @version $Revision: 1.4 $ * * Last update: $Date: 2007-05-24 09:30:07 $ by : $Author: bpoussin $ Modified: trunk/exports/CapturesPoids.java =================================================================== --- trunk/exports/CapturesPoids.java 2016-01-18 09:39:47 UTC (rev 381) +++ trunk/exports/CapturesPoids.java 2016-02-12 10:12:36 UTC (rev 382) @@ -43,7 +43,7 @@ * Export des captures en poids de la forme : * Population ; Métier ; Groupe ; Zone ; Pas de temps ; Valeur * - * @author anonymous <anonymous(a)labs.libre-entreprise.org> + * @author anonymous <anonymous(a)labs.libre-entreprise.org> * @version $Revision: 1.4 $ * * Last update: $Date: 2007-05-24 09:30:07 $ by : $Author: bpoussin $ Modified: trunk/exports/CapturesPoidsStrategies.java =================================================================== --- trunk/exports/CapturesPoidsStrategies.java 2016-01-18 09:39:47 UTC (rev 381) +++ trunk/exports/CapturesPoidsStrategies.java 2016-02-12 10:12:36 UTC (rev 382) @@ -44,7 +44,7 @@ * Export des captures en poids de la forme : * Population ; Stratégie ; Métier ; Groupe ; Zone ; Pas de temps ; Valeur * - * @author anonymous <anonymous(a)labs.libre-entreprise.org> + * @author anonymous <anonymous(a)labs.libre-entreprise.org> * @version $Revision: 1.4 $ * * Last update: $Date: 2007-05-24 09:30:07 $ by : $Author: bpoussin $ Modified: trunk/exports/CellsDefinition.java =================================================================== --- trunk/exports/CellsDefinition.java 2016-01-18 09:39:47 UTC (rev 381) +++ trunk/exports/CellsDefinition.java 2016-02-12 10:12:36 UTC (rev 382) @@ -37,7 +37,7 @@ * * Created: 17 janvier 2007 * - * @author bpoussin <bpoussin(a)labs.libre-entreprise.org> + * @author bpoussin <bpoussin(a)labs.libre-entreprise.org> * @version $Revision: 1.2 $ * * Last update: $Date: 2007-05-24 09:30:07 $ Modified: trunk/exports/EffortsMetier.java =================================================================== --- trunk/exports/EffortsMetier.java 2016-01-18 09:39:47 UTC (rev 381) +++ trunk/exports/EffortsMetier.java 2016-02-12 10:12:36 UTC (rev 382) @@ -39,7 +39,7 @@ * * Created: 23 novembre 2006 * - * @author anonymous <anonymous(a)labs.libre-entreprise.org> + * @author anonymous <anonymous(a)labs.libre-entreprise.org> * @version $Revision: 1.3 $ * * Last update: $Date: 2007-05-24 09:30:07 $ Modified: trunk/exports/Lbar.java =================================================================== --- trunk/exports/Lbar.java 2016-01-18 09:39:47 UTC (rev 381) +++ trunk/exports/Lbar.java 2016-02-12 10:12:36 UTC (rev 382) @@ -39,7 +39,7 @@ * * Created: 03/2015 * - * @author lgasche <anonymous(a)labs.libre-entreprise.org> + * @author lgasche <anonymous(a)labs.libre-entreprise.org> * @version $Revision$ */ public class Lbar implements Export { Modified: trunk/exports/MetierZone.java =================================================================== --- trunk/exports/MetierZone.java 2016-01-18 09:39:47 UTC (rev 381) +++ trunk/exports/MetierZone.java 2016-02-12 10:12:36 UTC (rev 382) @@ -38,7 +38,7 @@ * * Created: 17 janvier 2007 * - * @author bpoussin <bpoussin(a)labs.libre-entreprise.org> + * @author bpoussin <bpoussin(a)labs.libre-entreprise.org> * @version $Revision: 1.3 $ * * Last update: $Date: 2007-05-24 09:30:07 $ Modified: trunk/exports/NonActivite.java =================================================================== --- trunk/exports/NonActivite.java 2016-01-18 09:39:47 UTC (rev 381) +++ trunk/exports/NonActivite.java 2016-02-12 10:12:36 UTC (rev 382) @@ -39,7 +39,7 @@ * * Created: 23 novembre 2006 * - * @author anonymous <anonymous(a)labs.libre-entreprise.org> + * @author anonymous <anonymous(a)labs.libre-entreprise.org> * @version $Revision: 1.3 $ * * Last update: $Date: 2007-05-24 09:30:07 $ Modified: trunk/exports/OwnerMargin.java =================================================================== --- trunk/exports/OwnerMargin.java 2016-01-18 09:39:47 UTC (rev 381) +++ trunk/exports/OwnerMargin.java 2016-02-12 10:12:36 UTC (rev 382) @@ -39,7 +39,7 @@ * * Created: 23 novembre 2006 * - * @author anonymous <anonymous(a)labs.libre-entreprise.org> + * @author anonymous <anonymous(a)labs.libre-entreprise.org> * @version $Revision: 1.3 $ * * Last update: $Date: 2007-05-24 09:30:07 $ Modified: trunk/exports/Recruitment.java =================================================================== --- trunk/exports/Recruitment.java 2016-01-18 09:39:47 UTC (rev 381) +++ trunk/exports/Recruitment.java 2016-02-12 10:12:36 UTC (rev 382) @@ -39,7 +39,7 @@ * * Created: 03/2015 * - * @author lgasche <anonymous(a)labs.libre-entreprise.org> + * @author lgasche <anonymous(a)labs.libre-entreprise.org> * @version $Revision$ */ public class Recruitment implements Export { Modified: trunk/exports/RegionDefinition.java =================================================================== --- trunk/exports/RegionDefinition.java 2016-01-18 09:39:47 UTC (rev 381) +++ trunk/exports/RegionDefinition.java 2016-02-12 10:12:36 UTC (rev 382) @@ -37,7 +37,7 @@ * * Created: 17 janvier 2007 * - * @author bpoussin <bpoussin(a)labs.libre-entreprise.org> + * @author bpoussin <bpoussin(a)labs.libre-entreprise.org> * @version $Revision: 1.3 $ * * Last update: $Date: 2007-05-24 10:05:22 $ Modified: trunk/exports/RejetsNombre.java =================================================================== --- trunk/exports/RejetsNombre.java 2016-01-18 09:39:47 UTC (rev 381) +++ trunk/exports/RejetsNombre.java 2016-02-12 10:12:36 UTC (rev 382) @@ -42,7 +42,7 @@ * * Created: 23 novembre 2006 * - * @author anonymous <anonymous(a)labs.libre-entreprise.org> + * @author anonymous <anonymous(a)labs.libre-entreprise.org> * @version $Revision: 1.4 $ * * Last update: $Date: 2007-05-24 09:30:07 $ by : $Author: bpoussin $ Modified: trunk/exports/RejetsPoids.java =================================================================== --- trunk/exports/RejetsPoids.java 2016-01-18 09:39:47 UTC (rev 381) +++ trunk/exports/RejetsPoids.java 2016-02-12 10:12:36 UTC (rev 382) @@ -42,7 +42,7 @@ * * Created: 23 novembre 2006 * - * @author anonymous <anonymous(a)labs.libre-entreprise.org> + * @author anonymous <anonymous(a)labs.libre-entreprise.org> * @version $Revision: 1.4 $ * * Last update: $Date: 2007-05-24 09:30:07 $ by : $Author: bpoussin $ Modified: trunk/exports/VesselMargin.java =================================================================== --- trunk/exports/VesselMargin.java 2016-01-18 09:39:47 UTC (rev 381) +++ trunk/exports/VesselMargin.java 2016-02-12 10:12:36 UTC (rev 382) @@ -39,7 +39,7 @@ * * Created: 23 novembre 2006 * - * @author anonymous <anonymous(a)labs.libre-entreprise.org> + * @author anonymous <anonymous(a)labs.libre-entreprise.org> * @version $Revision: 1.3 $ * * Last update: $Date: 2007-05-24 09:30:07 $ Modified: trunk/exports/ZonesDefinition.java =================================================================== --- trunk/exports/ZonesDefinition.java 2016-01-18 09:39:47 UTC (rev 381) +++ trunk/exports/ZonesDefinition.java 2016-02-12 10:12:36 UTC (rev 382) @@ -39,7 +39,7 @@ * * Created: 17 janvier 2007 * - * @author bpoussin <bpoussin(a)labs.libre-entreprise.org> + * @author bpoussin <bpoussin(a)labs.libre-entreprise.org> * @version $Revision: 1.2 $ * * Last update: $Date: 2007-05-24 09:30:07 $ Modified: trunk/rules/Cantonnement.java =================================================================== --- trunk/rules/Cantonnement.java 2016-01-18 09:39:47 UTC (rev 381) +++ trunk/rules/Cantonnement.java 2016-02-12 10:12:36 UTC (rev 382) @@ -52,7 +52,7 @@ * * Created: 30 novembre 2006 * - * @author anonymous <anonymous(a)labs.libre-entreprise.org> + * @author anonymous <anonymous(a)labs.libre-entreprise.org> * @version $Revision: 1.5 $ * * Last update: $Date: 2007-11-02 17:41:41 $ Modified: trunk/rules/CantonnementPreSimu.java =================================================================== --- trunk/rules/CantonnementPreSimu.java 2016-01-18 09:39:47 UTC (rev 381) +++ trunk/rules/CantonnementPreSimu.java 2016-02-12 10:12:36 UTC (rev 382) @@ -50,7 +50,7 @@ * * Created: 30 novembre 2006 * - * @author anonymous <anonymous(a)labs.libre-entreprise.org> + * @author anonymous <anonymous(a)labs.libre-entreprise.org> * @version $Revision: 1.2 $ * * Last update: $Date: 2007-01-24 18:25:34 $ Modified: trunk/rules/ChangementParamControlablePresimu.java =================================================================== --- trunk/rules/ChangementParamControlablePresimu.java 2016-01-18 09:39:47 UTC (rev 381) +++ trunk/rules/ChangementParamControlablePresimu.java 2016-02-12 10:12:36 UTC (rev 382) @@ -53,7 +53,7 @@ * * Created: 30 novembre 2006 * - * @author anonymous <anonymous(a)labs.libre-entreprise.org> + * @author anonymous <anonymous(a)labs.libre-entreprise.org> * @version $Revision: 1.1 $ * * Last update: $Date: 2007-01-24 18:25:34 $ Modified: trunk/rules/EffortReduction.java =================================================================== --- trunk/rules/EffortReduction.java 2016-01-18 09:39:47 UTC (rev 381) +++ trunk/rules/EffortReduction.java 2016-02-12 10:12:36 UTC (rev 382) @@ -39,7 +39,7 @@ * * Created: 3 septembre 2008 * - * @author anonymous <anonymous(a)labs.libre-entreprise.org> + * @author anonymous <anonymous(a)labs.libre-entreprise.org> * @version $Revision$ */ public class EffortReduction extends AbstractRule { Modified: trunk/rules/GraviteVPUE1.java =================================================================== --- trunk/rules/GraviteVPUE1.java 2016-01-18 09:39:47 UTC (rev 381) +++ trunk/rules/GraviteVPUE1.java 2016-02-12 10:12:36 UTC (rev 382) @@ -46,7 +46,7 @@ * * Created: 26 aout 2008 * - * @author anonymous <anonymous(a)labs.libre-entreprise.org> + * @author anonymous <anonymous(a)labs.libre-entreprise.org> * @version $Revision$ * * Last update: $Date$ Modified: trunk/rules/InterdictionEngin.java =================================================================== --- trunk/rules/InterdictionEngin.java 2016-01-18 09:39:47 UTC (rev 381) +++ trunk/rules/InterdictionEngin.java 2016-02-12 10:12:36 UTC (rev 382) @@ -47,7 +47,7 @@ * * Created: 30 novembre 2006 * - * @author anonymous <anonymous(a)labs.libre-entreprise.org> + * @author anonymous <anonymous(a)labs.libre-entreprise.org> * @version $Revision: 1.1 $ * * Last update: $Date: 2007-01-24 18:25:34 $ Modified: trunk/rules/InterdictionEnginPreSimu.java =================================================================== --- trunk/rules/InterdictionEnginPreSimu.java 2016-01-18 09:39:47 UTC (rev 381) +++ trunk/rules/InterdictionEnginPreSimu.java 2016-02-12 10:12:36 UTC (rev 382) @@ -48,7 +48,7 @@ * * Created: 30 novembre 2006 * - * @author anonymous <anonymous(a)labs.libre-entreprise.org> + * @author anonymous <anonymous(a)labs.libre-entreprise.org> * @version $Revision: 1.1 $ * * Last update: $Date: 2007-01-24 18:25:34 $ Modified: trunk/rules/TACpoids.java =================================================================== --- trunk/rules/TACpoids.java 2016-01-18 09:39:47 UTC (rev 381) +++ trunk/rules/TACpoids.java 2016-02-12 10:12:36 UTC (rev 382) @@ -53,14 +53,16 @@ * TAC peut-etre utilise pour les differents TAC, en proportion des effectifs * et/ou avec survie ou non. * + * <ul> * <li>Pour utiliser le tac proportionnel, il faut mettre dans le parametre - * propTac une valeur > 0, le TAC sera alors recalcule a chaque mois de janvier. + * propTac une valeur > 0, le TAC sera alors recalcule a chaque mois de janvier.</li> * <li>Pour utiliser la survie il faut mettre dans le parametre propSurvie une - * valeur > 0, automatiquement les suvie seront ajoute aux effectifs + * valeur > 0, automatiquement les suvie seront ajoute aux effectifs</li> + * </ul> * * Created: 7 septembre 2006 * - * @author anonymous <anonymous(a)labs.libre-entreprise.org> + * @author anonymous <anonymous(a)labs.libre-entreprise.org> * @version $Revision: 1.3 $ * * Last update: $Date: 290607 $ Modified: trunk/scripts/ObjectiveFunctionBaranov.java =================================================================== --- trunk/scripts/ObjectiveFunctionBaranov.java 2016-01-18 09:39:47 UTC (rev 381) +++ trunk/scripts/ObjectiveFunctionBaranov.java 2016-02-12 10:12:36 UTC (rev 382) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2012, 2014 Ifremer, CodeLutin, lgasche + * Copyright (C) 2012, 2016 Ifremer, CodeLutin, lgasche * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -29,7 +29,7 @@ * * Created: 10 aout 2012 * - * @author lgasche <user.name(a)vcs.hostName> + * @author lgasche <user.name(a)vcs.hostName> * @version $Revision$ * * Last update: $Date$ Modified: trunk/scripts/RuleUtil.java =================================================================== --- trunk/scripts/RuleUtil.java 2016-01-18 09:39:47 UTC (rev 381) +++ trunk/scripts/RuleUtil.java 2016-02-12 10:12:36 UTC (rev 382) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2014 Ifremer, CodeLutin, Chatellier Eric + * Copyright (C) 2006 - 2016 Ifremer, CodeLutin, 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 @@ -38,7 +38,7 @@ * * Created: 6 septembre 2006 * - * @author anonymous <anonymous(a)labs.libre-entreprise.org> + * @author anonymous <anonymous(a)labs.libre-entreprise.org> * @version $Revision: 1.3 $ * * Last update: $Date: 2007-11-20 15:51:05 $ Modified: trunk/simulationplans/SimulationNumberRestriction.java =================================================================== --- trunk/simulationplans/SimulationNumberRestriction.java 2016-01-18 09:39:47 UTC (rev 381) +++ trunk/simulationplans/SimulationNumberRestriction.java 2016-02-12 10:12:36 UTC (rev 382) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2014 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 @@ -34,7 +34,7 @@ * * Created: 2 mars 2007 * - * @author bpoussin <bpoussin(a)labs.libre-entreprise.org> + * @author bpoussin <bpoussin(a)labs.libre-entreprise.org> * @version $Revision: 1.2 $ * * Last update: $Date: 2007-03-09 15:27:21 $ by : $Author: bpoussin $ Modified: trunk/simulators/DefaultSimulator.java =================================================================== --- trunk/simulators/DefaultSimulator.java 2016-01-18 09:39:47 UTC (rev 381) +++ trunk/simulators/DefaultSimulator.java 2016-02-12 10:12:36 UTC (rev 382) @@ -74,6 +74,7 @@ * overwrite this method to return you SiMatrix version * @param context * @return + * @throws TopiaException */ protected SiMatrix newSiMatrix(SimulationContext context) throws TopiaException { return new SiMatrix(context); @@ -85,6 +86,8 @@ * @param context * @param siMatrix * @return + * @throws TopiaException + * @throws StorageException */ protected GravityModel newGravityModel(SimulationContext context, SiMatrix siMatrix) throws TopiaException, StorageException { return new GravityModel(context, siMatrix);

1 0