Author: jcouteau Date: 2009-05-07 16:40:51 +0000 (Thu, 07 May 2009) New Revision: 136 Modified: trunk/exports/SensitivityCapturesWeightReferenceY7.java trunk/exports/SensitivityCapturesWeightRelativeReferenceY10.java trunk/exports/SensitivityCapturesWeightRelativeY4.java trunk/exports/SensitivityCapturesWeightY1.java Log: Fix captures weight export Modified: trunk/exports/SensitivityCapturesWeightReferenceY7.java =================================================================== --- trunk/exports/SensitivityCapturesWeightReferenceY7.java 2009-05-07 12:41:53 UTC (rev 135) +++ trunk/exports/SensitivityCapturesWeightReferenceY7.java 2009-05-07 16:40:51 UTC (rev 136) @@ -24,7 +24,7 @@ static private Log log = LogFactory .getLog(SensitivityCapturesWeightReferenceY7.class); - protected String[] necessaryResult = { ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET }; + protected String[] necessaryResult = { ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP }; @Doc("Population") public Population param_pop; @@ -53,7 +53,7 @@ .getMatrix( new Date(lastDate.getDate() - i), pop, - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET); + ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP); capturesWeight += matlastdate.sumAll(); //Get the reference captures Weight of each month of the last year @@ -62,7 +62,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(); tx.commitTransaction(); Modified: trunk/exports/SensitivityCapturesWeightRelativeReferenceY10.java =================================================================== --- trunk/exports/SensitivityCapturesWeightRelativeReferenceY10.java 2009-05-07 12:41:53 UTC (rev 135) +++ trunk/exports/SensitivityCapturesWeightRelativeReferenceY10.java 2009-05-07 16:40:51 UTC (rev 136) @@ -25,7 +25,7 @@ static private Log log = LogFactory .getLog(SensitivityCapturesWeightRelativeReferenceY10.class); - protected String[] necessaryResult = { ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET }; + protected String[] necessaryResult = { ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP }; @Doc("Population") public Population param_pop; @@ -56,7 +56,7 @@ .getMatrix( new Date(lastDate.getDate() - i), pop, - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET); + ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP); capturesWeight += matlastdate.sumAll(); //Get the captures Weight of each month of the first year @@ -64,7 +64,7 @@ .getMatrix( new Date(i), pop, - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET); + ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP); capturesWeightfirst += matfirstdate.sumAll(); //Get the reference captures Weight of each month of the last year Modified: trunk/exports/SensitivityCapturesWeightRelativeY4.java =================================================================== --- trunk/exports/SensitivityCapturesWeightRelativeY4.java 2009-05-07 12:41:53 UTC (rev 135) +++ trunk/exports/SensitivityCapturesWeightRelativeY4.java 2009-05-07 16:40:51 UTC (rev 136) @@ -23,7 +23,7 @@ static private Log log = LogFactory .getLog(SensitivityCapturesWeightRelativeY4.class); - protected String[] necessaryResult = { ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET }; + protected String[] necessaryResult = { ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP }; @Doc("Population") public Population param_pop; @@ -45,7 +45,7 @@ .getMatrix( new Date(lastDate.getDate() - i), pop, - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET); + ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP); capturesWeight += matlastdate.sumAll(); //Get the captures Weight of each month of the first year @@ -53,7 +53,7 @@ .getMatrix( new Date(i), pop, - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET); + ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP); capturesWeightfirst += matfirstdate.sumAll(); } Modified: trunk/exports/SensitivityCapturesWeightY1.java =================================================================== --- trunk/exports/SensitivityCapturesWeightY1.java 2009-05-07 12:41:53 UTC (rev 135) +++ trunk/exports/SensitivityCapturesWeightY1.java 2009-05-07 16:40:51 UTC (rev 136) @@ -23,7 +23,7 @@ static private Log log = LogFactory .getLog(SensitivityCapturesWeightY1.class); - protected String[] necessaryResult = { ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET }; + protected String[] necessaryResult = { ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP }; @Doc("Population") public Population param_pop; @@ -44,7 +44,7 @@ .getMatrix( new Date(lastDate.getDate() - i), pop, - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET); + ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP); capturesWeight += matlastdate.sumAll(); }