Author: echatellier Date: 2015-06-23 15:35:53 +0000 (Tue, 23 Jun 2015) New Revision: 370 Url: http://forge.codelutin.com/projects/isis-fish-data/repository/revisions/370 Log: Merge branch 4.4.0-resultnames into trunk. Added: trunk/resultinfos/ Modified: trunk/ trunk/exports/Abundances.java trunk/exports/Biomasses.java trunk/exports/CapturesNombre.java trunk/exports/CapturesNombreStrategies.java trunk/exports/CapturesPoids.java trunk/exports/CapturesPoidsStrategies.java trunk/exports/CellsDefinition.java trunk/exports/EffortsMetier.java trunk/exports/Lbar.java trunk/exports/MetierZone.java trunk/exports/NonActivite.java trunk/exports/OwnerMargin.java trunk/exports/Recruitment.java trunk/exports/RegionDefinition.java trunk/exports/RejetsNombre.java trunk/exports/RejetsPoids.java trunk/exports/VesselMargin.java trunk/exports/ZonesDefinition.java trunk/rules/Cantonnement.java trunk/rules/CantonnementPreSimu.java trunk/rules/ChangementParamControlablePresimu.java trunk/rules/EffortReduction.java trunk/rules/GraviteVPUE1.java trunk/rules/InterdictionEngin.java trunk/rules/InterdictionEnginPreSimu.java trunk/rules/TACpoids.java trunk/rules/TailleMin.java trunk/rules/TotalClosure.java trunk/scripts/GravityModel.java trunk/scripts/ResultName.java trunk/scripts/SiMatrix.java trunk/scripts/SiMatrixEffortByCell.java trunk/sensitivityexports/SensitivityBiomassReferenceY9.java trunk/sensitivityexports/SensitivityBiomassRelativeReferenceY12.java trunk/sensitivityexports/SensitivityBiomassRelativeY6.java trunk/sensitivityexports/SensitivityBiomassY3.java trunk/sensitivityexports/SensitivityCatchWeightReferenceY7.java trunk/sensitivityexports/SensitivityCatchWeightRelativeReferenceY10.java trunk/sensitivityexports/SensitivityCatchWeightRelativeY4.java trunk/sensitivityexports/SensitivityCatchWeightY1.java trunk/sensitivityexports/SensitivityLbarJanvierY1.java trunk/sensitivityexports/SensitivityRecruitmentY1.java trunk/sensitivityexports/SensitivitySpawningBiomassReferenceY8.java trunk/sensitivityexports/SensitivitySpawningBiomassRelativeReferenceY11.java trunk/sensitivityexports/SensitivitySpawningBiomassRelativeY5.java trunk/sensitivityexports/SensitivitySpawningBiomassY2.java trunk/simulationplans/CalibrationSimplexePasVariable2Capturabilite.java trunk/simulationplans/SimulationNumberRestriction.java trunk/simulators/DefaultSimulator.java Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo - /branches/4.2.2:305-317 + /branches/4.2.2:305-317 /branches/4.4.0-resultnames:358-369 Modified: trunk/exports/Abundances.java =================================================================== --- trunk/exports/Abundances.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/exports/Abundances.java 2015-06-23 15:35:53 UTC (rev 370) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2014 Ifremer, CodeLutin, Chatellier Eric + * Copyright (C) 2006 - 2015 Ifremer, CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -28,11 +28,10 @@ import org.nuiton.math.matrix.*; -import scripts.ResultName; - import fr.ifremer.isisfish.entities.*; import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.types.TimeStep; +import resultinfos.MatrixAbundance; import fr.ifremer.isisfish.datastore.SimulationStorage; /** @@ -52,7 +51,7 @@ static private Log log = LogFactory.getLog(Abundances.class); protected String[] necessaryResult = { - ResultName.MATRIX_ABUNDANCE + MatrixAbundance.NAME }; @Override @@ -78,7 +77,7 @@ @Override public void export(SimulationStorage simulation, Writer out) throws Exception { for (Population pop : simulation.getParameter().getPopulations()) { - MatrixND mat = simulation.getResultStorage().getMatrix(pop, ResultName.MATRIX_ABUNDANCE); + MatrixND mat = simulation.getResultStorage().getMatrix(pop, MatrixAbundance.NAME); for (MatrixIterator i = mat.iterator(); i.hasNext();) { i.next(); Object[] sems = i.getSemanticsCoordinates(); Modified: trunk/exports/Biomasses.java =================================================================== --- trunk/exports/Biomasses.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/exports/Biomasses.java 2015-06-23 15:35:53 UTC (rev 370) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2014 Ifremer, CodeLutin + * Copyright (C) 2006 - 2015 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -28,11 +28,10 @@ import org.nuiton.math.matrix.*; -import scripts.ResultName; - import fr.ifremer.isisfish.entities.*; import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.types.TimeStep; +import resultinfos.MatrixBiomass; import fr.ifremer.isisfish.datastore.SimulationStorage; /** @@ -52,7 +51,7 @@ static private Log log = LogFactory.getLog(Biomasses.class); protected String[] necessaryResult = { - ResultName.MATRIX_BIOMASS + MatrixBiomass.NAME }; @Override @@ -78,7 +77,7 @@ @Override public void export(SimulationStorage simulation, Writer out) throws Exception { for (Population pop : simulation.getParameter().getPopulations()) { - MatrixND mat = simulation.getResultStorage().getMatrix(pop, ResultName.MATRIX_BIOMASS); + MatrixND mat = simulation.getResultStorage().getMatrix(pop, MatrixBiomass.NAME); for (MatrixIterator i = mat.iterator(); i.hasNext();) { i.next(); Object[] sems = i.getSemanticsCoordinates(); Modified: trunk/exports/CapturesNombre.java =================================================================== --- trunk/exports/CapturesNombre.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/exports/CapturesNombre.java 2015-06-23 15:35:53 UTC (rev 370) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2014 Ifremer, CodeLutin + * Copyright (C) 2006 - 2015 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -28,11 +28,12 @@ import fr.ifremer.isisfish.entities.Zone; import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.types.TimeStep; +import resultinfos.MatrixCatchPerStrategyMetPerZonePop; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixIterator; import org.nuiton.math.matrix.MatrixND; -import scripts.ResultName; import java.io.Writer; @@ -53,7 +54,7 @@ static private Log log = LogFactory.getLog(CapturesNombre.class); protected String[] necessaryResult = { - ResultName.MATRIX_CATCH_PER_STRATEGY_MET_PER_ZONE_POP + MatrixCatchPerStrategyMetPerZonePop.NAME }; @Override @@ -84,7 +85,7 @@ for (Population pop : simulation.getParameter().getPopulations()) { for (TimeStep step = new TimeStep(0); !step.after(lastStep); step = step.next()) { MatrixND mat = simulation.getResultStorage().getMatrix(step, - pop, ResultName.MATRIX_CATCH_PER_STRATEGY_MET_PER_ZONE_POP); + pop, MatrixCatchPerStrategyMetPerZonePop.NAME); 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/CapturesNombreStrategies.java =================================================================== --- trunk/exports/CapturesNombreStrategies.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/exports/CapturesNombreStrategies.java 2015-06-23 15:35:53 UTC (rev 370) @@ -29,11 +29,12 @@ import fr.ifremer.isisfish.entities.Zone; import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.types.TimeStep; +import resultinfos.MatrixCatchPerStrategyMetPerZonePop; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixIterator; import org.nuiton.math.matrix.MatrixND; -import scripts.ResultName; import java.io.Writer; @@ -54,7 +55,7 @@ static private Log log = LogFactory.getLog(CapturesNombreStrategies.class); protected String[] necessaryResult = { - ResultName.MATRIX_CATCH_PER_STRATEGY_MET_PER_ZONE_POP + MatrixCatchPerStrategyMetPerZonePop.NAME }; @Override @@ -85,7 +86,7 @@ for (TimeStep step = new TimeStep(0); !step.after(lastStep); step = step .next()) { MatrixND mat = simulation.getResultStorage().getMatrix(step, - pop, ResultName.MATRIX_CATCH_PER_STRATEGY_MET_PER_ZONE_POP); + pop, MatrixCatchPerStrategyMetPerZonePop.NAME); 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 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/exports/CapturesPoids.java 2015-06-23 15:35:53 UTC (rev 370) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2014 Ifremer, CodeLutin + * Copyright (C) 2006 - 2015 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -28,11 +28,12 @@ import fr.ifremer.isisfish.entities.Zone; import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.types.TimeStep; +import resultinfos.MatrixCatchWeightPerStrategyMetPerZonePop; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixIterator; import org.nuiton.math.matrix.MatrixND; -import scripts.ResultName; import java.io.Writer; @@ -53,7 +54,7 @@ static private Log log = LogFactory.getLog(CapturesPoids.class); protected String[] necessaryResult = { - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP + MatrixCatchWeightPerStrategyMetPerZonePop.NAME }; @Override @@ -85,7 +86,7 @@ for (TimeStep step = new TimeStep(0); !step.after(lastStep); step = step .next()) { MatrixND mat = simulation.getResultStorage().getMatrix(step, - pop, ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP); + pop, MatrixCatchWeightPerStrategyMetPerZonePop.NAME); 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/CapturesPoidsStrategies.java =================================================================== --- trunk/exports/CapturesPoidsStrategies.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/exports/CapturesPoidsStrategies.java 2015-06-23 15:35:53 UTC (rev 370) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2014 Ifremer, CodeLutin + * Copyright (C) 2006 - 2015 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -29,11 +29,12 @@ import fr.ifremer.isisfish.entities.Zone; import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.types.TimeStep; +import resultinfos.MatrixCatchWeightPerStrategyMetPerZonePop; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixIterator; import org.nuiton.math.matrix.MatrixND; -import scripts.ResultName; import java.io.Writer; @@ -54,7 +55,7 @@ static private Log log = LogFactory.getLog(CapturesPoidsStrategies.class); protected String[] necessaryResult = { - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP + MatrixCatchWeightPerStrategyMetPerZonePop.NAME }; @Override @@ -86,7 +87,7 @@ for (TimeStep step = new TimeStep(0); !step.after(lastStep); step = step .next()) { MatrixND mat = simulation.getResultStorage().getMatrix(step, - pop, ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP); + pop, MatrixCatchWeightPerStrategyMetPerZonePop.NAME); 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/CellsDefinition.java =================================================================== --- trunk/exports/CellsDefinition.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/exports/CellsDefinition.java 2015-06-23 15:35:53 UTC (rev 370) @@ -51,8 +51,8 @@ protected String [] necessaryResult = { // put here all necessary result for this rule // example: - // ResultName.MATRIX_BIOMASS, - // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, + // MatrixBiomass.NAME, + // MatrixNetValueOfLandingsPerStrategyMet.NAME }; @Override Modified: trunk/exports/EffortsMetier.java =================================================================== --- trunk/exports/EffortsMetier.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/exports/EffortsMetier.java 2015-06-23 15:35:53 UTC (rev 370) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2014 Ifremer, CodeLutin + * Copyright (C) 2006 - 2015 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -28,11 +28,10 @@ import org.nuiton.math.matrix.*; -import scripts.ResultName; - import fr.ifremer.isisfish.entities.*; import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.types.TimeStep; +import resultinfos.MatrixEffortPerStrategyMet; import fr.ifremer.isisfish.datastore.SimulationStorage; /** @@ -52,7 +51,7 @@ static private Log log = LogFactory.getLog(EffortsMetier.class); protected String [] necessaryResult = { - ResultName.MATRIX_EFFORT_PER_STRATEGY_MET + MatrixEffortPerStrategyMet.NAME }; @Override @@ -77,7 +76,7 @@ @Override public void export(SimulationStorage simulation, Writer out) throws Exception { - MatrixND mat = simulation.getResultStorage().getMatrix(ResultName.MATRIX_EFFORT_PER_STRATEGY_MET); + MatrixND mat = simulation.getResultStorage().getMatrix(MatrixEffortPerStrategyMet.NAME); for (MatrixIterator i = mat.iterator(); i.hasNext();) { i.next(); Object [] sems = i.getSemanticsCoordinates(); Modified: trunk/exports/Lbar.java =================================================================== --- trunk/exports/Lbar.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/exports/Lbar.java 2015-06-23 15:35:53 UTC (rev 370) @@ -28,11 +28,10 @@ import org.nuiton.math.matrix.*; -import scripts.ResultName; - import fr.ifremer.isisfish.entities.*; import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.types.TimeStep; +import resultinfos.MatrixLbar; import fr.ifremer.isisfish.datastore.SimulationStorage; /** @@ -49,7 +48,7 @@ static private Log log = LogFactory.getLog(Lbar.class); protected String[] necessaryResult = { - ResultName.MATRIX_LBAR + MatrixLbar.NAME }; @Override @@ -75,7 +74,7 @@ @Override public void export(SimulationStorage simulation, Writer out) throws Exception { for (Population pop : simulation.getParameter().getPopulations()) { - MatrixND mat = simulation.getResultStorage().getMatrix(pop, ResultName.MATRIX_LBAR); + MatrixND mat = simulation.getResultStorage().getMatrix(pop, MatrixLbar.NAME); for (MatrixIterator i = mat.iterator(); i.hasNext();) { i.next(); Object[] sems = i.getSemanticsCoordinates(); Modified: trunk/exports/MetierZone.java =================================================================== --- trunk/exports/MetierZone.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/exports/MetierZone.java 2015-06-23 15:35:53 UTC (rev 370) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2014 Ifremer, CodeLutin + * Copyright (C) 2006 - 2015 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -28,10 +28,9 @@ import org.nuiton.math.matrix.*; -import scripts.ResultName; - import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.types.TimeStep; +import resultinfos.MatrixMetierZone; import fr.ifremer.isisfish.datastore.SimulationStorage; /** @@ -51,7 +50,7 @@ static private Log log = LogFactory.getLog(MetierZone.class); protected String [] necessaryResult = { - ResultName.MATRIX_METIER_ZONE, + MatrixMetierZone.NAME }; @Override @@ -79,7 +78,7 @@ TimeStep lastStep = simulation.getResultStorage().getLastStep(); for (TimeStep step = new TimeStep(0); !step.after(lastStep); step = step.next() ) { - MatrixND mat = simulation.getResultStorage().getMatrix(step, ResultName.MATRIX_METIER_ZONE); + MatrixND mat = simulation.getResultStorage().getMatrix(step, MatrixMetierZone.NAME); if (mat != null) { // can be null if simulation is stopped before last year simulation for (MatrixIterator i = mat.iterator(); i.hasNext();) { i.next(); Modified: trunk/exports/NonActivite.java =================================================================== --- trunk/exports/NonActivite.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/exports/NonActivite.java 2015-06-23 15:35:53 UTC (rev 370) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2014 Ifremer, CodeLutin + * Copyright (C) 2006 - 2015 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -28,11 +28,10 @@ import org.nuiton.math.matrix.*; -import scripts.ResultName; - import fr.ifremer.isisfish.entities.*; import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.types.TimeStep; +import resultinfos.MatrixNoActivity; import fr.ifremer.isisfish.datastore.SimulationStorage; /** @@ -52,7 +51,7 @@ static private Log log = LogFactory.getLog(NonActivite.class); protected String [] necessaryResult = { - ResultName.MATRIX_NO_ACTIVITY + MatrixNoActivity.NAME }; @Override @@ -77,7 +76,7 @@ @Override public void export(SimulationStorage simulation, Writer out) throws Exception { - MatrixND mat = simulation.getResultStorage().getMatrix(ResultName.MATRIX_NO_ACTIVITY); + MatrixND mat = simulation.getResultStorage().getMatrix(MatrixNoActivity.NAME); for (MatrixIterator i = mat.iterator(); i.hasNext();) { i.next(); Object [] sems = i.getSemanticsCoordinates(); Modified: trunk/exports/OwnerMargin.java =================================================================== --- trunk/exports/OwnerMargin.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/exports/OwnerMargin.java 2015-06-23 15:35:53 UTC (rev 370) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2014 Ifremer, CodeLutin + * Copyright (C) 2006 - 2015 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -28,11 +28,10 @@ import org.nuiton.math.matrix.*; -import scripts.ResultName; - import fr.ifremer.isisfish.entities.*; import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.types.TimeStep; +import resultinfos.MatrixOwnerMarginOverVariableCostsPerStrategyPerVessel; import fr.ifremer.isisfish.datastore.SimulationStorage; /** @@ -52,7 +51,7 @@ static private Log log = LogFactory.getLog(OwnerMargin.class); protected String [] necessaryResult = { - ResultName.MATRIX_OWNER_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY_PER_VESSEL + MatrixOwnerMarginOverVariableCostsPerStrategyPerVessel.NAME }; @Override @@ -77,7 +76,7 @@ @Override public void export(SimulationStorage simulation, Writer out) throws Exception { - MatrixND mat = simulation.getResultStorage().getMatrix(ResultName.MATRIX_OWNER_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY_PER_VESSEL); + MatrixND mat = simulation.getResultStorage().getMatrix(MatrixOwnerMarginOverVariableCostsPerStrategyPerVessel.NAME); for (MatrixIterator i = mat.iterator(); i.hasNext();) { i.next(); Object[] sems = i.getSemanticsCoordinates(); Modified: trunk/exports/Recruitment.java =================================================================== --- trunk/exports/Recruitment.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/exports/Recruitment.java 2015-06-23 15:35:53 UTC (rev 370) @@ -28,11 +28,10 @@ import org.nuiton.math.matrix.*; -import scripts.ResultName; - import fr.ifremer.isisfish.entities.*; import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.types.TimeStep; +import resultinfos.MatrixRecruitment; import fr.ifremer.isisfish.datastore.SimulationStorage; /** @@ -49,7 +48,7 @@ static private Log log = LogFactory.getLog(Recruitment.class); protected String[] necessaryResult = { - ResultName.MATRIX_RECRUITMENT + MatrixRecruitment.NAME }; @Override @@ -75,7 +74,7 @@ @Override public void export(SimulationStorage simulation, Writer out) throws Exception { for (Population pop : simulation.getParameter().getPopulations()) { - MatrixND mat = simulation.getResultStorage().getMatrix(pop, ResultName.MATRIX_RECRUITMENT); + MatrixND mat = simulation.getResultStorage().getMatrix(pop, MatrixRecruitment.NAME); for (MatrixIterator i = mat.iterator(); i.hasNext();) { i.next(); Object[] sems = i.getSemanticsCoordinates(); Modified: trunk/exports/RegionDefinition.java =================================================================== --- trunk/exports/RegionDefinition.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/exports/RegionDefinition.java 2015-06-23 15:35:53 UTC (rev 370) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2014 Ifremer, CodeLutin + * Copyright (C) 2006 - 2015 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -51,8 +51,8 @@ protected String [] necessaryResult = { // put here all necessary result for this rule // example: - // ResultName.MATRIX_BIOMASS, - // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, + // MatrixBiomass.NAME, + // MatrixNetValueOfLandingsPerStrategyMet.NAME }; @Override Modified: trunk/exports/RejetsNombre.java =================================================================== --- trunk/exports/RejetsNombre.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/exports/RejetsNombre.java 2015-06-23 15:35:53 UTC (rev 370) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2014 Ifremer, CodeLutin + * Copyright (C) 2006 - 2015 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -28,7 +28,6 @@ import org.nuiton.math.matrix.MatrixIterator; import org.nuiton.math.matrix.MatrixND; -import scripts.ResultName; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.entities.Metier; import fr.ifremer.isisfish.entities.Population; @@ -36,6 +35,7 @@ import fr.ifremer.isisfish.entities.Zone; import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.types.TimeStep; +import resultinfos.MatrixDiscardsPerStrMetPerZonePop; /** * RejetsNombre.java @@ -53,7 +53,7 @@ static private Log log = LogFactory.getLog(RejetsNombre.class); protected String[] necessaryResult = { - ResultName.MATRIX_DISCARDS_PER_STR_MET_PER_ZONE_POP + MatrixDiscardsPerStrMetPerZonePop.NAME }; @Override @@ -85,7 +85,7 @@ for (TimeStep step = new TimeStep(0); !step.after(lastStep); step = step .next()) { MatrixND mat = simulation.getResultStorage().getMatrix(step, - pop, ResultName.MATRIX_DISCARDS_PER_STR_MET_PER_ZONE_POP); + pop, MatrixDiscardsPerStrMetPerZonePop.NAME); 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/RejetsPoids.java =================================================================== --- trunk/exports/RejetsPoids.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/exports/RejetsPoids.java 2015-06-23 15:35:53 UTC (rev 370) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2014 Ifremer, CodeLutin + * Copyright (C) 2006 - 2015 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -28,7 +28,6 @@ import org.nuiton.math.matrix.MatrixIterator; import org.nuiton.math.matrix.MatrixND; -import scripts.ResultName; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.entities.Metier; import fr.ifremer.isisfish.entities.Population; @@ -36,6 +35,7 @@ import fr.ifremer.isisfish.entities.Zone; import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.types.TimeStep; +import resultinfos.MatrixDiscardsWeightPerStrMetPerZonePop; /** * RejetsPoids.java @@ -53,7 +53,7 @@ static private Log log = LogFactory.getLog(RejetsPoids.class); protected String[] necessaryResult = { - ResultName.MATRIX_DISCARDS_WEIGHT_PER_STR_MET_PER_ZONE_POP + MatrixDiscardsWeightPerStrMetPerZonePop.NAME }; @Override @@ -85,7 +85,7 @@ for (TimeStep step = new TimeStep(0); !step.after(lastStep); step = step .next()) { MatrixND mat = simulation.getResultStorage().getMatrix(step, - pop, ResultName.MATRIX_DISCARDS_WEIGHT_PER_STR_MET_PER_ZONE_POP); + pop, MatrixDiscardsWeightPerStrMetPerZonePop.NAME); 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/VesselMargin.java =================================================================== --- trunk/exports/VesselMargin.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/exports/VesselMargin.java 2015-06-23 15:35:53 UTC (rev 370) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2014 Ifremer, CodeLutin + * Copyright (C) 2006 - 2015 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -28,11 +28,10 @@ import org.nuiton.math.matrix.*; -import scripts.ResultName; - import fr.ifremer.isisfish.entities.*; import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.types.TimeStep; +import resultinfos.MatrixVesselMarginOverVariableCostsPerStrategyPerVessel; import fr.ifremer.isisfish.datastore.SimulationStorage; /** @@ -52,7 +51,7 @@ static private Log log = LogFactory.getLog(VesselMargin.class); protected String [] necessaryResult = { - ResultName.MATRIX_VESSEL_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY_PER_VESSEL + MatrixVesselMarginOverVariableCostsPerStrategyPerVessel.NAME }; @Override @@ -77,7 +76,7 @@ @Override public void export(SimulationStorage simulation, Writer out) throws Exception { - MatrixND mat = simulation.getResultStorage().getMatrix(ResultName.MATRIX_VESSEL_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY_PER_VESSEL); + MatrixND mat = simulation.getResultStorage().getMatrix(MatrixVesselMarginOverVariableCostsPerStrategyPerVessel.NAME); for (MatrixIterator i = mat.iterator(); i.hasNext();) { i.next(); Object [] sems = i.getSemanticsCoordinates(); Modified: trunk/exports/ZonesDefinition.java =================================================================== --- trunk/exports/ZonesDefinition.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/exports/ZonesDefinition.java 2015-06-23 15:35:53 UTC (rev 370) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2014 Ifremer, CodeLutin + * Copyright (C) 2006 - 2015 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -53,8 +53,8 @@ protected String [] necessaryResult = { // put here all necessary result for this rule // example: - // ResultName.MATRIX_BIOMASS, - // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, + // MatrixBiomass.NAME, + // MatrixNetValueOfLandingsPerStrategyMet.NAME }; @Override Modified: trunk/rules/Cantonnement.java =================================================================== --- trunk/rules/Cantonnement.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/rules/Cantonnement.java 2015-06-23 15:35:53 UTC (rev 370) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2014 Ifremer, CodeLutin + * Copyright (C) 2006 - 2015 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -24,7 +24,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import scripts.ResultName; import scripts.SiMatrix; import java.util.ArrayList; @@ -43,7 +42,8 @@ import fr.ifremer.isisfish.entities.*; import fr.ifremer.isisfish.rule.AbstractRule; -import fr.ifremer.isisfish.util.Doc; // pour pouvoir afficher une aide contextuelle (BUG#1605) +import fr.ifremer.isisfish.util.Doc; +import resultinfos.MatrixNoActivity; /** * Cantonnement.java @@ -79,9 +79,9 @@ protected String [] necessaryResult = { // put here all necessary result for this rule // example: - // ResultName.MATRIX_BIOMASS, - // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, - ResultName.MATRIX_NO_ACTIVITY, + // MatrixBiomass.NAME, + // MatrixNetValueOfLandingsPerStrategyMet.NAME + MatrixNoActivity.NAME }; @Override @@ -209,7 +209,7 @@ SiMatrix siMatrix = SiMatrix.getSiMatrix(context); MatrixND noActivity = metierMon.getOrCreateNoActivity(step, - ResultName.MATRIX_NO_ACTIVITY, + MatrixNoActivity.NAME, siMatrix.getStrategies(step), siMatrix.getMetiers(step)); metierMon.addforbiddenMetier(metier); Modified: trunk/rules/CantonnementPreSimu.java =================================================================== --- trunk/rules/CantonnementPreSimu.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/rules/CantonnementPreSimu.java 2015-06-23 15:35:53 UTC (rev 370) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2014 Ifremer, CodeLutin + * Copyright (C) 2006 - 2015 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -24,7 +24,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import scripts.ResultName; import scripts.SiMatrix; import java.util.ArrayList; @@ -43,7 +42,8 @@ import fr.ifremer.isisfish.entities.*; import fr.ifremer.isisfish.rule.AbstractRule; -import fr.ifremer.isisfish.util.Doc; // pour pouvoir afficher une aide contextuelle (BUG#1605) +import fr.ifremer.isisfish.util.Doc; +import resultinfos.MatrixNoActivity; /** * CantonnementPreSimu.java @@ -76,9 +76,9 @@ protected String [] necessaryResult = { // put here all necessary result for this rule // example: - // ResultName.MATRIX_BIOMASS, - // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, - ResultName.MATRIX_NO_ACTIVITY, + // MatrixBiomass.NAME, + // MatrixNetValueOfLandingsPerStrategyMet.NAME + MatrixNoActivity.NAME }; @Override @@ -112,7 +112,7 @@ MatrixND matNonActiviteMois=tableNonActivite.get(month); if (matNonActiviteMois == null){ matNonActiviteMois = MatrixFactory.getInstance().create( - ResultName.MATRIX_NO_ACTIVITY, + MatrixNoActivity.NAME, new List[]{listestrategies, metiers}, new String[]{"Strategies", "Metiers"}); tableNonActivite.put(month, matNonActiviteMois); Modified: trunk/rules/ChangementParamControlablePresimu.java =================================================================== --- trunk/rules/ChangementParamControlablePresimu.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/rules/ChangementParamControlablePresimu.java 2015-06-23 15:35:53 UTC (rev 370) @@ -78,8 +78,8 @@ protected String [] necessaryResult = { // put here all necessary result for this rule // example: - // ResultName.MATRIX_BIOMASS, - // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, + // MatrixBiomass.NAME, + // MatrixNetValueOfLandingsPerStrategyMet.NAME }; @Override Modified: trunk/rules/EffortReduction.java =================================================================== --- trunk/rules/EffortReduction.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/rules/EffortReduction.java 2015-06-23 15:35:53 UTC (rev 370) @@ -60,7 +60,8 @@ protected String[] necessaryResult = { // put here all necessary result for this rule // example: - // ResultName.MATRIX_BIOMASS, + // MatrixBiomass.NAME, + // MatrixNetValueOfLandingsPerStrategyMet.NAME }; /** Modified: trunk/rules/GraviteVPUE1.java =================================================================== --- trunk/rules/GraviteVPUE1.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/rules/GraviteVPUE1.java 2015-06-23 15:35:53 UTC (rev 370) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2014 Ifremer, CodeLutin + * Copyright (C) 2006 - 2015 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -24,7 +24,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import scripts.ResultName; import scripts.SiMatrix; import java.util.Arrays; @@ -35,10 +34,11 @@ import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.types.TimeStep; +import resultinfos.MatrixEffortNominalPerStrategyMet; +import resultinfos.MatrixGrossValueOfLandingsPerStrategyMet; import fr.ifremer.isisfish.types.Month; import fr.ifremer.isisfish.entities.*; import fr.ifremer.isisfish.rule.AbstractRule; -import fr.ifremer.isisfish.datastore.ResultStorage; import fr.ifremer.isisfish.simulator.ResultManager; /** @@ -69,9 +69,10 @@ protected String[] necessaryResult = { // put here all necessary result for this rule // example: - // ResultName.MATRIX_BIOMASS, - ResultName.MATRIX_GROSS_VALUE_OF_LANDINGS_PER_STRATEGY_MET, - ResultName.MATRIX_EFFORT_NOMINAL_PER_STRATEGY_MET + // MatrixBiomass.NAME, + // MatrixNetValueOfLandingsPerStrategyMet.NAME + MatrixGrossValueOfLandingsPerStrategyMet.NAME, + MatrixEffortNominalPerStrategyMet.NAME }; @Override @@ -191,14 +192,14 @@ //Calcul de l effort nominal par strategy met MatrixND EffortNominalPerStrMet; EffortNominalPerStrMet = resultmanager.getMatrix(step.previousYear(), - ResultName.MATRIX_EFFORT_NOMINAL_PER_STRATEGY_MET); + MatrixEffortNominalPerStrategyMet.NAME); //System.out.println("EffortNominalPerStrMet calculee " // + EffortNominalPerStrMet); //on commence par creer une matrice de valeurs (somme sur ttes les especes capturees) par strategie met MatrixND GrossValuePerStrMet; GrossValuePerStrMet = resultmanager.getMatrix(step.previousYear(), - ResultName.MATRIX_GROSS_VALUE_OF_LANDINGS_PER_STRATEGY_MET); + MatrixGrossValueOfLandingsPerStrategyMet.NAME); //System.out.println("GrossValuePerStrMet calculee " + GrossValuePerStrMet); Modified: trunk/rules/InterdictionEngin.java =================================================================== --- trunk/rules/InterdictionEngin.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/rules/InterdictionEngin.java 2015-06-23 15:35:53 UTC (rev 370) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2014 Ifremer, CodeLutin + * Copyright (C) 2006 - 2015 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -24,7 +24,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import scripts.ResultName; import scripts.SiMatrix; import java.util.ArrayList; @@ -40,7 +39,8 @@ import fr.ifremer.isisfish.entities.*; import fr.ifremer.isisfish.rule.AbstractRule; -import fr.ifremer.isisfish.util.Doc; // pour pouvoir afficher une aide contextuelle (BUG#1605) +import fr.ifremer.isisfish.util.Doc; +import resultinfos.MatrixNoActivity; /** * InterdictionEngin.java @@ -72,8 +72,8 @@ protected String [] necessaryResult = { // put here all necessary result for this rule // example: - // ResultName.MATRIX_BIOMASS, - // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, + // MatrixBiomass.NAME, + // MatrixNetValueOfLandingsPerStrategyMet.NAME }; @Override @@ -196,7 +196,7 @@ // s'il n'y a pas de metier alternatif, on passe a nonActivite else { MatrixND matNonActivite = metierMon.getOrCreateNoActivity(step, - ResultName.MATRIX_NO_ACTIVITY, + MatrixNoActivity.NAME, siMatrix.getStrategies(step), siMatrix.getMetiers(step)); matNonActivite.setValue(Strat, metier, Modified: trunk/rules/InterdictionEnginPreSimu.java =================================================================== --- trunk/rules/InterdictionEnginPreSimu.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/rules/InterdictionEnginPreSimu.java 2015-06-23 15:35:53 UTC (rev 370) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2014 Ifremer, CodeLutin + * Copyright (C) 2006 - 2015 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -24,8 +24,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import scripts.ResultName; - import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -42,7 +40,8 @@ import fr.ifremer.isisfish.rule.AbstractRule; import fr.ifremer.isisfish.datastore.RegionStorage; -import fr.ifremer.isisfish.util.Doc; // pour pouvoir afficher une aide contextuelle (BUG#1605) +import fr.ifremer.isisfish.util.Doc; +import resultinfos.MatrixNoActivity; /** * InterdictionEnginPreSimu. @@ -73,8 +72,8 @@ protected String [] necessaryResult = { // put here all necessary result for this rule // example: - // ResultName.MATRIX_BIOMASS, - // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, + // MatrixBiomass.NAME, + // MatrixNetValueOfLandingsPerStrategyMet.NAME }; @Override @@ -154,7 +153,7 @@ MatrixND matNonActiviteMois=tableNonActivite.get(mois); if (matNonActiviteMois == null){ matNonActiviteMois = MatrixFactory.getInstance().create( - ResultName.MATRIX_NO_ACTIVITY, + MatrixNoActivity.NAME, new List[]{ListeStrat, ListeMetiers}, new String[]{"Strategies", "Metiers"}); tableNonActivite.put(mois, matNonActiviteMois); Modified: trunk/rules/TACpoids.java =================================================================== --- trunk/rules/TACpoids.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/rules/TACpoids.java 2015-06-23 15:35:53 UTC (rev 370) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2014 Ifremer, CodeLutin + * Copyright (C) 2006 - 2015 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -29,7 +29,6 @@ import org.nuiton.math.matrix.MatrixIterator; import org.nuiton.math.matrix.MatrixND; -import scripts.ResultName; import scripts.RuleUtil; import scripts.SiMatrix; import fr.ifremer.isisfish.entities.EffortDescription; @@ -47,6 +46,8 @@ import fr.ifremer.isisfish.types.TimeStep; import fr.ifremer.isisfish.types.Month; import fr.ifremer.isisfish.util.Doc; +import resultinfos.MatrixDiscardsPerStrMetPerZonePop; +import resultinfos.MatrixNoActivity; /** * TAC peut-etre utilise pour les differents TAC, en proportion des effectifs @@ -90,8 +91,8 @@ protected String[] necessaryResult = { // put here all necessary result for this rule // example: - // ResultName.MATRIX_BIOMASS, - // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, + // MatrixBiomass.NAME, + // MatrixNetValueOfLandingsPerStrategyMet.NAME }; /** @@ -275,7 +276,7 @@ // sinon on met tout dans le metier nonActivite MetierMonitor metierMon = context.getMetierMonitor(); MatrixND mat = metierMon.getOrCreateNoActivity(step, - ResultName.MATRIX_NO_ACTIVITY, siMatrix + MatrixNoActivity.NAME, siMatrix .getStrategies(step), siMatrix .getMetiers(step)); mat.setValue(str, metier, smi.getProportionMetier(metier)); @@ -330,7 +331,7 @@ log.info("catch = " + popMon.getCatch(pop)); discard = popMon.getCatch(pop).copy(); // ca ne doit pas pouvoir marcher car MATRIX_DISCARDS_PER_STR_MET est de dimension pop groupe str met - et discard n'a plus la dimension pop - discard.setName(ResultName.MATRIX_DISCARDS_PER_STR_MET_PER_ZONE_POP); + discard.setName(MatrixDiscardsPerStrMetPerZonePop.NAME); popMon.addDiscard(step, pop, discard); log.info("[TAC] add discard for " + pop + ": " + discard); Modified: trunk/rules/TailleMin.java =================================================================== --- trunk/rules/TailleMin.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/rules/TailleMin.java 2015-06-23 15:35:53 UTC (rev 370) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2014 Ifremer, CodeLutin, Stéphanie Mahevas, Chatellier Eric + * Copyright (C) 2006 - 2015 Ifremer, CodeLutin, Stéphanie Mahevas, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -26,7 +26,6 @@ import org.nuiton.math.matrix.MatrixIterator; import org.nuiton.math.matrix.MatrixND; -import scripts.ResultName; import fr.ifremer.isisfish.entities.Metier; import fr.ifremer.isisfish.entities.MetierSeasonInfo; import fr.ifremer.isisfish.entities.Population; @@ -39,6 +38,8 @@ import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.types.TimeStep; import fr.ifremer.isisfish.util.Doc; +import resultinfos.MatrixDiscardsPerStrMetPerZonePop; + import java.util.List; /** @@ -82,8 +83,8 @@ protected String[] necessaryResult = { // put here all necessary result for this rule // example: - // ResultName.MATRIX_BIOMASS, - // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, + // MatrixBiomass.NAME, + // MatrixNetValueOfLandingsPerStrategyMet.NAME }; @Override @@ -210,7 +211,7 @@ for (Population pop : param_species.getPopulation()) { MatrixND discard = popMon.getCatch(pop).copy(); - discard.setName(ResultName.MATRIX_DISCARDS_PER_STR_MET_PER_ZONE_POP); + discard.setName(MatrixDiscardsPerStrMetPerZonePop.NAME); MatrixND eff = popMon.getN(pop); Modified: trunk/rules/TotalClosure.java =================================================================== --- trunk/rules/TotalClosure.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/rules/TotalClosure.java 2015-06-23 15:35:53 UTC (rev 370) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2014 Ifremer, CodeLutin + * Copyright (C) 2006 - 2015 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -27,7 +27,6 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixND; -import scripts.ResultName; import scripts.SiMatrix; import fr.ifremer.isisfish.entities.Metier; import fr.ifremer.isisfish.entities.Strategy; @@ -36,6 +35,7 @@ import fr.ifremer.isisfish.simulator.MetierMonitor; import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.types.TimeStep; +import resultinfos.MatrixNoActivity; import fr.ifremer.isisfish.types.Month; /** @@ -56,7 +56,7 @@ public Month param_endMonth = Month.JANUARY; protected String[] necessaryResult = { - ResultName.MATRIX_NO_ACTIVITY + MatrixNoActivity.NAME }; @Override @@ -119,7 +119,7 @@ SiMatrix siMatrix = SiMatrix.getSiMatrix(context); MatrixND noActivity = metierMon.getOrCreateNoActivity(step, - ResultName.MATRIX_NO_ACTIVITY, siMatrix.getStrategies(step), + MatrixNoActivity.NAME, siMatrix.getStrategies(step), siMatrix.getMetiers(step)); metierMon.addforbiddenMetier(metier); List<Strategy> strategies = siMatrix.getStrategies(step); Modified: trunk/scripts/GravityModel.java =================================================================== --- trunk/scripts/GravityModel.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/scripts/GravityModel.java 2015-06-23 15:35:53 UTC (rev 370) @@ -47,6 +47,30 @@ import fr.ifremer.isisfish.types.TimeStep; import fr.ifremer.isisfish.types.Month; import fr.ifremer.isisfish.types.TimeUnit; +import resultinfos.MatrixCatchWeightPerStrategyMetPerZonePop; +import resultinfos.MatrixCostsOfFishingPerVessel; +import resultinfos.MatrixCrewSharePerStrategyPerVessel; +import resultinfos.MatrixDiscardsWeightPerStrMetPerZonePop; +import resultinfos.MatrixEffortPerStrategyMet; +import resultinfos.MatrixFishingTimePerMonthPerVessel; +import resultinfos.MatrixFuelCostsOfTravelPerVessel; +import resultinfos.MatrixFuelCostsPerVessel; +import resultinfos.MatrixGrossValueOfLandingsPerSpeciesPerStrategyMet; +import resultinfos.MatrixGrossValueOfLandingsPerStrategyMet; +import resultinfos.MatrixGrossValueOfLandingsPerStrategyMetPerVessel; +import resultinfos.MatrixNetRevenueToSharePerStrategyMetPerVessel; +import resultinfos.MatrixNetValueOfLandingsPerStrategyMet; +import resultinfos.MatrixNetValueOfLandingsPerStrategyMetPerVessel; +import resultinfos.MatrixOtherRunningCostsPerVessel; +import resultinfos.MatrixOwnerMarginOverVariableCostsPerStrategy; +import resultinfos.MatrixOwnerMarginOverVariableCostsPerStrategyMetPerVessel; +import resultinfos.MatrixOwnerMarginOverVariableCostsPerStrategyPerVessel; +import resultinfos.MatrixRepairAndMaintenanceGearCostsPerVessel; +import resultinfos.MatrixSharedNotFixedCostsPerVessel; +import resultinfos.MatrixVesselMarginOverVariableCostsPerStrategy; +import resultinfos.MatrixVesselMarginOverVariableCostsPerStrategyMetPerVessel; +import resultinfos.MatrixVesselMarginOverVariableCostsPerStrategyPerVessel; + import org.nuiton.math.matrix.MatrixIterator; /** @@ -110,7 +134,7 @@ List<Metier> metiers = siMatrix.getMetiers(step); MatrixND result = MatrixFactory.getInstance().create( - ResultName.MATRIX_FISHING_TIME_PER_MONTH_PER_VESSEL, + MatrixFishingTimePerMonthPerVessel.NAME, new List[] { strategies, metiers }, new String[] { n("Strategies"), n("Metiers") }); @@ -155,7 +179,7 @@ List<Metier> metiers = siMatrix.getMetiers(step); MatrixND result = MatrixFactory.getInstance().create( - ResultName.MATRIX_FUEL_COSTS_OF_TRAVEL_PER_VESSEL, + MatrixFuelCostsOfTravelPerVessel.NAME, new List[] { strategies, metiers }, new String[] { n("Strategies"), n("Metiers") }); @@ -207,7 +231,7 @@ List<Metier> metiers = siMatrix.getMetiers(step); MatrixND result = MatrixFactory.getInstance().create( - ResultName.MATRIX_COSTS_OF_FISHING_PER_VESSEL, + MatrixCostsOfFishingPerVessel.NAME, new List[] { strategies, metiers }, new String[] { n("Strategies"), n("Metiers") }); @@ -261,7 +285,7 @@ List<Metier> metiers = siMatrix.getMetiers(step); MatrixND result = MatrixFactory.getInstance().create( - ResultName.MATRIX_FUEL_COSTS_PER_VESSEL, + MatrixFuelCostsPerVessel.NAME, new List[] { strategies, metiers }, new String[] { n("Strategies"), n("Metiers") }); @@ -305,7 +329,7 @@ List<Metier> metiers = siMatrix.getMetiers(step); MatrixND result = MatrixFactory.getInstance().create( - ResultName.MATRIX_REPAIR_AND_MAINTENANCE_GEAR_COSTS_PER_VESSEL, + MatrixRepairAndMaintenanceGearCostsPerVessel.NAME, new List[] { strategies, metiers }, new String[] { n("Strategies"), n("Metiers") }); @@ -380,7 +404,7 @@ List<Metier> metiers = siMatrix.getMetiers(step); MatrixND result = MatrixFactory.getInstance().create( - ResultName.MATRIX_OTHER_RUNNING_COSTS_PER_VESSEL, + MatrixOtherRunningCostsPerVessel.NAME, new List[] { strategies, metiers }, new String[] { n("Strategies"), n("Metiers") }); @@ -433,7 +457,7 @@ List<Metier> metiers = siMatrix.getMetiers(step); MatrixND result = MatrixFactory.getInstance().create( - ResultName.MATRIX_SHARED_NOT_FIXED_COSTS_PER_VESSEL, + MatrixSharedNotFixedCostsPerVessel.NAME, new List[] { strategies, metiers }, new String[] { n("Strategies"), n("Metiers") }); @@ -482,7 +506,7 @@ MatrixND result = MatrixFactory .getInstance() .create( - ResultName.MATRIX_GROSS_VALUE_OF_LANDINGS_PER_SPECIES_PER_STRATEGY_MET, + MatrixGrossValueOfLandingsPerSpeciesPerStrategyMet.NAME, new List[] { strategies, metiers, pops }, new String[] { n("Strategies"), n("Metiers"), n("Populations") }); @@ -491,7 +515,7 @@ int strDim = 0; int metierDim = 1; int groupDim = 2; - int zoneDim = 3; + //int zoneDim = 3; for (int p = 0; p < pops.size(); p++) { Population pop = pops.get(p); @@ -615,7 +639,7 @@ private MatrixND getResult_MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP(TimeStep step, Population pop) { MatrixND mat = resultManager.getMatrix(step, pop, - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP); + MatrixCatchWeightPerStrategyMetPerZonePop.NAME); return mat; } @@ -639,7 +663,7 @@ private MatrixND getResult_MATRIX_DISCARDS_WEIGHT_PER_STR_MET_PER_ZONE_POP(TimeStep step, Population pop) { MatrixND mat = resultManager.getMatrix(step, pop, - ResultName.MATRIX_DISCARDS_WEIGHT_PER_STR_MET_PER_ZONE_POP); + MatrixDiscardsWeightPerStrMetPerZonePop.NAME); return mat; } @@ -653,7 +677,7 @@ MatrixND matPerSpecies = matrixGrossValueOfLandingsPerSpeciesPerStrategyMet(step); // sum over pop MatrixND result = matPerSpecies.sumOverDim(2).reduceDims(2); - result.setName(ResultName.MATRIX_GROSS_VALUE_OF_LANDINGS_PER_STRATEGY_MET); + result.setName(MatrixGrossValueOfLandingsPerStrategyMet.NAME); return result; // List<Strategy> strategies = siMatrix.getStrategies(step); @@ -705,14 +729,14 @@ throws TopiaException { MatrixND matGrossValue = matrixGrossValueOfLandingsPerStrategyMet(step); MatrixND result = matGrossValue.copy(); - result.setName(ResultName.MATRIX_GROSS_VALUE_OF_LANDINGS_PER_STRATEGY_MET_PER_VESSEL); + result.setName(MatrixGrossValueOfLandingsPerStrategyMetPerVessel.NAME); for (MatrixIterator i=result.iterator(); i.next();) { Object[] sems = i.getSemanticsCoordinates(); Strategy str = (Strategy)sems[0]; Metier metier = (Metier)sems[1]; - // FIXME verifier que c bien cette donn�e qu'il faut utiliser dans le doc: PropNbVessels(str, sov) + // FIXME verifier que c bien cette donnee qu'il faut utiliser dans le doc: PropNbVessels(str, sov) double proportionSetOfVessels = str.getProportionSetOfVessels(); double numberOfVessels = str.getSetOfVessels().getNumberOfVessels(); @@ -765,7 +789,7 @@ // Metier metier, TimeStep step) throws TopiaException { // double grossValueOfLandingsPerStrategyMet = grossValueOfLandingsPerStrategyMet( // str, metier, step); -// // FIXME verifier que c bien cette donn�e qu'il faut utiliser dans le doc: PropNbVessels(str, sov) +// // FIXME verifier que c bien cette donnee qu'il faut utiliser dans le doc: PropNbVessels(str, sov) // double proportionSetOfVessels = str.getProportionSetOfVessels(); // double numberOfVessels = str.getSetOfVessels().getNumberOfVessels(); // @@ -784,7 +808,7 @@ throws TopiaException { MatrixND result = matrixGrossValueOfLandingsPerStrategyMet(step).copy(); - result.setName(ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET); + result.setName(MatrixNetValueOfLandingsPerStrategyMet.NAME); for (MatrixIterator i=result.iterator(); i.next();) { Object[] sems = i.getSemanticsCoordinates(); @@ -876,12 +900,12 @@ public MatrixND matrixNetValueOfLandingsPerStrategyMetPerVessel(TimeStep step) throws TopiaException { MatrixND result = matrixNetValueOfLandingsPerStrategyMet(step).copy(); - result.setName(ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET_PER_VESSEL); + result.setName(MatrixNetValueOfLandingsPerStrategyMetPerVessel.NAME); - for(MatrixIterator i=result.iteratorNotZero(); i.next();) { + for (MatrixIterator i=result.iteratorNotZero(); i.next();) { Object[] sems = i.getSemanticsCoordinates(); Strategy str = (Strategy)sems[0]; - Metier metier = (Metier)sems[1]; + //Metier metier = (Metier)sems[1]; // FIXME verifier que c bien cette donnée qu'il faut utiliser dans le doc: PropNbVessels(str, sov) double proportionSetOfVessels = str.getProportionSetOfVessels(); @@ -954,7 +978,7 @@ throws TopiaException { MatrixND result = matrixNetValueOfLandingsPerStrategyMetPerVessel(step).copy(); - result.setName(ResultName.MATRIX_NET_RENEVUE_TO_SHARE_PER_STRATEGY_MET_PER_VESSEL); + result.setName(MatrixNetRevenueToSharePerStrategyMetPerVessel.NAME); for(MatrixIterator i=result.iteratorNotZero(); i.next();) { Object[] sems = i.getSemanticsCoordinates(); @@ -1030,7 +1054,7 @@ throws TopiaException { MatrixND result = matrixNetValueOfLandingsPerStrategyMetPerVessel(step).copy(); - result.setName(ResultName.MATRIX_CREW_SHARE_PER_STRATEGY_MET_PER_VESSEL); + result.setName(MatrixCrewSharePerStrategyPerVessel.NAME); for(MatrixIterator i=result.iteratorNotZero(); i.next();) { Object[] sems = i.getSemanticsCoordinates(); @@ -1111,9 +1135,9 @@ MatrixND matRevenue = matrixNetRenevueToSharePerStrategyMetPerVessel(step); MatrixND result = matRevenue.copy(); - result.setName(ResultName.MATRIX_OWNER_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY_MET_PER_VESSEL); + result.setName(MatrixOwnerMarginOverVariableCostsPerStrategyMetPerVessel.NAME); - for(MatrixIterator i=result.iterator(); i.next();) { + for (MatrixIterator i=result.iterator(); i.next();) { Object[] sems = i.getSemanticsCoordinates(); Strategy str = (Strategy)sems[0]; Metier metier = (Metier)sems[1]; @@ -1195,9 +1219,9 @@ MatrixND matRepair = matrixRepairAndMaintenanceGearCostsPerVessel(step); MatrixND result = matrixNetValueOfLandingsPerStrategyMetPerVessel(step).copy(); - result.setName(ResultName.MATRIX_VESSEL_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY_MET_PER_VESSEL); + result.setName(MatrixVesselMarginOverVariableCostsPerStrategyMetPerVessel.NAME); - for(MatrixIterator i=result.iterator(); i.next();) { + for (MatrixIterator i=result.iterator(); i.next();) { Object[] sems = i.getSemanticsCoordinates(); Strategy str = (Strategy)sems[0]; Metier metier = (Metier)sems[1]; @@ -1275,7 +1299,7 @@ MatrixND result = MatrixFactory .getInstance() .create( - ResultName.MATRIX_OWNER_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY_PER_VESSEL, + MatrixOwnerMarginOverVariableCostsPerStrategyPerVessel.NAME, new List[] { matOwner.getSemantic(0) }, new String[] { n("Strategies") }); @@ -1348,7 +1372,7 @@ public MatrixND matrixOwnerMarginOverVariableCostsPerStrategy(TimeStep step) throws TopiaException { MatrixND result = matrixOwnerMarginOverVariableCostsPerStrategyPerVessel(step).copy(); - result.setName(ResultName.MATRIX_OWNER_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY); + result.setName(MatrixOwnerMarginOverVariableCostsPerStrategy.NAME); for(MatrixIterator i=result.iteratorNotZero(); i.next();) { Object[] sems = i.getSemanticsCoordinates(); @@ -1414,7 +1438,7 @@ MatrixND result = MatrixFactory .getInstance() .create( - ResultName.MATRIX_VESSEL_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY_PER_VESSEL, + MatrixVesselMarginOverVariableCostsPerStrategyPerVessel.NAME, new List[] { matPerMet.getSemantic(0) }, new String[] { n("Strategies") }); @@ -1490,7 +1514,7 @@ throws TopiaException { MatrixND result = matrixVesselMarginOverVariableCostsPerStrategyPerVessel(step).copy(); - result.setName(ResultName.MATRIX_VESSEL_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY); + result.setName(MatrixVesselMarginOverVariableCostsPerStrategy.NAME); for(MatrixIterator i=result.iteratorNotZero(); i.next();) { Object[] sems = i.getSemanticsCoordinates(); @@ -1588,8 +1612,7 @@ * @return */ public double getEffortPerStrategyMet(Strategy str, Metier metier, TimeStep step) { - MatrixND mat = resultManager.getMatrix(step, - ResultName.MATRIX_EFFORT_PER_STRATEGY_MET); + MatrixND mat = resultManager.getMatrix(step, MatrixEffortPerStrategyMet.NAME); double result = 0; if (mat != null) { result = mat.getValue(str, metier); Modified: trunk/scripts/ResultName.java =================================================================== --- trunk/scripts/ResultName.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/scripts/ResultName.java 2015-06-23 15:35:53 UTC (rev 370) @@ -22,10 +22,9 @@ package scripts; -import static org.nuiton.i18n.I18n.n; +import fr.ifremer.isisfish.util.Doc; +import resultinfos.*; -import fr.ifremer.isisfish.util.Doc; // pour pouvoir afficher une aide contextuelle (BUG#1605) - /** * Contient l'ensemble des noms des differents resultats. Le mieux lorsque l'on * veut un nouveau resultat est d'ajouter une constante ici, et de l'utiliser @@ -40,7 +39,11 @@ * afficher l'ensemble des resultats disponible * * @author poussin + * + * @deprecated since 4.4, result has been moved to dedicated classes in "resultname" package. + * This class will remaing to ensure compatibility issue with pre 4.4 users scripts */ +@Deprecated public class ResultName { /** @@ -51,7 +54,7 @@ * Dimension 4 : Zone */ @Doc(value = "do the doc of Result matrixDiscardsWeightPerStrMet") - static final public String MATRIX_DISCARDS_WEIGHT_PER_STR_MET_PER_ZONE_POP = n("matrixDiscardsWeightPerStrMetPerZonePop"); + static final public String MATRIX_DISCARDS_WEIGHT_PER_STR_MET_PER_ZONE_POP = MatrixDiscardsWeightPerStrMetPerZonePop.NAME; /** * Matrix with five dimensions @@ -62,7 +65,7 @@ * Dimension 5 : Zone */ @Doc(value = "do the doc of Result matrixDiscardsPerStrMet") - static final public String MATRIX_DISCARDS_PER_STR_MET_PER_ZONE_POP = n("matrixDiscardsPerStrMetPerZonePop"); + static final public String MATRIX_DISCARDS_PER_STR_MET_PER_ZONE_POP = MatrixDiscardsPerStrMetPerZonePop.NAME; /** * Matrix with five dimensions @@ -73,7 +76,7 @@ * Dimension 5 : Zone */ @Doc(value = "do the doc of Result matrixLandingPerMet") - static final public String MATRIX_LANDING_PER_MET = n("matrixLandingPerMet"); + static final public String MATRIX_LANDING_PER_MET = MatrixLandingPerMet.NAME; /** * Matrix with three dimensions @@ -82,7 +85,7 @@ * Dimension 3 : Metier */ @Doc(value = "do the doc of Result matrixEffortPerStrategyMet") - static final public String MATRIX_EFFORT_PER_STRATEGY_MET = n("matrixEffortPerStrategyMet"); + static final public String MATRIX_EFFORT_PER_STRATEGY_MET = MatrixEffortPerStrategyMet.NAME; /** * Matrix with three dimensions @@ -91,7 +94,7 @@ * Dimension 3 : Metier */ @Doc(value = "do the doc of Result matrixEffortNominalPerStrategyMet") - static final public String MATRIX_EFFORT_NOMINAL_PER_STRATEGY_MET = n("matrixEffortNominalPerStrategyMet"); + static final public String MATRIX_EFFORT_NOMINAL_PER_STRATEGY_MET = MatrixEffortNominalPerStrategyMet.NAME; /** * Matrix with five dimensions @@ -102,7 +105,7 @@ * Dimension 5 : Zone */ @Doc(value = "Disponible uniquement avec les simulations par Zone. do the doc of Result matrixCatchRatePerStrategyMet") - static final public String MATRIX_CATCH_RATE_PER_STRATEGY_MET_PER_ZONE_POP = n("matrixCatchRatePerStrategyMet"); + static final public String MATRIX_CATCH_RATE_PER_STRATEGY_MET_PER_ZONE_POP = MatrixCatchRatePerStrategyMet.NAME; /** * Matrix with five dimensions @@ -116,7 +119,7 @@ * @see simulators.SimulatorEffortByCell */ @Doc(value = "do the doc of Result matrixCatchPerStrategyMetPerZoneMet") - static final public String MATRIX_CATCH_PER_STRATEGY_MET_PER_ZONE_MET = n("matrixCatchPerStrategyMetPerZoneMet"); + static final public String MATRIX_CATCH_PER_STRATEGY_MET_PER_ZONE_MET = MatrixCatchPerStrategyMetPerZoneMet.NAME; /** * Matrix with five dimensions @@ -127,7 +130,7 @@ * Dimension 5 : Zone */ @Doc(value = "do the doc of Result matrixCatchPerStrategyMetPerZonePop") - static final public String MATRIX_CATCH_PER_STRATEGY_MET_PER_ZONE_POP = n("matrixCatchPerStrategyMetPerZonePop"); + static final public String MATRIX_CATCH_PER_STRATEGY_MET_PER_ZONE_POP = MatrixCatchPerStrategyMetPerZonePop.NAME; /** * Matrix with five dimensions @@ -141,7 +144,7 @@ * @see simulators.SimulatorEffortByCell */ @Doc(value = "do the doc of Result matrixCatchWeightPerStrategyMetPerZoneMet") - static final public String MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_MET = n("matrixCatchWeightPerStrategyMetPerZoneMet"); + static final public String MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_MET = MatrixCatchWeightPerStrategyMetPerZoneMet.NAME; /** * Matrix with five dimensions @@ -152,7 +155,7 @@ * Dimension 5 : Zone */ @Doc(value = "do the doc of Result matrixCatchWeightPerStrategyMetPerZonePop") - static final public String MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP = n("matrixCatchWeightPerStrategyMetPerZonePop"); + static final public String MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP = MatrixCatchWeightPerStrategyMetPerZonePop.NAME; /** * Matrix with five dimensions @@ -163,14 +166,14 @@ * Dimension 5 : Zone */ @Doc(value = "Disponible uniquement avec les simulations par Zone. do the doc of Result matrixFishingMortality") - static final public String MATRIX_FISHING_MORTALITY = n("matrixFishingMortality"); + static final public String MATRIX_FISHING_MORTALITY = MatrixFishingMortality.NAME; /** * Matrix with 1 dimension * Dimension 1 : TimeStep */ @Doc(value = "do the doc of Result matrixTotalFishingMortality") - static final public String MATRIX_TOTAL_FISHING_MORTALITY = n("matrixTotalFishingMortality"); + static final public String MATRIX_TOTAL_FISHING_MORTALITY = MatrixTotalFishingMortality.NAME; /** * Matrix with 2 dimensions @@ -178,7 +181,7 @@ * Dimension 2 : Group */ @Doc(value = "do the doc of Result matrixFishingMortalityPerGroup") - static final public String MATRIX_FISHING_MORTALITY_PER_GROUP = n("matrixFishingMortalityPerGroup"); + static final public String MATRIX_FISHING_MORTALITY_PER_GROUP = MatrixFishingMortalityPerGroup.NAME; /** * Matrix with three dimensions @@ -187,7 +190,7 @@ * Dimension 3 : Zone (semantics : Dimension 2) */ @Doc(value = "do the doc of Result matrixAbundance") - static final public String MATRIX_ABUNDANCE = n("matrixAbundance"); + static final public String MATRIX_ABUNDANCE = MatrixAbundance.NAME; /** * Matrix with two dimensions @@ -195,14 +198,14 @@ * Dimension 2 : Zone (semantics : Dimension 1) */ @Doc(value = "do the doc of Result matrixLbar") - static final public String MATRIX_LBAR = n("matrixLbar"); + static final public String MATRIX_LBAR = MatrixLbar.NAME; /** * Matrix with one dimension * Dimension 1 : TimeStep */ @Doc(value = "do the doc of Result matrixRecruitment") - static final public String MATRIX_RECRUITMENT = n("matrixRecruitment"); + static final public String MATRIX_RECRUITMENT = MatrixRecruitment.NAME; /** * Matrix with three dimensions @@ -211,7 +214,7 @@ * Dimension 3 : Zone */ @Doc(value = "do the doc of Result matrixAbundanceBeginMonth") - static final public String MATRIX_ABUNDANCE_BEGIN_MONTH = n("matrixAbundanceBeginMonth"); + static final public String MATRIX_ABUNDANCE_BEGIN_MONTH = MatrixAbundanceBeginMonth.NAME; /** * Matrix with three dimensions @@ -220,7 +223,7 @@ * Dimension 3 : Zone */ @Doc(value = "do the doc of Result matrixBiomass") - static final public String MATRIX_BIOMASS = n("matrixBiomass"); + static final public String MATRIX_BIOMASS = MatrixBiomass.NAME; /** * Matrix with three dimensions @@ -229,7 +232,7 @@ * Dimension 3 : Zone */ @Doc(value = "do the doc of Result matrixBiomassBeginMonth") - static final public String MATRIX_BIOMASS_BEGIN_MONTH = n("matrixBiomassBeginMonth"); + static final public String MATRIX_BIOMASS_BEGIN_MONTH = MatrixBiomassBeginMonth.NAME; /** * Matrix with three dimensions @@ -238,7 +241,7 @@ * Dimension 3 : Metier */ @Doc(value = "do the doc of Result matrixFishingTimePerMonthPerVessel") - static final public String MATRIX_FISHING_TIME_PER_MONTH_PER_VESSEL = n("matrixFishingTimePerMonthPerVessel"); + static final public String MATRIX_FISHING_TIME_PER_MONTH_PER_VESSEL = MatrixFishingTimePerMonthPerVessel.NAME; /** * Matrix with three dimensions @@ -247,7 +250,7 @@ * Dimension 3 : Metier */ @Doc(value = "do the doc of Result matrixFuelCostsOfTravelPerVessel") - static final public String MATRIX_FUEL_COSTS_OF_TRAVEL_PER_VESSEL = n("matrixFuelCostsOfTravelPerVessel"); + static final public String MATRIX_FUEL_COSTS_OF_TRAVEL_PER_VESSEL = MatrixFuelCostsOfTravelPerVessel.NAME; /** * Matrix with three dimensions @@ -256,7 +259,7 @@ * Dimension 3 : Metier */ @Doc(value = "do the doc of Result matrixCostsOfFishingPerVessel") - static final public String MATRIX_COSTS_OF_FISHING_PER_VESSEL = n("matrixCostsOfFishingPerVessel"); + static final public String MATRIX_COSTS_OF_FISHING_PER_VESSEL = MatrixCostsOfFishingPerVessel.NAME; /** * Matrix with three dimensions @@ -265,7 +268,7 @@ * Dimension 3 : Metier */ @Doc(value = "do the doc of Result matrixFuelCostsPerVessel") - static final public String MATRIX_FUEL_COSTS_PER_VESSEL = n("matrixFuelCostsPerVessel"); + static final public String MATRIX_FUEL_COSTS_PER_VESSEL = MatrixFuelCostsPerVessel.NAME; /** * Matrix with three dimensions @@ -274,7 +277,7 @@ * Dimension 3 : Metier */ @Doc(value = "do the doc of Result matrixRepairAndMaintenanceGearCostsPerVessel") - static final public String MATRIX_REPAIR_AND_MAINTENANCE_GEAR_COSTS_PER_VESSEL = n("matrixRepairAndMaintenanceGearCostsPerVessel"); + static final public String MATRIX_REPAIR_AND_MAINTENANCE_GEAR_COSTS_PER_VESSEL = MatrixRepairAndMaintenanceGearCostsPerVessel.NAME; /** * Matrix with three dimensions @@ -283,7 +286,7 @@ * Dimension 3 : Metier */ @Doc(value = "do the doc of Result matrixOtherRunningCostsPerVessel") - static final public String MATRIX_OTHER_RUNNING_COSTS_PER_VESSEL = n("matrixOtherRunningCostsPerVessel"); + static final public String MATRIX_OTHER_RUNNING_COSTS_PER_VESSEL = MatrixOtherRunningCostsPerVessel.NAME; /** * Matrix with three dimensions @@ -292,7 +295,7 @@ * Dimension 3 : Metier */ @Doc(value = "do the doc of Result matrixSharedNotFixedCostsPerVessel") - static final public String MATRIX_SHARED_NOT_FIXED_COSTS_PER_VESSEL = n("matrixSharedNotFixedCostsPerVessel"); + static final public String MATRIX_SHARED_NOT_FIXED_COSTS_PER_VESSEL = MatrixSharedNotFixedCostsPerVessel.NAME; /** * Matrix with four dimensions @@ -302,7 +305,7 @@ * Dimension 4 : Population */ @Doc(value = "do the doc of Result matrixGrossValueOfLandingsPerSpeciesPerStrategyMet") - static final public String MATRIX_GROSS_VALUE_OF_LANDINGS_PER_SPECIES_PER_STRATEGY_MET = n("matrixGrossValueOfLandingsPerSpeciesPerStrategyMet"); + static final public String MATRIX_GROSS_VALUE_OF_LANDINGS_PER_SPECIES_PER_STRATEGY_MET = MatrixGrossValueOfLandingsPerSpeciesPerStrategyMet.NAME; /** * Matrix with three dimensions @@ -311,7 +314,7 @@ * Dimension 3 : Metier */ @Doc(value = "do the doc of Result matrixGrossValueOfLandingsPerStrategyMet") - static final public String MATRIX_GROSS_VALUE_OF_LANDINGS_PER_STRATEGY_MET = n("matrixGrossValueOfLandingsPerStrategyMet"); + static final public String MATRIX_GROSS_VALUE_OF_LANDINGS_PER_STRATEGY_MET = MatrixGrossValueOfLandingsPerStrategyMet.NAME; /** * Matrix with three dimensions @@ -322,7 +325,7 @@ * Matrix calculated in the non generic Rule : GraviteVPUE1LangEtGrossValueOtherSpeciesECOMOD */ @Doc(value = "do the doc of Result matrixGrossValueOfLandingsOtherSpeciesPerStrategyMet") - static final public String MATRIX_GROSS_VALUE_OF_LANDINGS_OTHER_SPECIES_PER_STRATEGY_MET = n("matrixGrossValueOfLandingsOtherSpeciesPerStrategyMet"); + static final public String MATRIX_GROSS_VALUE_OF_LANDINGS_OTHER_SPECIES_PER_STRATEGY_MET = MatrixGrossValueOfLandingsOtherSpeciesPerStrategyMet.NAME; /** * Matrix with three dimensions @@ -331,7 +334,7 @@ * Dimension 3 : Metier */ @Doc(value = "do the doc of Result matrixGrossValueOfLandingsPerStrategyMetPerVessel") - static final public String MATRIX_GROSS_VALUE_OF_LANDINGS_PER_STRATEGY_MET_PER_VESSEL = n("matrixGrossValueOfLandingsPerStrategyMetPerVessel"); + static final public String MATRIX_GROSS_VALUE_OF_LANDINGS_PER_STRATEGY_MET_PER_VESSEL = MatrixGrossValueOfLandingsPerStrategyMetPerVessel.NAME; /** * Matrix with three dimensions @@ -340,7 +343,7 @@ * Dimension 3 : Metier */ @Doc(value = "do the doc of Result matrixNetValueOfLandingsPerStrategyMet") - static final public String MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET = n("matrixNetValueOfLandingsPerStrategyMet"); + static final public String MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET = MatrixNetValueOfLandingsPerStrategyMet.NAME; /** * Matrix with three dimensions @@ -349,7 +352,7 @@ * Dimension 3 : Metier */ @Doc(value = "do the doc of Result matrixNetValueOfLandingsPerStrategyMetPerVessel") - static final public String MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET_PER_VESSEL = n("matrixNetValueOfLandingsPerStrategyMetPerVessel"); + static final public String MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET_PER_VESSEL = MatrixNetValueOfLandingsPerStrategyMetPerVessel.NAME; /** * Matrix with three dimensions @@ -358,7 +361,7 @@ * Dimension 3 : Metier */ @Doc(value = "do the doc of Result matrixNetRenevueToSharePerStrategyMetPerVessel") - static final public String MATRIX_NET_RENEVUE_TO_SHARE_PER_STRATEGY_MET_PER_VESSEL = n("matrixNetRenevueToSharePerStrategyMetPerVessel"); + static final public String MATRIX_NET_RENEVUE_TO_SHARE_PER_STRATEGY_MET_PER_VESSEL = MatrixNetRevenueToSharePerStrategyMetPerVessel.NAME; /** * Matrix with three dimensions @@ -367,7 +370,7 @@ * Dimension 3 : Metier */ @Doc(value = "do the doc of Result matrixCrewSharePerStrategyPerVessel") - static final public String MATRIX_CREW_SHARE_PER_STRATEGY_MET_PER_VESSEL = n("matrixCrewSharePerStrategyPerVessel"); + static final public String MATRIX_CREW_SHARE_PER_STRATEGY_MET_PER_VESSEL = MatrixCrewSharePerStrategyPerVessel.NAME; /** * Matrix with three dimensions @@ -376,7 +379,7 @@ * Dimension 3 : Metier */ @Doc(value = "do the doc of Result matrixOwnerMarginOverVariableCostsPerStrategyMetPerVessel") - static final public String MATRIX_OWNER_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY_MET_PER_VESSEL = n("matrixOwnerMarginOverVariableCostsPerStrategyMetPerVessel"); + static final public String MATRIX_OWNER_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY_MET_PER_VESSEL = MatrixOwnerMarginOverVariableCostsPerStrategyMetPerVessel.NAME; /** * Matrix with three dimensions @@ -385,7 +388,7 @@ * Dimension 3 : Metier */ @Doc(value = "do the doc of Result matrixVesselMarginOverVariableCostsPerStrategyMetPerVessel") - static final public String MATRIX_VESSEL_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY_MET_PER_VESSEL = n("matrixVesselMarginOverVariableCostsPerStrategyMetPerVessel"); + static final public String MATRIX_VESSEL_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY_MET_PER_VESSEL = MatrixVesselMarginOverVariableCostsPerStrategyMetPerVessel.NAME; /** * Matrix with three dimensions @@ -394,7 +397,7 @@ * Dimension 3 : Metier */ @Doc(value = "do the doc of Result matrixOwnerMarginOverVariableCostsPerStrategyPerVessel") - static final public String MATRIX_OWNER_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY_PER_VESSEL = n("matrixOwnerMarginOverVariableCostsPerStrategyPerVessel"); + static final public String MATRIX_OWNER_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY_PER_VESSEL = MatrixOwnerMarginOverVariableCostsPerStrategyPerVessel.NAME; /** * Matrix with two dimensions @@ -402,7 +405,7 @@ * Dimension 2 : Strategy */ @Doc(value = "do the doc of Result matrixOwnerMarginOverVariableCostsPerStrategy") - static final public String MATRIX_OWNER_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY = n("matrixOwnerMarginOverVariableCostsPerStrategy"); + static final public String MATRIX_OWNER_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY = MatrixOwnerMarginOverVariableCostsPerStrategy.NAME; /** * Matrix with two dimensions @@ -410,7 +413,7 @@ * Dimension 2 : Strategy */ @Doc(value = "do the doc of Result matrixVesselMarginOverVariableCostsPerStrategyPerVessel") - static final public String MATRIX_VESSEL_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY_PER_VESSEL = n("matrixVesselMarginOverVariableCostsPerStrategyPerVessel"); + static final public String MATRIX_VESSEL_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY_PER_VESSEL = MatrixVesselMarginOverVariableCostsPerStrategyPerVessel.NAME; /** * Matrix with two dimensions @@ -418,7 +421,7 @@ * Dimension 2 : Strategy */ @Doc(value = "do the doc of Result matrixVesselMarginOverVariableCostsPerStrategy") - static final public String MATRIX_VESSEL_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY = n("matrixVesselMarginOverVariableCostsPerStrategy"); + static final public String MATRIX_VESSEL_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY = MatrixVesselMarginOverVariableCostsPerStrategy.NAME; /** * Matrix with three dimensions @@ -427,7 +430,7 @@ * Dimension 3 : Metier */ @Doc(value = "do the doc of Result matrixNoActivity") - static final public String MATRIX_NO_ACTIVITY = n("matrixNoActivity"); + static final public String MATRIX_NO_ACTIVITY = MatrixNoActivity.NAME; /** * Matrix with three dimensions @@ -436,7 +439,7 @@ * Dimension 3 : Zone */ @Doc(value = "do the doc of Result matrixMetierZone") - static final public String MATRIX_METIER_ZONE = n("matrixMetierZone"); + static final public String MATRIX_METIER_ZONE = MatrixMetierZone.NAME; /** * Matrix with two dimensions @@ -444,5 +447,5 @@ * Dimension 2 : Group */ @Doc(value = "do the doc of Result matrixPrice") - static final public String MATRIX_PRICE = n("matrixPrice"); + static final public String MATRIX_PRICE = MatrixPrice.NAME; } Modified: trunk/scripts/SiMatrix.java =================================================================== --- trunk/scripts/SiMatrix.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/scripts/SiMatrix.java 2015-06-23 15:35:53 UTC (rev 370) @@ -40,25 +40,13 @@ import fr.ifremer.isisfish.IsisFishDAOHelper; import fr.ifremer.isisfish.IsisFishException; -import fr.ifremer.isisfish.entities.Cell; -import fr.ifremer.isisfish.entities.EffortDescription; -import fr.ifremer.isisfish.entities.Gear; -import fr.ifremer.isisfish.entities.Metier; -import fr.ifremer.isisfish.entities.MetierSeasonInfo; -import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.entities.PopulationGroup; -import fr.ifremer.isisfish.entities.PopulationSeasonInfo; -import fr.ifremer.isisfish.entities.Selectivity; -import fr.ifremer.isisfish.entities.SetOfVessels; -import fr.ifremer.isisfish.entities.Strategy; -import fr.ifremer.isisfish.entities.StrategyMonthInfo; -import fr.ifremer.isisfish.entities.Zone; -import fr.ifremer.isisfish.entities.ZoneDAO; +import fr.ifremer.isisfish.entities.*; import fr.ifremer.isisfish.simulator.ResultManager; import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.types.Month; import fr.ifremer.isisfish.types.TimeStep; import fr.ifremer.isisfish.util.Nocache; +import resultinfos.*; /** * SiMatrix.java @@ -222,7 +210,7 @@ List<Zone> zones = getZones(step); MatrixND result = MatrixFactory.getInstance().create( - ResultName.MATRIX_METIER_ZONE, new List[] { metiers, zones }, + MatrixMetierZone.NAME, new List[] { metiers, zones }, new String[] { n("Metiers"), n("Zones") }); for (Metier metier : metiers) { @@ -238,7 +226,7 @@ public MatrixND matrixPrice(TimeStep step, Population pop) { List<PopulationGroup> groups = pop.getPopulationGroup(); MatrixND result = MatrixFactory.getInstance().create( - ResultName.MATRIX_PRICE, new List[] { groups }, + MatrixPrice.NAME, new List[] { groups }, new String[] { n("PopulationGroup") }); for (PopulationGroup group : groups) { @@ -260,7 +248,7 @@ throws TopiaException, IsisFishException { return matrixToWeightMatrix(step, 2, - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP, + MatrixCatchWeightPerStrategyMetPerZonePop.NAME, matrixCatchPerStrategyMetPerZonePop); } @@ -286,7 +274,7 @@ int dimZone = 3; MatrixND result = matrixCatchRatePerStrategyMet.copy(); - result.setName(ResultName.MATRIX_CATCH_PER_STRATEGY_MET_PER_ZONE_POP); + result.setName(MatrixCatchPerStrategyMetPerZonePop.NAME); for (MatrixIterator i=result.iteratorNotZero(); i.next();) { Object[] posSem = i.getSemanticsCoordinates(); @@ -319,7 +307,7 @@ List<Zone> zones = pop.getPopulationZone(); MatrixND result = MatrixFactory.getInstance().create( - ResultName.MATRIX_CATCH_RATE_PER_STRATEGY_MET_PER_ZONE_POP, + MatrixCatchRatePerStrategyMet.NAME, new List[] { strategies, metiers, groups, zones }, new String[] { n("Strategies"), n("Metiers"), n("Groups"), n("Zones") }); @@ -378,6 +366,7 @@ /** * @param str * @param metier + * @param infoMet * @param step * @return */ @@ -506,7 +495,7 @@ // default value in matrix is 0 MatrixND result = MatrixFactory.getInstance().create( - ResultName.MATRIX_FISHING_MORTALITY, + MatrixFishingMortality.NAME, new List[] { strategies, metiers, groups, zones }, new String[] { n("Strategies"), n("Metiers"), n("Groups"), n("Zones") }); @@ -904,7 +893,7 @@ List<Zone> zones = pop.getPopulationZone(); MatrixND result = MatrixFactory.getInstance().create( - ResultName.MATRIX_ABUNDANCE, new List[] { groups, zones }, + MatrixAbundance.NAME, new List[] { groups, zones }, new String[] { n("Groups"), n("Zones") }); for (int g = 0; g < groups.size(); g++) { @@ -939,7 +928,7 @@ List<Zone> zones = pop.getPopulationZone(); MatrixND result = MatrixFactory.getInstance().create( - ResultName.MATRIX_ABUNDANCE, new List[] { groups, zones }, + MatrixAbundance.NAME, new List[] { groups, zones }, new String[] { n("Groups"), n("Zones") }); for (int g = 0; g < groups.size(); g++) { @@ -963,6 +952,7 @@ * @param step * @param group * @param zone + * @param matrixFishingMortality * @return * @throws IsisFishException * @throws TopiaException @@ -992,7 +982,7 @@ * @return */ public MatrixND matrixBiomass(MatrixND N, Population pop, TimeStep step) { - return matrixToWeightMatrix(step, 0, ResultName.MATRIX_BIOMASS, N); + return matrixToWeightMatrix(step, 0, MatrixBiomass.NAME, N); // // List<PopulationGroup> groups = (List<PopulationGroup>)N.getSemantic(0); // List<Zone> zones = (List<Zone>)N.getSemantic(1); @@ -1017,7 +1007,7 @@ public MatrixND matrixBiomassBeginMonth(MatrixND N, Population pop, TimeStep step) { - return matrixToWeightMatrix(step, 0, ResultName.MATRIX_BIOMASS_BEGIN_MONTH, N); + return matrixToWeightMatrix(step, 0, MatrixBiomassBeginMonth.NAME, N); // List<PopulationGroup> groups = (List<PopulationGroup>)N.getSemantic(0); // List<Zone> zones = (List<Zone>)N.getSemantic(1); @@ -1045,7 +1035,7 @@ List<Zone> zones = (List<Zone>)N.getSemantic(1); MatrixND result = MatrixFactory.getInstance().create( - ResultName.MATRIX_ABUNDANCE_BEGIN_MONTH, new List[] { groups, zones }, + MatrixBiomassBeginMonth.NAME, new List[] { groups, zones }, new String[] { n("Groups"), n("Zones") }); for (int g = 0; g < groups.size(); g++) { @@ -1069,7 +1059,7 @@ List<Metier> metiers = getMetiers(step); MatrixND result = MatrixFactory.getInstance().create( - ResultName.MATRIX_EFFORT_PER_STRATEGY_MET, + MatrixEffortPerStrategyMet.NAME, new List[] { strategies, metiers }, new String[] { n("Strategies"), n("Metiers") }); @@ -1097,7 +1087,7 @@ public MatrixND matrixDiscardWeightPerStrategyMetPerZonePop(Population pop, TimeStep step, MatrixND matrixDiscardPerStrategyMetPerZonePop) { return matrixToWeightMatrix(step, 2, - ResultName.MATRIX_DISCARDS_WEIGHT_PER_STR_MET_PER_ZONE_POP, + MatrixDiscardsWeightPerStrMetPerZonePop.NAME, matrixDiscardPerStrategyMetPerZonePop); // List<PopulationGroup> groups = pop.getPopulationGroup(); @@ -1120,7 +1110,7 @@ List<Metier> metiers = getMetiers(step); MatrixND result = MatrixFactory.getInstance().create( - ResultName.MATRIX_EFFORT_NOMINAL_PER_STRATEGY_MET, + MatrixEffortNominalPerStrategyMet.NAME, new List[]{strategies, metiers}, new String[]{n("Strategies"), n("Metiers")}); @@ -1151,13 +1141,13 @@ double Fgroup = 0; double Cgroup = 0; double Mgroup = 0; - double NgroupJan = 0; + double NgroupRef = 0; List<Population> populations = Collections.singletonList(pop); List<PopulationGroup> groups = pop.getPopulationGroup(); MatrixND tfgMatrix = MatrixFactory.getInstance().create( - ResultName.MATRIX_FISHING_MORTALITY_PER_GROUP, + MatrixFishingMortalityPerGroup.NAME, new List[]{populations, groups}, // On travaille sur les pops ET les groupes new String[]{n("Population"), n("Group")}); @@ -1172,7 +1162,12 @@ // s'ils ont deja ete calcules une fois (meme s'ils ont change depuis) // beforeOrEquals sert a bien prendre Decembre aussi - MatrixND catchPerStrategyTemp = resManager.getMatrix(loopstep, pop, ResultName.MATRIX_CATCH_PER_STRATEGY_MET_PER_ZONE_POP); + MatrixND catchPerStrategyTemp; + if (pop.isComputeFOnLandings()) { + catchPerStrategyTemp = resManager.getMatrix(loopstep, pop, MatrixLandingPerMet.NAME); + } else { + catchPerStrategyTemp = resManager.getMatrix(loopstep, pop, MatrixCatchPerStrategyMetPerZonePop.NAME); + } if (catchPerStrategy == null) { catchPerStrategy = catchPerStrategyTemp.copy(); // On clone la matrice car si on fait les operations sur celle contenue dans le cache on la modifie et donc on recupere des resultats faux. @@ -1198,13 +1193,18 @@ Mgroup = naturalDeathRatePop.getValue(group); //log.info("Mgroup= " + Mgroup + "Year=" + step.getYear()); - MatrixND abundancePopJan = resManager.getMatrix(new TimeStep(12*step.getYear()), pop, ResultName.MATRIX_ABUNDANCE); // Le timestep 0 correspond a janvier de la premiere annee et les annees sont numerotees a partir de zero - abundancePopJan = abundancePopJan.sumOverDim(1); // somme sur Zone - abundancePopJan = abundancePopJan.reduce(); - NgroupJan = abundancePopJan.getValue(group); - //log.info("NgroupJan = " + NgroupJan + "Year=" + step.getYear()); + Month abundanceReferenceMonth = pop.getAbundanceReferenceMonth(); + if (abundanceReferenceMonth == null) { + abundanceReferenceMonth = Month.JANUARY; + } + TimeStep refStep = new TimeStep(12 * step.getYear() + abundanceReferenceMonth.getMonthNumber()); + MatrixND abundancePopRef = resManager.getMatrix(refStep, pop, MatrixAbundance.NAME); // Le timestep 0 correspond a janvier de la premiere annee et les annees sont numerotees a partir de zero + abundancePopRef = abundancePopRef.sumOverDim(1); // somme sur Zone + abundancePopRef = abundancePopRef.reduce(); + NgroupRef = abundancePopRef.getValue(group); + //log.info("NgroupRef = " + NgroupJan + "Year=" + step.getYear()); - ObjectiveFunction f = new ObjectiveFunctionBaranov(Cgroup, Mgroup, NgroupJan); + ObjectiveFunction f = new ObjectiveFunctionBaranov(Cgroup, Mgroup, NgroupRef); Fgroup = MinimisationUtil.fmin(0.0,2.0,1.0e-10, f); // step ?? //log.info("Fgroup = " + Fgroup); @@ -1231,13 +1231,13 @@ */ public MatrixND totalFishingMortality(TimeStep step, Population pop, MatrixND fishingMortalityPerGroup) throws TopiaException { MatrixND tfmMatrix = fishingMortalityPerGroup.copy(); - tfmMatrix.setName(ResultName.MATRIX_TOTAL_FISHING_MORTALITY); + tfmMatrix.setName(MatrixFishingMortality.NAME); //log.info("tfmMatrix = " + tfmMatrix); List<PopulationGroup> groups = pop.getPopulationGroup(); - int groupMin = pop.getGroupMin(); - int groupMax = pop.getGroupMax(); + int groupMin = pop.getFbarGroupMin(); + int groupMax = pop.getFbarGroupMax(); int Nbre = (int)groupMax - (int)groupMin + 1; //log.info("Nbre = " + Nbre); @@ -1296,7 +1296,7 @@ */ public MatrixND Lbar(TimeStep step, Population pop, MatrixND N) throws TopiaException { MatrixND LbarMatrix = N.copy(); - LbarMatrix.setName(ResultName.MATRIX_LBAR); + LbarMatrix.setName(MatrixLbar.NAME); //log.info("Lbar_1 = " + LbarMatrix); List<PopulationGroup> groups = pop.getPopulationGroup(); @@ -1343,7 +1343,7 @@ List<Population> populations = Collections.singletonList(pop); MatrixND RecruitmentMatrix = MatrixFactory.getInstance().create( - ResultName.MATRIX_RECRUITMENT, + MatrixRecruitment.NAME, new List[]{populations}, // new String[]{n("Population")}); Modified: trunk/scripts/SiMatrixEffortByCell.java =================================================================== --- trunk/scripts/SiMatrixEffortByCell.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/scripts/SiMatrixEffortByCell.java 2015-06-23 15:35:53 UTC (rev 370) @@ -38,6 +38,11 @@ import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.types.Month; import fr.ifremer.isisfish.types.TimeStep; +import resultinfos.MatrixAbundance; +import resultinfos.MatrixCatchPerStrategyMetPerZoneMet; +import resultinfos.MatrixCatchPerStrategyMetPerZonePop; +import resultinfos.MatrixCatchWeightPerStrategyMetPerZoneMet; + import java.util.Collection; import java.util.HashSet; import java.util.List; @@ -72,8 +77,7 @@ matrixCatchPerStrategyMetPerZoneMet(N, pop, step); resManager.addResult(step, pop, catchPerStrategyMetPerZoneMet); - if (resManager - .isEnabled(ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_MET)) { + if (resManager.isEnabled(MatrixCatchWeightPerStrategyMetPerZoneMet.NAME)) { MatrixND catchWeightPerStrategyMet = matrixCatchWeightPerStrategyMetPerZoneMet(step, pop, catchPerStrategyMetPerZoneMet); @@ -86,7 +90,7 @@ throws TopiaException, IsisFishException { return matrixToWeightMatrix(step, 2, - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_MET, + MatrixCatchWeightPerStrategyMetPerZoneMet.NAME, matrixCatchPerStrategyMetPerZoneMet); } @@ -110,7 +114,7 @@ .getSemantic(4)); MatrixND result = MatrixFactory.getInstance().create( - ResultName.MATRIX_CATCH_PER_STRATEGY_MET_PER_ZONE_MET, + MatrixCatchPerStrategyMetPerZoneMet.NAME, new List[] { strategies, metiers, groups, zones }, new String[] { n("Strategies"), n("Metiers"), n("Groups"), n("Zones") }); @@ -166,7 +170,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(MatrixCatchPerStrategyMetPerZonePop.NAME); return result; } @@ -193,7 +197,7 @@ matrixFishingMortalityPerCell); result = result.sumOverDim(2); result = result.reduceDims(2); - result.setName(ResultName.MATRIX_ABUNDANCE); + result.setName(MatrixAbundance.NAME); return result; } @@ -215,7 +219,7 @@ List<Cell> allCells = getCells(zones); MatrixND result = MatrixFactory.getInstance().create( - ResultName.MATRIX_ABUNDANCE + "_PER_CELL", + MatrixAbundance.NAME + "_PER_CELL", new List[] { groups, zones, allCells }, new String[] { n("Groups"), n("Zones"), n("Cells") }); Modified: trunk/sensitivityexports/SensitivityBiomassReferenceY9.java =================================================================== --- trunk/sensitivityexports/SensitivityBiomassReferenceY9.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/sensitivityexports/SensitivityBiomassReferenceY9.java 2015-06-23 15:35:53 UTC (rev 370) @@ -29,13 +29,13 @@ import org.nuiton.math.matrix.MatrixND; import org.nuiton.util.ReverseFileReader; -import scripts.ResultName; import fr.ifremer.isisfish.datastore.ResultStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.types.TimeStep; import fr.ifremer.isisfish.util.Doc; +import resultinfos.MatrixBiomass; public class SensitivityBiomassReferenceY9 implements SensitivityExport { @@ -43,13 +43,15 @@ static private Log log = LogFactory .getLog(SensitivityBiomassReferenceY9.class); - protected String[] necessaryResult = { ResultName.MATRIX_BIOMASS }; + protected String[] necessaryResult = { + MatrixBiomass.NAME + }; @Doc("Population") public Population param_pop; @Doc("URL of the Biomasses.csv reference export file") - public String param_referenceBiomassCSV =""; + public String param_referenceBiomassCSV = ""; @Override public void export(SimulationStorage simulation, Writer out) @@ -96,7 +98,7 @@ //Get the biomass of the last time step MatrixND matrixLastDate = resultStorage.getMatrix(lastStep, pop, - ResultName.MATRIX_BIOMASS); + MatrixBiomass.NAME); //sum all biomass = matrixLastDate.sumAll(); } Modified: trunk/sensitivityexports/SensitivityBiomassRelativeReferenceY12.java =================================================================== --- trunk/sensitivityexports/SensitivityBiomassRelativeReferenceY12.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/sensitivityexports/SensitivityBiomassRelativeReferenceY12.java 2015-06-23 15:35:53 UTC (rev 370) @@ -29,13 +29,13 @@ import org.nuiton.math.matrix.MatrixND; import org.nuiton.util.ReverseFileReader; -import scripts.ResultName; import fr.ifremer.isisfish.datastore.ResultStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.types.TimeStep; import fr.ifremer.isisfish.util.Doc; +import resultinfos.MatrixBiomass; public class SensitivityBiomassRelativeReferenceY12 implements SensitivityExport { @@ -44,7 +44,9 @@ static private Log log = LogFactory .getLog(SensitivityBiomassRelativeReferenceY12.class); - protected String[] necessaryResult = { ResultName.MATRIX_BIOMASS }; + protected String[] necessaryResult = { + MatrixBiomass.NAME + }; @Doc("Population") public Population param_pop; @@ -102,12 +104,12 @@ //Get the biomass on december of the first year MatrixND matfirstdate = resultStorage.getMatrix(firstStep, pop, - ResultName.MATRIX_BIOMASS); + MatrixBiomass.NAME); firstBiomass = matfirstdate.sumAll(); //Get the biomass of the last time step MatrixND matlastdate = resultStorage.getMatrix(lastStep, pop, - ResultName.MATRIX_BIOMASS); + MatrixBiomass.NAME); biomass = matlastdate.sumAll(); } } Modified: trunk/sensitivityexports/SensitivityBiomassRelativeY6.java =================================================================== --- trunk/sensitivityexports/SensitivityBiomassRelativeY6.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/sensitivityexports/SensitivityBiomassRelativeY6.java 2015-06-23 15:35:53 UTC (rev 370) @@ -27,13 +27,13 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixND; -import scripts.ResultName; import fr.ifremer.isisfish.datastore.ResultStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.types.TimeStep; import fr.ifremer.isisfish.util.Doc; +import resultinfos.MatrixBiomass; public class SensitivityBiomassRelativeY6 implements SensitivityExport { @@ -41,7 +41,9 @@ static private Log log = LogFactory .getLog(SensitivityBiomassRelativeY6.class); - protected String[] necessaryResult = { ResultName.MATRIX_BIOMASS }; + protected String[] necessaryResult = { + MatrixBiomass.NAME + }; @Doc("Population") public Population param_pop; @@ -60,12 +62,12 @@ //Get the biomass on december of the first year MatrixND matfirstdate = resultStorage.getMatrix(firstStep, pop, - ResultName.MATRIX_BIOMASS); + MatrixBiomass.NAME); firstbiomass = matfirstdate.sumAll(); //Get the biomass of the last time step MatrixND matlastdate = resultStorage.getMatrix(lastStep, pop, - ResultName.MATRIX_BIOMASS); + MatrixBiomass.NAME); biomass = matlastdate.sumAll(); } Modified: trunk/sensitivityexports/SensitivityBiomassY3.java =================================================================== --- trunk/sensitivityexports/SensitivityBiomassY3.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/sensitivityexports/SensitivityBiomassY3.java 2015-06-23 15:35:53 UTC (rev 370) @@ -27,20 +27,22 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixND; -import scripts.ResultName; import fr.ifremer.isisfish.datastore.ResultStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.types.TimeStep; import fr.ifremer.isisfish.util.Doc; +import resultinfos.MatrixBiomass; public class SensitivityBiomassY3 implements SensitivityExport { /** to use log facility, just put in your code: log.info("..."); */ static private Log log = LogFactory.getLog(SensitivityBiomassY3.class); - protected String[] necessaryResult = { ResultName.MATRIX_BIOMASS }; + protected String[] necessaryResult = { + MatrixBiomass.NAME + }; @Doc("Population") public Population param_pop; @@ -56,7 +58,7 @@ //Get the biomass of the last time step MatrixND matlastdate = resultStorage.getMatrix(lastStep, pop, - ResultName.MATRIX_BIOMASS); + MatrixBiomass.NAME); biomass = matlastdate.sumAll(); } } Modified: trunk/sensitivityexports/SensitivityCatchWeightReferenceY7.java =================================================================== --- trunk/sensitivityexports/SensitivityCatchWeightReferenceY7.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/sensitivityexports/SensitivityCatchWeightReferenceY7.java 2015-06-23 15:35:53 UTC (rev 370) @@ -29,13 +29,13 @@ import org.nuiton.math.matrix.MatrixND; import org.nuiton.util.ReverseFileReader; -import scripts.ResultName; import fr.ifremer.isisfish.datastore.ResultStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.types.TimeStep; import fr.ifremer.isisfish.util.Doc; +import resultinfos.MatrixCatchWeightPerStrategyMetPerZonePop; public class SensitivityCatchWeightReferenceY7 implements SensitivityExport { @@ -43,7 +43,9 @@ static private Log log = LogFactory .getLog(SensitivityCatchWeightReferenceY7.class); - protected String[] necessaryResult = { ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP }; + protected String[] necessaryResult = { + MatrixCatchWeightPerStrategyMetPerZonePop.NAME + }; @Doc("Population") public Population param_pop; @@ -98,7 +100,7 @@ MatrixND matlastdate = resultStorage.getMatrix( new TimeStep(lastStep.getStep() - i), pop, - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP); + MatrixCatchWeightPerStrategyMetPerZonePop.NAME); capturesWeight += matlastdate.sumAll(); } } Modified: trunk/sensitivityexports/SensitivityCatchWeightRelativeReferenceY10.java =================================================================== --- trunk/sensitivityexports/SensitivityCatchWeightRelativeReferenceY10.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/sensitivityexports/SensitivityCatchWeightRelativeReferenceY10.java 2015-06-23 15:35:53 UTC (rev 370) @@ -29,13 +29,13 @@ import org.nuiton.math.matrix.MatrixND; import org.nuiton.util.ReverseFileReader; -import scripts.ResultName; import fr.ifremer.isisfish.datastore.ResultStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.types.TimeStep; import fr.ifremer.isisfish.util.Doc; +import resultinfos.MatrixCatchWeightPerStrategyMetPerZonePop; public class SensitivityCatchWeightRelativeReferenceY10 implements SensitivityExport { @@ -44,7 +44,7 @@ .getLog(SensitivityCatchWeightRelativeReferenceY10.class); protected String[] necessaryResult = { - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP + MatrixCatchWeightPerStrategyMetPerZonePop.NAME }; @Doc("Population") @@ -108,7 +108,7 @@ .getMatrix( new TimeStep(lastStep.getStep() - i), pop, - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP); + MatrixCatchWeightPerStrategyMetPerZonePop.NAME); capturesWeight += matlastdate.sumAll(); //Get the captures Weight of each month of the first year @@ -116,7 +116,7 @@ .getMatrix( new TimeStep(i), pop, - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP); + MatrixCatchWeightPerStrategyMetPerZonePop.NAME); capturesWeightFirst += matfirstdate.sumAll(); } Modified: trunk/sensitivityexports/SensitivityCatchWeightRelativeY4.java =================================================================== --- trunk/sensitivityexports/SensitivityCatchWeightRelativeY4.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/sensitivityexports/SensitivityCatchWeightRelativeY4.java 2015-06-23 15:35:53 UTC (rev 370) @@ -27,13 +27,13 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixND; -import scripts.ResultName; import fr.ifremer.isisfish.datastore.ResultStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.types.TimeStep; import fr.ifremer.isisfish.util.Doc; +import resultinfos.MatrixCatchWeightPerStrategyMetPerZonePop; public class SensitivityCatchWeightRelativeY4 implements SensitivityExport { @@ -42,7 +42,7 @@ .getLog(SensitivityCatchWeightRelativeY4.class); protected String[] necessaryResult = { - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP + MatrixCatchWeightPerStrategyMetPerZonePop.NAME }; @Doc("Population") @@ -65,7 +65,7 @@ .getMatrix( new TimeStep(lastStep.getStep() - i), pop, - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP); + MatrixCatchWeightPerStrategyMetPerZonePop.NAME); capturesWeight += matlastdate.sumAll(); //Get the captures Weight of each month of the first year @@ -73,7 +73,7 @@ .getMatrix( new TimeStep(i), pop, - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP); + MatrixCatchWeightPerStrategyMetPerZonePop.NAME); capturesWeightfirst += matfirstdate.sumAll(); } Modified: trunk/sensitivityexports/SensitivityCatchWeightY1.java =================================================================== --- trunk/sensitivityexports/SensitivityCatchWeightY1.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/sensitivityexports/SensitivityCatchWeightY1.java 2015-06-23 15:35:53 UTC (rev 370) @@ -27,13 +27,13 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixND; -import scripts.ResultName; import fr.ifremer.isisfish.datastore.ResultStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.types.TimeStep; import fr.ifremer.isisfish.util.Doc; +import resultinfos.MatrixCatchWeightPerStrategyMetPerZonePop; public class SensitivityCatchWeightY1 implements SensitivityExport { @@ -42,7 +42,7 @@ .getLog(SensitivityCatchWeightY1.class); protected String[] necessaryResult = { - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP + MatrixCatchWeightPerStrategyMetPerZonePop.NAME }; @Doc("Population") @@ -64,7 +64,7 @@ .getMatrix( new TimeStep(lastStep.getStep() - i), pop, - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP); + MatrixCatchWeightPerStrategyMetPerZonePop.NAME); capturesWeight += matlastdate.sumAll(); } Modified: trunk/sensitivityexports/SensitivityLbarJanvierY1.java =================================================================== --- trunk/sensitivityexports/SensitivityLbarJanvierY1.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/sensitivityexports/SensitivityLbarJanvierY1.java 2015-06-23 15:35:53 UTC (rev 370) @@ -27,20 +27,22 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixND; -import scripts.ResultName; import fr.ifremer.isisfish.datastore.ResultStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.types.TimeStep; import fr.ifremer.isisfish.util.Doc; +import resultinfos.MatrixLbar; public class SensitivityLbarJanvierY1 implements SensitivityExport { /** to use log facility, just put in your code: log.info("..."); */ static private Log log = LogFactory.getLog(SensitivityLbarJanvierY1.class); - protected String[] necessaryResult = { ResultName.MATRIX_LBAR }; + protected String[] necessaryResult = { + MatrixLbar.NAME + }; @Doc("Population") public Population param_pop; @@ -57,7 +59,7 @@ //Get the lbar of the last time step MatrixND matlastJan = resultStorage.getMatrix(janvierLastYear, pop, - ResultName.MATRIX_LBAR); + MatrixLbar.NAME); MatrixND meanLastJan = matlastJan.meanOverDim(0); // moyenne sur les zones lbar = meanLastJan.sumAll(); // On somme tout mais en fait il n'y a plus qu'une valeur dans la matrice; permet d'avoir un double } Modified: trunk/sensitivityexports/SensitivityRecruitmentY1.java =================================================================== --- trunk/sensitivityexports/SensitivityRecruitmentY1.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/sensitivityexports/SensitivityRecruitmentY1.java 2015-06-23 15:35:53 UTC (rev 370) @@ -27,13 +27,13 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixND; -import scripts.ResultName; import fr.ifremer.isisfish.datastore.ResultStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.types.TimeStep; import fr.ifremer.isisfish.util.Doc; +import resultinfos.MatrixRecruitment; public class SensitivityRecruitmentY1 implements SensitivityExport { @@ -41,7 +41,7 @@ static private Log log = LogFactory.getLog(SensitivityRecruitmentY1.class); protected String[] necessaryResult = { - ResultName.MATRIX_RECRUITMENT + MatrixRecruitment.NAME }; @Doc("Population") @@ -62,7 +62,7 @@ MatrixND matlastdate = resultStorage.getMatrix( new TimeStep(lastStep.getStep() - i), pop, - ResultName.MATRIX_RECRUITMENT); + MatrixRecruitment.NAME); recruitment += matlastdate.sumAll(); } } Modified: trunk/sensitivityexports/SensitivitySpawningBiomassReferenceY8.java =================================================================== --- trunk/sensitivityexports/SensitivitySpawningBiomassReferenceY8.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/sensitivityexports/SensitivitySpawningBiomassReferenceY8.java 2015-06-23 15:35:53 UTC (rev 370) @@ -28,13 +28,14 @@ import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.types.TimeStep; import fr.ifremer.isisfish.util.Doc; +import resultinfos.MatrixBiomass; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixIterator; import org.nuiton.math.matrix.MatrixND; import org.nuiton.topia.TopiaContext; import org.nuiton.util.ReverseFileReader; -import scripts.ResultName; import java.io.File; import java.io.Writer; @@ -49,7 +50,7 @@ .getLog(SensitivitySpawningBiomassReferenceY8.class); protected String[] necessaryResult = { - ResultName.MATRIX_BIOMASS + MatrixBiomass.NAME }; @Doc("Population") @@ -114,7 +115,7 @@ //Get the biomass of the last time step MatrixND matlastdate = resultStorage.getMatrix(pop, - ResultName.MATRIX_BIOMASS, tx); + MatrixBiomass.NAME, tx); for (MatrixIterator i = matlastdate.iterator(); i.hasNext();) { i.next(); Object[] sems = i.getSemanticsCoordinates(); Modified: trunk/sensitivityexports/SensitivitySpawningBiomassRelativeReferenceY11.java =================================================================== --- trunk/sensitivityexports/SensitivitySpawningBiomassRelativeReferenceY11.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/sensitivityexports/SensitivitySpawningBiomassRelativeReferenceY11.java 2015-06-23 15:35:53 UTC (rev 370) @@ -28,13 +28,14 @@ import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.types.TimeStep; import fr.ifremer.isisfish.util.Doc; +import resultinfos.MatrixBiomass; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixIterator; import org.nuiton.math.matrix.MatrixND; import org.nuiton.topia.TopiaContext; import org.nuiton.util.ReverseFileReader; -import scripts.ResultName; import java.io.File; import java.io.Writer; @@ -49,7 +50,9 @@ static private Log log = LogFactory .getLog(SensitivitySpawningBiomassRelativeReferenceY11.class); - protected String[] necessaryResult = { ResultName.MATRIX_BIOMASS }; + protected String[] necessaryResult = { + MatrixBiomass.NAME + }; @Doc("Population") public Population param_pop; @@ -122,7 +125,7 @@ //Get the biomass of the first time step MatrixND matfirstdate = resultStorage.getMatrix(pop, - ResultName.MATRIX_BIOMASS, tx); + MatrixBiomass.NAME, tx); for (MatrixIterator i = matfirstdate.iterator(); i.hasNext();) { i.next(); Object[] sems = i.getSemanticsCoordinates(); @@ -136,7 +139,7 @@ //Get the biomass of the last time step MatrixND matlastdate = resultStorage.getMatrix(pop, - ResultName.MATRIX_BIOMASS, tx); + MatrixBiomass.NAME, tx); for (MatrixIterator i = matlastdate.iterator(); i.hasNext();) { i.next(); Object[] sems = i.getSemanticsCoordinates(); Modified: trunk/sensitivityexports/SensitivitySpawningBiomassRelativeY5.java =================================================================== --- trunk/sensitivityexports/SensitivitySpawningBiomassRelativeY5.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/sensitivityexports/SensitivitySpawningBiomassRelativeY5.java 2015-06-23 15:35:53 UTC (rev 370) @@ -28,13 +28,13 @@ import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.types.TimeStep; import fr.ifremer.isisfish.util.Doc; +import resultinfos.MatrixBiomass; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixIterator; import org.nuiton.math.matrix.MatrixND; -import scripts.ResultName; - import java.io.Writer; import org.nuiton.topia.TopiaContext; @@ -45,7 +45,7 @@ .getLog(SensitivitySpawningBiomassRelativeY5.class); protected String[] necessaryResult = { - ResultName.MATRIX_BIOMASS + MatrixBiomass.NAME }; @Doc("Population") @@ -67,7 +67,7 @@ //Get the biomass of the first time step MatrixND matfirstdate = resultStorage.getMatrix(pop, - ResultName.MATRIX_BIOMASS, tx); + MatrixBiomass.NAME, tx); for (MatrixIterator i = matfirstdate.iterator(); i.hasNext();) { i.next(); Object[] sems = i.getSemanticsCoordinates(); @@ -81,7 +81,7 @@ //Get the biomass of the last time step MatrixND matlastdate = resultStorage.getMatrix(pop, - ResultName.MATRIX_BIOMASS, tx); + MatrixBiomass.NAME, tx); for (MatrixIterator i = matlastdate.iterator(); i.hasNext();) { i.next(); Object[] sems = i.getSemanticsCoordinates(); Modified: trunk/sensitivityexports/SensitivitySpawningBiomassY2.java =================================================================== --- trunk/sensitivityexports/SensitivitySpawningBiomassY2.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/sensitivityexports/SensitivitySpawningBiomassY2.java 2015-06-23 15:35:53 UTC (rev 370) @@ -28,13 +28,13 @@ import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.types.TimeStep; import fr.ifremer.isisfish.util.Doc; +import resultinfos.MatrixBiomass; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixIterator; import org.nuiton.math.matrix.MatrixND; -import scripts.ResultName; - import java.io.Writer; import org.nuiton.topia.TopiaContext; @@ -45,7 +45,7 @@ .getLog(SensitivitySpawningBiomassY2.class); protected String[] necessaryResult = { - ResultName.MATRIX_BIOMASS + MatrixBiomass.NAME }; @Doc("Population") @@ -65,7 +65,7 @@ //Get the biomass of the last time step MatrixND matlastdate = resultStorage.getMatrix(pop, - ResultName.MATRIX_BIOMASS, tx); + MatrixBiomass.NAME, tx); for (MatrixIterator i = matlastdate.iterator(); i.hasNext();) { i.next(); Object[] sems = i.getSemanticsCoordinates(); Modified: trunk/simulationplans/CalibrationSimplexePasVariable2Capturabilite.java =================================================================== --- trunk/simulationplans/CalibrationSimplexePasVariable2Capturabilite.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/simulationplans/CalibrationSimplexePasVariable2Capturabilite.java 2015-06-23 15:35:53 UTC (rev 370) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2007 - 2014 Ifremer, CodeLutin, Sigrid Lehuta + * Copyright (C) 2007 - 2015 Ifremer, CodeLutin, Sigrid Lehuta * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -32,10 +32,8 @@ import org.nuiton.math.matrix.MatrixIterator; import org.nuiton.math.matrix.MatrixND; import org.nuiton.topia.TopiaContext; -import org.nuiton.util.FileUtil; import org.nuiton.util.StringUtil; -import scripts.ResultName; import fr.ifremer.isisfish.datastore.ResultStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.entities.Population; @@ -44,6 +42,7 @@ import fr.ifremer.isisfish.simulator.SimulationPlanContext; import fr.ifremer.isisfish.util.Doc; import fr.ifremer.isisfish.util.ScriptUtil; +import resultinfos.MatrixCatchWeightPerStrategyMetPerZonePop; /** * CalibrationSimplexePasVariable2Capturabilite. @@ -109,7 +108,7 @@ //*** write the name of the simulated matrix that contains the data corresponding // to your observations (here MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP) protected String[] necessaryResult = { - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP + MatrixCatchWeightPerStrategyMetPerZonePop.NAME }; public String[] getNecessaryResult() { @@ -134,7 +133,7 @@ public void init(SimulationPlanContext context) throws Exception { if (param_nomfichier_debarquements == null || "".equals(param_nomfichier_debarquements)) { - debarquementsObserves = FileUtil.getFile(".*.csv", + debarquementsObserves = ScriptUtil.getFile(".*.csv", "fichier csv séparateur ';'"); } else { debarquementsObserves = new File(param_nomfichier_debarquements); @@ -355,7 +354,7 @@ /////***import the matrix of simulated data (here landings) from the simulation result MatrixND L = result.getMatrix(param_Population, - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP); + MatrixCatchWeightPerStrategyMetPerZonePop.NAME); /////*** extract, sum, etc to obtain the same format/data as your observation matrix // useful methods to work on matrix : sumOverDim(), getSubMatrix(), reduce() Modified: trunk/simulationplans/SimulationNumberRestriction.java =================================================================== --- trunk/simulationplans/SimulationNumberRestriction.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/simulationplans/SimulationNumberRestriction.java 2015-06-23 15:35:53 UTC (rev 370) @@ -50,8 +50,8 @@ protected String[] necessaryResult = { // put here all necessary result for this rule // example: - // ResultName.MATRIX_BIOMASS, - // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, + // MatrixBiomass.NAME, + // MatrixNetValueOfLandingsPerStrategyMet.NAME }; @Override Modified: trunk/simulators/DefaultSimulator.java =================================================================== --- trunk/simulators/DefaultSimulator.java 2015-06-23 15:22:43 UTC (rev 369) +++ trunk/simulators/DefaultSimulator.java 2015-06-23 15:35:53 UTC (rev 370) @@ -37,6 +37,8 @@ import fr.ifremer.isisfish.simulator.Simulator; import fr.ifremer.isisfish.types.Month; import fr.ifremer.isisfish.types.TimeStep; +import resultinfos.*; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixFactory; @@ -44,7 +46,6 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import scripts.GravityModel; -import scripts.ResultName; import scripts.SiMatrix; import java.util.List; @@ -115,7 +116,7 @@ for (Population pop : allpops) { MatrixND N = param.getNumberOf(pop); - N.setName(ResultName.MATRIX_ABUNDANCE); + N.setName(MatrixAbundance.NAME); populationMonitor.setN(pop, N); } @@ -171,9 +172,9 @@ // only if there are one or more strategy if (siMatrix.getStrategies(step).size() > 0) { - if (resManager.isEnabled(ResultName.MATRIX_NO_ACTIVITY)) { + if (resManager.isEnabled(MatrixNoActivity.NAME)) { MatrixND mat = metierMonitor.getOrCreateNoActivity(step, - ResultName.MATRIX_NO_ACTIVITY, siMatrix + MatrixNoActivity.NAME, siMatrix .getStrategies(step), siMatrix .getMetiers(step)); resManager.addResult(step, mat); @@ -223,7 +224,7 @@ // // Keep modification's information done in rule // - if (resManager.isEnabled(ResultName.MATRIX_METIER_ZONE)) { + if (resManager.isEnabled(MatrixMetierZone.NAME)) { MatrixND metierZone = siMatrix.getMetierZone(step); resManager.addResult(step, metierZone); } @@ -246,13 +247,13 @@ control.setText("Add some results"); if (resManager - .isEnabled(ResultName.MATRIX_EFFORT_PER_STRATEGY_MET)) { + .isEnabled(MatrixEffortPerStrategyMet.NAME)) { MatrixND effortPerStrategyMet = siMatrix .matrixEffortPerStrategyMet(step); resManager.addResult(step, effortPerStrategyMet); } - if (resManager.isEnabled(ResultName.MATRIX_EFFORT_NOMINAL_PER_STRATEGY_MET)) { + if (resManager.isEnabled(MatrixEffortNominalPerStrategyMet.NAME)) { MatrixND effortNominalPerStrategyMet = siMatrix.matrixEffortNominalPerStrategyMet(step); resManager.addResult(step, effortNominalPerStrategyMet); } @@ -285,7 +286,7 @@ if (discard != null || step.getStep() == 0) { // force discard for the first month to have discard in result if (discard == null) { discard = MatrixFactory.getInstance().create( - ResultName.MATRIX_DISCARDS_PER_STR_MET_PER_ZONE_POP, + MatrixDiscardsPerStrMetPerZonePop.NAME, new List[] { siMatrix.getStrategies(step), siMatrix.getMetiers(step), pop.getPopulationGroup(), @@ -297,7 +298,7 @@ resManager.addResult(step, pop, discard); if (resManager - .isEnabled(ResultName.MATRIX_DISCARDS_WEIGHT_PER_STR_MET_PER_ZONE_POP)) { + .isEnabled(MatrixDiscardsWeightPerStrMetPerZonePop.NAME)) { MatrixND discardWeightPerStrategyMet = siMatrix .matrixDiscardWeightPerStrategyMetPerZonePop( pop, step, discard); @@ -310,29 +311,50 @@ // // add landing result // - if (resManager.isEnabled(ResultName.MATRIX_LANDING_PER_MET)) { + if (resManager.isEnabled(MatrixLandingPerMet.NAME)) { MatrixND landing = populationMonitor.getCatch(pop).copy(); - landing.setName(ResultName.MATRIX_LANDING_PER_MET); + landing.setName(MatrixLandingPerMet.NAME); if (discard != null) { landing = landing.minus(discard); } resManager.addResult(step, pop, landing); } + + if (resManager.isEnabled(MatrixLandingWeight.NAME)) { + MatrixND landing = populationMonitor.getCatch(pop).copy(); + if (discard != null) { + landing = landing.minus(discard); + } + MatrixND landingweight = siMatrix.matrixToWeightMatrix(step, 2, + MatrixLandingWeight.NAME, landing); + + resManager.addResult(step, pop, landingweight); + } + + // F and Fbar + if (resManager.isEnabled(MatrixFishingMortalityPerGroup.NAME)) { + MatrixND fishingMortalityPerGroup = siMatrix.fishingMortalityPerGroup(step, pop, context.getResultManager()); + resManager.addResult(step, pop, fishingMortalityPerGroup); + + // MatrixTotalFishingMortality.NAME depends on MatrixFishingMortalityPerGroup.NAME + if (resManager.isEnabled(MatrixTotalFishingMortality.NAME)) { + MatrixND totalFishingMortality = siMatrix.totalFishingMortality( + step, pop, fishingMortalityPerGroup); + resManager.addResult(step, pop, totalFishingMortality); + } + } } // // Add economics results // - - if (siMatrix.getStrategies(step).size() > 0) { - if (!"false".equalsIgnoreCase(param.getTagValue().get( - "ecoResult"))) { - control.setText("Add economics results"); - saveGravityModel(step, resManager, gravityModel); - } + if (!"false".equalsIgnoreCase(param.getTagValue().get( + "ecoResult"))) { + control.setText("Add economics results"); + saveGravityModel(step, resManager, gravityModel); } - if (resManager.isEnabled(ResultName.MATRIX_PRICE)) { + if (resManager.isEnabled(MatrixPrice.NAME)) { for (Population pop : siMatrix.getPopulations(step)) { MatrixND matPrice = siMatrix.matrixPrice(step, pop); resManager.addResult(step, pop, matPrice); @@ -383,7 +405,7 @@ resManager.addResult(step, pop, N); MatrixND biomass = siMatrix.matrixBiomass(N, pop, step); - if (resManager.isEnabled(ResultName.MATRIX_BIOMASS)) { + if (resManager.isEnabled(MatrixBiomass.NAME)) { resManager.addResult(step, pop, biomass); } @@ -445,23 +467,23 @@ N = N.add(recruitment); log.debug("N after recru: " + N); - if (resManager.isEnabled(ResultName.MATRIX_ABUNDANCE_BEGIN_MONTH)) { + if (resManager.isEnabled(MatrixAbundanceBeginMonth.NAME)) { MatrixND abondanceBM = siMatrix.matrixAbondanceBeginMonth(N, pop, step); resManager.addResult(step, pop, abondanceBM); } - if (resManager.isEnabled(ResultName.MATRIX_BIOMASS_BEGIN_MONTH)) { + if (resManager.isEnabled(MatrixBiomassBeginMonth.NAME)) { MatrixND biomassBM = siMatrix.matrixBiomassBeginMonth(N, pop, step); resManager.addResult(step, pop, biomassBM); } - if (resManager.isEnabled(ResultName.MATRIX_LBAR)) { + if (resManager.isEnabled(MatrixLbar.NAME)) { MatrixND Lbar = siMatrix.Lbar(step, pop, N); resManager.addResult(step, pop, Lbar); } - if (resManager.isEnabled(ResultName.MATRIX_RECRUITMENT)) { + if (resManager.isEnabled(MatrixRecruitment.NAME)) { MatrixND Recruitment = siMatrix.Recruitment(step, pop); resManager.addResult(step, pop, Recruitment); } @@ -482,29 +504,13 @@ resManager.addResult(step, pop, catchPerStrategyMetPerZonePop); if (resManager - .isEnabled(ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP)) { + .isEnabled(MatrixCatchWeightPerStrategyMetPerZonePop.NAME)) { MatrixND catchWeightPerStrategyMet = siMatrix .matrixCatchWeightPerStrategyMetPerZonePop(step, pop, catchPerStrategyMetPerZonePop); resManager.addResult(step, pop, catchWeightPerStrategyMet); } - if (resManager.isEnabled(ResultName.MATRIX_FISHING_MORTALITY_PER_GROUP) || - resManager.isEnabled(ResultName.MATRIX_TOTAL_FISHING_MORTALITY)) { - MatrixND fishingMortalityPerGroup = siMatrix.fishingMortalityPerGroup( - step, pop, context.getResultManager()); - - if (resManager.isEnabled(ResultName.MATRIX_FISHING_MORTALITY_PER_GROUP)) { - resManager.addResult(step, pop, fishingMortalityPerGroup); - } - - if (resManager.isEnabled(ResultName.MATRIX_TOTAL_FISHING_MORTALITY)) { - MatrixND totalFishingMortality = siMatrix.totalFishingMortality( - step, pop, fishingMortalityPerGroup); - resManager.addResult(step, pop, totalFishingMortality); - } - } - siMatrix.computeMonthExtra(step, pop, N); } else { // no strategies @@ -530,115 +536,115 @@ protected void saveGravityModel(TimeStep step, ResultManager resManager, GravityModel gravityModel) throws IsisFishException, TopiaException { if (resManager - .isEnabled(ResultName.MATRIX_FISHING_TIME_PER_MONTH_PER_VESSEL)) { + .isEnabled(MatrixFishingTimePerMonthPerVessel.NAME)) { MatrixND mat = gravityModel .matrixFishingTimePerMonthPerVessel(step); resManager.addResult(step, mat); } if (resManager - .isEnabled(ResultName.MATRIX_FUEL_COSTS_OF_TRAVEL_PER_VESSEL)) { + .isEnabled(MatrixFuelCostsOfTravelPerVessel.NAME)) { MatrixND mat = gravityModel.matrixFuelCostsOfTravelPerVessel(step); resManager.addResult(step, mat); } - if (resManager.isEnabled(ResultName.MATRIX_COSTS_OF_FISHING_PER_VESSEL)) { + if (resManager.isEnabled(MatrixCostsOfFishingPerVessel.NAME)) { MatrixND mat = gravityModel.matrixCostsOfFishingPerVessel(step); resManager.addResult(step, mat); } - if (resManager.isEnabled(ResultName.MATRIX_FUEL_COSTS_PER_VESSEL)) { + if (resManager.isEnabled(MatrixFuelCostsPerVessel.NAME)) { MatrixND mat = gravityModel.matrixFuelCostsOfTravelPerVessel(step); resManager.addResult(step, mat); } if (resManager - .isEnabled(ResultName.MATRIX_REPAIR_AND_MAINTENANCE_GEAR_COSTS_PER_VESSEL)) { + .isEnabled(MatrixRepairAndMaintenanceGearCostsPerVessel.NAME)) { MatrixND mat = gravityModel .matrixRepairAndMaintenanceGearCostsPerVessel(step); resManager.addResult(step, mat); } if (resManager - .isEnabled(ResultName.MATRIX_OTHER_RUNNING_COSTS_PER_VESSEL)) { + .isEnabled(MatrixOtherRunningCostsPerVessel.NAME)) { MatrixND mat = gravityModel.matrixOtherRunningCostsPerVessel(step); resManager.addResult(step, mat); } if (resManager - .isEnabled(ResultName.MATRIX_SHARED_NOT_FIXED_COSTS_PER_VESSEL)) { + .isEnabled(MatrixSharedNotFixedCostsPerVessel.NAME)) { MatrixND mat = gravityModel .matrixSharedNotFixedCostsPerVessel(step); resManager.addResult(step, mat); } if (resManager - .isEnabled(ResultName.MATRIX_GROSS_VALUE_OF_LANDINGS_PER_SPECIES_PER_STRATEGY_MET)) { + .isEnabled(MatrixGrossValueOfLandingsPerSpeciesPerStrategyMet.NAME)) { MatrixND mat = gravityModel .matrixGrossValueOfLandingsPerSpeciesPerStrategyMet(step); resManager.addResult(step, mat); } if (resManager - .isEnabled(ResultName.MATRIX_GROSS_VALUE_OF_LANDINGS_PER_STRATEGY_MET)) { + .isEnabled(MatrixGrossValueOfLandingsPerStrategyMet.NAME)) { MatrixND mat = gravityModel .matrixGrossValueOfLandingsPerStrategyMet(step); resManager.addResult(step, mat); } if (resManager - .isEnabled(ResultName.MATRIX_GROSS_VALUE_OF_LANDINGS_PER_STRATEGY_MET_PER_VESSEL)) { + .isEnabled(MatrixGrossValueOfLandingsPerStrategyMetPerVessel.NAME)) { MatrixND mat = gravityModel .matrixGrossValueOfLandingsPerStrategyMetPerVessel(step); resManager.addResult(step, mat); } if (resManager - .isEnabled(ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET)) { + .isEnabled(MatrixNetValueOfLandingsPerStrategyMet.NAME)) { MatrixND mat = gravityModel .matrixNetValueOfLandingsPerStrategyMet(step); resManager.addResult(step, mat); } if (resManager - .isEnabled(ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET_PER_VESSEL)) { + .isEnabled(MatrixNetValueOfLandingsPerStrategyMetPerVessel.NAME)) { MatrixND mat = gravityModel .matrixNetValueOfLandingsPerStrategyMetPerVessel(step); resManager.addResult(step, mat); } if (resManager - .isEnabled(ResultName.MATRIX_NET_RENEVUE_TO_SHARE_PER_STRATEGY_MET_PER_VESSEL)) { + .isEnabled(MatrixNetRevenueToSharePerStrategyMetPerVessel.NAME)) { MatrixND mat = gravityModel .matrixNetRenevueToSharePerStrategyMetPerVessel(step); resManager.addResult(step, mat); } if (resManager - .isEnabled(ResultName.MATRIX_CREW_SHARE_PER_STRATEGY_MET_PER_VESSEL)) { + .isEnabled(MatrixCrewSharePerStrategyPerVessel.NAME)) { MatrixND mat = gravityModel .matrixCrewSharePerStrategyMetPerVessel(step); resManager.addResult(step, mat); } if (resManager - .isEnabled(ResultName.MATRIX_OWNER_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY_MET_PER_VESSEL)) { + .isEnabled(MatrixOwnerMarginOverVariableCostsPerStrategyMetPerVessel.NAME)) { MatrixND mat = gravityModel .matrixOwnerMarginOverVariableCostsPerStrategyMetPerVessel(step); resManager.addResult(step, mat); } if (resManager - .isEnabled(ResultName.MATRIX_VESSEL_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY_MET_PER_VESSEL)) { + .isEnabled(MatrixVesselMarginOverVariableCostsPerStrategyMetPerVessel.NAME)) { MatrixND mat = gravityModel .matrixVesselMarginOverVariableCostsPerStrategyMetPerVessel(step); resManager.addResult(step, mat); } if (resManager - .isEnabled(ResultName.MATRIX_OWNER_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY_PER_VESSEL)) { + .isEnabled(MatrixOwnerMarginOverVariableCostsPerStrategyPerVessel.NAME)) { MatrixND mat = gravityModel .matrixOwnerMarginOverVariableCostsPerStrategyPerVessel(step); resManager.addResult(step, mat); } if (resManager - .isEnabled(ResultName.MATRIX_OWNER_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY)) { + .isEnabled(MatrixOwnerMarginOverVariableCostsPerStrategy.NAME)) { MatrixND mat = gravityModel .matrixOwnerMarginOverVariableCostsPerStrategy(step); resManager.addResult(step, mat); } if (resManager - .isEnabled(ResultName.MATRIX_VESSEL_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY_PER_VESSEL)) { + .isEnabled(MatrixVesselMarginOverVariableCostsPerStrategyPerVessel.NAME)) { MatrixND mat = gravityModel .matrixVesselMarginOverVariableCostsPerStrategyPerVessel(step); resManager.addResult(step, mat); } if (resManager - .isEnabled(ResultName.MATRIX_VESSEL_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY)) { + .isEnabled(MatrixVesselMarginOverVariableCostsPerStrategy.NAME)) { MatrixND mat = gravityModel .matrixVesselMarginOverVariableCostsPerStrategy(step); resManager.addResult(step, mat);