diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2016-07-30 11:08:05 +0200 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2016-07-30 11:08:05 +0200 |
| commit | 3260b0e875b7af24f2aef7bc2464418525a192df (patch) | |
| tree | 61aaebf7531c5627afd7a5c434f5ff0f75ca98c8 /pkg | |
| parent | b8f953d04e4094c79b4f860d99f3c1466ed3ad6a (diff) | |
Fix the TOXSWA reading test
Since a recent commit we are reading the concentrations at the end
of each hour, so the test needed to be updated accordingly
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/man/read.TOXSWA_cwa.Rd | 9 | ||||
| -rw-r--r-- | pkg/tests/testthat/EXSW2_R1_stream_printed.txt | 12 |
2 files changed, 13 insertions, 8 deletions
diff --git a/pkg/man/read.TOXSWA_cwa.Rd b/pkg/man/read.TOXSWA_cwa.Rd index aca2a56..84ef3da 100644 --- a/pkg/man/read.TOXSWA_cwa.Rd +++ b/pkg/man/read.TOXSWA_cwa.Rd @@ -5,7 +5,8 @@ \title{Read TOXSWA surface water concentrations} \usage{ read.TOXSWA_cwa(filename, basedir = ".", zipfile = NULL, segment = "last", - total = FALSE, windows = NULL, thresholds = NULL) + substance = "parent", total = FALSE, windows = NULL, + thresholds = NULL) } \arguments{ \item{filename}{The filename of the cwa file (TOXSWA 2.x.y or similar) or the @@ -18,6 +19,10 @@ out file (FOCUS TOXSWA 4, i.e. TOXSWA 4.4.2 or similar).} \item{segment}{The segment for which the data should be read. Either "last", or the segment number.} +\item{substance}{For TOXSWA 4 .out files, the default value "parent" leads +to reading concentrations of the parent compound. Alternatively, the substance +of interested can be selected by its code name.} + \item{total}{Set this to TRUE in order to read total concentrations as well. This is only necessary for .out files as generated by TOXSWA 4.4.2 or similar, not for .cwa files. For .cwa files, the total concentration is always read as well.} @@ -35,7 +40,7 @@ An instance of an R6 object of class \description{ Read TOXSWA hourly concentrations of a chemical substance in a specific segment of a TOXSWA surface water body. Per default, the data for the last -segment are imported. As TOXSWA reports the values at the end of the hour +segment are imported. As TOXSWA 4 reports the values at the end of the hour (ConLiqWatLayCur) in its summary file, we use this value as well instead of the hourly averages (ConLiqWatLay). } diff --git a/pkg/tests/testthat/EXSW2_R1_stream_printed.txt b/pkg/tests/testthat/EXSW2_R1_stream_printed.txt index f4e0a10..60bb5ac 100644 --- a/pkg/tests/testthat/EXSW2_R1_stream_printed.txt +++ b/pkg/tests/testthat/EXSW2_R1_stream_printed.txt @@ -1,10 +1,10 @@ <TOXSWA_cwa> data from file 3.out segment 20 datetime t t_firstjan t_rel_to_max cwa_mug_per_L -1 1978-10-01 00:30:00 0.021 273.0208 -55.292 0 -2 1978-10-01 01:30:00 0.063 273.0625 -55.250 0 -3 1978-10-01 02:30:00 0.104 273.1042 -55.209 0 -4 1978-10-01 03:30:00 0.146 273.1458 -55.167 0 -5 1978-10-01 04:30:00 0.188 273.1875 -55.125 0 -6 1978-10-01 05:30:00 0.229 273.2292 -55.084 0 +1 1978-10-01 00:00:00 0.000 273.0000 -55.083 0 +2 1978-10-01 01:00:00 0.042 273.0417 -55.041 0 +3 1978-10-01 02:00:00 0.083 273.0833 -55.000 0 +4 1978-10-01 03:00:00 0.125 273.1250 -54.958 0 +5 1978-10-01 04:00:00 0.167 273.1667 -54.916 0 +6 1978-10-01 05:00:00 0.208 273.2083 -54.875 0 Moving window analysis NULL |