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

rename with continent

parent f872fe92
<environment.BasinNetworkNEA>
<environment.BasinNetworkSWithContinent>
<nbBasin>0</nbBasin>
<memorySize>10</memorySize>
<memorySizeLongQueue>30</memorySizeLongQueue>
......@@ -15,4 +15,4 @@
<distanceGridFileName>data/input/atlanticarea/distanceGridAA.csv</distanceGridFileName>
<temperatureCatchmentFile>data/input/atlanticarea/aa_sst_depuis1800.csv</temperatureCatchmentFile>
<useRealPDam>false</useRealPDam>
</environment.BasinNetworkNEA>
\ No newline at end of file
</environment.BasinNetworkSWithContinent>
\ No newline at end of file
......@@ -3,10 +3,10 @@
<java-class>fr.cemagref.simaqualife.kernel.AquaticWorld</java-class>
<fr.cemagref.observation.kernel.ObservablesHandler>
<observers>
<environment.BasinNetworkObserverNEA>
<environment.BasinNetworkObserverWithContinent>
<title>Atlantic Area</title>
<threshold>10000</threshold>
</environment.BasinNetworkObserverNEA>
</environment.BasinNetworkObserverWithContinent>
</observers>
</fr.cemagref.observation.kernel.ObservablesHandler>
......
<environment.BasinNetworkNEA>
<environment.BasinNetworkSWithContinent>
<nbBasin>0</nbBasin>
<memorySize>10</memorySize>
<memorySizeLongQueue>30</memorySizeLongQueue>
......@@ -15,4 +15,4 @@
<distanceGridFileName>data/input/northeastamerica/distanceGridNEA.csv</distanceGridFileName>
<temperatureCatchmentFile>data/input/northeastamerica/basins_temperatures_from_1800.csv</temperatureCatchmentFile>
<useRealPDam>false</useRealPDam>
</environment.BasinNetworkNEA>
\ No newline at end of file
</environment.BasinNetworkSWithContinent>
\ No newline at end of file
......@@ -3,10 +3,10 @@
<java-class>fr.cemagref.simaqualife.kernel.AquaticWorld</java-class>
<fr.cemagref.observation.kernel.ObservablesHandler>
<observers>
<environment.BasinNetworkObserverNEA>
<environment.BasinNetworkObserverWithContinent>
<title>North East America</title>
<threshold>1000000</threshold>
</environment.BasinNetworkObserverNEA>
</environment.BasinNetworkObserverWithContinent>
</observers>
</fr.cemagref.observation.kernel.ObservablesHandler>
......
......@@ -34,7 +34,7 @@ import fr.cemagref.simaqualife.pilot.Pilot;
import species.DiadromousFishGroup;
@SuppressWarnings("serial")
public class BasinNetworkObserverNEA extends ObserverListener implements Configurable, Drawable, MouseMotionListener {
public class BasinNetworkObserverWithContinent extends ObserverListener implements Configurable, Drawable, MouseMotionListener {
private String title;
private double threshold = 13000000.;
......@@ -43,7 +43,7 @@ public class BasinNetworkObserverNEA extends ObserverListener implements Configu
public ColorScaleEnum colorScaleEnum = ColorScaleEnum.BluesScale;
// a basin network
private transient BasinNetworkNEA bn;
private transient BasinNetworkSWithContinent bn;
// the time
private transient Time time;
......@@ -108,7 +108,7 @@ public class BasinNetworkObserverNEA extends ObserverListener implements Configu
shapeBasinMap = new HashMap<Shape, Basin>();
// load basin to a have access to the shape
bn = (BasinNetworkNEA) pilot.getAquaticWorld().getEnvironment();
bn = (BasinNetworkSWithContinent) pilot.getAquaticWorld().getEnvironment();
// time in bn is not yet created
time = new Time();
......@@ -192,7 +192,7 @@ public class BasinNetworkObserverNEA extends ObserverListener implements Configu
maxX = maxY = Double.NEGATIVE_INFINITY;
minX = minY = Double.POSITIVE_INFINITY;
mapContinent = ((BasinNetworkNEA) pilot.getAquaticWorld().getEnvironment()).getMapContinent();
mapContinent = ((BasinNetworkSWithContinent) pilot.getAquaticWorld().getEnvironment()).getMapContinent();
for (Path2D.Double path : mapContinent.values()) {
minX = Math.min(minX, path.getBounds2D().getMinX());
maxX = Math.max(maxX, path.getBounds2D().getMaxX());
......@@ -229,7 +229,7 @@ public class BasinNetworkObserverNEA extends ObserverListener implements Configu
public static void main(String[] args) {
System.out.println((new XStream(new DomDriver())).toXML(new BasinNetworkObserverNEA()));
System.out.println((new XStream(new DomDriver())).toXML(new BasinNetworkObserverWithContinent()));
}
private class DisplayComponent extends JComponent {
......
......@@ -27,7 +27,7 @@ import fr.cemagref.simaqualife.kernel.util.TransientParameters.InitTransientPara
import fr.cemagref.simaqualife.pilot.Pilot;
import miscellaneous.QueueMemoryMap;
public class BasinNetworkNEA extends BasinNetwork {
public class BasinNetworkSWithContinent extends BasinNetwork {
private String basinFile = "data/input/northeastamerica/nea_basins.csv";
......@@ -122,7 +122,7 @@ public class BasinNetworkNEA extends BasinNetwork {
public static void main(String[] args) {
System.out.println((new XStream(new DomDriver())).toXML(new BasinNetworkNEA()));
System.out.println((new XStream(new DomDriver())).toXML(new BasinNetworkSWithContinent()));
}
......
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