From c6be28d8a0916a5df305a3556a0f65e1bc26aba0 Mon Sep 17 00:00:00 2001
From: Nicolas Dumoulin <nicolas.dumoulin@irstea.fr>
Date: Tue, 9 Jun 2015 13:50:28 +0000
Subject: [PATCH] runtime fixes
---
data/input/grid.xml | 10 +++-------
src/main/java/pikelake/Grid.java | 11 ++++++++++-
src/main/java/pikelake/pikes/PikeMovement.java | 16 ++++++++--------
3 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/data/input/grid.xml b/data/input/grid.xml
index d7ed7be..58cdec7 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 d1227c4..288f4a8 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 554f5de..3d8cf4d 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>();
--
GitLab