diff --git a/data/input/grid.xml b/data/input/grid.xml index d7ed7bec797bb794e64f0c0101aee79ac6ea962c..58cdec728052d1a6af3c4a319aa173690084eb64 100644 --- a/data/input/grid.xml +++ b/data/input/grid.xml @@ -2,11 +2,7 @@ <!DOCTYPE xml> <pikelake.Grid> <torusType>BOTH</torusType> - <neighborsType>NEIGHBORHOOD_VON_NEUMANN</neighborsType> - <preyCarryingCapacity>50</preyCarryingCapacity> - <gridWidth>10</gridWidth> - <gridHeight>10</gridHeight> - <habitatValue0>0.25</habitatValue0> - <habitatValue1>0.5</habitatValue1> - <habitatValue2>1</habitatValue2> + <neighborsType>NEIGHBORHOOD_VON_NEUMANN</neighborsType> + <gridWidth>10</gridWidth> + <gridHeight>10</gridHeight> </pikelake.Grid> \ No newline at end of file diff --git a/src/main/java/pikelake/Grid.java b/src/main/java/pikelake/Grid.java index d1227c4eabbcd756df37f8450fe706c2980464d6..288f4a81a3e4cb5d4f0a0418c0dd375c5be5e58f 100644 --- a/src/main/java/pikelake/Grid.java +++ b/src/main/java/pikelake/Grid.java @@ -5,6 +5,8 @@ import fr.cemagref.simaqualife.extensions.spatial2D.Grid2D.NeighborsType; import fr.cemagref.simaqualife.kernel.AquaNismsGroup; import fr.cemagref.simaqualife.kernel.util.TransientParameters.InitTransientParameters; import fr.cemagref.simaqualife.pilot.Pilot; +import java.util.ArrayList; +import java.util.List; import pikelake.pikes.Pike; public class Grid extends Grid2D<Cell, Individual> { @@ -16,8 +18,9 @@ public class Grid extends Grid2D<Cell, Individual> { @InitTransientParameters public void initTransientParameters(Pilot pilot) { - // TODO + // TODO empty grid + this.grid = new Cell[]{new Cell(0, 0.0), new Cell(1, 0.0)}; } @Override @@ -39,4 +42,10 @@ public class Grid extends Grid2D<Cell, Individual> { ind.getPosition().removePike((Pike) ind); } + public List<Cell> getNeighbours(Cell position, int distance) { + // TODO + return new ArrayList<Cell>(); + } + + } diff --git a/src/main/java/pikelake/pikes/PikeMovement.java b/src/main/java/pikelake/pikes/PikeMovement.java index 554f5de9bd9c7a744824d92c21dc43abc7e791eb..3d8cf4d33bfea50b73a3e0cf2d884e542250a894 100644 --- a/src/main/java/pikelake/pikes/PikeMovement.java +++ b/src/main/java/pikelake/pikes/PikeMovement.java @@ -13,22 +13,22 @@ import fr.cemagref.simaqualife.pilot.Pilot; public class PikeMovement extends LoopAquaNismsGroupProcess<Pike, PikesGroup> { + private int distance; transient private UniformGen uniformGen; public PikeMovement(Pilot pilot) { uniformGen = new UniformGen(pilot.getRandomStream(), new UniformDist()); } - @InitTransientParameters - public void initTransientParameters(Pilot pilot) { - uniformGen = new UniformGen(pilot.getRandomStream(), new UniformDist(0,1)); - } - - + + @InitTransientParameters + public void initTransientParameters(Pilot pilot) { + uniformGen = new UniformGen(pilot.getRandomStream(), new UniformDist(0, 1)); + } + @Override protected void doProcess(Pike pike, PikesGroup group) { - final List<Cell> surrounding = group.getEnvironment(). - getNeighbours(pike.getPosition()); + final List<Cell> surrounding = group.getEnvironment().getNeighbours(pike.getPosition(), distance); // the first possiblity is the cell where the prey is List<Cell> possibilities = new ArrayList<Cell>();