| Previous changeset 1:b67730406f1b (2023-01-04) |
|
Commit message:
planemo upload for repository https://github.com/Marie59/champ_blocs commit 075fd90d1a39ae7912b48549e5537971635b9620 |
|
modified:
cb_dissimilarity.r cb_ivr.r cb_ivr.xml cb_ivr_site_report_col_scale_loop.Rmd div_index.r macro.xml |
| b |
| diff -r b67730406f1b -r bcbad4f83dec cb_dissimilarity.r --- a/cb_dissimilarity.r Wed Jan 04 13:21:30 2023 +0000 +++ b/cb_dissimilarity.r Sat Mar 18 16:49:19 2023 +0000 |
| b |
| @@ -20,6 +20,7 @@ # magrittr # rmarkdown library(magrittr) + #####Load arguments args <- commandArgs(trailingOnly = TRUE) |
| b |
| diff -r b67730406f1b -r bcbad4f83dec cb_ivr.r --- a/cb_ivr.r Wed Jan 04 13:21:30 2023 +0000 +++ b/cb_ivr.r Sat Mar 18 16:49:19 2023 +0000 |
| b |
| @@ -19,6 +19,7 @@ # magrittr # rmarkdown library(magrittr) +library(gmp) #####Load arguments args <- commandArgs(trailingOnly = TRUE) |
| b |
| diff -r b67730406f1b -r bcbad4f83dec cb_ivr.xml --- a/cb_ivr.xml Wed Jan 04 13:21:30 2023 +0000 +++ b/cb_ivr.xml Sat Mar 18 16:49:19 2023 +0000 |
| [ |
| @@ -1,16 +1,23 @@ -<tool id="cb_ivr" name="IVR" version="@VERSION@" profile = "20.01"> +<tool id="cb_ivr" name="IVR" version="@VERSION@" profile="20.01"> <description>indicator</description> <macros> <import>macro.xml</import> </macros> - <expand macro="cb_requirements"> - <requirement type="package" version="2.19">r-rmarkdown</requirement> + <requirements> + <requirement type="package" version="1.0.10">r-dplyr</requirement> + <requirement type="package" version="1.2.1">r-tidyr</requirement> + <requirement type="package" version="1.4.1">r-stringr</requirement> + <requirement type="package" version="3.1.8">r-tibble</requirement> + <requirement type="package" version="1.40">r-knitr</requirement> + <requirement type="package" version="0.6_8">r-gmp</requirement> + <requirement type="package" version="2.0.3">r-magrittr</requirement> + <requirement type="package" version="2.18">r-rmarkdown</requirement> <requirement type="package" version="0.2.4">r-officedown</requirement> <requirement type="package" version="1.3.2">r-tidyverse</requirement> - <requirement type="package" version="0.5.0">r-officer</requirement> + <requirement type="package" version="0.5.1">r-officer</requirement> <requirement type="package" version="0.8.3">r-flextable</requirement> - <requirement type="package" version="3.4">r-ggplot2</requirement> - </expand> + <requirement type="package" version="3.4.0">r-ggplot2</requirement> + </requirements> <required_files> <include type="literal" path="test-data/champbloc_ivr.csv"/> <include type="literal" path="test-data/ficheterrain.csv"/> @@ -21,11 +28,12 @@ <include type="literal" path="cb_ivr.r"/> </required_files> <command detect_errors="exit_code"><{width=1000}\n' |
| b |
| diff -r b67730406f1b -r bcbad4f83dec div_index.r --- a/div_index.r Wed Jan 04 13:21:30 2023 +0000 +++ b/div_index.r Sat Mar 18 16:49:19 2023 +0000 |
| [ |
| @@ -10,17 +10,6 @@ #####Packages : dplyr # tidyr -# readr -# writexl -# stringr -# readxl -# tibble -# lubridate -# cowplot -# magrittr -# rmarkdown -library(magrittr) -library(dplyr) #####Load arguments args <- commandArgs(trailingOnly = TRUE) @@ -106,7 +95,7 @@ qecnato0$Face <- as.character(qecnato0$Face) div_list <- vector("list", length(unique(qecnato0$site_year_month_day))) - +library(dplyr) for (i in c(1:nrow(qecnato0))) { div_i <- dplyr::filter(qecnato0, site_year_month_day == qecnato0$site_year_month_day[i]) |
| b |
| diff -r b67730406f1b -r bcbad4f83dec macro.xml --- a/macro.xml Wed Jan 04 13:21:30 2023 +0000 +++ b/macro.xml Sat Mar 18 16:49:19 2023 +0000 |
| b |
| @@ -1,17 +1,5 @@ <macros> <token name="@VERSION@">0.0.0</token> - <xml name="cb_requirements"> - <requirements> - <requirement type="package" version="4.2.2">r-base</requirement> - <requirement type="package" version="1.0.10">r-dplyr</requirement> - <requirement type="package" version="1.2.1">r-tidyr</requirement> - <requirement type="package" version="1.5.0">r-stringr</requirement> - <requirement type="package" version="3.1.8">r-tibble</requirement> - <requirement type="package" version="1.41">r-knitr</requirement> - <requirement type="package" version="2.0.3">r-magrittr</requirement> - <yield/> - </requirements> - </xml> <xml name="cb_input"> <param name="fiche_val" type="data" format="data" label="Input ficheterrain.csv"/> </xml> |