Commit db793f43 authored by patrick.lambert's avatar patrick.lambert
Browse files

move lastSpawnerNumbersBeforeReproduction to a speccif AquaNismGroupProcess

parent f0b9e4b7
...@@ -106,7 +106,7 @@ public class RiverBasin extends Basin { ...@@ -106,7 +106,7 @@ public class RiverBasin extends Basin {
// private int memorySize; // size of the queue // private int memorySize; // size of the queue
// TODO define as many QueueMemory as populations // TODO define as many QueueMemory as populations
private QueueMemory<Double> lastSpawnerNumbersBeforeReproduction;
private QueueMemory<Long> lastRecruitments; private QueueMemory<Long> lastRecruitments;
private QueueMemory<Long> lastRecruitmentExpectations; private QueueMemory<Long> lastRecruitmentExpectations;
private QueueMemory<Double> lastProdCapacities; // keep the production capacities of the basin (parameter alpha of private QueueMemory<Double> lastProdCapacities; // keep the production capacities of the basin (parameter alpha of
...@@ -235,7 +235,6 @@ public class RiverBasin extends Basin { ...@@ -235,7 +235,6 @@ public class RiverBasin extends Basin {
this.yearOfLastNulRep = 0; this.yearOfLastNulRep = 0;
this.type = Basin.BasinType.RIVER; this.type = Basin.BasinType.RIVER;
// this.memorySize = memoryAllQueues; // this.memorySize = memoryAllQueues;
this.lastSpawnerNumbersBeforeReproduction = new QueueMemory<Double>(memorySize);
this.lastRecruitments = new QueueMemory<Long>(memorySize); this.lastRecruitments = new QueueMemory<Long>(memorySize);
this.lastRecruitmentExpectations = new QueueMemory<Long>(memorySize); this.lastRecruitmentExpectations = new QueueMemory<Long>(memorySize);
this.lastProdCapacities = new QueueMemory<Double>(memorySize); this.lastProdCapacities = new QueueMemory<Double>(memorySize);
...@@ -430,14 +429,6 @@ public class RiverBasin extends Basin { ...@@ -430,14 +429,6 @@ public class RiverBasin extends Basin {
} }
/**
* @return the lastSpawnerNumbersBeforeReproduction
*/
public QueueMemory<Double> getLastSpawnerNumbersBeforeReproduction() {
return this.lastSpawnerNumbersBeforeReproduction;
}
public QueueMemory<Long> getLastRecruitments() { public QueueMemory<Long> getLastRecruitments() {
return lastRecruitments; return lastRecruitments;
} }
......
...@@ -126,7 +126,6 @@ public class ReproduceAndSurviveAfterReproductionWithDiagnose extends AquaNismsG ...@@ -126,7 +126,6 @@ public class ReproduceAndSurviveAfterReproductionWithDiagnose extends AquaNismsG
// before the party !!!! // before the party !!!!
double fluxBefore = riverBasin.getSpawnerNumberPerGroup(group); double fluxBefore = riverBasin.getSpawnerNumberPerGroup(group);
riverBasin.getLastSpawnerNumbersBeforeReproduction().push(fluxBefore);
double b, c, alpha, beta, amountPerSuperIndividual, S95, S50; double b, c, alpha, beta, amountPerSuperIndividual, S95, S50;
double numberOfFemaleSpawners = 0.; double numberOfFemaleSpawners = 0.;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment