Author: jcouteau Date: 2011-11-30 14:02:08 +0100 (Wed, 30 Nov 2011) New Revision: 268 Url: http://forge.codelutin.com/repositories/revision/isis-fish-data/268 Log: Fix build Modified: trunk/simulators/DefaultSimulator.java Modified: trunk/simulators/DefaultSimulator.java =================================================================== --- trunk/simulators/DefaultSimulator.java 2011-11-30 09:37:50 UTC (rev 267) +++ trunk/simulators/DefaultSimulator.java 2011-11-30 13:02:08 UTC (rev 268) @@ -22,21 +22,6 @@ package simulators; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; - -import java.util.List; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.math.matrix.MatrixFactory; -import org.nuiton.math.matrix.MatrixND; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; - -import scripts.GravityModel; -import scripts.ResultName; -import scripts.SiMatrix; import fr.ifremer.isisfish.IsisFishException; import fr.ifremer.isisfish.datastore.ResultStorage; import fr.ifremer.isisfish.entities.Metier; @@ -51,9 +36,23 @@ import fr.ifremer.isisfish.simulator.SimulationControl; import fr.ifremer.isisfish.simulator.SimulationParameter; import fr.ifremer.isisfish.simulator.Simulator; -import fr.ifremer.isisfish.types.TimeStep; import fr.ifremer.isisfish.types.Month; +import fr.ifremer.isisfish.types.TimeStep; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.math.matrix.MatrixFactory; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import scripts.GravityModel; +import scripts.ResultName; +import scripts.SiMatrix; +import java.util.List; + +import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; + /** * DefaultSimulator.java * @@ -80,7 +79,7 @@ SimulationControl control = context.getSimulationControl(); int lastYear = param.getNumberOfYear(); int lastStep = lastYear * Month.NUMBER_OF_MONTH; - TimeStep step = control.getTimeStep(); + TimeStep step = control.getStep(); ResultManager resManager = context.getResultManager(); TopiaContext db = context.getDB(); @@ -132,7 +131,7 @@ break; } - control.setTimeStep(step); + control.setStep(step); control.setProgress(step.getStep()); control.setText(_("begin step " + step)); @@ -375,7 +374,7 @@ PopulationSeasonInfo info = pop.getPopulationSeasonInfo(month); // group change - MatrixND CA = null; + MatrixND CA; if (step.getStep() == 0) { CA = MatrixFactory.getInstance().matrixId( pop.sizePopulationGroup() * pop.sizePopulationZone()); @@ -440,7 +439,7 @@ resManager.addResult(step, pop, biomassBM); } - MatrixND abundance = N; + MatrixND abundance; // compute fishing matrix only if there are one or more strategy if (siMatrix.getStrategies(step).size() > 0) { // compute some Matrix and add result @@ -512,7 +511,7 @@ } /** - * @param date + * @param step * @param resManager * @throws IsisFishException * @throws TopiaException