Refactor seqB

[Rnaught] / R / server.R

diff --git a/R/server.R b/R/server.R
index ed5ecd7454b8ae73047cc6212ef38725afdd606d..384b341d6f10eb7eaab383b977890390fdd345b3 100644 (file)
--- a/R/server.R
+++ b/R/server.R
@@ -142,7 +142,7 @@ server <- function(input, output) {
           output$gridShapeWarn <- shiny::renderText("")
 
         if (is.na(max_scale) || max_scale < 1 / grid_length) {
-          output$gridShapeWarn <- shiny::renderText("Error: The maximum scale
+          output$gridScaleWarn <- shiny::renderText("Error: The maximum scale
             must be at least the reciprocal of the grid length.")
           checks_passed <- FALSE
         }
@@ -299,14 +299,14 @@ eval_estimator <- function(input, output, estimator, dataset) {
   }
   # Sequential Bayes
   else if (estimator$method == "seqB")
-    estimate <- round(seqB(unlist(dataset[3]), mu = serial,
-                           kappa = estimator$kappa)$Rhat, 2)
+    estimate <- round(seq_bayes(unlist(dataset[3]), mu = serial,
+                           kappa = estimator$kappa), 2)
   # Incidence Decay
   else if (estimator$method == "ID")
-    estimate <- round(ID(unlist(dataset[3]), mu = serial), 2)
+    estimate <- round(id(unlist(dataset[3]), mu = serial), 2)
   # Incidence Decay with Exponential Adjustement
   else if (estimator$method == "IDEA")
-    estimate <- round(IDEA(unlist(dataset[3]), mu = serial), 2)
+    estimate <- round(idea(unlist(dataset[3]), mu = serial), 2)
 
   return(estimate)
 }