r134 - in trunk: exports rules scripts simulators
Author: jcouteau Date: 2009-05-07 12:27:08 +0000 (Thu, 07 May 2009) New Revision: 134 Modified: trunk/exports/CapturesNombre.java trunk/exports/RejetsNombre.java trunk/exports/RejetsPoids.java trunk/rules/TACpoids.java trunk/rules/TailleMin.java trunk/scripts/ResultName.java trunk/scripts/SiMatrix.java trunk/simulators/DefaultSimulator.java Log: Repair wrong commit Modified: trunk/exports/CapturesNombre.java =================================================================== --- trunk/exports/CapturesNombre.java 2009-05-04 08:54:52 UTC (rev 133) +++ trunk/exports/CapturesNombre.java 2009-05-07 12:27:08 UTC (rev 134) @@ -35,7 +35,7 @@ /** to use log facility, just put in your code: log.info("..."); */ static private Log log = LogFactory.getLog(CapturesNombre.class); - protected String[] necessaryResult = { ResultName.MATRIX_CATCH_PER_STRATEGY_MET }; + protected String[] necessaryResult = { ResultName.MATRIX_CATCH_PER_STRATEGY_MET_PER_ZONE_POP }; public String[] getNecessaryResult() { return this.necessaryResult; @@ -61,7 +61,7 @@ for (Date date = new Date(0); !date.after(lastDate); date = date .next()) { MatrixND mat = simulation.getResultStorage().getMatrix(date, - pop, ResultName.MATRIX_CATCH_PER_STRATEGY_MET); + pop, ResultName.MATRIX_CATCH_PER_STRATEGY_MET_PER_ZONE_POP); if (mat != null) { // can be null if simulation is stopped before last year simulation mat = mat.sumOverDim(0); //sum on strategy for (MatrixIterator i = mat.iterator(); i.hasNext();) { Modified: trunk/exports/RejetsNombre.java =================================================================== --- trunk/exports/RejetsNombre.java 2009-05-04 08:54:52 UTC (rev 133) +++ trunk/exports/RejetsNombre.java 2009-05-07 12:27:08 UTC (rev 134) @@ -35,7 +35,7 @@ /** to use log facility, just put in your code: log.info("..."); */ static private Log log = LogFactory.getLog(RejetsNombre.class); - protected String[] necessaryResult = { ResultName.MATRIX_DISCARDS_PER_STR_MET }; + protected String[] necessaryResult = { ResultName.MATRIX_DISCARDS_PER_STR_MET_PER_ZONE_POP }; public String[] getNecessaryResult() { return this.necessaryResult; Modified: trunk/exports/RejetsPoids.java =================================================================== --- trunk/exports/RejetsPoids.java 2009-05-04 08:54:52 UTC (rev 133) +++ trunk/exports/RejetsPoids.java 2009-05-07 12:27:08 UTC (rev 134) @@ -35,7 +35,7 @@ /** to use log facility, just put in your code: log.info("..."); */ static private Log log = LogFactory.getLog(RejetsPoids.class); - protected String[] necessaryResult = { ResultName.MATRIX_DISCARDS_WEIGHT_PER_STR_MET + protected String[] necessaryResult = { ResultName.MATRIX_DISCARDS_WEIGHT_PER_STR_MET_PER_ZONE_POP }; @@ -63,7 +63,7 @@ for (Date date = new Date(0); !date.after(lastDate); date = date .next()) { MatrixND mat = simulation.getResultStorage().getMatrix(date, - pop, ResultName.MATRIX_DISCARDS_WEIGHT_PER_STR_MET); + pop, ResultName.MATRIX_DISCARDS_WEIGHT_PER_STR_MET_PER_ZONE_POP); if (mat != null) { // can be null if simulation is stopped before last year simulation mat = mat.sumOverDim(0); //sum on strategy for (MatrixIterator i = mat.iterator(); i.hasNext();) { Modified: trunk/rules/TACpoids.java =================================================================== --- trunk/rules/TACpoids.java 2009-05-04 08:54:52 UTC (rev 133) +++ trunk/rules/TACpoids.java 2009-05-07 12:27:08 UTC (rev 134) @@ -313,7 +313,7 @@ log.info("catch = " + popMon.getCatch(pop)); discard = popMon.getCatch(pop).copy(); // ca ne doit pas pouvoir marcher car MATRIX_DISCARDS_PER_STR_MET est de dimension pop groupe str met - et discard n'a plus la dimension pop - discard.setName(ResultName.MATRIX_DISCARDS_PER_STR_MET); + discard.setName(ResultName.MATRIX_DISCARDS_PER_STR_MET_PER_ZONE_POP); popMon.addDiscard(date, pop, discard); log.info("[TAC] add discard for " + pop + ": " + discard); Modified: trunk/rules/TailleMin.java =================================================================== --- trunk/rules/TailleMin.java 2009-05-04 08:54:52 UTC (rev 133) +++ trunk/rules/TailleMin.java 2009-05-07 12:27:08 UTC (rev 134) @@ -203,7 +203,7 @@ * param_propSurvie); } } - discard.setName(ResultName.MATRIX_DISCARDS_PER_STR_MET); + discard.setName(ResultName.MATRIX_DISCARDS_PER_STR_MET_PER_ZONE_POP); popMon.addDiscard(date, pop, discard); } } Modified: trunk/scripts/ResultName.java =================================================================== --- trunk/scripts/ResultName.java 2009-05-04 08:54:52 UTC (rev 133) +++ trunk/scripts/ResultName.java 2009-05-07 12:27:08 UTC (rev 134) @@ -41,95 +41,103 @@ * ensuite lors de la creation de la matrice. * <p> * Ceci permet d'avoir un endroit unique ou l'on voit l'ensemble des resultats - * potentiellement disponible et de ne pas ce tromper en ecrivent le nom - * d'un resultat + * potentiellement disponible et de ne pas ce tromper en ecrivent le nom d'un + * resultat * <p> - * Cette classe ne doit contenir que des noms de resultat en static public String - * l'interface de lancement de simulation se base sur cette classe pour + * Cette classe ne doit contenir que des noms de resultat en static public + * String l'interface de lancement de simulation se base sur cette classe pour * afficher l'ensemble des resultats disponible * * @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_PER_ZONE_POP = n_("matrixDiscardsWeightPerStrMetPerZonePop"); - @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") + @Doc(value = "do the doc of Result matrixDiscardsPerStrMet") + static final public String MATRIX_DISCARDS_PER_STR_MET_PER_ZONE_POP = n_("matrixDiscardsPerStrMetPerZonePop"); + @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") + @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 matrixEffortNominalPerStrategyMet") + @Doc(value = "do the doc of Result matrixEffortNominalPerStrategyMet") static final public String MATRIX_EFFORT_NOMINAL_PER_STRATEGY_MET = n_("matrixEffortNominalPerStrategyMet"); - @Doc(value = "do the doc of Result matrixStdTravelEffortPerStrategyMet") + @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") + @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") + @Doc(value = "Disponible uniquement avec les simulations par Zone. do the doc of Result matrixCatchRatePerStrategyMet") + static final public String MATRIX_CATCH_RATE_PER_STRATEGY_MET_PER_ZONE_POP = n_("matrixCatchRatePerStrategyMet"); + @Doc(value = "do the doc of Result matrixCatchPerStrategyMetPerZoneMet") + static final public String MATRIX_CATCH_PER_STRATEGY_MET_PER_ZONE_MET = n_("matrixCatchPerStrategyMetPerZoneMet"); + @Doc(value = "do the doc of Result matrixCatchPerStrategyMetPerZonePop") + static final public String MATRIX_CATCH_PER_STRATEGY_MET_PER_ZONE_POP = n_("matrixCatchPerStrategyMetPerZonePop"); + @Doc(value = "do the doc of Result matrixCatchWeightPerStrategyMetPerZoneMet") + static final public String MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_MET = n_("matrixCatchWeightPerStrategyMetPerZoneMet"); + @Doc(value = "do the doc of Result matrixCatchWeightPerStrategyMetPerZonePop") + static final public String MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP = n_("matrixCatchWeightPerStrategyMetPerZonePop"); + @Doc(value = "Disponible uniquement avec les simulations par Zone. do the doc of Result matrixFishingMortality") static final public String MATRIX_FISHING_MORTALITY = n_("matrixFishingMortality"); - @Doc(value = "do the doc of Result matrixCatchWeightPerStrategyMet") + @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") + @Doc(value = "do the doc of Result matrixAbundance") static final public String MATRIX_ABUNDANCE = n_("matrixAbundance"); - @Doc(value = "do the doc of Result matrixBiomass") + @Doc(value = "do the doc of Result matrixBiomass") + static final public String MATRIX_ABUNDANCE_BEGIN_MONTH = n_("matrixAbundanceBeginMonth"); + @Doc(value = "do the doc of Result matrixBiomass") static final public String MATRIX_BIOMASS = n_("matrixBiomass"); + @Doc(value = "do the doc of Result matrixBiomass") + static final public String MATRIX_BIOMASS_BEGIN_MONTH = n_("matrixBiomassBeginMonth"); - @Doc(value = "do the doc of Result matrixFishingTimePerMonthPerVessel") + @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") + @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") + @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") + @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") + @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") + @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") + @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_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") + @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 matrixGrossValueOfLandingsOtherSpeciesPerStrategyMet") + @Doc(value = "do the doc of Result matrixGrossValueOfLandingsOtherSpeciesPerStrategyMet") static final public String MATRIX_GROSS_VALUE_OF_LANDINGS_OTHER_SPECIES_PER_STRATEGY_MET = n_("matrixGrossValueOfLandingsOtherSpeciesPerStrategyMet"); - @Doc(value = "do the doc of Result matrixGrossValueOfLandingsPerStrategyMetPerVessel") + @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") + @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") + @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") + @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") + @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") + @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") + @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") + @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") + @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") + @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") + @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") + @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") + @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") + @Doc(value = "do the doc of Result matrixPrice") static final public String MATRIX_PRICE = n_("matrixPrice"); } - - Modified: trunk/scripts/SiMatrix.java =================================================================== --- trunk/scripts/SiMatrix.java 2009-05-04 08:54:52 UTC (rev 133) +++ trunk/scripts/SiMatrix.java 2009-05-07 12:27:08 UTC (rev 134) @@ -282,7 +282,7 @@ .getSemantics(4)); MatrixND result = MatrixFactory.getInstance().create( - ResultName.MATRIX_CATCH_PER_STRATEGY_MET, + ResultName.MATRIX_CATCH_PER_STRATEGY_MET_PER_ZONE_POP, new List[] { strategies, metiers, groups, zones }, new String[] { n_("Strategies"), n_("Metiers"), n_("Groups"), n_("Zones") }); @@ -333,7 +333,7 @@ // on somme sur les cellules MatrixND result = matrixCatchPerStrategyMetPerCell.sumOverDim(4); result = result.reduceDims(4); - result.setName(ResultName.MATRIX_CATCH_PER_STRATEGY_MET); + result.setName(ResultName.MATRIX_CATCH_PER_STRATEGY_MET_PER_ZONE_POP); return result; } @@ -377,7 +377,7 @@ // on le passe en argument ce qui evite de le calculer 2 fois // MatrixND matrixCatchRatePerStrategyMet = matrixCatchRatePerStrategyMet(pop, date); MatrixND result = matrixCatchRatePerStrategyMet.copy(); - result.setName(ResultName.MATRIX_CATCH_PER_STRATEGY_MET); + result.setName(ResultName.MATRIX_CATCH_PER_STRATEGY_MET_PER_ZONE_POP); for (PopulationGroup group : groups) { MatrixND sub = result.getSubMatrix(2, group, 1); @@ -409,7 +409,7 @@ List<Zone> zones = pop.getPopulationZone(); MatrixND result = MatrixFactory.getInstance().create( - ResultName.MATRIX_CATCH_RATE_PER_STRATEGY_MET, + ResultName.MATRIX_CATCH_RATE_PER_STRATEGY_MET_PER_ZONE_POP, new List[] { strategies, metiers, groups, zones }, new String[] { n_("Strategies"), n_("Metiers"), n_("Groups"), n_("Zones") }); @@ -1685,7 +1685,7 @@ List<Zone> zones = N.getSemantics(1); MatrixND result = MatrixFactory.getInstance().create( - ResultName.MATRIX_BIOMASS, new List[] { groups, zones }, + ResultName.MATRIX_BIOMASS_BEGIN_MONTH, new List[] { groups, zones }, new String[] { n_("Groups"), n_("Zones") }); for (int g = 0; g < groups.size(); g++) { @@ -1707,7 +1707,7 @@ List<Zone> zones = N.getSemantics(1); MatrixND result = MatrixFactory.getInstance().create( - ResultName.MATRIX_ABUNDANCE, new List[] { groups, zones }, + ResultName.MATRIX_ABUNDANCE_BEGIN_MONTH, new List[] { groups, zones }, new String[] { n_("Groups"), n_("Zones") }); for (int g = 0; g < groups.size(); g++) { Modified: trunk/simulators/DefaultSimulator.java =================================================================== --- trunk/simulators/DefaultSimulator.java 2009-05-04 08:54:52 UTC (rev 133) +++ trunk/simulators/DefaultSimulator.java 2009-05-07 12:27:08 UTC (rev 134) @@ -283,7 +283,7 @@ if (discard != null || date.getDate() == 0) { // force discard for the first month to have discard in result if (discard == null) { discard = MatrixFactory.getInstance().create( - ResultName.MATRIX_DISCARDS_PER_STR_MET, + ResultName.MATRIX_DISCARDS_PER_STR_MET_PER_ZONE_POP, new List[] { siMatrix.getStrategies(date), siMatrix.getMetiers(date), pop.getPopulationGroup(), @@ -295,7 +295,7 @@ resManager.addResult(date, pop, discard); if (resManager - .isEnabled(ResultName.MATRIX_DISCARDS_WEIGHT_PER_STR_MET)) { + .isEnabled(ResultName.MATRIX_DISCARDS_WEIGHT_PER_STR_MET_PER_ZONE_POP)) { MatrixND discardWeightPerStrategyMet = siMatrix .matrixDiscardWeightPerStrategyMetPerZonePop( pop, date, discard);
participants (1)
-
jcouteau＠users.labs.libre-entreprise.org