Skip to content
Snippets Groups Projects
Commit 0f62f1d6 authored by thierrychambert's avatar thierrychambert
Browse files

Minor updates + changed "trend > growth" values to 4% increments

parent 756c9663
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
inst/ShinyApp/server.R
+ 8
− 8
View file @ 0f62f1d6
......@@ -30,9 +30,9 @@ server <- function(input, output, session){
CP = 0.99
# Values of pop_growth (assumed), when the "trend" option is chosen
growth_weak <- 1.05
growth_average <- 1.10
growth_strong <- 1.15
growth_weak <- 1.04
growth_average <- 1.08
growth_strong <- 1.12
decline_weak <- 0.97
decline_average <- 0.94
......@@ -439,7 +439,7 @@ server <- function(input, output, session){
updateMatrixInput(session, inputId = "fatalities_mat_cumulated",
value = matrix(fill_mat, nrow = n_farm, ncol = 3, byrow = TRUE,
dimnames = list(paste("Parc", c(1:n_farm)),
c("Moyenne",
c("Valeur centrale",
"Erreur-type",
"Anne (dbut)"))))
})
......@@ -462,7 +462,7 @@ server <- function(input, output, session){
updateMatrixInput(session, inputId = "fatalities_mat_expert",
value = matrix(fill_mat, nrow = n_experts, ncol = 5, byrow = TRUE,
dimnames = list(paste0("#", 1:n_experts),
c("Poids", "Min", "Best", "Max", "% IC" ))
c("Poids", "Min", "Best", "Max", "%IC" ))
)
)
})
......@@ -485,7 +485,7 @@ server <- function(input, output, session){
updateMatrixInput(session, inputId = "pop_size_mat_expert",
value = matrix(fill_mat, nrow = n_experts, ncol = 5, byrow = TRUE,
dimnames = list(paste0("#", 1:n_experts),
c("Poids", "Min", "Best", "Max", "% IC" ))
c("Poids", "Min", "Best", "Max", "%IC" ))
)
)
})
......@@ -508,7 +508,7 @@ server <- function(input, output, session){
updateMatrixInput(session, inputId = "pop_growth_mat_expert",
value = matrix(fill_mat, nrow = n_experts, ncol = 5, byrow = TRUE,
dimnames = list(paste0("#", 1:n_experts),
c("Poids", "Min", "Best", "Max", "% IC" ))
c("Poids", "Min", "Best", "Max", "%IC" ))
)
)
})
......@@ -531,7 +531,7 @@ server <- function(input, output, session){
updateMatrixInput(session, inputId = "carrying_cap_mat_expert",
value = matrix(fill_mat, nrow = n_experts, ncol = 5, byrow = TRUE,
dimnames = list(paste0("#", 1:n_experts),
c("Poids", "Min", "Best", "Max", "% IC" ))
c("Poids", "Min", "Best", "Max", "%IC" ))
)
)
})
......
inst/ShinyApp/ui.R
+ 7
− 7
View file @ 0f62f1d6
......@@ -302,7 +302,7 @@ rm(list = ls(all.names = TRUE))
matrixInput(inputId = "fatalities_mat_expert",
value = matrix(data = eli_fatalities, nrow = 4, ncol = 5,
dimnames = list(c("#1", "#2", "#3", "#4"),
c("Poids", "Min", "Best", "Max", "% IC" )),
c("Poids", "Min", "Best", "Max", "%IC" )),
byrow = TRUE),
class = "numeric",
rows = list(names = TRUE),
......@@ -334,9 +334,9 @@ rm(list = ls(all.names = TRUE))
3, 0.5, 2018),
nrow = 3, ncol = 3, byrow = TRUE,
dimnames = list(c(paste0("Parc num.", c(1:3))),
c("Moyenne",
c("Valeur centrale",
"Erreur-type",
"Anne de mise en service du parc"))),
"Anne (dbut)"))),
class = "numeric",
rows = list(names = TRUE),
cols = list(names = TRUE)),
......@@ -444,7 +444,7 @@ rm(list = ls(all.names = TRUE))
matrixInput(inputId = "pop_size_mat_expert",
value = matrix(data = eli_pop_size, nrow = 4, ncol = 5,
dimnames = list(c("#1", "#2", "#3", "#4"),
c("Poids", "Min", "Best", "Max", "% IC" )),
c("Poids", "Min", "Best", "Max", "%IC" )),
byrow = TRUE),
class = "numeric",
rows = list(names = TRUE),
......@@ -524,7 +524,7 @@ rm(list = ls(all.names = TRUE))
matrixInput(inputId = "pop_growth_mat_expert",
value = matrix(data = eli_pop_growth, nrow = 4, ncol = 5,
dimnames = list(c("#1", "#2", "#3", "#4"),
c("Poids", "Min", "Best", "Max", "% IC" )),
c("Poids", "Min", "Best", "Max", "%IC" )),
byrow = TRUE),
class = "numeric",
rows = list(names = TRUE),
......@@ -538,7 +538,7 @@ rm(list = ls(all.names = TRUE))
column(6,
radioButtons(inputId = "pop_trend",
label = "Tendance",
choices = c("En croissance" = "growth",
choices = c("Croissance" = "growth",
"Stable" = "stable",
"En dclin" = "decline")),
),
......@@ -634,7 +634,7 @@ rm(list = ls(all.names = TRUE))
matrixInput(inputId = "carrying_cap_mat_expert",
value = matrix(data = eli_carrying_cap, nrow = 4, ncol = 5,
dimnames = list(c("#1", "#2", "#3", "#4"),
c("Poids", "Min", "Best", "Max", "% IC" )),
c("Poids", "Min", "Best", "Max", "%IC" )),
byrow = TRUE),
class = "numeric",
rows = list(names = TRUE),
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Documentation | Mentions légales | CGU | Accessibilité : non conforme