diff --git a/.gitignore b/.gitignore index e89eb583c2b427fc0e033303043c1881c0d22bd1..d4e8d4fe167cfaba5eb993c0cd09fd313665d82d 100644 --- a/.gitignore +++ b/.gitignore @@ -102,3 +102,4 @@ target org.* /src/main/java/miscellaneous/Essai.java >>>>>>> master +/exploration/R/.Rhistory diff --git a/src/main/java/species/Calibrate.java b/src/main/java/species/Calibrate.java index 171ff54dfabcadbb1bf6db4152c487713701a554..ad00e366fed8698a6a7060a162c00154e4f55a36 100644 --- a/src/main/java/species/Calibrate.java +++ b/src/main/java/species/Calibrate.java @@ -164,13 +164,13 @@ class GR3DObjeciveFunction implements IObjectiveFunction { try { pilot.load(); - ReflectUtils.setFieldValueFromPath(pilot, "aquaticWorld.aquaNismsGroupsList.0.processes.processesEachStep.6.tempMinRep", par[0]); + ReflectUtils.setFieldValueFromPath(pilot, "aquaticWorld.aquaNismsGroupsList.0.processes.processesEachStep.7.tempMinRep", par[0]); //System.out.println("tempMinRep: " + (double) ReflectUtils.getValueFromPath(pilot, "aquaticWorld.aquaNismsGroupsList.0.processes.processesEachStep.6.getTempMinRep")); - ReflectUtils.setFieldValueFromPath(pilot, "aquaticWorld.aquaNismsGroupsList.0.processes.processesEachStep.3.kOptForFemale", par[1]); + ReflectUtils.setFieldValueFromPath(pilot, "aquaticWorld.aquaNismsGroupsList.0.processes.processesEachStep.4.kOptForFemale", par[1]); //System.out.println("KOptFemale: " + (double) ReflectUtils.getValueFromPath(pilot, "aquaticWorld.aquaNismsGroupsList.0.processes.processesEachStep.3.getkOptForFemale")); - ReflectUtils.setFieldValueFromPath(pilot, "aquaticWorld.aquaNismsGroupsList.0.processes.processesEachStep.3.kOptForMale",par[2]); + ReflectUtils.setFieldValueFromPath(pilot, "aquaticWorld.aquaNismsGroupsList.0.processes.processesEachStep.4.kOptForMale",par[2]); //System.out.println("KOptMale: " + (double) ReflectUtils.getValueFromPath(pilot, "aquaticWorld.aquaNismsGroupsList.0.processes.processesEachStep.3.getkOptForMale")); } catch (Exception e1) { diff --git a/src/main/java/species/Survive.java b/src/main/java/species/Survive.java index 214e038fac08c68285eceffa4449569b64d7cbf0..01def654cd3b489ee092b929fc2f5b6a86bb871e 100644 --- a/src/main/java/species/Survive.java +++ b/src/main/java/species/Survive.java @@ -24,7 +24,7 @@ public class Survive extends AquaNismsGroupProcess<DiadromousFish, DiadromousFis public double tempOptSurvivalSpawnerInRiv = 20.; public double survivalProbOptGenInRiv = 1.; - public double mortalityRateInRiver = 0.4; + //public double mortalityRateInRiver = 0.4; public double mortalityRateInSea = 0.4; public double mortalityRateInOffshore = 0.4;