Author: echatellier Date: 2014-10-08 13:13:07 +0200 (Wed, 08 Oct 2014) New Revision: 346 Url: http://forge.codelutin.com/projects/isis-fish-data/repository/revisions/346 Log: Use result manager Modified: tags/4.3.1/scripts/SiMatrix.java tags/4.3.1/simulators/DefaultSimulator.java Modified: tags/4.3.1/scripts/SiMatrix.java =================================================================== --- tags/4.3.1/scripts/SiMatrix.java 2014-10-08 11:00:58 UTC (rev 345) +++ tags/4.3.1/scripts/SiMatrix.java 2014-10-08 11:13:07 UTC (rev 346) @@ -55,10 +55,10 @@ import fr.ifremer.isisfish.entities.StrategyMonthInfo; import fr.ifremer.isisfish.entities.Zone; import fr.ifremer.isisfish.entities.ZoneDAO; +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.types.Month; -import fr.ifremer.isisfish.datastore.ResultStorage; import fr.ifremer.isisfish.util.Nocache; /** @@ -1891,7 +1891,7 @@ * @param pop population * @return Fishing mortality per group per year (computed in December) */ - public MatrixND fishingMortalityPerGroup(TimeStep step, Population pop, ResultStorage resManager) throws TopiaException { + public MatrixND fishingMortalityPerGroup(TimeStep step, Population pop, ResultManager resManager) throws TopiaException { double Fgroup = 0; double Cgroup = 0; double Mgroup = 0; Modified: tags/4.3.1/simulators/DefaultSimulator.java =================================================================== --- tags/4.3.1/simulators/DefaultSimulator.java 2014-10-08 11:00:58 UTC (rev 345) +++ tags/4.3.1/simulators/DefaultSimulator.java 2014-10-08 11:13:07 UTC (rev 346) @@ -499,7 +499,7 @@ if (resManager.isEnabled(ResultName.MATRIX_FISHING_MORTALITY_PER_GROUP) || resManager.isEnabled(ResultName.MATRIX_TOTAL_FISHING_MORTALITY)) { MatrixND fishingMortalityPerGroup = siMatrix.fishingMortalityPerGroup(step, - pop, context.getSimulationStorage().getResultStorage()); + pop, context.getResultManager()); if (resManager.isEnabled(ResultName.MATRIX_FISHING_MORTALITY_PER_GROUP)) { resManager.addResult(step, pop, fishingMortalityPerGroup);