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
cb58b96f
Commit
cb58b96f
authored
Jul 02, 2020
by
Lambert Patrick
Browse files
calculation of dispersal corrected
but could differ from Rougier's coding
parent
f1a0aa4c
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/main/java/species/DisperseAndMigrateToRiverWithMultiNomDistriAndDeathBasin.java
View file @
cb58b96f
package
species
;
import
java.util.HashMap
;
import
java.util.Iterator
;
import
java.util.List
;
import
java.util.ListIterator
;
import
java.util.Map
;
...
...
@@ -193,41 +192,45 @@ public class DisperseAndMigrateToRiverWithMultiNomDistriAndDeathBasin extends Di
totalWeight
=
totalWeight
+
weightOfDeathBasin
;
// Afficher le contenu du MAP
System
.
out
.
println
(
departure
.
getName
()
+
": "
+
totalWeight
);
System
.
out
.
println
(
"strayedAmount before: "
+
strayedAmoun
t
);
Iterator
<
RiverBasin
>
iterateur
=
basinWeightsFromDeparture
.
keySet
().
iterator
();
// Parcourir les clés et afficher les entrées de chaque clé;
while
(
iterateur
.
hasNext
())
{
RiverBasin
key
=
iterateur
.
next
();
System
.
out
.
println
(
key
.
getName
()
+
" dist = "
+
departure
.
getNeighboursDistances
().
get
(
key
)
+
"=>"
+
(
basinWeightsFromDeparture
.
get
(
key
)));
}
/*
*
System.out.println(
departure.getName() + ": " + totalWeigh
t);
* System.out.println("strayedAmount before: " + strayedAmount); Iterator<RiverBasin>
* iterateur = basinWeightsFromDeparture.keySet().iterator(); while
*
(iterateur.hasNext()) {
RiverBasin key = iterateur.next();
* System.out.println(key.getName() + " dist = " +
*
departure.getNeighboursDistances().get(key)
+ "=>" +
*
(basinWeightsFromDeparture.get(key)));
}
*/
// compute sequentially the prob to go into a basin
for
(
Entry
<
RiverBasin
,
Double
>
entry
:
basinWeightsPerBasin
.
get
(
departure
).
entrySet
())
{
long
remainingStrayedAmount
=
strayedAmount
;
for
(
Entry
<
RiverBasin
,
Double
>
entry
:
basinWeightsFromDeparture
.
entrySet
())
{
RiverBasin
strayerDestination
=
entry
.
getKey
();
Double
weight
=
entry
.
getValue
();
probToGo
=
weight
/
totalWeight
;
// amountToGo = Miscellaneous.binomialForSuperIndividual(group.getPilot(),
// strayedAmount, probToGo);
amountToGo
=
aleaGen
.
getSuccessNumber
(
strayedAmount
,
probToGo
);
amountToGo
=
Math
.
min
(
remainingStrayedAmount
,
aleaGen
.
getSuccessNumber
(
strayedAmount
,
probToGo
));
if
(
amountToGo
>
0
)
{
strayerDestination
.
addFish
(
fish
.
duplicateWithNewPositionAndAmount
(
group
.
getPilot
(),
strayerDestination
,
amountToGo
),
group
);
remainingStrayedAmount
-=
amountToGo
;
System
.
out
.
println
(
strayerDestination
.
getName
()
+
"<-"
+
amountToGo
);
}
totalWeight
-=
weight
;
strayedAmount
-=
amountToGo
;
if
(
strayedAmount
<=
0
)
{
if
(
remainingStrayedAmount
==
0
)
{
// CHECK if it occurs and for which basins
break
;
}
}
}
System
.
out
.
println
(
"strayedAmount after: "
+
strayedAmount
);
System
.
out
.
println
();
//
System.out.println("strayedAmount after: " + strayedAmount);
//
System.out.println();
// update fish with homing
if
(
homingAmount
>
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