Skip to content

Commit

Permalink
cran prep
Browse files Browse the repository at this point in the history
  • Loading branch information
Flavio Lozano Isla committed Feb 5, 2024
1 parent 38b2276 commit a194704
Show file tree
Hide file tree
Showing 172 changed files with 4,427 additions and 11,213 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
Package: inti
Type: Package
Version: 0.6.3
Version: 0.6.4
Title: Tools and Statistical Procedures in Plant Science
Description: The 'inti' package is part of the 'inkaverse' project for developing
different procedures and tools used in plant science and experimental designs.
The mean aim of the package is to support researchers during the planning of
experiments and data collection (tarpuy()), data analysis and graphics (yupana())
, and technical writing.
Learn more about the 'inkaverse' project at <https://inkaverse.com/>.
Date: 2023-10-26
Date: 2024-02-05
Authors@R: c(
person("Flavio", "Lozano-Isla", email = "[email protected]", role = c("aut", "cre")
, comment = c(ORCID = "0000-0002-0714-669X")),
Expand Down
4 changes: 2 additions & 2 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@

# inti 0.6.4

- Update bootstrap in apps
- Tarpuy:
- Alows to exclude or delete `{when}` or `{sample}` colums
- Allow `defaultValue` for numeric traits
- Allow `defaultValue` for traits
- Rticles
- Include images using markdown syntax `![]()`


=> Fix if "defaultvalue" is in the trait table

# inti 0.6.3
Expand Down
9 changes: 5 additions & 4 deletions R/tarpuy_traits.R
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
#' fb <- ds %>% tarpuy_design()
#'
#' url_trt <- paste0("https://docs.google.com/spreadsheets/d/"
#' , "1kIoI__uHQpZ8qXMPFoZpimBhywU8J0Rw49KgjJcovMY/edit#gid=1056776892")
#' , "1fBSnEq6CmYKK9Pdxlz0egEEflezJRnlAOylQwbythBE/edit#gid=179601173")
#'
#' traits <- gsheet2tbl(url_trt)
#'
Expand Down Expand Up @@ -111,8 +111,8 @@ tarpuy_traits <- function(fieldbook = NULL

# -------------------------------------------------------------------------

cols <- c("trait" = NA_real_, "format" = NA_real_, "default" = NA_real_
, "minimum" = NA_real_, "maximum" = NA_real_, "details" = NA_real_
cols <- c("trait" = NA_real_, "format" = NA_real_, "default" = NA_real_
, "minimum" = NA_real_, "maximum" = NA_real_, "details" = NA_real_
, "categories" = NA_real_)

# -------------------------------------------------------------------------
Expand All @@ -131,6 +131,7 @@ tarpuy_traits <- function(fieldbook = NULL
} %>%
dplyr::bind_rows() %>%
tibble::add_column(!!!cols[!names(cols) %in% names(.)]) %>%
dplyr::rename("defaultValue" = "default") %>%
dplyr::filter(!grepl("X", .data$abbreviation))

traitsnames <- traitstb %>%
Expand Down Expand Up @@ -163,7 +164,7 @@ tarpuy_traits <- function(fieldbook = NULL
dplyr::mutate(isVisible = "true") %>%
dplyr::mutate(defaultValue = dplyr::case_when(
.data$format %in% "boolean" ~ "false"
, TRUE ~ .data$defaultValue
, TRUE ~ as.character(.data$defaultValue)
)) %>%
dplyr::rowwise() %>%
dplyr::mutate(categories = case_when(
Expand Down
6 changes: 3 additions & 3 deletions docs/404.html

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

4 changes: 2 additions & 2 deletions docs/LICENSE-text.html

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

8 changes: 5 additions & 3 deletions docs/articles/apps.html

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

Binary file modified docs/articles/extra/files/fig-01.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/articles/extra/files/fig-02.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/articles/extra/files/fig-03.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/articles/extra/files/plot_cluster_map.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/articles/extra/files/plot_pca_ind.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/articles/extra/files/plot_pca_var.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit a194704

Please sign in to comment.