Author: jcouteau Date: 2009-04-28 13:25:06 +0000 (Tue, 28 Apr 2009) New Revision: 122 Modified: trunk/scripts/SiMatrix.java Log: Adaptation aux scripts de St?\195?\169phanie Modified: trunk/scripts/SiMatrix.java =================================================================== --- trunk/scripts/SiMatrix.java 2009-04-28 13:19:55 UTC (rev 121) +++ trunk/scripts/SiMatrix.java 2009-04-28 13:25:06 UTC (rev 122) @@ -246,7 +246,7 @@ List<PopulationGroup> groups = pop.getPopulationGroup(); MatrixND result = matrixCatchPerStrategyMetPerZoneMet.copy(); - result.setName(ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_MET); + result.setName(ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET); for (PopulationGroup group : groups) { MatrixND sub = result.getSubMatrix(2, group, 1); @@ -271,7 +271,7 @@ Set<Cell> cellPops = new HashSet(matrixCatchPerStrategyMetPerCell.getSemantics(4)); MatrixND result = MatrixFactory.getInstance().create( - ResultName.MATRIX_CATCH_PER_STRATEGY_MET_PER_ZONE_MET, + ResultName.MATRIX_CATCH_PER_STRATEGY_MET, new List[]{strategies, metiers, groups, zones}, new String[]{n_("Strategies"), n_("Metiers"), n_("Groups"), n_("Zones")}); @@ -316,7 +316,7 @@ // on somme sur les cellules MatrixND result = matrixCatchPerStrategyMetPerCell.sumOverDim(4); result = result.reduceDims(4); - result.setName(ResultName.MATRIX_CATCH_PER_STRATEGY_MET_PER_ZONE_POP); + result.setName(ResultName.MATRIX_CATCH_PER_STRATEGY_MET); return result; } @@ -326,7 +326,7 @@ List<PopulationGroup> groups = pop.getPopulationGroup(); MatrixND result = matrixCatchPerStrategyMetPerZonePop.copy(); - result.setName(ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP); + result.setName(ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET); for (PopulationGroup group : groups) { MatrixND sub = result.getSubMatrix(2, group, 1); @@ -359,7 +359,7 @@ // on le passe en argument ce qui evite de le calculer 2 fois // MatrixND matrixCatchRatePerStrategyMet = matrixCatchRatePerStrategyMet(pop, date); MatrixND result = matrixCatchRatePerStrategyMet.copy(); - result.setName(ResultName.MATRIX_CATCH_PER_STRATEGY_MET_PER_ZONE_POP); + result.setName(ResultName.MATRIX_CATCH_PER_STRATEGY_MET); for(PopulationGroup group : groups) { MatrixND sub = result.getSubMatrix(2, group, 1); @@ -390,7 +390,7 @@ List<Zone> zones = pop.getPopulationZone(); MatrixND result = MatrixFactory.getInstance().create( - ResultName.MATRIX_CATCH_RATE_PER_STRATEGY_MET_PER_ZONE_POP, + ResultName.MATRIX_CATCH_RATE_PER_STRATEGY_MET, new List[]{strategies, metiers, groups, zones}, new String[]{n_("Strategies"), n_("Metiers"), n_("Groups"), n_("Zones")}); @@ -1624,7 +1624,7 @@ List<Zone> zones = N.getSemantics(1); MatrixND result = MatrixFactory.getInstance().create( - ResultName.MATRIX_BIOMASS_BEGIN_MONTH, + ResultName.MATRIX_BIOMASS, new List[]{groups, zones}, new String[]{n_("Groups"), n_("Zones")}); @@ -1646,7 +1646,7 @@ List<Zone> zones = N.getSemantics(1); MatrixND result = MatrixFactory.getInstance().create( - ResultName.MATRIX_ABONDANCE_BEGIN_MONTH, + ResultName.MATRIX_ABUNDANCE, new List[]{groups, zones}, new String[]{n_("Groups"), n_("Zones")}); @@ -1742,7 +1742,7 @@ List<PopulationGroup> groups = pop.getPopulationGroup(); MatrixND result = matrixDiscardPerStrategyMetPerZonePop.copy(); - result.setName(ResultName.MATRIX_DISCARDS_WEIGHT_PER_STR_MET_PER_ZONE_POP); + result.setName(ResultName.MATRIX_DISCARDS_WEIGHT_PER_STR_MET); for(PopulationGroup group : groups){ MatrixND sub = result.getSubMatrix(2, group, 1);