Author: jcouteau Date: 2009-04-28 13:29:04 +0000 (Tue, 28 Apr 2009) New Revision: 123 Modified: trunk/exports/CapturesNombre.java trunk/exports/CapturesPoids.java Log: Adpatation aux scripts de St?\195?\169phanie Modified: trunk/exports/CapturesNombre.java =================================================================== --- trunk/exports/CapturesNombre.java 2009-04-28 13:25:06 UTC (rev 122) +++ trunk/exports/CapturesNombre.java 2009-04-28 13:29:04 UTC (rev 123) @@ -37,7 +37,7 @@ static private Log log = LogFactory.getLog(CapturesNombre.class); protected String [] necessaryResult = { - ResultName.MATRIX_CATCH_PER_STRATEGY_MET_PER_ZONE_POP + ResultName.MATRIX_CATCH_PER_STRATEGY_MET }; public String[] getNecessaryResult() { @@ -62,7 +62,7 @@ for (Population pop : simulation.getParameter().getPopulations()) { 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_PER_ZONE_POP); + ResultName.MATRIX_CATCH_PER_STRATEGY_MET); 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/CapturesPoids.java =================================================================== --- trunk/exports/CapturesPoids.java 2009-04-28 13:25:06 UTC (rev 122) +++ trunk/exports/CapturesPoids.java 2009-04-28 13:29:04 UTC (rev 123) @@ -37,7 +37,7 @@ static private Log log = LogFactory.getLog(CapturesPoids.class); protected String [] necessaryResult = { - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP + ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET }; public String[] getNecessaryResult() { @@ -62,7 +62,7 @@ for (Population pop : simulation.getParameter().getPopulations()) { 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_PER_ZONE_POP); + ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET); 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();) {