Author: jcouteau Date: 2009-05-07 12:41:53 +0000 (Thu, 07 May 2009) New Revision: 135 Modified: trunk/exports/RejetsNombre.java trunk/scripts/GravityModel.java trunk/scripts/SiMatrix.java Log: Fix 3 wrong files Modified: trunk/exports/RejetsNombre.java =================================================================== --- trunk/exports/RejetsNombre.java 2009-05-07 12:27:08 UTC (rev 134) +++ trunk/exports/RejetsNombre.java 2009-05-07 12:41:53 UTC (rev 135) @@ -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_DISCARDS_PER_STR_MET); + 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/scripts/GravityModel.java =================================================================== --- trunk/scripts/GravityModel.java 2009-05-07 12:27:08 UTC (rev 134) +++ trunk/scripts/GravityModel.java 2009-05-07 12:41:53 UTC (rev 135) @@ -652,7 +652,7 @@ private double getDiscardsWeightPerStrMet(Strategy str, Metier metier, PopulationGroup group, Zone zone, Date date) { MatrixND mat = resultManager.getMatrix(date, group.getPopulation(), - ResultName.MATRIX_DISCARDS_WEIGHT_PER_STR_MET); + ResultName.MATRIX_DISCARDS_WEIGHT_PER_STR_MET_PER_ZONE_POP); double result = 0; if (mat != null) { result = mat.getValue(str, metier, group, zone); Modified: trunk/scripts/SiMatrix.java =================================================================== --- trunk/scripts/SiMatrix.java 2009-05-07 12:27:08 UTC (rev 134) +++ trunk/scripts/SiMatrix.java 2009-05-07 12:41:53 UTC (rev 135) @@ -1801,7 +1801,7 @@ List<PopulationGroup> groups = pop.getPopulationGroup(); MatrixND result = matrixDiscardPerStrategyMetPerZonePop.copy(); - result.setName(ResultName.MATRIX_DISCARDS_WEIGHT_PER_STR_MET); + result.setName(ResultName.MATRIX_DISCARDS_WEIGHT_PER_STR_MET_PER_ZONE_POP); for (PopulationGroup group : groups) { MatrixND sub = result.getSubMatrix(2, group, 1);