Excretion corrected

Without the composition of individuals

Excretion corrected
Without the composition of individuals
dcd002ba · Poulet Camille · 55cc6b71 · dcd002ba
Commit dcd002ba authored 5 years ago by Poulet Camille
Hide whitespace changes
Inline Side-by-side

Showing

with 3 additions and 6 deletions
+3 -6
--- a/src/main/java/species/FishNutrient.java
+++ b/src/main/java/species/FishNutrient.java
@@ -177,8 +177,7 @@ public class FishNutrient {
 						* compoCarcassPreSpawning.get(fish.getGender()).get(nutrient);
 				double excretion = totalWeightPre 
 						* residenceTime 
-						* excretionRate.get(nutrient) 
-						* compoCarcassPreSpawning.get(fish.getGender()).get(nutrient); 
+						* excretionRate.get(nutrient) ; 
 				double nutrientImport = carcass + excretion;
 				
 				nutrientsInput.put(nutrient, nutrientImport); 
@@ -218,8 +217,7 @@ public class FishNutrient {
 						*compoGametes.get(fish.getGender()).get(nutrient); //TODO: FAUX ! Revoir comment calculer les gamtes 
 				double excretion = totalWeightPost
 						* residenceTime 
-						* excretionRate.get(nutrient) 
-						* compoCarcassPostSpawning.get(fish.getGender()).get(nutrient);
+						* excretionRate.get(nutrient);
 				double nutrientImport = carcass + gametes + excretion;
 				
 				nutrientsInput.put(nutrient,nutrientImport);
@@ -253,8 +251,7 @@ public class FishNutrient {
 						* compoGametes.get(fish.getGender()).get(nutrient);
 				double excretion = totalWeightPost 
 						* residenceTime 
-						* excretionRate.get(nutrient) 
-						* compoCarcassPostSpawning.get(fish.getGender()).get(nutrient);
+						* excretionRate.get(nutrient);
 				double nutrientImport = gametes + excretion;
 				//TotalWeigthPre - TotalWeightPost = gonad weight loss = gamete emission 
 				//Gamete compositions depends on sex.