From f684ca6621e9c9e67dd1464f730e5836adb18e37 Mon Sep 17 00:00:00 2001
From: "guillaume.garbay" <guillaume.garbay>
Date: Mon, 31 Aug 2015 10:04:13 +0000
Subject: [PATCH]
---
data/input/fishLight.xml | 3 +--
src/main/java/pikelake/Marnage.java | 6 +-----
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/data/input/fishLight.xml b/data/input/fishLight.xml
index b92d284..305aa9d 100644
--- a/data/input/fishLight.xml
+++ b/data/input/fishLight.xml
@@ -18,11 +18,10 @@
</pikelake.environment.AreaMovement>
<pikelake.pikes.PikesPopulateProcess>
- <initialNumberOfPikes>0</initialNumberOfPikes>
+ <initialNumberOfPikes>10</initialNumberOfPikes>
</pikelake.pikes.PikesPopulateProcess>
</processesAtBegin>
-
<processesEachStep>
diff --git a/src/main/java/pikelake/Marnage.java b/src/main/java/pikelake/Marnage.java
index 4b6abaa..56bcccd 100644
--- a/src/main/java/pikelake/Marnage.java
+++ b/src/main/java/pikelake/Marnage.java
@@ -14,7 +14,6 @@ import pikelake.pikes.PikesGroup;
public class Marnage extends AquaNismsGroupProcess<Pike,PikesGroup> {
public static String marnageOld = null, marnageNew = null;
- public int cpt = 0;
@Override
public void doProcess(PikesGroup object) {
@@ -23,11 +22,8 @@ public class Marnage extends AquaNismsGroupProcess<Pike,PikesGroup> {
marnageNew = FichierMarnage.calculMarnage();
- if (!marnageNew.equals(marnageOld)) {
- cpt++;
+ if (!marnageNew.equals(marnageOld))
majCote(grid);
- //System.out.println(cpt + " Marnage : " + marnageNew);
- }
}
public void majCote (Grid grid) {
--
GitLab