Skip to content

Commit

Permalink
updating to 18.10.2024
Browse files Browse the repository at this point in the history
  • Loading branch information
lilyclements committed Dec 2, 2024
1 parent 4303329 commit f682569
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 15 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Description: This package contains a set of climatic functions used in R-Instat.
License: LGPL (>= 3)
Encoding: UTF-8
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.2.3
RoxygenNote: 7.3.2
Imports:
climdex.pcic,
colorRamps,
Expand Down Expand Up @@ -45,4 +45,4 @@ Imports:
tidyselect,
zoo
Remotes:
pacificclimate/climdex.pcic
pacificclimate/climdex.pcic
10 changes: 5 additions & 5 deletions R/climatic_details.R
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#'
#' @param data A dataset containing climatic data.
#' @param date The date variable in the dataset.
#' @param elements A character vector specifying the climatic elements to analyze.
#' @param stations A character vector specifying the stations to analyze.
#' @param elements A character vector specifying the climatic elements to analyse.
#' @param stations A character vector specifying the stations to analyse.
#' @param order A logical value indicating whether the resulting tables should be ordered.
#' @param day A logical value indicating whether to include information at the day level.
#' @param month A logical value indicating whether to include information at the month level.
Expand All @@ -29,9 +29,9 @@
#' # level = TRUE)

climatic_details <- function(data, date, elements = ..., stations,
order = FALSE,
day = TRUE,
month = FALSE,
order = TRUE,
day = FALSE,
month = TRUE,
year = FALSE, level = FALSE){


Expand Down
5 changes: 2 additions & 3 deletions R/convert_to_character_matrix.R
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ convert_to_character_matrix <- function(data, format_decimal_places = TRUE, deci
#which are recognised oddly by the R.Net
out[, i] <- as.character(data[[i]])
} else {
out[, i] <-
format(data[[i]], digits = decimal_places[i], scientific = is_scientific[i])
out[,i] <- format(data[[i]], digits = decimal_places[i], scientific = is_scientific[i])
}
if (!is.null(na_display)) {
out[is.na(data[[i]]), i] <- na_display
Expand All @@ -54,4 +53,4 @@ convert_to_character_matrix <- function(data, format_decimal_places = TRUE, deci
}
if(return_data_frame) out <- data.frame(out, stringsAsFactors = FALSE, check.names = check.names)
return(out)
}
}
10 changes: 5 additions & 5 deletions man/climatic_details.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit f682569

Please sign in to comment.