Author: chatellier Date: 2009-06-24 10:36:06 +0000 (Wed, 24 Jun 2009) New Revision: 151 Modified: trunk/exports/CapturesPoids.java trunk/exports/SensitivityCapturesWeightRelativeReferenceY10.java trunk/rules/GraviteCPUE.java trunk/scripts/GravityModel.java trunk/scripts/ResultName.java trunk/simulators/DefaultSimulator.java Log: Suppression du resultat MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET (renomm?\195?\169) Modified: trunk/exports/CapturesPoids.java =================================================================== --- trunk/exports/CapturesPoids.java 2009-06-22 13:14:48 UTC (rev 150) +++ trunk/exports/CapturesPoids.java 2009-06-24 10:36:06 UTC (rev 151) @@ -35,7 +35,7 @@ /** to use log facility, just put in your code: log.info("..."); */ static private Log log = LogFactory.getLog(CapturesPoids.class); - protected String[] necessaryResult = { ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET }; + protected String[] necessaryResult = { ResultName.MATRIX_CATCH_WEIGHT_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_WEIGHT_PER_STRATEGY_MET); + pop, ResultName.MATRIX_CATCH_WEIGHT_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/SensitivityCapturesWeightRelativeReferenceY10.java =================================================================== --- trunk/exports/SensitivityCapturesWeightRelativeReferenceY10.java 2009-06-22 13:14:48 UTC (rev 150) +++ trunk/exports/SensitivityCapturesWeightRelativeReferenceY10.java 2009-06-24 10:36:06 UTC (rev 151) @@ -75,7 +75,7 @@ MatrixND matlastdatereference = referenceResultStorage .getMatrix( new Date(lastDate.getDate() - i), - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET + ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP + " " + pop, tx); capturesWeightreference += matlastdatereference.sumAll(); @@ -83,7 +83,7 @@ MatrixND matfirstdatereference = referenceResultStorage .getMatrix( new Date(i), - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET + ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP + " " + pop, tx); capturesWeightfirstreference += matfirstdatereference .sumAll(); Modified: trunk/rules/GraviteCPUE.java =================================================================== --- trunk/rules/GraviteCPUE.java 2009-06-22 13:14:48 UTC (rev 150) +++ trunk/rules/GraviteCPUE.java 2009-06-24 10:36:06 UTC (rev 151) @@ -57,7 +57,7 @@ // example: // ResultName.MATRIX_BIOMASS, // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET, + ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP, ResultName.MATRIX_EFFORT_PER_STRATEGY_MET, }; @@ -186,7 +186,7 @@ MatrixND temp = resultmanager.getMatrix( date.previousYear(), pop, - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET); + ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP); // on somme sur les zones temp=temp.sumOverDim(3); // on somme sur les groupes Modified: trunk/scripts/GravityModel.java =================================================================== --- trunk/scripts/GravityModel.java 2009-06-22 13:14:48 UTC (rev 150) +++ trunk/scripts/GravityModel.java 2009-06-24 10:36:06 UTC (rev 151) @@ -633,7 +633,7 @@ private double getCatchWeightPerStrMetPerZonePop(Strategy str, Metier metier, PopulationGroup group, Zone zone, Date date) { MatrixND mat = resultManager.getMatrix(date, group.getPopulation(), - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET); + ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP); double result = 0; if (mat != null) { result = mat.getValue(str, metier, group, zone); Modified: trunk/scripts/ResultName.java =================================================================== --- trunk/scripts/ResultName.java 2009-06-22 13:14:48 UTC (rev 150) +++ trunk/scripts/ResultName.java 2009-06-24 10:36:06 UTC (rev 151) @@ -79,8 +79,6 @@ 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") - 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") Modified: trunk/simulators/DefaultSimulator.java =================================================================== --- trunk/simulators/DefaultSimulator.java 2009-06-22 13:14:48 UTC (rev 150) +++ trunk/simulators/DefaultSimulator.java 2009-06-24 10:36:06 UTC (rev 151) @@ -488,7 +488,7 @@ resManager.addResult(date, pop, catchPerStrategyMetPerZonePop); if (resManager - .isEnabled(ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET)) { + .isEnabled(ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP)) { MatrixND catchWeightPerStrategyMet = siMatrix .matrixCatchWeightPerStrategyMetPerZonePop(date, pop, catchPerStrategyMetPerZonePop); @@ -501,7 +501,7 @@ resManager.addResult(date, pop, catchPerStrategyMetPerZoneMet); if (resManager - .isEnabled(ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET)) { + .isEnabled(ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_MET)) { MatrixND catchWeightPerStrategyMet = siMatrix .matrixCatchWeightPerStrategyMetPerZoneMet(date, pop, catchPerStrategyMetPerZoneMet);