Merge pull request #71 from CSAFE-ISU/52-fix-phase-on-windows

52 fix phase on windows

Author: stephaniereinders

R/app.R

@@ -895,7 +895,7 @@ bulletAnalyzrApp <- function(
       bulldata$comparison <- report_results$comparison
       bulldata$comparison_export <- report_results$comparison_export
       if (save_diagnostics) {
-        saveRDS(bulldata, file.path(tempdir(), "bulldata.rds"))
+        saveRDS(reactiveValuesToList(bulldata), file.path(tempdir(), "bulldata.rds"))
       }
     })
 
@@ -918,7 +918,11 @@ bulletAnalyzrApp <- function(
       saveRDS(d, file.path(tempdir(), "filtered_data_for_pt.rds"))
 
       tryCatch({
-        phase$test_results <- bulletxtrctr::phase_test(land1 = d$landA, land2 = d$landB, d$ccf)
+        phase$test_results <- phase_test_fixed(
+          land1 = d$landA, 
+          land2 = d$landB, 
+          score = d$ccf
+        )
         saveRDS(phase, file.path(tempdir(), "phase_test.rds"))
       }, error = function(e) {
         return(d)

tests/testthat/fixtures/make_process_features.R

@@ -0,0 +1,20 @@
+# Run the app with save_diagnostics = TRUE to save intermediate files to the
+# temporary directory.
+
+# Copy rds files to fixtures > process folder
+files <- c("bullet_scores_pre_ss.rds", "bullet_scores_post_ss.rds", 
+           "features.rds", "bulldata.rds")
+
+for (f in files) {
+  file.rename(
+    file.path(tempdir(), f), 
+    testthat::test_path("fixtures", "process", f)
+  )
+}
+
+# copy file to fixtures > phase_test folder
+file.rename(
+  file.path(tempdir(), "filtered_data_for_pt.rds"), 
+  testthat::test_path("fixtures", "process", "filtered_data_for_pt.rds")
+)
+

tests/testthat/fixtures/phase_test/phase_test.rds

@@ -1,5 +1,5 @@
 testthat::test_that("bullet to land predict fixed works", {
-  input <- readRDS(testthat::test_path("fixtures", "bullet_scores_pre_ss.rds"))
+  input <- readRDS(testthat::test_path("fixtures", "process", "bullet_scores_pre_ss.rds"))
   input <- input$data[[2]]
   actual <- bullet_to_land_predict_fixed(
     land1 = input$landA,
@@ -15,7 +15,7 @@ testthat::test_that("bullet to land predict fixed works", {
 })
 
 testthat::test_that("compute average scores fixed works", {
-  input <- readRDS(testthat::test_path("fixtures", "features.rds"))
+  input <- readRDS(testthat::test_path("fixtures", "process", "features.rds"))
   input <- input %>% dplyr::group_by(bulletA, bulletB) %>% tidyr::nest()
   input <- input$data[[1]]
   actual <- compute_average_scores_fixed(