Commit 1cb26402 authored by patrick.lambert's avatar patrick.lambert
Browse files

keep last female and male spawners number

parent bdf18389
......@@ -126,11 +126,13 @@ public class RiverBasin extends Basin {
private QueueMemory<Double> numberOfNonNulRecruitmentForFinalProbOfPres;
private double lastFemaleSpawnerNumber;
private double lastMaleSpawnerNumber;
private double nativeSpawnerMortality; // mortality coefficient between recruitement and spawning for fish born in
// this basin
private double mortalityCrash;
private double stockTrap;
private double lastFemaleSpawnerNumber;
protected static transient ObservablesHandler cobservable;
......@@ -582,6 +584,23 @@ public class RiverBasin extends Basin {
}
/**
* @return the lastMaleSpawnerNumber
*/
public double getLastMaleSpawnerNumber() {
return this.lastMaleSpawnerNumber;
}
/**
* @param lastMaleSpawnerNumber
* the lastMaleSpawnerNumber to set
*/
public void setLastMaleSpawnerNumber(double lastMaleSpawnerNumber) {
this.lastMaleSpawnerNumber = lastMaleSpawnerNumber;
}
public String getPopulationStatus() {
String populationStatus;
if (Double.isNaN(nativeSpawnerMortality))
......
......@@ -356,8 +356,9 @@ public class ReproduceAndSurviveAfterReproductionWithDiagnose extends AquaNismsG
}
}
// keep the number of female spawner
// keep the number of spawner
riverBasin.setLastFemaleSpawnerNumber(numberOfFemaleSpawners);
riverBasin.setLastMaleSpawnerNumber(numberOfMaleSpawners);
// --------------------------------------------------------------------------------------------------
// Diagnose of the population dynamics in the basin
......
......@@ -250,8 +250,9 @@ public class ReproduceWithDiagnose extends AquaNismsGroupProcess<DiadromousFish,
fish.incNumberOfReproduction();
}
// keep the number of female spawner
// keep the number of spawner
riverBasin.setLastFemaleSpawnerNumber(numberOfFemaleSpawners);
riverBasin.setLastMaleSpawnerNumber(numberOfMaleSpawners);
}
// --------------------------------------------------------------------------------------------------
// Diagnose of the population dynamics in the basin
......
Markdown is supported
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