Skip to content
GitLab
Commit f7c6ebb1 authored by Lambert Patrick's avatar Lambert Patrick
Browse files

cleaning

parent 28a5e0bc
master BasinImprovement Camille DeplacementBasin Script SpawnerRunAnalysis atlantic_area develop exploration_GR3D_process hotfix3.2.1 v3.2.1 v3.2.1.b v3.2.0 v3.1 V3.2.1.a
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 30 additions and 30 deletions
+30 -30
src/main/java/species/Survive.java
+ 30
− 30
View file @ f7c6ebb1
...@@ -33,44 +33,44 @@ public class Survive extends AquaNismsGroupProcess<DiadromousFish, DiadromousFis ...@@ -33,44 +33,44 @@ public class Survive extends AquaNismsGroupProcess<DiadromousFish, DiadromousFis
@Override @Override
public void doProcess(DiadromousFishGroup group) { public void doProcess(DiadromousFishGroup group) {
// TODO Auto-generated method stub
double survivalProbability; double survivalProbability=1.;
List<DiadromousFish> deadFish = new ArrayList<DiadromousFish>(); List<DiadromousFish> deadFish = new ArrayList<DiadromousFish>();
long survivalAmount; long survivalAmount;
for(Basin basin : group.getEnvironment().getBasins()){ for(Basin basin : group.getEnvironment().getBasins()){
if (basin.getFishs(group)!=null) for(DiadromousFish fish : basin.getFishs(group)){ if (basin.getFishs(group)!=null) for(DiadromousFish fish : basin.getFishs(group)){
survivalProbability = 1.;
//Survive
if(fish.getPosition().getType() == TypeBassin.RIVER && fish.isMature()){
double tempEffectSurv = Miscellaneous.temperatureEffect(fish.getPosition().getCurrentTemperature(group.getPilot()), tempMinMortGenInRiv, tempOptMortGenInRiv, tempMaxMortGenInRiv);
if (tempEffectSurv == 0.){
survivalProbability = 0.;
//System.out.println("le poisson situ dans le bassin " + fish.getPosition().getName() + " en " + Time.getSeason() +" a un coeff de mortalit de " + fish.getMortalityRateInRiver() + " mais cause de la temprature une prob de survie de " + survivalProbability);
}else{
survivalProbability = survivalProbOptGenInRiv * tempEffectSurv;
//System.out.println("le poisson situ dans le bassin " + fish.getPosition().getName() + " en " + Time.getSeason() + " a un coeff de mortalit de " + fish.getMortalityRateInRiver() + " et donc une prob de survie de " + survivalProbability);
}
}else if (fish.getPosition().getType() == TypeBassin.SEA){
survivalProbability = Math.exp(-mortalityRateInSea * Time.getSeasonDuration());
//System.out.println("le poisson situ dans le bassin " + fish.getPosition().getName() + " en " + Time.getSeason() + " a un coeff de mortalit de " + fish.getMortalityRateInSea() + " et donc une prob de survie de " + survivalProbability);
}else if (fish.getPosition().getType() == TypeBassin.OFFSHORE){
survivalProbability = Math.exp(-mortalityRateInOffshore * Time.getSeasonDuration());
//System.out.println("le poisson situ dans le bassin " + fish.getPosition().getName() + " en " + Time.getSeason() + " a un coeff de mortalit de " + fish.getMortalityRateInOffshore() + " et donc une prob de survie de " + survivalProbability);
}else{
survivalProbability = 1.; survivalProbability = 1.;
} //Survive
if(fish.getPosition().getType() == TypeBassin.RIVER && fish.isMature()){
double tempEffectSurv = Miscellaneous.temperatureEffect(fish.getPosition().getCurrentTemperature(group.getPilot()), tempMinMortGenInRiv, tempOptMortGenInRiv, tempMaxMortGenInRiv);
if (tempEffectSurv == 0.){
survivalProbability = 0.;
//System.out.println("le poisson situ� dans le bassin " + fish.getPosition().getName() + " en " + Time.getSeason() +" a un coeff de mortalit� de " + fish.getMortalityRateInRiver() + " mais � cause de la temp�rature une prob de survie de " + survivalProbability);
}else{
survivalProbability = survivalProbOptGenInRiv * tempEffectSurv;
//System.out.println("le poisson situ� dans le bassin " + fish.getPosition().getName() + " en " + Time.getSeason() + " a un coeff de mortalit� de " + fish.getMortalityRateInRiver() + " et donc une prob de survie de " + survivalProbability);
}
}else if (fish.getPosition().getType() == TypeBassin.SEA){
survivalProbability = Math.exp(-mortalityRateInSea * Time.getSeasonDuration());
//System.out.println("le poisson situ� dans le bassin " + fish.getPosition().getName() + " en " + Time.getSeason() + " a un coeff de mortalit� de " + fish.getMortalityRateInSea() + " et donc une prob de survie de " + survivalProbability);
}else if (fish.getPosition().getType() == TypeBassin.OFFSHORE){
survivalProbability = Math.exp(-mortalityRateInOffshore * Time.getSeasonDuration());
//System.out.println("le poisson situ� dans le bassin " + fish.getPosition().getName() + " en " + Time.getSeason() + " a un coeff de mortalit� de " + fish.getMortalityRateInOffshore() + " et donc une prob de survie de " + survivalProbability);
}else{
survivalProbability = 1.;
}
if (survivalProbability<1.){ if (survivalProbability<1.){
survivalAmount = Miscellaneous.binomialForSuperIndividual(group.getPilot(), fish.getAmount(), survivalProbability); survivalAmount = Miscellaneous.binomialForSuperIndividual(group.getPilot(), fish.getAmount(), survivalProbability);
if (survivalAmount > 0) if (survivalAmount > 0)
fish.setAmount(survivalAmount); fish.setAmount(survivalAmount);
else else
deadFish.add(fish); deadFish.add(fish);
}
} }
} }
}
for (DiadromousFish fish : deadFish){ for (DiadromousFish fish : deadFish){
group.removeAquaNism(fish); group.removeAquaNism(fish);
......
Supports Markdown
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