aboutsummaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorJohannes Ranke <jranke@uni-bremen.de>2015-05-07 16:15:23 +0200
committerJohannes Ranke <jranke@uni-bremen.de>2015-05-07 16:15:23 +0200
commit8021c7cb9aac06e961227a3c0e0b013ec2d2d501 (patch)
treefcf21c5798ace16b7fed67e9843bd851be7ba6a2 /pkg
parent508d883f7689d617d15915dbd26a27f1613bb857 (diff)
Bugfix: Reset maximum event concentration for each event
Diffstat (limited to 'pkg')
-rw-r--r--pkg/R/TOXSWA_cwa.R1
-rw-r--r--pkg/tests/testthat/H_sw_D4_pond.rdsbin243098 -> 244540 bytes
-rw-r--r--pkg/tests/testthat/H_sw_R1_stream_events.rdsbin332 -> 332 bytes
3 files changed, 1 insertions, 0 deletions
diff --git a/pkg/R/TOXSWA_cwa.R b/pkg/R/TOXSWA_cwa.R
index 948d7a9..7fd8ec1 100644
--- a/pkg/R/TOXSWA_cwa.R
+++ b/pkg/R/TOXSWA_cwa.R
@@ -252,6 +252,7 @@ TOXSWA_cwa <- R6Class("TOXSWA_cwa",
pre_interval = event_start - event_end
i_start = i
event = TRUE
+ event_max = cwa_cur
}
} else {
if (cwa_cur > event_max) event_max = cwa_cur
diff --git a/pkg/tests/testthat/H_sw_D4_pond.rds b/pkg/tests/testthat/H_sw_D4_pond.rds
index 0b8046b..62c54bc 100644
--- a/pkg/tests/testthat/H_sw_D4_pond.rds
+++ b/pkg/tests/testthat/H_sw_D4_pond.rds
Binary files differ
diff --git a/pkg/tests/testthat/H_sw_R1_stream_events.rds b/pkg/tests/testthat/H_sw_R1_stream_events.rds
index 3e2828e..842c5de 100644
--- a/pkg/tests/testthat/H_sw_R1_stream_events.rds
+++ b/pkg/tests/testthat/H_sw_R1_stream_events.rds
Binary files differ

Contact - Imprint