Commit cdf4e2f9 authored by patrick.lambert's avatar patrick.lambert
Browse files

fusion de develop

parents e6d6f723 6e7f94b4
...@@ -183,7 +183,7 @@ public class RIOBasinNetworkObserverPresence extends ObserverListener implements ...@@ -183,7 +183,7 @@ public class RIOBasinNetworkObserverPresence extends ObserverListener implements
if (mapContinent == null) { if (mapContinent == null) {
maxX = maxY = Double.NEGATIVE_INFINITY; maxX = maxY = Double.NEGATIVE_INFINITY;
minX = minY = Double.POSITIVE_INFINITY; minX = minY = Double.POSITIVE_INFINITY;
mapContinent = ((BasinNetworkSWithContinent) pilot.getAquaticWorld().getEnvironment()).getMapContinent(); mapContinent = ((RIOBasinNetworkWithContinent) pilot.getAquaticWorld().getEnvironment()).getMapContinent();
for (Path2D.Double path : mapContinent.values()) { for (Path2D.Double path : mapContinent.values()) {
minX = Math.min(minX, path.getBounds2D().getMinX()); minX = Math.min(minX, path.getBounds2D().getMinX());
maxX = Math.max(maxX, path.getBounds2D().getMaxX()); maxX = Math.max(maxX, path.getBounds2D().getMaxX());
......
...@@ -248,6 +248,10 @@ public class DisperseAndMigrateToRiverWithMultiNomDistriAndDeathBasin extends Di ...@@ -248,6 +248,10 @@ public class DisperseAndMigrateToRiverWithMultiNomDistriAndDeathBasin extends Di
} }
} }
} }
System.out.println(" total abundance in river basins: " + group.getFishEffective());
System.out.println(
"female spawners: " + group.getFemaleSpawnerEffective() + " \tmale spawners: " + group.getMaleSpawnerEffective());
} }
} }
} }
...@@ -53,8 +53,6 @@ public class PopulateBasinNetworkSeveralTimesAccordingToBasinSize ...@@ -53,8 +53,6 @@ public class PopulateBasinNetworkSeveralTimesAccordingToBasinSize
nbFishPerSI + remainingIndividuals, Gender.MALE)); nbFishPerSI + remainingIndividuals, Gender.MALE));
} }
} }
System.out.println(" total abundance: " + group.getFishEffective());
System.out.println(
"female spawners: " + group.getFemaleSpawnerEffective() + " \tmale spawners: " + group.getMaleSpawnerEffective());
} }
} }
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