* Made server.list compliant with state list.

* Remove adjust argument. * Remove value column from output of queuelength * Remove tests for create_batches
AnthonyEbert · Sep 13, 2018 · a3393c1 · a3393c1
1 parent 4e32971
commit a3393c1
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 25 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -10,8 +10,6 @@ export(average_queue)
 export(depart)
 export(integrate_stepfun_interval)
 export(lag_step)
-export(p_busy)
-export(p_util)
 export(performance_output)
 export(ql_summary)
 export(queue)

diff --git a/R/core_queuefunctions.R b/R/core_queuefunctions.R
@@ -110,7 +110,9 @@ queue_pass.server.list <- function(arrivals, service, servers){
     output[i] <- queue_times[queue]
     queue_vector[i] <- queue
   }
-  return(c(output, queue_vector, NA))
+
+  output <- list(times = output, server = queue_vector, state = queue_times)
+  return(output)
 }
 
 
@@ -124,7 +126,6 @@ queue_pass.server.list <- function(arrivals, service, servers){
 #' @param servers a non-zero natural number, an object of class \code{server.stepfun}
 #' or an object of class \code{server.list}.
 #' @param labels character vector of customer labels.
-#' @param adjust non-negative number, an adjustment parameter for scaling the service times.
 #' @return A vector of response times for the input of arrival times and service times.
 #' @examples
 #'
@@ -164,11 +165,11 @@ queue_pass.server.list <- function(arrivals, service, servers){
 #' @seealso
 #' \code{\link{queue}}, \code{\link{summary.queue_list}}, \code{\link{plot.queue_list}}
 #' @export
-queue_step <- function(arrivals, service, servers = 1, labels = NULL, adjust = 1){
+queue_step <- function(arrivals, service, servers = 1, labels = NULL){
 
   arrivals <- depart(arrivals)
 
-  departures <- queue(arrivals = arrivals, service = service, servers = servers, serveroutput = TRUE, adjust = 1)
+  departures <- queue(arrivals = arrivals, service = service, servers = servers, serveroutput = TRUE)
 
   server <- attr(departures, "server")
   state <- attr(departures, "state")

diff --git a/R/dplyr_plugins.R b/R/dplyr_plugins.R
@@ -77,11 +77,11 @@ queue_lengths <- function(arrivals, service = 0, departures, epsilon = 1e-10, ..
 
   queuedata <- data.frame(
     times = out$x,
-    value = cumsum(.subset(qd_state, out$ix))
+    queuelength = cumsum(.subset(qd_state, out$ix))
   )
 
   # For compatability
-  queuedata$queuelength <- queuedata$value
+  #queuedata$queuelength <- queuedata$value
 
   return(queuedata)
 

diff --git a/R/util_stepfun.R b/R/util_stepfun.R
@@ -40,14 +40,12 @@ performance_output <- function(arrivals, service = 0, departures, servers, epsil
   return(output)
 }
 
-#' @export
 p_busy <- function(arrivals, service, departures, epsilon = 1e-10, servers){
   output <- performance_output(arrivals, service, departures, epsilon, servers)
 
   return(output$busy_df)
 }
 
-#' @export
 p_util <- function(arrivals, service, departures, epsilon = 1e-10, servers){
   output <- performance_output(arrivals, service, departures, epsilon, servers)
 
@@ -74,7 +72,7 @@ p_util <- function(arrivals, service, departures, epsilon = 1e-10, servers){
 #' #plot(output$util_stepfun, type = "l")
 busy_util_stepfun <- function(systemlength_df, servers, return_stepfun = TRUE, shorten = TRUE){
 
-  sys_length_stepfun <- stats::stepfun(systemlength_df$times[-1], systemlength_df$value)
+  sys_length_stepfun <- stats::stepfun(systemlength_df$times[-1], systemlength_df$queuelength)
 
   x_new <- unique(sort(c(stats::knots(sys_length_stepfun), stats::knots(servers))))
   y_new_busy <- rep(NA, length(x_new))

diff --git a/man/queue_step.Rd b/man/queue_step.Rd
diff --git a/tests/testthat/test_addons.R b/tests/testthat/test_addons.R
@@ -4,6 +4,7 @@ library(dplyr)
 library(testthat)
 library(queuecomputer)
 
+context("addons")
 
 base::load(file = "../create_batch_test.RData")
 
@@ -18,17 +19,6 @@ flight_schedule <- data_frame(
   log_mu = c(1 , 2)
 )
 
-passenger_df_2 <- flight_schedule %>% group_by(flight) %>%
-  do(create_batches(., arrival_dist = "rgamma",
-    service_rate = exp(1/.$log_mu),
-    time = .$time)
-  )
-
-test_that("create_batches", {
-  expect_equal(passenger_df_2$arrivals, passenger_df$arrivals)
-  expect_equal(passenger_df_2$service, passenger_df$service)
-})
-
 ## Queue length test
 
 set.seed(2)

diff --git a/tests/testthat/test_deterministic.R b/tests/testthat/test_deterministic.R
@@ -2,6 +2,8 @@
 library(testthat)
 library(queuecomputer)
 
+context("deterministic")
+
 # Same computation as newdataframe
 
 ##New data -------------------------