Author: bpoussin Date: 2007-12-07 19:56:32 +0000 (Fri, 07 Dec 2007) New Revision: 5 Modified: trunk/simulators/DefaultSimulator.java Log: modification pour la nouvelle gestion des resultats Modified: trunk/simulators/DefaultSimulator.java =================================================================== --- trunk/simulators/DefaultSimulator.java 2007-12-06 17:51:13 UTC (rev 4) +++ trunk/simulators/DefaultSimulator.java 2007-12-07 19:56:32 UTC (rev 5) @@ -57,6 +57,7 @@ import fr.ifremer.isisfish.rule.Rule; import fr.ifremer.isisfish.simulator.MetierMonitor; import fr.ifremer.isisfish.simulator.PopulationMonitor; +import fr.ifremer.isisfish.simulator.ResultManager; import fr.ifremer.isisfish.simulator.RuleMonitor; import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.simulator.SimulationControl; @@ -87,10 +88,10 @@ Date date = control.getDate(); control.setProgressMax(lastDate); - ResultStorage resManager = context.getSimulationStorage().getResultStorage(); + ResultManager resManager = context.getResultManager(); TopiaContext db = context.getDB(); - SiMatrix siMatrix = new SiMatrix(context); + SiMatrix siMatrix = SiMatrix.getSiMatrix(context); GravityModel gravityModel = new GravityModel(context, siMatrix); PopulationMonitor populationMonitor = context.getPopulationMonitor(); @@ -434,7 +435,7 @@ * @throws IsisFishException * @throws TopiaException */ - private void saveGravityModel(Date date, ResultStorage resManager, GravityModel gravityModel) throws IsisFishException, TopiaException { + private void saveGravityModel(Date date, ResultManager resManager, GravityModel gravityModel) throws IsisFishException, TopiaException { if (resManager.isEnabled(ResultName.MATRIX_FISHING_TIME_PER_MONTH_PER_VESSEL)) { MatrixND mat = gravityModel.matrixFishingTimePerMonthPerVessel(date); resManager.addResult(date, mat);