Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
CSIRO-INRA
landsepi
Commits
5e820bde
Commit
5e820bde
authored
Jul 20, 2021
by
Jean-Francois Rey
☕
Browse files
update output bug/hack
try to include pdf parameters into pkgdown et reduce size
parent
056800ea
Pipeline
#3858
passed with stages
in 65 minutes and 45 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
DESCRIPTION
View file @
5e820bde
...
...
@@ -22,7 +22,7 @@ Authors@R:
family = "Gaussen",
role = "ctb",
email = "jean-loup-thomas.gaussen@inrae.fr"))
Maintainer: Jean-Fran
c
ois Rey <jean-francois.rey@inrae.fr>
Maintainer: Jean-Fran
ç
ois Rey <jean-francois.rey@inrae.fr>
Description: A stochastic, spatially-explicit, demo-genetic model simulating the spread and evolution
of a plant pathogen in a heterogeneous landscape to assess resistance deployment strategies.
It is based on a spatial geometry for describing the landscape and allocation of different cultivars,
...
...
R/output.R
View file @
5e820bde
...
...
@@ -846,7 +846,8 @@ evol_output <- function(types = "all", time_param, Npoly, cultivars_param, genes
return
(
res
[
match
(
types
,
valid_outputs
)])
}
## Hack foreach dopar y variable
utils
::
globalVariables
(
c
(
"y"
))
#' @title Generation of a video
#' @name video
#' @description Generates a video showing the epidemic dynamics on a map representing the cropping landscape.
...
...
@@ -1015,6 +1016,7 @@ video <- function(audpc, time_param, Npatho, landscape, area, rotation, croptype
# legend_prev <- sprintf("%.3f", intvls)
legend_prev
<-
paste
(
intvls
*
100
,
"%"
,
sep
=
""
)
registerDoParallel
(
parallel
::
detectCores
())
foreach
(
y
=
1
:
Nyears
)
%dopar%
{
print
(
paste
(
"Year"
,
y
,
"/"
,
Nyears
))
...
...
man/landsepi-package.Rd
View file @
5e820bde
...
...
@@ -211,7 +211,7 @@ url: https://cran.r-project.org/package=landsepi.
Useful links:
\itemize{
\item \url{https://csiro-inra.pages.biosp.inrae.fr/landsepi/}
\item \url{https://gitlab.paca.inra.fr/CSIRO-INRA/landsepi}
\item \url{https://gitlab.paca.inra
e
.fr/CSIRO-INRA/landsepi}
\item Report bugs at \url{https://gitlab.paca.inrae.fr/CSIRO-INRA/landsepi/-/issues}
}
...
...
vignettes/O1-run_simple_simul.Rmd
View file @
5e820bde
...
...
@@ -8,6 +8,8 @@ vignette: >
%\VignetteEngine{knitr::rmarkdown}
editor_options:
chunk_output_type: console
resource_files:
- inst/doc/list_of_parameters.pdf
---
```{r, include = FALSE}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment