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

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

26 Feb '08

Author: tchemit Date: 2008-02-26 22:13:37 +0000 (Tue, 26 Feb 2008) New Revision: 39 Modified: trunk/scripts/ResultName.java Log: #1605 : add import and annotation Doc on results Modified: trunk/scripts/ResultName.java =================================================================== --- trunk/scripts/ResultName.java 2008-02-26 22:11:27 UTC (rev 38) +++ trunk/scripts/ResultName.java 2008-02-26 22:13:37 UTC (rev 39) @@ -33,6 +33,8 @@ import static org.codelutin.i18n.I18n.n_; +import fr.ifremer.isisfish.util.Doc; // pour pouvoir afficher une aide contextuelle (BUG#1605) + /** * Contient l'ensemble des noms des differents resultats. Le mieux lorsque l'on * veut un nouveau r�sultat est d'ajouter une constante ici, et de l'utiliser @@ -49,48 +51,81 @@ * @author poussin */ public class ResultName { + @Doc(value = "do the doc of Result matrixDiscardsWeightPerStrMet") + static final public String MATRIX_DISCARDS_WEIGHT_PER_STR_MET = n_("matrixDiscardsWeightPerStrMet"); - static final public String MATRIX_DISCARDS_WEIGHT_PER_STR_MET = n_("matrixDiscardsWeightPerStrMet"); - + @Doc(value = "do the doc of Result matrixDiscardsPerStrMet") static final public String MATRIX_DISCARDS_PER_STR_MET = n_("matrixDiscardsPerStrMet"); + @Doc(value = "do the doc of Result matrixLandingPerMet") static final public String MATRIX_LANDING_PER_MET = n_("matrixLandingPerMet"); + @Doc(value = "do the doc of Result matrixEffortPerStrategyMet") static final public String MATRIX_EFFORT_PER_STRATEGY_MET = n_("matrixEffortPerStrategyMet"); + @Doc(value = "do the doc of Result matrixStdTravelEffortPerStrategyMet") static final public String MATRIX_STD_TRAVEL_EFFORT_PER_STRATEGY_MET = n_("matrixStdTravelEffortPerStrategyMet"); + @Doc(value = "do the doc of Result matrixEffortPerZonePop") static final public String MATRIX_EFFORT_PER_ZONE_POP = n_("matrixEffortPerZonePop"); + @Doc(value = "do the doc of Result matrixCatchRatePerStrategyMet") static final public String MATRIX_CATCH_RATE_PER_STRATEGY_MET = n_("matrixCatchRatePerStrategyMet"); + @Doc(value = "do the doc of Result matrixCatchPerStrategyMet") static final public String MATRIX_CATCH_PER_STRATEGY_MET = n_("matrixCatchPerStrategyMet"); + @Doc(value = "do the doc of Result matrixFishingMortality") static final public String MATRIX_FISHING_MORTALITY = n_("matrixFishingMortality"); + @Doc(value = "do the doc of Result matrixCatchWeightPerStrategyMet") static final public String MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET = n_("matrixCatchWeightPerStrategyMet"); + @Doc(value = "do the doc of Result matrixAbundance") static final public String MATRIX_ABUNDANCE = n_("matrixAbundance"); + @Doc(value = "do the doc of Result matrixBiomass") static final public String MATRIX_BIOMASS = n_("matrixBiomass"); + @Doc(value = "do the doc of Result matrixFishingTimePerMonthPerVessel") static final public String MATRIX_FISHING_TIME_PER_MONTH_PER_VESSEL = n_("matrixFishingTimePerMonthPerVessel"); + @Doc(value = "do the doc of Result matrixFuelCostsOfTravelPerVessel") static final public String MATRIX_FUEL_COSTS_OF_TRAVEL_PER_VESSEL = n_("matrixFuelCostsOfTravelPerVessel"); + @Doc(value = "do the doc of Result matrixCostsOfFishingPerVessel") static final public String MATRIX_COSTS_OF_FISHING_PER_VESSEL = n_("matrixCostsOfFishingPerVessel"); + @Doc(value = "do the doc of Result matrixFuelCostsPerVessel") static final public String MATRIX_FUEL_COSTS_PER_VESSEL = n_("matrixFuelCostsPerVessel"); + @Doc(value = "do the doc of Result matrixRepairAndMaintenanceGearCostsPerVessel") static final public String MATRIX_REPAIR_AND_MAINTENANCE_GEAR_COSTS_PER_VESSEL = n_("matrixRepairAndMaintenanceGearCostsPerVessel"); + @Doc(value = "do the doc of Result matrixOtherRunningCostsPerVessel") static final public String MATRIX_OTHER_RUNNING_COSTS_PER_VESSEL = n_("matrixOtherRunningCostsPerVessel"); + @Doc(value = "do the doc of Result matrixSharedNotFixedCostsPerVessel") static final public String MATRIX_SHARED_NOT_FIXED_COSTS_PER_VESSEL = n_("matrixSharedNotFixedCostsPerVessel"); // static final public String MATRIX_SHARED_FIXED_COSTS_PER_VESSEL_PER_MET = n_("matrixSharedFixedCostsPerVesselPerMet"); + @Doc(value = "do the doc of Result matrixGrossValueOfLandingsPerSpeciesPerStrategyMet") static final public String MATRIX_GROSS_VALUE_OF_LANDINGS_PER_SPECIES_PER_STRATEGY_MET = n_("matrixGrossValueOfLandingsPerSpeciesPerStrategyMet"); + @Doc(value = "do the doc of Result matrixGrossValueOfLandingsPerStrategyMet") static final public String MATRIX_GROSS_VALUE_OF_LANDINGS_PER_STRATEGY_MET = n_("matrixGrossValueOfLandingsPerStrategyMet"); + @Doc(value = "do the doc of Result matrixGrossValueOfLandingsPerStrategyMetPerVessel") static final public String MATRIX_GROSS_VALUE_OF_LANDINGS_PER_STRATEGY_MET_PER_VESSEL = n_("matrixGrossValueOfLandingsPerStrategyMetPerVessel"); + @Doc(value = "do the doc of Result matrixNetValueOfLandingsPerStrategyMet") static final public String MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET = n_("matrixNetValueOfLandingsPerStrategyMet"); + @Doc(value = "do the doc of Result matrixNetValueOfLandingsPerStrategyMetPerVessel") static final public String MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET_PER_VESSEL = n_("matrixNetValueOfLandingsPerStrategyMetPerVessel"); + @Doc(value = "do the doc of Result matrixNetRenevueToSharePerStrategyMetPerVessel") static final public String MATRIX_NET_RENEVUE_TO_SHARE_PER_STRATEGY_MET_PER_VESSEL = n_("matrixNetRenevueToSharePerStrategyMetPerVessel"); + @Doc(value = "do the doc of Result matrixCrewSharePerStrategyPerVessel") static final public String MATRIX_CREW_SHARE_PER_STRATEGY_MET_PER_VESSEL = n_("matrixCrewSharePerStrategyPerVessel"); + @Doc(value = "do the doc of Result matrixOwnerMarginOverVariableCostsPerStrategyMetPerVessel") static final public String MATRIX_OWNER_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY_MET_PER_VESSEL = n_("matrixOwnerMarginOverVariableCostsPerStrategyMetPerVessel"); + @Doc(value = "do the doc of Result matrixVesselMarginOverVariableCostsPerStrategyMetPerVessel") static final public String MATRIX_VESSEL_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY_MET_PER_VESSEL = n_("matrixVesselMarginOverVariableCostsPerStrategyMetPerVessel"); + @Doc(value = "do the doc of Result matrixOwnerMarginOverVariableCostsPerStrategyPerVessel") static final public String MATRIX_OWNER_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY_PER_VESSEL = n_("matrixOwnerMarginOverVariableCostsPerStrategyPerVessel"); + @Doc(value = "do the doc of Result matrixOwnerMarginOverVariableCostsPerStrategy") static final public String MATRIX_OWNER_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY = n_("matrixOwnerMarginOverVariableCostsPerStrategy"); + @Doc(value = "do the doc of Result matrixVesselMarginOverVariableCostsPerStrategyPerVessel") static final public String MATRIX_VESSEL_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY_PER_VESSEL = n_("matrixVesselMarginOverVariableCostsPerStrategyPerVessel"); + @Doc(value = "do the doc of Result matrixVesselMarginOverVariableCostsPerStrategy") static final public String MATRIX_VESSEL_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY = n_("matrixVesselMarginOverVariableCostsPerStrategy"); + @Doc(value = "do the doc of Result matrixNoActivity") static final public String MATRIX_NO_ACTIVITY = n_("matrixNoActivity"); + @Doc(value = "do the doc of Result matrixMetierZone") static final public String MATRIX_METIER_ZONE = n_("matrixMetierZone"); + @Doc(value = "do the doc of Result matrixPrice") static final public String MATRIX_PRICE = n_("matrixPrice"); - }

1 0

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

26 Feb '08

Author: tchemit Date: 2008-02-26 22:11:27 +0000 (Tue, 26 Feb 2008) New Revision: 38 Modified: trunk/analyseplans/Max.java Log: #1605 : add import and annotation Doc on params Modified: trunk/analyseplans/Max.java =================================================================== --- trunk/analyseplans/Max.java 2008-02-26 22:11:08 UTC (rev 37) +++ trunk/analyseplans/Max.java 2008-02-26 22:11:27 UTC (rev 38) @@ -20,6 +20,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) + /** * Max.java * @@ -36,7 +38,8 @@ /** to use log facility, just put in your code: log.info("..."); */ static private Log log = LogFactory.getLog(Max.class); - public int param_max = 10; + @Doc(value="do the doc of param max") + public int param_max = 10; public String [] necessaryResult = {

1 0

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

26 Feb '08

Author: tchemit Date: 2008-02-26 22:11:08 +0000 (Tue, 26 Feb 2008) New Revision: 37 Modified: trunk/analyseplans/Calibration.java Log: #1605 : add import and annotation Doc on params Modified: trunk/analyseplans/Calibration.java =================================================================== --- trunk/analyseplans/Calibration.java 2008-02-26 22:10:44 UTC (rev 36) +++ trunk/analyseplans/Calibration.java 2008-02-26 22:11:08 UTC (rev 37) @@ -26,6 +26,7 @@ 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) /** * Calibration_bidon.java * @@ -43,14 +44,20 @@ static private Log log = LogFactory.getLog(Calibration.class); enum State {STATE_INIT, STATE_0, STATE_1, STATE_2, STATE_3, STATE_4}; - + //parametres de la simu 3 points initiaux d un simplex d ordre 2 + @Doc(value="do the doc of param Population") public Population param_Population = null; + @Doc(value="do the doc of param M1 (devient un parametre du plan d analyse)") public String param_M1 = "1e-5;1e-6";// devient un parametre du plan d analyse + @Doc(value="do the doc of param M2 (devient un parametre du plan d analyse)") public String param_M2 = "2e-4;2e-5";// devient un parametre du plan d analyse + @Doc(value="do the doc of param M3 (devient un parametre du plan d analyse)") public String param_M3 = "1e-4;1e-6";// devient un parametre du plan d analyse + @Doc(value="do the doc of param pas (devient un parametre du plan d analyse)") public String param_pas = "1e-5";// devient un parametre du plan d analyse + @Doc(value="nom + chemin du fichier contenant les debarquements observes par groupe pour la derniere annee") public String param_nomfichier_debarquements = "";//nom + chemin du fichier contenant les debarquements observes par groupe pour la derniere annee protected File debarquementsObserves;

1 0

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

26 Feb '08

Author: tchemit Date: 2008-02-26 22:10:44 +0000 (Tue, 26 Feb 2008) New Revision: 36 Modified: trunk/rules/TailleMin.java Log: #1605 : add import and annotation Doc on params Modified: trunk/rules/TailleMin.java =================================================================== --- trunk/rules/TailleMin.java 2008-02-26 22:10:23 UTC (rev 35) +++ trunk/rules/TailleMin.java 2008-02-26 22:10:44 UTC (rev 36) @@ -21,6 +21,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) + /** * TailleMin.java * @@ -41,10 +43,15 @@ /** to use log facility, just put in your code: log.info("..."); */ static private Log log = LogFactory.getLog(TailleMin.class); + @Doc(value="do the doc of param beginDate") public Date param_beginDate = new Date(0); + @Doc(value="do the doc of param endDate") public Date param_endDate = new Date(119); + @Doc(value="do the doc of param species") public Species param_species = null; + @Doc(value="do the doc of param TailleMin") public double param_TailleMin = 27; + @Doc(value="do the doc of param propSurvie") public double param_propSurvie = 0; public String [] necessaryResult = {

1 0

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

26 Feb '08

Author: tchemit Date: 2008-02-26 22:10:23 +0000 (Tue, 26 Feb 2008) New Revision: 35 Modified: trunk/rules/TACpoids.java Log: #1605 : add import and annotation Doc on params Modified: trunk/rules/TACpoids.java =================================================================== --- trunk/rules/TACpoids.java 2008-02-26 22:10:04 UTC (rev 34) +++ trunk/rules/TACpoids.java 2008-02-26 22:10:23 UTC (rev 35) @@ -30,6 +30,8 @@ import fr.ifremer.isisfish.types.Date; import fr.ifremer.isisfish.types.Month; +import fr.ifremer.isisfish.util.Doc; // pour pouvoir afficher une aide contextuelle (BUG#1605) + /** * TAC.java * @@ -57,10 +59,15 @@ /** to use log facility, just put in your code: log.info("..."); */ static private Log log = LogFactory.getLog(TACpoids.class); + @Doc(value="do the doc of param species") public Species param_species = null; + @Doc(value="do the doc of param beginDate") public Date param_beginDate = new Date(0); + @Doc(value="do the doc of param endDate") public Date param_endDate = new Date(22); + @Doc(value="do the doc of param propSurvie") public double param_propSurvie = 0; + @Doc(value="do the doc of param propTac") public double param_propTac = 0; /** TAC in tonne */

1 0

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

26 Feb '08

Author: tchemit Date: 2008-02-26 22:10:04 +0000 (Tue, 26 Feb 2008) New Revision: 34 Modified: trunk/rules/RecrutementLangoustine.java Log: #1605 : add import and annotation Doc on params Modified: trunk/rules/RecrutementLangoustine.java =================================================================== --- trunk/rules/RecrutementLangoustine.java 2008-02-26 22:09:46 UTC (rev 33) +++ trunk/rules/RecrutementLangoustine.java 2008-02-26 22:10:04 UTC (rev 34) @@ -23,6 +23,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) + /** * RecrutementLangoustine.java * @@ -39,13 +41,21 @@ /** to use log facility, just put in your code: log.info("..."); */ static private Log log = LogFactory.getLog(RecrutementLangoustine.class); + @Doc(value="do the doc of param recrut1998") public double param_recrut1998 =0; + @Doc(value="do the doc of param recrut1999") public double param_recrut1999 =0; + @Doc(value="do the doc of param recrut2000") public double param_recrut2000 =0; + @Doc(value="do the doc of param recrut2001") public double param_recrut2001 =0; + @Doc(value="do the doc of param recrut2002") public double param_recrut2002 =0; + @Doc(value="do the doc of param recrut2003") public double param_recrut2003 =0; + @Doc(value="do the doc of param recrut2004") public double param_recrut2004 =0; + @Doc(value="do the doc of param recrut2005") public double param_recrut2005 =0; public double [] recru = null;

1 0

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

26 Feb '08

Author: tchemit Date: 2008-02-26 22:09:46 +0000 (Tue, 26 Feb 2008) New Revision: 33 Modified: trunk/rules/InterdictionEnginPreSimu.java Log: #1605 : add import and annotation Doc on params Modified: trunk/rules/InterdictionEnginPreSimu.java =================================================================== --- trunk/rules/InterdictionEnginPreSimu.java 2008-02-26 22:09:23 UTC (rev 32) +++ trunk/rules/InterdictionEnginPreSimu.java 2008-02-26 22:09:46 UTC (rev 33) @@ -27,6 +27,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) + /** * InterdictionEngin.java * @@ -43,8 +45,11 @@ /** to use log facility, just put in your code: log.info("..."); */ static private Log log = LogFactory.getLog(InterdictionEnginPreSimu.class); + @Doc(value="do the doc of param gear") public Gear param_gear = null; + @Doc(value="do the doc of param beginMonth") public Month param_beginMonth = Month.JANUARY; + @Doc(value="do the doc of param endMonth") public Month param_endMonth = Month.DECEMBER; protected Map<Month, MatrixND> tableNonActivite = new HashMap<Month, MatrixND>();

1 0

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

26 Feb '08

Author: tchemit Date: 2008-02-26 22:09:23 +0000 (Tue, 26 Feb 2008) New Revision: 32 Modified: trunk/rules/InterdictionEngin.java Log: #1605 : add import and annotation Doc on params Modified: trunk/rules/InterdictionEngin.java =================================================================== --- trunk/rules/InterdictionEngin.java 2008-02-26 22:08:41 UTC (rev 31) +++ trunk/rules/InterdictionEngin.java 2008-02-26 22:09:23 UTC (rev 32) @@ -26,6 +26,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) + /** * InterdictionEngin.java * @@ -42,10 +44,15 @@ /** to use log facility, just put in your code: log.info("..."); */ static private Log log = LogFactory.getLog(InterdictionEngin.class); + @Doc(value="do the doc of param gear") public Gear param_gear = null; + @Doc(value="do the doc of param beginDate") public Date param_beginDate = new Date(0); + @Doc(value="do the doc of param endDate") public Date param_endDate = new Date(119); + @Doc(value="do the doc of param beginMonth") public Month param_beginMonth = Month.JANUARY; + @Doc(value="do the doc of param endMonth") public Month param_endMonth = Month.DECEMBER; public String [] necessaryResult = {

1 0

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

26 Feb '08

Author: tchemit Date: 2008-02-26 22:08:41 +0000 (Tue, 26 Feb 2008) New Revision: 31 Modified: trunk/rules/ChangementParamControlablePresimu.java Log: #1605 : add import and annotation Doc on params Modified: trunk/rules/ChangementParamControlablePresimu.java =================================================================== --- trunk/rules/ChangementParamControlablePresimu.java 2008-02-26 22:07:13 UTC (rev 30) +++ trunk/rules/ChangementParamControlablePresimu.java 2008-02-26 22:08:41 UTC (rev 31) @@ -24,6 +24,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) + /** * TailleMin.java * @@ -40,10 +42,15 @@ /** to use log facility, just put in your code: log.info("..."); */ static private Log log = LogFactory.getLog(ChangementParamControlablePresimu.class); + @Doc(value="do the doc of param zone") public Zone param_zone = null; + @Doc(value="do the doc of param gear") public Gear param_gear = null; + @Doc(value="do the doc of param beginMonth") public Month param_beginMonth = Month.JANUARY; + @Doc(value="do the doc of param endMonth") public Month param_endMonth = Month.DECEMBER; + @Doc(value="do the doc of param newParamValue") public String param_newParamValue = "80"; public String [] necessaryResult = {

1 0

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

26 Feb '08

Author: tchemit Date: 2008-02-26 22:07:13 +0000 (Tue, 26 Feb 2008) New Revision: 30 Modified: trunk/rules/CantonnementPreSimu.java Log: #1605 : add import and annotation Doc on params Modified: trunk/rules/CantonnementPreSimu.java =================================================================== --- trunk/rules/CantonnementPreSimu.java 2008-02-26 22:06:16 UTC (rev 29) +++ trunk/rules/CantonnementPreSimu.java 2008-02-26 22:07:13 UTC (rev 30) @@ -28,6 +28,8 @@ import fr.ifremer.isisfish.entities.*; import fr.ifremer.isisfish.rule.AbstractRule; +import fr.ifremer.isisfish.util.Doc; // pour pouvoir afficher une aide contextuelle (BUG#1605) + /** * Cantonnement.java * @@ -44,10 +46,15 @@ /** to use log facility, just put in your code: log.info("..."); */ static private Log log = LogFactory.getLog(CantonnementPreSimu.class); + @Doc(value="do the doc of param zone") public Zone param_zone = null; + @Doc(value="do the doc of param gear") public Gear param_gear = null; + @Doc(value="do the doc of param enginSelective") public boolean param_enginSelective = true; + @Doc(value="do the doc of param beginMonth") public Month param_beginMonth = Month.JANUARY; + @Doc(value="do the doc of param endMonth") public Month param_endMonth = Month.DECEMBER; protected Map<Month, MatrixND> tableNonActivite = new HashMap<Month, MatrixND>();

1 0