Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
SimAquaLife
GR3D
Commits
25611443
Commit
25611443
authored
Apr 17, 2020
by
Lambert Patrick
Browse files
automatic code cleaning
parent
71b2b6f4
Changes
1
Show whitespace changes
Inline
Side-by-side
src/main/java/environment/BasinNetworkNEA.java
View file @
25611443
...
...
@@ -114,7 +114,8 @@ public class BasinNetworkNEA extends BasinNetwork {
@Override
public
String
toString
()
{
return
"Record [order="
+
this
.
order
+
", basin_id="
+
this
.
basin_id
+
", name="
+
this
.
name
+
", longitude="
+
this
.
longitude
+
", latitude="
+
this
.
latitude
+
", surface="
+
this
.
surface
return
"Record [order="
+
this
.
order
+
", basin_id="
+
this
.
basin_id
+
", name="
+
this
.
name
+
", longitude="
+
this
.
longitude
+
", latitude="
+
this
.
latitude
+
", surface="
+
this
.
surface
+
", pDam="
+
this
.
pDam
+
"]"
;
}
}
...
...
@@ -154,7 +155,8 @@ public class BasinNetworkNEA extends BasinNetwork {
}
if
(
test
==
false
)
{
StringBuilder
message
=
new
StringBuilder
();
message
.
append
(
"The name header "
).
append
(
name
).
append
(
" does not exist in "
).
append
(
basinShpFile
).
append
(
". Choose between "
);
message
.
append
(
"The name header "
).
append
(
name
).
append
(
" does not exist in "
).
append
(
basinShpFile
)
.
append
(
". Choose between "
);
for
(
Property
property
:
feature
.
getProperties
())
{
message
.
append
(
property
.
getName
().
toString
()).
append
(
" "
);
}
...
...
@@ -292,15 +294,17 @@ public class BasinNetworkNEA extends BasinNetwork {
for
(
int
index
=
0
;
index
<
nbBasin
;
index
++)
{
Record
record
=
records
.
get
(
index
);
Basin
riverBasin
=
new
RiverBasin
(
pilot
,
index
,
record
.
getName
(),
record
.
getBasin_id
(),
winterTemperature
,
springTemperature
,
summerTemperature
,
fallTemperature
,
record
.
getLatitude
(),
record
.
getLongitude
(),
record
.
getSurface
(),
firstDamHeight
,
record
.
getPDam
(),
pAttractive
,
this
.
memorySize
,
this
.
memorySizeLongQueue
);
Basin
riverBasin
=
new
RiverBasin
(
pilot
,
index
,
record
.
getName
(),
record
.
getBasin_id
(),
winterTemperature
,
springTemperature
,
summerTemperature
,
fallTemperature
,
record
.
getLatitude
(),
record
.
getLongitude
(),
record
.
getSurface
(),
firstDamHeight
,
record
.
getPDam
(),
pAttractive
,
this
.
memorySize
,
this
.
memorySizeLongQueue
);
// Basin offshoreBasin = new OffshoreBasin(index + 2 * nbBasin,
// name+"-o",
// 12., 12., 12., 12.);
Basin
seaBasin
=
new
SeaBasin
(
index
+
nbBasin
,
record
.
getName
()
+
"-s"
,
(
12
.
+
winterTemperature
)
/
2
.,
(
12
.
+
springTemperature
)
/
2
.,
(
12
.
+
summerTemperature
)
/
2
.,
(
12
.
+
fallTemperature
)
/
2
.);
Basin
seaBasin
=
new
SeaBasin
(
index
+
nbBasin
,
record
.
getName
()
+
"-s"
,
(
12
.
+
winterTemperature
)
/
2
.,
(
12
.
+
springTemperature
)
/
2
.,
(
12
.
+
summerTemperature
)
/
2
.,
(
12
.
+
fallTemperature
)
/
2
.);
// append the shape for each basin
// System.out.println(record.getName());
if
(
mapRiverBasin
!=
null
)
{
if
(
mapRiverBasin
.
containsKey
(
record
.
getName
()))
riverBasin
.
getShape
().
append
(
mapRiverBasin
.
get
(
record
.
getName
()),
true
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment