Author: chatellier Date: 2009-02-26 15:42:53 +0000 (Thu, 26 Feb 2009) New Revision: 64 Modified: trunk/exports/RejetsNombre.java trunk/rules/TACpoids.java trunk/rules/TailleMin.java Log: Fix compilation. Result name renamed ? MATRIX_DISCARDS_PER_STR_MET > MATRIX_DISCARDS_PER_STR_MET_PER_ZONE_POP Modified: trunk/exports/RejetsNombre.java =================================================================== --- trunk/exports/RejetsNombre.java 2009-02-26 09:31:58 UTC (rev 63) +++ trunk/exports/RejetsNombre.java 2009-02-26 15:42:53 UTC (rev 64) @@ -37,7 +37,7 @@ static private Log log = LogFactory.getLog(RejetsNombre.class); protected String [] necessaryResult = { - ResultName.MATRIX_DISCARDS_PER_STR_MET + ResultName.MATRIX_DISCARDS_PER_STR_MET_PER_ZONE_POP }; public String[] getNecessaryResult() { @@ -61,7 +61,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_DISCARDS_PER_STR_MET); + MatrixND mat = simulation.getResultStorage().getMatrix(date, pop, ResultName.MATRIX_DISCARDS_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-02-26 09:31:58 UTC (rev 63) +++ trunk/rules/TACpoids.java 2009-02-26 15:42:53 UTC (rev 64) @@ -281,7 +281,7 @@ } discard = popMon.getCatch(pop).copy(); - 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-02-26 09:31:58 UTC (rev 63) +++ trunk/rules/TailleMin.java 2009-02-26 15:42:53 UTC (rev 64) @@ -187,7 +187,7 @@ + i.getValue() * 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); } }