Report : added all entries parameters

inst/ShinyApp/report.Rmd

 ---
-title: "Rapport de l'analyse avec eolpop"
+title: "Rapport : analyse démographique (eolpop)"
 output: pdf_document
 params:
   intro: NA
@@ -13,25 +13,69 @@ params:
   fatalities_val1: NA
   fatalities_val2: NA
   
+  pop_size_unit: NA
+  pop_size_input_type: NA
+  pop_size_val1: NA
+  pop_size_val2: NA
+  
+  pop_growth_input_type: NA
+  pop_growth_val1: NA
+  pop_growth_val2: NA
+  
+  carrying_cap_unit: NA
+  carrying_cap_input_type: NA
+  carrying_cap_val1: NA
+  carrying_cap_val2: NA
+  
   impact_plot: NA
   trajectory_plot : NA
 ---
 
+## Contexte de l'étude
 `r paste(params$intro)`
 
-## Type d'analyse realisée : `r paste(params$analysis)`
+### Type d'analyse realisée : `r paste(params$analysis)`
 
-## Espèce choisie: `r paste(params$species)`
+### Espèce choisie: `r paste(params$species)`
 
------------------------------------------------------------------------------
+***
+
+# Paramètres d'entrée utilisés
 
 ## Mortalités annuelles
-### `r paste(params$fatalities_unit)`
-### `r paste(params$fatalities_input_type)`
-`r paste(params$fatalities_val1)`
-`r paste(params$fatalities_val2)`
+`r paste(params$fatalities_unit)`  
+`r paste(params$fatalities_input_type)`  
+  
+**`r paste(params$fatalities_val1)` `r paste(params$fatalities_val2)`**
+
+
+
+## Taille de la population
+`r paste(params$pop_size_unit)`  
+`r paste(params$pop_size_input_type)`  
+  
+**`r paste(params$pop_size_val1)` `r paste(params$pop_size_val2)`**
+
+
+
+## Taux de croissance annuel
+`r paste(params$pop_growth_input_type)`  
+  
+**`r paste(params$pop_growth_val1)` `r paste(params$pop_growth_val2)`**
+
+
+
+## Capacité de charge
+`r paste(params$carrying_cap_unit)`  
+`r paste(params$carrying_cap_input_type)`  
+  
+**`r paste(params$carrying_cap_val1)` `r paste(params$carrying_cap_val2)`**
+
+
+***
+
 
------------------------------------------------------------------------------
+# Résultats
 
 # Graphique : Impact relatif au cours du temps
 ```{r, echo=FALSE}

inst/ShinyApp/server.R

@@ -1730,23 +1730,143 @@ server <- function(input, output, session){
     }
 
     if(input$fatalities_input_type == "itvl"){
-      out$fatalities_input_type <- "Saisie : intervalle\n"
+      out$fatalities_input_type <- "Saisie : intervalle"
       out$fatalities_val1 <- paste0("Min : ", input$fatalities_lower, unit, " ; ")
       out$fatalities_val2 <- paste0("Max : ", input$fatalities_upper, unit)
     }
     if(input$fatalities_input_type == "val"){
-      out$fatalities_input_type <- "Saisie : estimation et erreur-type\n"
+      out$fatalities_input_type <- "Saisie : estimation et erreur-type"
       out$fatalities_val1 <- paste0("Valeur estime : ", input$fatalities_mean, unit, " ; ")
       out$fatalities_val2 <- paste0("Erreur-type : ", input$fatalities_se, unit)
     }
     if(input$fatalities_input_type == "eli_exp"){
-      out$fatalities_input_type <- "Saisie : licitation d'experts\n"
+      out$fatalities_input_type <- "Saisie : licitation d'experts"
       out$fatalities_val1 <- paste0("Moyenne estime : ", round(param$fatalities_eli_result$mean, 2), unit, " ; ")
       out$fatalities_val2 <- paste0("Erreur_type : ", round(param$fatalities_eli_result$SE, 2), unit)
     }
   })
 
 
+  # Population Size
+  observeEvent({
+    input$run
+  }, {
+    if(input$pop_size_unit == "Npair"){
+      out$pop_size_unit <- paste0("Unit : nombre de couples")
+      unit <- " couples"
+    }
+    if(input$pop_size_unit == "Ntotal"){
+      out$pop_size_unit <- paste0("Unit : effectif total")
+      unit <- " individus"
+    }
+
+    if(input$pop_size_input_type == "itvl"){
+      out$pop_size_input_type <- "Saisie : intervalle"
+      out$pop_size_val1 <- paste0("Min : ", input$pop_size_lower, unit, " ; ")
+      out$pop_size_val2 <- paste0("Max : ", input$pop_size_upper, unit)
+    }
+    if(input$pop_size_input_type == "val"){
+      out$pop_size_input_type <- "Saisie : estimation et erreur-type"
+      out$pop_size_val1 <- paste0("Valeur estime : ", input$pop_size_mean, unit, " ; ")
+      out$pop_size_val2 <- paste0("Erreur-type : ", input$pop_size_se, unit)
+    }
+    if(input$pop_size_input_type == "eli_exp"){
+      out$pop_size_input_type <- "Saisie : licitation d'experts"
+      out$pop_size_val1 <- paste0("Moyenne estime : ", round(param$pop_size_eli_result$mean, 2), unit, " ; ")
+      out$pop_size_val2 <- paste0("Erreur_type : ", round(param$pop_size_eli_result$SE, 2), unit)
+    }
+  })
+
+
+  # Population Growth rate
+  observeEvent({
+    input$run
+  }, {
+    unit <- "%"
+
+    if(input$pop_growth_input_type == "itvl"){
+      out$pop_growth_input_type <- "Saisie : intervalle"
+      out$pop_growth_val1 <- paste0("Min : ", input$pop_growth_lower, unit, " ; ")
+      out$pop_growth_val2 <- paste0("Max : ", input$pop_growth_upper, unit)
+    }
+    if(input$pop_growth_input_type == "val"){
+      out$pop_growth_input_type <- "Saisie : estimation et erreur-type"
+      out$pop_growth_val1 <- paste0("Valeur estime : ", input$pop_growth_mean, unit, " ; ")
+      out$pop_growth_val2 <- paste0("Erreur-type : ", input$pop_growth_se, unit)
+    }
+    if(input$pop_growth_input_type == "eli_exp"){
+      out$pop_growth_input_type <- "Saisie : licitation d'experts"
+      out$pop_growth_val1 <- paste0("Moyenne estime : ", round(param$pop_growth_eli_result$mean, 2), unit, " ; ")
+      out$pop_growth_val2 <- paste0("Erreur_type : ", round(param$pop_growth_eli_result$SE, 2), unit)
+    }
+
+    ## TREND
+
+    if(input$pop_growth_input_type == "trend"){
+      out$pop_growth_input_type <- "Saisie : tendance"
+
+      if(input$pop_trend == "stable"){
+        V1 <- "Stable"
+        V2 <- NULL
+      }
+
+      if(input$pop_trend == "growth"){
+        V1 <- "En croissance"
+        if(input$pop_trend_strength == "weak") V2 <- "faible"
+        if(input$pop_trend_strength == "average") V2 <- "modre"
+        if(input$pop_trend_strength == "strong") V2 <- "forte"
+      }
+
+      if(input$pop_trend == "decline"){
+        V1 <- "En dclin"
+        if(input$pop_trend_strength == "weak") V2 <- "faible"
+        if(input$pop_trend_strength == "average") V2 <- "modr"
+        if(input$pop_trend_strength == "strong") V2 <- "fort"
+      }
+        out$pop_growth_val1 <- V1
+        out$pop_growth_val2 <- V2
+    }
+
+  })
+
+  # Carrying capacity
+  observeEvent({
+    input$run
+  }, {
+    if(input$pop_size_unit == "Npair"){
+      out$carrying_cap_unit <- paste0("Unit : nombre de couples")
+      unit <- " couples"
+    }
+    if(input$pop_size_unit == "Ntotal"){
+      out$carrying_cap_unit <- paste0("Unit : effectif total")
+      unit <- " individus"
+    }
+
+    if(input$carrying_cap_input_type == "itvl"){
+      out$carrying_cap_input_type <- "Saisie : intervalle"
+      out$carrying_cap_val1 <- paste0("Min : ", input$carrying_capacity_lower, unit, " ; ")
+      out$carrying_cap_val2 <- paste0("Max : ", input$carrying_capacity_upper, unit)
+    }
+    if(input$carrying_cap_input_type == "val"){
+      out$carrying_cap_input_type <- "Saisie : estimation et erreur-type"
+      out$carrying_cap_val1 <- paste0("Valeur estime : ", input$carrying_capacity_mean, unit, " ; ")
+      out$carrying_cap_val2 <- paste0("Erreur-type : ", input$carrying_capacity_se, unit)
+    }
+    if(input$carrying_cap_input_type == "eli_exp"){
+      out$carrying_cap_input_type <- "Saisie : licitation d'experts"
+      out$carrying_cap_val1 <- paste0("Moyenne estime : ", round(param$carrying_cap_eli_result$mean, 2), unit, " ; ")
+      out$carrying_cap_val2 <- paste0("Erreur_type : ", round(param$carrying_cap_eli_result$SE, 2), unit)
+    }
+
+    if(input$carrying_cap_input_type == "no_K"){
+      out$carrying_cap_input_type <- NULL
+      out$carrying_cap_val1 <- paste0("Absence de capacit de charge")
+      out$carrying_cap_val2 <- paste0("Justifi ou pas ??")
+    }
+
+  })
+
+
   #####
   ##-----------------------------------------------------------------------------------
   ##                                REPORT
@@ -1776,20 +1896,19 @@ server <- function(input, output, session){
         fatalities_val1 = out$fatalities_val1,
         fatalities_val2 = out$fatalities_val2,
 
-        #pop_size_unit = out$pop_size_unit,
-        #pop_size_input_type = out$pop_size_input_type,
-        #pop_size_val1 = out$pop_size_val1,
-        #pop_size_val2 = out$pop_size_val2,
+        pop_size_unit = out$pop_size_unit,
+        pop_size_input_type = out$pop_size_input_type,
+        pop_size_val1 = out$pop_size_val1,
+        pop_size_val2 = out$pop_size_val2,
 
-        #pop_growth_unit = out$pop_growth_unit,
-        #pop_growth_input_type = out$pop_growth_input_type,
-        #pop_growth_val1 = out$pop_growth_val1,
-        #pop_growth_val2 = out$pop_growth_val2,
+        pop_growth_input_type = out$pop_growth_input_type,
+        pop_growth_val1 = out$pop_growth_val1,
+        pop_growth_val2 = out$pop_growth_val2,
 
-        #carr_cap_unit = out$carr_cap_unit,
-        #carr_cap_input_type = out$carr_cap_input_type,
-        #carr_cap_val1 = out$carr_cap_val1,
-        #carr_cap_val2 = out$carr_cap_val2,
+        carrying_cap_unit = out$carrying_cap_unit,
+        carrying_cap_input_type = out$carrying_cap_input_type,
+        carrying_cap_val1 = out$carrying_cap_val1,
+        carrying_cap_val2 = out$carrying_cap_val2,
 
         impact_plot = out$impact_plot,
         trajectory_plot = out$trajectory_plot

inst/ShinyApp/ui.R

@@ -494,7 +494,7 @@ rm(list = ls(all.names = TRUE))
                                            ## Input values: mean and se
                                            numericInput(inputId = "pop_growth_mean",
                                                         label = "Moyenne (taux d'accroissement en %)",
-                                                        value = -1.5,
+                                                        value = -7.5,
                                                         min = -100, max = Inf, step = 1),
 
                                            numericInput(inputId = "pop_growth_se",