Author: jcouteau Date: 2009-05-11 13:51:57 +0000 (Mon, 11 May 2009) New Revision: 141 Modified: trunk/scripts/SiMatrix.java Log: Back to normal (matrixCatchWeightPerStrategyMetPerZonePop well calculated) Modified: trunk/scripts/SiMatrix.java =================================================================== --- trunk/scripts/SiMatrix.java 2009-05-11 09:53:41 UTC (rev 140) +++ trunk/scripts/SiMatrix.java 2009-05-11 13:51:57 UTC (rev 141) @@ -251,7 +251,7 @@ List<PopulationGroup> groups = pop.getPopulationGroup(); MatrixND result = matrixCatchPerStrategyMetPerZoneMet.copy(); - result.setName(ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET); + result.setName(ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_MET); for (PopulationGroup group : groups) { MatrixND sub = result.getSubMatrix(2, group, 1); @@ -282,7 +282,7 @@ .getSemantics(4)); MatrixND result = MatrixFactory.getInstance().create( - ResultName.MATRIX_CATCH_PER_STRATEGY_MET_PER_ZONE_POP, + ResultName.MATRIX_CATCH_PER_STRATEGY_MET_PER_ZONE_MET, new List[] { strategies, metiers, groups, zones }, new String[] { n_("Strategies"), n_("Metiers"), n_("Groups"), n_("Zones") }); @@ -344,7 +344,7 @@ List<PopulationGroup> groups = pop.getPopulationGroup(); MatrixND result = matrixCatchPerStrategyMetPerZonePop.copy(); - result.setName(ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET); + result.setName(ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP); for (PopulationGroup group : groups) { MatrixND sub = result.getSubMatrix(2, group, 1);