mirror of
https://github.com/msberends/AMR.git
synced 2026-03-24 08:02:22 +01:00
* Modernise messaging infrastructure with cli support
Rewrites message_(), warning_(), stop_() to use cli::cli_inform(),
cli::cli_warn(), and cli::cli_abort() when the cli package is available,
with a fully functional plain-text fallback for environments without cli.
Key changes:
- New cli_to_plain() helper converts cli inline markup ({.fun}, {.arg},
{.val}, {.field}, {.cls}, {.pkg}, {.href}, {.url}, etc.) to readable
plain-text equivalents for the non-cli fallback path
- word_wrap() simplified: drops add_fn, ANSI re-index algorithm, RStudio
link injection, and operator spacing hack; returns pasted input unchanged
when cli is available
- stop_() no longer references AMR_env$cli_abort; uses pkg_is_available()
directly; passes sys.call() objects to cli::cli_abort() call= argument
- Removed add_fn parameter from message_(), warning_(), and word_wrap()
- All call sites across R/ updated: add_fn arguments removed, some paste0-
based string construction converted to cli glue syntax ({.fun as.mo},
{.arg col_mo}, {n} results, etc.)
- cli already listed in Suggests; no DESCRIPTION dependency changes needed
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* Replace {.fun} with {.help} for all exported functions in messaging
All function names referenced via {.fun …} in cli-style messages are
exported in NAMESPACE, so {.help …} is the appropriate markup — it
renders as a clickable help link rather than plain function styling.
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* Qualify all {.help} tags with AMR:: and convert backtick ?func references
- Add AMR:: namespace prefix and trailing () to all {.help} cli markup
so they render as clickable help links (e.g. {.help AMR::as.sir}())
- Convert `?funcname` backtick-quoted help references to {.help AMR::funcname}()
in aa_helper_functions.R, custom_eucast_rules.R, interpretive_rules.R,
key_antimicrobials.R, mo.R, plotting.R, resistance_predict.R, and sir.R
- Skipped `?proportion` in sir_calc.R as 'proportion' is not exported
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* Require cli >= 3.0.0 for cli_inform/cli_warn/cli_abort availability checks
cli_inform, cli_warn, and cli_abort were introduced in cli 3.0.0.
Add min_version = "3.0.0" (as character) to all four pkg_is_available("cli")
checks so older cli versions fall back to base R messaging.
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* Implement cli::code_highlight() for R code examples in messages (issue #191)
Add highlight_code() helper that wraps cli::code_highlight() when cli >= 3.0.0
is available, falling back to plain code otherwise. Apply it to all inline
R code examples embedded in message/warning/stop strings across the package.
Also convert remaining backtick-quoted function and argument references in
messaging calls to proper cli markup: {.help AMR::fn}(), {.arg arg},
{.code expr}, and {.pkg pkg} throughout ab.R, ab_from_text.R, av_from_text.R,
amr_selectors.R, count.R, custom_antimicrobials.R, custom_microorganisms.R,
interpretive_rules.R, mo.R, mo_property.R, sir.R, sir_calc.R.
Fixes #191
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* Fix {.help} markup to use correct cli link format [{.fun fn}](AMR::fn)
Replace all instances of {.help AMR::fn}() (incorrect format with manual
parentheses outside the link) with {.help [{.fun fn}](AMR::fn)} which is
the correct cli hyperlink syntax: the display text [{.fun fn}] renders the
function name with parentheses automatically, and (AMR::fn) is the link target.
Also update the plain-text fallback handler in aa_helper_functions.R to
extract the display text from the [text](topic) markdown link format,
so that non-cli environments show just the function name (e.g. `fn()`),
not the raw link markup.
Dynamic cases in amr_selectors.R and mo_property.R also updated.
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* Add {.topic} markup for non-function help page references
Replace {.code ?AMR-options} and backtick-style ?AMR-options / ?AMR-deprecated
references with proper {.topic AMR-options} / {.topic AMR-deprecated} cli markup
in count.R, interpretive_rules.R, proportion.R, and zz_deprecated.R.
Add {.topic} fallback handler to format_message() in aa_helper_functions.R:
plain-text environments render {.topic foo} as ?foo, and the [text](topic)
link form extracts just the display text (same pattern as {.help}).
Also convert remaining backtick function/arg references in proportion.R to
{.help [{.fun ...}](AMR::...)}, {.arg}, and {.code} markup for consistency.
Note: zzz.R intentionally keeps the backtick form since its startup message
goes through packageStartupMessage() which bypasses our cli infrastructure.
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* Fix {.topic} to use required pkg::topic format with display text
{.topic} in cli requires a package-qualified topic reference to generate
a valid x-r-help:pkg::topic URI. Bare {.topic AMR-options} produced a
malformed x-r-help:AMR-options URI (no package prefix).
Use the [display_text](pkg::topic) form throughout:
{.topic [AMR-options](AMR::AMR-options)}
{.topic [AMR-deprecated](AMR::AMR-deprecated)}
The hyphen in the topic name is fine as a URI string even though
AMR::AMR-options is not a valid R symbol expression.
The fallback handler in format_message() already handles the [text](uri)
form by extracting the display text, so plain-text output is unchanged.
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* Fix regexec() calls: remove perl=TRUE unsupported in older R
regexec() only gained the perl argument in R 4.1.0. The CI matrix
covers oldrel-1 through oldrel-4 (R 3.x/4.0.x), so perl=TRUE caused
an 'unused argument' error on every message_() call in those
environments.
All four affected regexec() calls use POSIX-extended compatible
patterns, so dropping perl=TRUE is safe.
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* Slim CI matrix for PRs to ubuntu-latest / r-release only
For pull requests, check-recent now runs a single job (ubuntu-latest,
r-release) via a setup job that emits the matrix as JSON. On push and
schedule the full matrix is unchanged (devel + release on all OSes,
oldrel-1 through oldrel-4).
Also removed the pull_request trigger from check-recent-dev-pkgs; the
dev-packages check only needs to run on push/schedule.
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* Restrict dev-versions and old-tinytest CI to main branch only
Both workflows were triggering on every push to every branch.
Narrowed push trigger to [main] so they only run after merging,
not on every feature/PR branch push.
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* Update NEWS.md to continuous log + add concise style rules to CLAUDE.md
NEWS.md is now a single continuous log under one heading per dev series,
not a new section per version bump. CLAUDE.md documents: only replace
line 1 (heading), append new entries, keep them extremely concise with
no trailing full stop.
Merged 9035 and 9036 entries into one section; condensed verbose 9036
bullets; added CI workflow change entry.
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* Replace single-quoted literals in messaging calls with cli markup
Converted bare 'value' strings inside stop_(), warning_(), message_()
to appropriate cli markup:
- {.val}: option values ('drug', 'dose', 'administration', 'SDD', 'logbook')
- {.cls}: class names ('sir', 'mo')
- {.field}: column names ('mo' in mo_source)
- {.code}: object/dataset names ('clinical_breakpoints')
Files changed: ab_from_text.R, av_from_text.R, sir.R, sir_calc.R, mo_source.R
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* Apply {.topic}, {.cls}, and {.field} markup in sir.R messaging
- 'clinical_breakpoints' (dataset): {.code} -> {.topic [clinical_breakpoints](AMR::clinical_breakpoints)}
- "is of class" context: extract bad_col/bad_cls/exp_cls vars and use {.cls} + {.field} in glue syntax
- Column references in as.sir() messages: font_bold(col) with surrounding quotes -> {.field {col}}
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* Replace glue-style dynamic markup with paste0() construction
{.field {variable}} and {.cls {variable}} patterns rely on glue
evaluation which is not safe in a zero-dependency package. Replace
all four occurrences with paste0("{.field ", var, "}") so the value
is baked into the markup string before reaching message_()/stop_().
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* Limit push trigger to main in check-recent workflow
push: branches: '**' caused both the push event (9-worker matrix) and
the pull_request event (1-worker matrix) to fire simultaneously on every
PR commit. Restricting push to [main] means PR pushes only trigger the
pull_request path (1 worker), while direct pushes to main still get the
full 9-worker matrix.
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* Limit push trigger to main in code-coverage workflow
Same fix as check-recent: push: branches: '**' caused the workflow to
run twice per PR commit (once for push, once for pull_request). Restricting
push to [main] ensures coverage runs only once per PR update.
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* Replace bare backticks with cli inline markup across all messaging calls
- {.arg} for argument names in stop_/warning_/message_ calls
- {.cls} after "of class" text in format_class() and elsewhere
- {.fun} for function names (replaces `fn()` pattern)
- {.pkg} for tidyverse package names (dplyr, ggplot2)
- {.code} for code literals (TRUE, FALSE, expressions)
- Rewrite print.ab: use cli named-vector with * bullets and code
highlighting when cli >= 3.0.0; keep plain-text fallback otherwise
- Fix typo in as.sir(): "of must be" -> "or must be"
- switch sir.R verbose notes from message() to message_()
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* Pre-evaluate inline expressions, add format_inline_(), fix print.ab
- All bare {variable}/{expression} in message_()/warning_()/stop_() calls
are now pre-evaluated via paste0(), so users without cli/glue never see
raw template syntax (mo_source.R, first_isolate.R, join_microorganisms.R,
antibiogram.R, atc_online.R)
- Add format_inline_() helper: formats a cli-markup string and returns it
(not emits it), using cli::format_inline() when available and cli_to_plain()
otherwise
- Rewrite .onAttach to use format_inline_() for all packageStartupMessage
calls; also adds {.topic} link and {.code} markup for option names
- print.ab: pre-evaluate function_name via paste0 (no .envir needed),
apply highlight_code() to each example bullet for R syntax highlighting
- join_microorganisms: pre-evaluate {type} and {nrow(...)} expressions
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* fixes
* Replace all "in \`funcname()\`:" with {.help [{.fun funcname}](AMR::funcname)}
Converts all "in `funcname()`:" prefixes in warning_()/message_()/stop_()
calls to the full {.help} link format for clickable help in supported
terminals. Also fixes adjacent backtick argument names to {.arg}.
Files changed: ab.R, ab_property.R, av.R, av_property.R, antibiogram.R,
key_antimicrobials.R, mdro.R, mic.R, mo.R, plotting.R
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* fixes
* definitive
* version fix
---------
Co-authored-by: Claude <noreply@anthropic.com>
269 lines
12 KiB
R
269 lines
12 KiB
R
# ==================================================================== #
|
|
# TITLE: #
|
|
# AMR: An R Package for Working with Antimicrobial Resistance Data #
|
|
# #
|
|
# SOURCE CODE: #
|
|
# https://github.com/msberends/AMR #
|
|
# #
|
|
# PLEASE CITE THIS SOFTWARE AS: #
|
|
# Berends MS, Luz CF, Friedrich AW, et al. (2022). #
|
|
# AMR: An R Package for Working with Antimicrobial Resistance Data. #
|
|
# Journal of Statistical Software, 104(3), 1-31. #
|
|
# https://doi.org/10.18637/jss.v104.i03 #
|
|
# #
|
|
# Developed at the University of Groningen and the University Medical #
|
|
# Center Groningen in The Netherlands, in collaboration with many #
|
|
# colleagues from around the world, see our website. #
|
|
# #
|
|
# This R package is free software; you can freely use and distribute #
|
|
# it for both personal and commercial purposes under the terms of the #
|
|
# GNU General Public License version 2.0 (GNU GPL-2), as published by #
|
|
# the Free Software Foundation. #
|
|
# We created this package for both routine data analysis and academic #
|
|
# research and it was publicly released in the hope that it will be #
|
|
# useful, but it comes WITHOUT ANY WARRANTY OR LIABILITY. #
|
|
# #
|
|
# Visit our website for the full manual and a complete tutorial about #
|
|
# how to conduct AMR data analysis: https://amr-for-r.org #
|
|
# ==================================================================== #
|
|
|
|
#' Determine Clinical or Epidemic Episodes
|
|
#'
|
|
#' These functions determine which items in a vector can be considered (the start of) a new episode. This can be used to determine clinical episodes for any epidemiological analysis. The [get_episode()] function returns the index number of the episode per group, while the [is_new_episode()] function returns `TRUE` for every new [get_episode()] index. Both absolute and relative episode determination are supported.
|
|
#' @param x Vector of dates (class `Date` or `POSIXt`), will be sorted internally to determine episodes.
|
|
#' @param episode_days Episode length in days to specify the time period after which a new episode begins, can also be less than a day or `Inf`, see *Details*.
|
|
#' @param case_free_days (inter-epidemic) interval length in days after which a new episode will start, can also be less than a day or `Inf`, see *Details*.
|
|
#' @param ... Ignored, only in place to allow future extensions.
|
|
#' @details Episodes can be determined in two ways: absolute and relative.
|
|
#'
|
|
#' 1. Absolute
|
|
#'
|
|
#' This method uses `episode_days` to define an episode length in days, after which a new episode will start. A common use case in AMR data analysis is microbial epidemiology: episodes of *S. aureus* bacteraemia in ICU patients for example. The episode length could then be 30 days, so that new *S. aureus* isolates after an ICU episode of 30 days will be considered a different (or new) episode.
|
|
#'
|
|
#' Thus, this method counts **since the start of the previous episode**.
|
|
#'
|
|
#' 2. Relative
|
|
#'
|
|
#' This method uses `case_free_days` to quantify the duration of case-free days (the inter-epidemic interval), after which a new episode will start. A common use case is infectious disease epidemiology: episodes of norovirus outbreaks in a hospital for example. The case-free period could then be 14 days, so that new norovirus cases after that time will be considered a different (or new) episode.
|
|
#'
|
|
#' Thus, this methods counts **since the last case in the previous episode**.
|
|
#'
|
|
#' In a table:
|
|
#'
|
|
#' | Date | Using `episode_days = 7` | Using `case_free_days = 7` |
|
|
#' |:----------:|:------------------------:|:--------------------------:|
|
|
#' | 2023-01-01 | 1 | 1 |
|
|
#' | 2023-01-02 | 1 | 1 |
|
|
#' | 2023-01-05 | 1 | 1 |
|
|
#' | 2023-01-08 | 2** | 1 |
|
|
#' | 2023-02-21 | 3 | 2*** |
|
|
#' | 2023-02-22 | 3 | 2 |
|
|
#' | 2023-02-23 | 3 | 2 |
|
|
#' | 2023-02-24 | 3 | 2 |
|
|
#' | 2023-03-01 | 4 | 2 |
|
|
#'
|
|
#' ** This marks the start of a new episode, because 8 January 2023 is more than 7 days since the start of the previous episode (1 January 2023). \cr
|
|
#' *** This marks the start of a new episode, because 21 January 2023 is more than 7 days since the last case in the previous episode (8 January 2023).
|
|
#'
|
|
#' Either `episode_days` or `case_free_days` must be provided in the function.
|
|
#'
|
|
#' ### Difference between `get_episode()` and `is_new_episode()`
|
|
#'
|
|
#' The [get_episode()] function returns the index number of the episode, so all cases/patients/isolates in the first episode will have the number 1, all cases/patients/isolates in the second episode will have the number 2, etc.
|
|
#'
|
|
#' The [is_new_episode()] function on the other hand, returns `TRUE` for every new [get_episode()] index.
|
|
#'
|
|
#' To specify, when setting `episode_days = 365` (using method 1 as explained above), this is how the two functions differ:
|
|
#'
|
|
#' | patient | date | `get_episode()` | `is_new_episode()` |
|
|
#' |:---------:|:----------:|:---------------:|:------------------:|
|
|
#' | A | 2019-01-01 | 1 | TRUE |
|
|
#' | A | 2019-03-01 | 1 | FALSE |
|
|
#' | A | 2021-01-01 | 2 | TRUE |
|
|
#' | B | 2008-01-01 | 1 | TRUE |
|
|
#' | B | 2008-01-01 | 1 | FALSE |
|
|
#' | C | 2020-01-01 | 1 | TRUE |
|
|
#'
|
|
#' ### Other
|
|
#'
|
|
#' The [first_isolate()] function is a wrapper around the [is_new_episode()] function, but is more efficient for data sets containing microorganism codes or names and allows for different isolate selection methods.
|
|
#'
|
|
#' The `dplyr` package is not required for these functions to work, but these episode functions do support [variable grouping][dplyr::group_by()] and work conveniently inside `dplyr` verbs such as [`filter()`][dplyr::filter()], [`mutate()`][dplyr::mutate()] and [`summarise()`][dplyr::summarise()].
|
|
#' @return
|
|
#' * [get_episode()]: an [integer] vector
|
|
#' * [is_new_episode()]: a [logical] vector
|
|
#' @seealso [first_isolate()]
|
|
#' @rdname get_episode
|
|
#' @export
|
|
#' @examples
|
|
#' # difference between absolute and relative determination of episodes:
|
|
#' x <- data.frame(dates = as.Date(c(
|
|
#' "2021-01-01",
|
|
#' "2021-01-02",
|
|
#' "2021-01-05",
|
|
#' "2021-01-08",
|
|
#' "2021-02-21",
|
|
#' "2021-02-22",
|
|
#' "2021-02-23",
|
|
#' "2021-02-24",
|
|
#' "2021-03-01",
|
|
#' "2021-03-01"
|
|
#' )))
|
|
#' x$absolute <- get_episode(x$dates, episode_days = 7)
|
|
#' x$relative <- get_episode(x$dates, case_free_days = 7)
|
|
#' x
|
|
#'
|
|
#'
|
|
#' # `example_isolates` is a data set available in the AMR package.
|
|
#' # See ?example_isolates
|
|
#' df <- example_isolates[sample(seq_len(2000), size = 100), ]
|
|
#'
|
|
#' get_episode(df$date, episode_days = 60) # indices
|
|
#' is_new_episode(df$date, episode_days = 60) # TRUE/FALSE
|
|
#'
|
|
#' # filter on results from the third 60-day episode only, using base R
|
|
#' df[which(get_episode(df$date, 60) == 3), ]
|
|
#'
|
|
#' # the functions also work for less than a day, e.g. to include one per hour:
|
|
#' get_episode(
|
|
#' c(
|
|
#' Sys.time(),
|
|
#' Sys.time() + 60 * 60
|
|
#' ),
|
|
#' episode_days = 1 / 24
|
|
#' )
|
|
#'
|
|
#' \donttest{
|
|
#' if (require("dplyr")) {
|
|
#' # is_new_episode() can also be used in dplyr verbs to determine patient
|
|
#' # episodes based on any (combination of) grouping variables:
|
|
#' df %>%
|
|
#' mutate(condition = sample(
|
|
#' x = c("A", "B", "C"),
|
|
#' size = 100,
|
|
#' replace = TRUE
|
|
#' )) %>%
|
|
#' group_by(patient, condition) %>%
|
|
#' mutate(new_episode = is_new_episode(date, 365)) %>%
|
|
#' select(patient, date, condition, new_episode) %>%
|
|
#' arrange(patient, condition, date)
|
|
#' }
|
|
#'
|
|
#' if (require("dplyr")) {
|
|
#' df %>%
|
|
#' group_by(ward, patient) %>%
|
|
#' transmute(date,
|
|
#' patient,
|
|
#' new_index = get_episode(date, 60),
|
|
#' new_logical = is_new_episode(date, 60)
|
|
#' ) %>%
|
|
#' arrange(patient, ward, date)
|
|
#' }
|
|
#'
|
|
#' if (require("dplyr")) {
|
|
#' df %>%
|
|
#' group_by(ward) %>%
|
|
#' summarise(
|
|
#' n_patients = n_distinct(patient),
|
|
#' n_episodes_365 = sum(is_new_episode(date, episode_days = 365)),
|
|
#' n_episodes_60 = sum(is_new_episode(date, episode_days = 60)),
|
|
#' n_episodes_30 = sum(is_new_episode(date, episode_days = 30))
|
|
#' )
|
|
#' }
|
|
#'
|
|
#' # grouping on patients and microorganisms leads to the same
|
|
#' # results as first_isolate() when using 'episode-based':
|
|
#' if (require("dplyr")) {
|
|
#' x <- df %>%
|
|
#' filter_first_isolate(
|
|
#' include_unknown = TRUE,
|
|
#' method = "episode-based"
|
|
#' )
|
|
#'
|
|
#' y <- df %>%
|
|
#' group_by(patient, mo) %>%
|
|
#' filter(is_new_episode(date, 365)) %>%
|
|
#' ungroup()
|
|
#'
|
|
#' identical(x, y)
|
|
#' }
|
|
#'
|
|
#' # but is_new_episode() has a lot more flexibility than first_isolate(),
|
|
#' # since you can now group on anything that seems relevant:
|
|
#' if (require("dplyr")) {
|
|
#' df %>%
|
|
#' group_by(patient, mo, ward) %>%
|
|
#' mutate(flag_episode = is_new_episode(date, 365)) %>%
|
|
#' select(group_vars(.), flag_episode)
|
|
#' }
|
|
#' }
|
|
get_episode <- function(x, episode_days = NULL, case_free_days = NULL, ...) {
|
|
meet_criteria(x, allow_class = c("Date", "POSIXt"), allow_NA = TRUE)
|
|
meet_criteria(episode_days, allow_class = c("numeric", "integer"), has_length = 1, is_positive = TRUE, is_finite = FALSE, allow_NULL = TRUE)
|
|
meet_criteria(case_free_days, allow_class = c("numeric", "integer"), has_length = 1, is_positive = TRUE, is_finite = FALSE, allow_NULL = TRUE)
|
|
as.integer(exec_episode(x, episode_days, case_free_days, ...))
|
|
}
|
|
|
|
#' @rdname get_episode
|
|
#' @export
|
|
is_new_episode <- function(x, episode_days = NULL, case_free_days = NULL, ...) {
|
|
meet_criteria(x, allow_class = c("Date", "POSIXt"), allow_NA = TRUE)
|
|
meet_criteria(episode_days, allow_class = c("numeric", "integer"), has_length = 1, is_positive = TRUE, is_finite = FALSE, allow_NULL = TRUE)
|
|
meet_criteria(case_free_days, allow_class = c("numeric", "integer"), has_length = 1, is_positive = TRUE, is_finite = FALSE, allow_NULL = TRUE)
|
|
!duplicated(exec_episode(x, episode_days, case_free_days, ...))
|
|
}
|
|
|
|
exec_episode <- function(x, episode_days, case_free_days, ...) {
|
|
stop_ifnot(is.null(episode_days) || is.null(case_free_days),
|
|
"either argument {.arg episode_days} or argument {.arg case_free_days} must be set.",
|
|
call = -2
|
|
)
|
|
|
|
# running as.double() on a POSIXct object will return its number of seconds since 1970-01-01
|
|
x <- as.double(as.POSIXct(x)) # as.POSIXct() required for Date classes
|
|
|
|
# since x is now in seconds, get seconds from episode_days as well
|
|
episode_seconds <- episode_days * 60 * 60 * 24
|
|
case_free_seconds <- case_free_days * 60 * 60 * 24
|
|
|
|
if (length(x) == 1) { # this will also match 1 NA, which is fine
|
|
return(1)
|
|
} else if (length(x) == 2 && all(!is.na(x))) {
|
|
if ((length(episode_seconds) > 0 && (max(x) - min(x)) >= episode_seconds) ||
|
|
(length(case_free_seconds) > 0 && (max(x) - min(x)) >= case_free_seconds)) {
|
|
if (x[1] <= x[2]) {
|
|
return(c(1, 2))
|
|
} else {
|
|
return(c(2, 1))
|
|
}
|
|
} else {
|
|
return(c(1, 1))
|
|
}
|
|
}
|
|
|
|
run_episodes <- function(x, episode_sec, case_free_sec) {
|
|
NAs <- which(is.na(x))
|
|
x[NAs] <- 0
|
|
|
|
indices <- integer(length = length(x))
|
|
start <- x[1]
|
|
ind <- 1
|
|
indices[ind] <- 1
|
|
for (i in 2:length(x)) {
|
|
if ((length(episode_sec) > 0 && (x[i] - start) >= episode_sec) ||
|
|
(length(case_free_sec) > 0 && (x[i] - x[i - 1]) >= case_free_sec)) {
|
|
ind <- ind + 1
|
|
start <- x[i]
|
|
}
|
|
indices[i] <- ind
|
|
}
|
|
indices[NAs] <- NA
|
|
indices
|
|
}
|
|
|
|
ord <- order(x)
|
|
out <- run_episodes(x[ord], episode_seconds, case_free_seconds)[order(ord)]
|
|
out[is.na(x) & ord != 1] <- NA # every NA expect for the first must remain NA
|
|
out
|
|
}
|