Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
SimAquaLife
GR3D
Commits
db793f43
Commit
db793f43
authored
Mar 23, 2021
by
patrick.lambert
Browse files
move lastSpawnerNumbersBeforeReproduction to a speccif AquaNismGroupProcess
parent
f0b9e4b7
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/main/java/environment/RiverBasin.java
View file @
db793f43
...
...
@@ -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
;
}
...
...
src/main/java/species/ReproduceAndSurviveAfterReproductionWithDiagnose.java
View file @
db793f43
...
...
@@ -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
.;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment