From db793f435d8b1711d0f39dba062c456959b933f8 Mon Sep 17 00:00:00 2001
From: "patrick.lambert" <patrick.mh.lambert@inrae.fr>
Date: Tue, 23 Mar 2021 08:13:03 +0100
Subject: [PATCH] move lastSpawnerNumbersBeforeReproduction to a speccif
AquaNismGroupProcess
---
src/main/java/environment/RiverBasin.java | 11 +----------
...roduceAndSurviveAfterReproductionWithDiagnose.java | 1 -
2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/src/main/java/environment/RiverBasin.java b/src/main/java/environment/RiverBasin.java
index aeec34d..0dd891c 100644
--- a/src/main/java/environment/RiverBasin.java
+++ b/src/main/java/environment/RiverBasin.java
@@ -106,7 +106,7 @@ public class RiverBasin extends Basin {
// private int memorySize; // size of the queue
// TODO define as many QueueMemory as populations
- private QueueMemory<Double> lastSpawnerNumbersBeforeReproduction;
+
private QueueMemory<Long> lastRecruitments;
private QueueMemory<Long> lastRecruitmentExpectations;
private QueueMemory<Double> lastProdCapacities; // keep the production capacities of the basin (parameter alpha of
@@ -235,7 +235,6 @@ public class RiverBasin extends Basin {
this.yearOfLastNulRep = 0;
this.type = Basin.BasinType.RIVER;
// this.memorySize = memoryAllQueues;
- this.lastSpawnerNumbersBeforeReproduction = new QueueMemory<Double>(memorySize);
this.lastRecruitments = new QueueMemory<Long>(memorySize);
this.lastRecruitmentExpectations = new QueueMemory<Long>(memorySize);
this.lastProdCapacities = new QueueMemory<Double>(memorySize);
@@ -430,14 +429,6 @@ public class RiverBasin extends Basin {
}
- /**
- * @return the lastSpawnerNumbersBeforeReproduction
- */
- public QueueMemory<Double> getLastSpawnerNumbersBeforeReproduction() {
- return this.lastSpawnerNumbersBeforeReproduction;
- }
-
-
public QueueMemory<Long> getLastRecruitments() {
return lastRecruitments;
}
diff --git a/src/main/java/species/ReproduceAndSurviveAfterReproductionWithDiagnose.java b/src/main/java/species/ReproduceAndSurviveAfterReproductionWithDiagnose.java
index 8904f00..3452bc7 100644
--- a/src/main/java/species/ReproduceAndSurviveAfterReproductionWithDiagnose.java
+++ b/src/main/java/species/ReproduceAndSurviveAfterReproductionWithDiagnose.java
@@ -126,7 +126,6 @@ public class ReproduceAndSurviveAfterReproductionWithDiagnose extends AquaNismsG
// before the party !!!!
double fluxBefore = riverBasin.getSpawnerNumberPerGroup(group);
- riverBasin.getLastSpawnerNumbersBeforeReproduction().push(fluxBefore);
double b, c, alpha, beta, amountPerSuperIndividual, S95, S50;
double numberOfFemaleSpawners = 0.;
--
GitLab