fix: lintr annotations

NEWS.md

@@ -1,6 +1,7 @@
 # DTSg v1.1.3.9000
 
 * Slightly improved documentation.
+* Minor internal code improvements.
 
 # DTSg v1.1.3
 

R/ClassDTSg.R

@@ -251,7 +251,7 @@ DTSg <- R6Class(
       tryCatch(
         {
           if (!testMultiClass(i, c("integer", "numeric")) && !is.expression(i) &&
-              !is.character(i) && !is.list(i)) {
+                !is.character(i) && !is.list(i)) {
             i <- expr
           }
 
@@ -429,15 +429,14 @@ DTSg <- R6Class(
         if (...length() > 0L) {
           dots <- list(...)
           dots <- sprintf("%s = %s", names(dots), dots)
-          sprintf(", %s", paste(dots, collapse = ", "))
+          sprintf(", %s", toString(dots))
         } else {
           ""
         }
       }
 
-      text <- paste(
-        sprintf("%s = %s(%s%s)", resultCols, funs, cols, dotsToCharacter(...)),
-        collapse = ", "
+      text <- toString(
+        sprintf("%s = %s(%s%s)", resultCols, funs, cols, dotsToCharacter(...))
       )
 
       sprintf("list(%s)", text)
@@ -581,7 +580,7 @@ DTSg <- R6Class(
       }
 
       if ((by != private$.periodicity || na.status == "explicit") &&
-          by != "unrecognised") {
+            by != "unrecognised") {
         if (rollback && mday(from) > 28L && grepl("^\\d+ (month|year)(s?)$", by)) {
           DT <- data.table(
             .dateTime = rollback(seq(
@@ -608,7 +607,7 @@ DTSg <- R6Class(
           call. = FALSE
         )
       } else if (na.status == "explicit" && by == "unrecognised" &&
-                 private$.timestamps > 2L) {
+                   private$.timestamps > 2L) {
         warning(
           "Only time series with recognised periodicity can have explicitly missing values.\n",
           'Consider calling "alter()" with "na.status = \'explicit\'" and specified "by" argument.',
@@ -758,7 +757,7 @@ DTSg <- R6Class(
 
         modes <- vapply(
           private$.values[, cols, with = FALSE],
-          function(col) mode(col),
+          function(col) mode(col), # nolint
           character(1L)
         )
 
@@ -770,7 +769,7 @@ DTSg <- R6Class(
 
         typeofs <- vapply(
           private$.values[, cols, with = FALSE],
-          function(col) typeof(col),
+          function(col) typeof(col), # nolint
           character(1L)
         )
 
@@ -937,7 +936,7 @@ DTSg <- R6Class(
       secAxisLabel = ""
     ) {
       if (!requireNamespace("dygraphs", quietly = TRUE) ||
-          !requireNamespace("RColorBrewer", quietly = TRUE)) {
+            !requireNamespace("RColorBrewer", quietly = TRUE)) {
         stop(
           'Packages "dygraphs" and "RColorBrewer" must be installed for this method.',
           call. = FALSE
@@ -1124,7 +1123,7 @@ DTSg <- R6Class(
             DT <- private$.values[DT, on = sprintf("%s == .dateTime", firstCol)]
             lags <- diff(DT[[1L]])
             if (all(lags >= private$.minLag) && all(lags <= private$.maxLag) &&
-                sum(!is.na(DT[, -1L])) == sum(!is.na(private$.values[seqLen, -1L]))) {
+                  sum(!is.na(DT[, -1L])) == sum(!is.na(private$.values[seqLen, -1L]))) {
               private$.periodicity <- by
 
               break
@@ -1443,8 +1442,8 @@ DTSg <- R6Class(
       )
       assertNoStartingDot(cols)
       if (length(cols) == length(names(private$.values)) - 1L &&
-          ((is.list(values) && all(vapply(values, is.null, logical(1L)))) ||
-          is.null(values))) {
+            ((is.list(values) && all(vapply(values, is.null, logical(1L)))) ||
+            is.null(values))) {
         stop("Removing all value columns is not allowed.", call. = FALSE)
       }
       qassert(clone, "B1")

R/Swrappers.R

@@ -27,8 +27,8 @@ S3WrapperGenerator <- function(R6Method, self = "x", dots = TRUE) {
     R6Method <- as.expression(substitute(R6Method))
   }
   if (!is.expression(R6Method) ||
-      R6Method[[1L]][[2L]][[3L]] != "public_methods" ||
-      !is.R6Class(eval(R6Method[[1L]][[2L]][[2L]]))) {
+        R6Method[[1L]][[2L]][[3L]] != "public_methods" ||
+        !is.R6Class(eval(R6Method[[1L]][[2L]][[2L]]))) {
     stop(
       '"R6Method" must contain a public method of an "R6ClassGenerator".',
       call. = FALSE
@@ -38,7 +38,7 @@ S3WrapperGenerator <- function(R6Method, self = "x", dots = TRUE) {
   qassert(dots, "B1")
 
   args <- list()
-  args[[self]] <- alist(`self` = )$`self`
+  args[[self]] <- alist(self = )$self
   args <- c(args, formals(eval(R6Method)))
 
   if (dots && !any(names(args) == "...")) {

R/TALFs.R

@@ -98,7 +98,7 @@ to.fakeUTCdateTime <- function(.dateTime, .helpers) {
   )
 
   if (grepl("^\\d+ (month|year)(s?)$", .helpers[["periodicity"]]) &&
-      mday(.dateTime[1L]) > 28L) {
+        mday(.dateTime[1L]) > 28L) {
     .dateTime <- rollback(.dateTime, .helpers[["periodicity"]])
   }
 

R/aaa.R

@@ -5,16 +5,16 @@
 NULL
 
 .onLoad <- function(libname, pkgname) {
-  suppressWarnings(onCRAN <- isTRUE(as.logical(as.numeric(
+  suppressWarnings(onCRAN <- isTRUE(as.logical(as.numeric( # nolint
     Sys.getenv("_R_CHECK_EXAMPLE_TIMING_CPU_TO_ELAPSED_THRESHOLD_")
   ))))
   if (onCRAN) {
     setDTthreads(2L)
   }
 
-  getOption("DTSgClone"             , options(DTSgClone              = TRUE      )) # nolint
-  getOption("DTSgDeprecatedWarnings", options(DTSgDeprecatedWarnings = TRUE      )) # nolint
-  getOption("DTSgFast"              , options(DTSgFast               = FALSE     )) # nolint
-  getOption("DTSgFunbyApproach"     , options(DTSgFunbyApproach      = "base"    )) # nolint
-  getOption("DTSgNA.status"         , options(DTSgNA.status          = "explicit")) # nolint
+  getOption("DTSgClone"             , options(DTSgClone              = TRUE      ))
+  getOption("DTSgDeprecatedWarnings", options(DTSgDeprecatedWarnings = TRUE      ))
+  getOption("DTSgFast"              , options(DTSgFast               = FALSE     ))
+  getOption("DTSgFunbyApproach"     , options(DTSgFunbyApproach      = "base"    ))
+  getOption("DTSgNA.status"         , options(DTSgNA.status          = "explicit"))
 }

R/assertives.R

@@ -2,13 +2,13 @@ assertFunbyApproach <- function(funbyApproach) {
   funbyApproach <- match.arg(funbyApproach, c("base", "fasttime", "RcppCCTZ"))
 
   if (funbyApproach == "fasttime" &&
-      !requireNamespace("fasttime", quietly = TRUE)) {
+        !requireNamespace("fasttime", quietly = TRUE)) {
     stop(
       'Package "fasttime" must be installed for this approach.',
       call. = FALSE
     )
   } else if (funbyApproach == "RcppCCTZ" &&
-             !requireNamespace("RcppCCTZ", quietly = TRUE)) {
+               !requireNamespace("RcppCCTZ", quietly = TRUE)) {
     stop(
       'Package "RcppCCTZ" must be installed for this approach.',
       call. = FALSE

inst/tinytest/data.R

@@ -1,4 +1,4 @@
-library(data.table) # nolint
+library(data.table)
 
 #### global test data ####
 DT1 <- data.table(

inst/tinytest/test_DTSg.R

@@ -1,4 +1,4 @@
-source("data.R") # nolint
+source("data.R")
 
 #### aggregate method ####
 expect_identical(
@@ -1118,13 +1118,12 @@ expect_identical(
   info = "values are copied"
 )
 
-expect_identical(
+expect_null(
   {
     TS <- DTSg$new(DT1)
     TS$values(TRUE)[, col1 := NULL]
     TS$values(TRUE)[["col1"]]
   },
-  NULL,
   info = "reference to values is returned"
 )
 

inst/tinytest/test_TALFs.R

@@ -1,4 +1,4 @@
-source("data.R") # nolint
+source("data.R")
 
 for (approach in c("base", "fasttime", "RcppCCTZ")) {
   options(DTSgFunbyApproach = approach)

inst/tinytest/test_deprecated.R

@@ -1,4 +1,4 @@
-source("data.R") # nolint
+source("data.R")
 
 options(DTSgDeprecatedWarnings = FALSE)
 

inst/tinytest/test_utils.R

@@ -1,4 +1,4 @@
-source("data.R") # nolint
+source("data.R")
 
 #### interpolateLinear ####
 expect_identical(

vignettes/b_advancedUsage.Rmd

@@ -121,7 +121,7 @@ TS <- DTSg$new(flow)
 TS$summary()
 TS$
   colapply(
-    function(x, ...) ifelse(is.na(x), TRUE, FALSE),
+    function(x, ...) is.na(x),
     resultCols = "missing"
   )$
   colapply(interpolateLinear)$