Commit 06687919 authored by Lambert Patrick's avatar Lambert Patrick
Browse files

rename lastSpawnerNumber with lastFemaleSpawnerNumber

Showing with 8 additions and 8 deletions
+8 -8
...@@ -41,7 +41,7 @@ public class RiverBasin extends Basin { ...@@ -41,7 +41,7 @@ public class RiverBasin extends Basin {
private double nativeSpawnerMortality; // mortality coefficient between recruitement and spawning for fish born in this basin private double nativeSpawnerMortality; // mortality coefficient between recruitement and spawning for fish born in this basin
private double mortalityCrash; private double mortalityCrash;
private double stockTrap; private double stockTrap;
private double lastSpawnerNumber; private double lastFemaleSpawnerNumber;
protected static transient ObservablesHandler cobservable; protected static transient ObservablesHandler cobservable;
...@@ -266,17 +266,17 @@ public class RiverBasin extends Basin { ...@@ -266,17 +266,17 @@ public class RiverBasin extends Basin {
} }
/** /**
* @return the lastSpawnerNumber * @return the last number of female spawners
*/ */
public double getLastSpawnerNumber() { public double getLastFemaleSpawnerNumber() {
return lastSpawnerNumber; return lastFemaleSpawnerNumber;
} }
/** /**
* @param lastSpawner the lastSpawnerNumber to set * @param lastSpawner the lastSpawnerNumber to set
*/ */
public void setLastSpawnerNumber(double lastSpawner) { public void setLastFemaleSpawnerNumber(double lastSpawner) {
this.lastSpawnerNumber = lastSpawner; this.lastFemaleSpawnerNumber = lastSpawner;
} }
public String getPopulationStatus() { public String getPopulationStatus() {
...@@ -288,10 +288,10 @@ public class RiverBasin extends Basin { ...@@ -288,10 +288,10 @@ public class RiverBasin extends Basin {
if (nativeSpawnerMortality> mortalityCrash) if (nativeSpawnerMortality> mortalityCrash)
populationStatus="overZcrash"; populationStatus="overZcrash";
else { else {
if (lastSpawnerNumber < stockTrap) if (lastFemaleSpawnerNumber < stockTrap)
populationStatus = "inTrapWithStrayers"; populationStatus = "inTrapWithStrayers";
else { else {
if (lastSpawnerNumber * lastPercentagesOfAutochtones.getLastItem() < stockTrap) if (lastFemaleSpawnerNumber * lastPercentagesOfAutochtones.getLastItem() < stockTrap)
populationStatus = "inTrapWithOnlyNatives"; populationStatus = "inTrapWithOnlyNatives";
else else
populationStatus = "sustain"; populationStatus = "sustain";
......
Supports Markdown
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