diff --git a/data/doc/PikeLake-doc.pdf b/data/doc/PikeLake-doc.pdf new file mode 100644 index 0000000000000000000000000000000000000000..d46d0d1cf5a8506997af6041b22c7cb528460f1b Binary files /dev/null and b/data/doc/PikeLake-doc.pdf differ diff --git a/data/doc/PikeLake.docx b/data/doc/PikeLake.docx index 6049d5ef5beae94d80cb867c91d1837667acc767..656cbbb49908506e9e01be6dae6e3ca71ea37351 100644 Binary files a/data/doc/PikeLake.docx and b/data/doc/PikeLake.docx differ diff --git a/data/input/fishLight.xml b/data/input/fishLight.xml index dfc1a9c6f947cb37d946ffb0091c22a58d2c092b..867d2050e6e6304fa886a03fa87daa929ad6c33e 100644 --- a/data/input/fishLight.xml +++ b/data/input/fishLight.xml @@ -32,7 +32,7 @@ </pikelake.Marnage> <pikelake.pikes.PikeMovement> - <basicMovingRate>2</basicMovingRate> + <!-- basicMovingRate>2</basicMovingRate--> </pikelake.pikes.PikeMovement> <pikelake.pikes.PikeTrackLocation> diff --git a/src/main/java/pikelake/environment/Movement2DWithinShapeObserver.java b/src/main/java/pikelake/environment/Movement2DWithinShapeObserver.java index 930043a421724a42a57e872f1c0500b0d1f80c34..de5fb37ab976e325439f19742d03faf534f183f3 100644 --- a/src/main/java/pikelake/environment/Movement2DWithinShapeObserver.java +++ b/src/main/java/pikelake/environment/Movement2DWithinShapeObserver.java @@ -219,7 +219,7 @@ public class Movement2DWithinShapeObserver extends ObserverListener implements C private static final long serialVersionUID = 1L; - protected synchronized void paintComponent(Graphics g) { + protected synchronized void paintComponent (Graphics g) { super.paintComponents(g); Graphics2D g2d = (Graphics2D)g; // determine if generalPath must be rescaled diff --git a/src/main/java/pikelake/pikes/PikeMovement.java b/src/main/java/pikelake/pikes/PikeMovement.java index 43faf57156a2d2f6c4d83712e8389bdb7bdaa8c2..72618c1f0f8bc3e8fd56b3945c1c920816209a28 100644 --- a/src/main/java/pikelake/pikes/PikeMovement.java +++ b/src/main/java/pikelake/pikes/PikeMovement.java @@ -13,8 +13,8 @@ import fr.cemagref.simaqualife.pilot.Pilot; public class PikeMovement extends LoopAquaNismsGroupProcess<Pike, PikesGroup> { - @SuppressWarnings("unused") - private double basicMovingRate; + //@SuppressWarnings("unused") + //private double basicMovingRate; transient private UniformGen uniformGen; public PikeMovement (Pilot pilot) {