rebrand model to player, split to round (#11) and print for epp class (…

…#8)
ModelOriented · Jul 28, 2021 · 91e40a2 · 91e40a2
1 parent c1681ea
commit 91e40a2
Show file tree

Hide file tree

Showing 9 changed files with 99 additions and 62 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -1,5 +1,6 @@
 # Generated by roxygen2: do not edit by hand
 
+S3method(print,epp_results)
 S3method(print,epp_test)
 export(calculate_actual_wins)
 export(calculate_epp)

diff --git a/R/calculate_elo.R b/R/calculate_elo.R
diff --git a/R/plot_wins_ratio.R b/R/plot_wins_ratio.R
@@ -41,15 +41,15 @@ plot_wins_ratio <- function(epp, random_sample = NULL, random_state = NULL){
       set.seed(random_state)
     }
 
-    sample_player <- sample(epp_score$model, size = floor(random_sample * length(epp_score$model)))
+    sample_player <- sample(epp_score$player, size = floor(random_sample * length(epp_score$player)))
     actual_score <- actual_score[actual_score$winner %in% sample_player & actual_score$loser %in% sample_player,]
-    epp_score <- epp_score[epp_score$model %in% sample_player, ]
+    epp_score <- epp_score[epp_score$player %in% sample_player, ]
   }
 
   actual_score[["ratio"]] <- actual_score[["wins"]] / actual_score[["match"]]
-  actual_score <- merge(actual_score, epp_score, by.x ="winner", by.y = "model")
+  actual_score <- merge(actual_score, epp_score, by.x ="winner", by.y = "player")
   names(actual_score)[names(actual_score)=='epp'] <- "epp_winner"
-  actual_score <- merge(actual_score, epp_score, by.x ="loser", by.y = "model")
+  actual_score <- merge(actual_score, epp_score, by.x ="loser", by.y = "player")
   names(actual_score)[names(actual_score)=='epp'] <- "epp_loser"
 
   actual_score[['pred_ratio']] <- exp(actual_score[["epp_winner"]] - actual_score[['epp_loser']])/(1+exp(actual_score[["epp_winner"]] - actual_score[['epp_loser']]))

diff --git a/R/wald_test.R b/R/wald_test.R
@@ -20,7 +20,7 @@
 test_players_diff <- function(epp, player1, player2){
   if(epp$estimation != "glm") stop("Test requires estimated covariance matrix. Use `estimation='glm'` in function `caluclate_epp()`.")
   coefs <- epp$epp_summary$epp
-  players <- epp$epp_summary$model
+  players <- epp$epp_summary$player
   covar <- epp$covariance_epp
   n <- length(coefs)
 
@@ -43,14 +43,14 @@ test_players_diff <- function(epp, player1, player2){
 
 #' @title Printing Summary of the EPP Test
 #'
-#' @param x epp_results. The result of a function \code{\link{calculate_epp}}.
+#' @param x epp_test. The result of a function \code{\link{test_players_diff}}.
 #' @param ... other parameters
 #'
 #' @return No return value, prints the structure of the object
 #'
 #' @export
 print.epp_test <- function(x, ...) {
-  cat("Wald-based test for the difference between ", x$player1, " and ", x$player1, ".\n", sep = "")
+  cat("Wald-based test for the difference between ", x$player1, " and ", x$player2, ".\n", sep = "")
   cat("Test statistic: ", x$statistic, "\n")
   cat("p-value: ", x$pval, "\n")
 }
diff --git a/man/calculate_actual_wins.Rd b/man/calculate_actual_wins.Rd
diff --git a/man/calculate_epp.Rd b/man/calculate_epp.Rd
diff --git a/man/print.epp_results.Rd b/man/print.epp_results.Rd
diff --git a/man/print.epp_test.Rd b/man/print.epp_test.Rd
diff --git a/tests/testthat/test_calculations.R b/tests/testthat/test_calculations.R
@@ -3,8 +3,8 @@ context("Testing functions calculating scores")
 data("auc_scores")
 auc_scores_short <- auc_scores[1:100,]
 test_that("Is epp calculated?", {
-  expect_is(calculate_epp(auc_scores_short, decreasing_metric = TRUE, compare_in_split = TRUE),
+  expect_is(calculate_epp(auc_scores_short, decreasing_metric = TRUE, compare_in_round = TRUE),
             "epp_results")
-  expect_is(calculate_epp(auc_scores_short, decreasing_metric = FALSE, compare_in_split = FALSE, keep_data = FALSE),
+  expect_is(calculate_epp(auc_scores_short, decreasing_metric = FALSE, compare_in_round = FALSE, keep_data = FALSE),
             "epp_results")
 })