From a02df59de4aed7dce4f283eb1b8f99bac4ab8655 Mon Sep 17 00:00:00 2001
From: Lambert Patrick <patrick.lambert@irstea.fr>
Date: Tue, 27 Aug 2019 18:04:52 +0200
Subject: [PATCH] avoid double call to getKopt
---
src/main/java/species/Grow.java | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/main/java/species/Grow.java b/src/main/java/species/Grow.java
index f7ec79b..8a7638b 100644
--- a/src/main/java/species/Grow.java
+++ b/src/main/java/species/Grow.java
@@ -120,20 +120,18 @@ public class Grow extends AquaNismsGroupProcess<DiadromousFish, DiadromousFishGr
* @param fish
* @param group
* @return the Brody coeff from Diadromousgroup if exists or from this grow process
+ * depends of the fish gender .In case of undifferentiaced fish, the mean for male and female is considered
*/
public double getKOpt(DiadromousFish fish, DiadromousFishGroup group) {
- double kOpt = 0.;
- if (Double.isNaN(group.getKOpt(fish))){
+ double kOpt = group.getKOpt(fish);
+ if (Double.isNaN(kOpt)){ // no definition for the group
if (fish.getGender() == Gender.FEMALE)
kOpt = kOptForFemale;
else if (fish.getGender() == Gender.MALE)
kOpt = kOptForMale;
else
kOpt= (kOptForFemale + kOptForMale) / 2.;
- }
- else
- kOpt = group.getKOpt(fish);
-
+ }
return kOpt;
--
GitLab