Skip to content

Commit d5a8645

Browse files
committed
Script adjusted to new functions
1 parent b4c9e20 commit d5a8645

1 file changed

Lines changed: 15 additions & 6 deletions

File tree

inst/extdata/scripts/impetus/readData_BerlinWaterModel_v2.R

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ output <- list(
3434
"def_hours" =
3535
qsimVis::deviating_hours(
3636
dataFrame = df_pro,
37-
thresholds = c(0,10, 20, 40, 60, 80)/100,
38-
#thresholds = c(1, 2, 4, 8, 16),
39-
dev_type = "egt"),
37+
thresholds = c(5, 10, 15, 20, 40, 60)/100, # Anzahl flexibel
38+
# thresholds = c(0,10, 20, 40, 60, 80)/100,
39+
dev_type = "egt"), # auch "elt" = equal or lower than möglich
4040
"adv_deviation" =
4141
qsimVis::adverse_deviation_from_reference(
4242
dataFrame = df_pro,
@@ -45,7 +45,7 @@ output <- list(
4545
good_values = "low"),
4646
"crit_events" = qsimVis::critical_events(
4747
dataFrame = df_pro,
48-
dev_type = "egt",
48+
dev_type = "egt", # auch "elt" = equal or lower than möglich
4949
deficiency_hours = 24,
5050
separating_hours = 0,
5151
threshold = 0.6,
@@ -67,13 +67,20 @@ rivers <- qsimVis::prepare_rivers(
6767
mapping_table = mapping_table,
6868
aggregated_data = output$adv_deviation,
6969
value_column = "adverse_dev",
70+
# aggregated_data = output$def_hours,
71+
# value_column = "above_0.6",
7072
path_manual = system.file(package = "qsimVis", "extdata/manually_added_rivers"),
7173
gap_filling = "steps"
7274
)
7375

76+
classBreaks <-
77+
# c(0, 0.05, 0.1, 0.15, 0.25, 0.5, 1)
78+
# c(0, 720, 2160, 4320, 8760, 43800, 184056)
79+
# c(0, 2160, 4320, 8760, 43800, 87600, 184056)
80+
7481
rivers <- qsimVis::value_to_classes(
7582
river_list = rivers,
76-
classBreaks = c(0, 0.05, 0.1, 0.2, 0.4, 0.7, 0.9)
83+
classBreaks = classBreaks
7784
)
7885

7986
# plot data
@@ -91,8 +98,10 @@ qsimVis::Berlin_add_waterbodies()
9198
qsimVis::add_coloredRivers(
9299
ext_rivers = rivers,
93100
aggregated_data = aggregated_data,
94-
sixBreaks = c(0, 0.05, 0.1, 0.2, 0.4, 0.7,0.9),
101+
sixBreaks = classBreaks,
95102
dataType = "time",
103+
# LegendTitle = "Durchschnittlicher \nRegenwasseranteil"
104+
# LegendTitle = "Überschreitungsdauer [h] \n60% Regenanteil"
96105
LegendTitle = "Durchschnittlicher \nAbwassergehalt"
97106
)
98107

0 commit comments

Comments
 (0)