cleaning

f7c6ebb1 · Lambert Patrick · 28a5e0bc · f7c6ebb1
Commit f7c6ebb1 authored 6 years ago by Lambert Patrick
Hide whitespace changes
Inline Side-by-side

Showing

with 30 additions and 30 deletions
+30 -30
--- a/src/main/java/species/Survive.java
+++ b/src/main/java/species/Survive.java
@@ -33,44 +33,44 @@ public class Survive extends AquaNismsGroupProcess<DiadromousFish, DiadromousFis

 	@Override
 	public void doProcess(DiadromousFishGroup group) {
-		// TODO Auto-generated method stub
-		double survivalProbability;
+		
+		double survivalProbability=1.;
 		List<DiadromousFish> deadFish = new ArrayList<DiadromousFish>();
 		long survivalAmount; 

 		for(Basin basin : group.getEnvironment().getBasins()){
-                    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{
+			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 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.){
-				survivalAmount = Miscellaneous.binomialForSuperIndividual(group.getPilot(), fish.getAmount(), survivalProbability);
+				if (survivalProbability<1.){
+					survivalAmount = Miscellaneous.binomialForSuperIndividual(group.getPilot(), fish.getAmount(), survivalProbability);

-				if (survivalAmount > 0) 
-					fish.setAmount(survivalAmount);
-				else
-					deadFish.add(fish);
+					if (survivalAmount > 0) 
+						fish.setAmount(survivalAmount);
+					else
+						deadFish.add(fish);
+				}
 			}
-                    }
-                }
+		}

 		for (DiadromousFish fish : deadFish){
 			group.removeAquaNism(fish);