remove test3

AngryMaciek · Mar 7, 2024 · b65bb71 · b65bb71
1 parent 55cd73e
commit b65bb71
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 117 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -119,21 +119,4 @@ jobs:
       - name: Cleanup (test2)
         shell: bash -l {0}
         run: rm -rf tests/test2/output
-
-      - name: Run the pipeline (test3) (Ubuntu)
-        shell: bash -l {0}
-        run: >
-            bash warlock.sh
-            --configfile tests/test3/config-Ubuntu.yml
-            --environment local
-            --cores 2
-
-      - name: Check md5 (test3) (Ubuntu)
-        shell: bash -l {0}
-        working-directory: ./tests/test3
-        run: md5sum -c output-Ubuntu.md5
-
-      - name: Cleanup (test3)
-        shell: bash -l {0}
-        run: rm -rf tests/test3/output
 ...
diff --git a/tests/test2/config-Ubuntu.yml b/tests/test2/config-Ubuntu.yml
@@ -29,20 +29,20 @@ demon_log2_deme_carrying_capacity: [1, 2, 3, 4]
 
 # dispersal
 demon_migration_type: 0
-demon_init_migration_rate: "2e-03"
+demon_init_migration_rate: ["1e-03", "5e-03"]
 demon_migration_edge_only: 1
 demon_migration_rate_scales_with_K: 1
 
 # mutation_rates
-demon_mu_driver_birth: ["1e-06", "1e-05"]
+demon_mu_driver_birth: "1e-05"
 demon_mu_passenger: 0.001
-demon_mu_driver_migration: 0.001
+demon_mu_driver_migration: 0.002
 demon_passenger_pop_threshold: -1
 
 # fitness_effects
 demon_normal_birth_rate: [0.8, 0.82, 0.84, 0.86, 0.88, 0.9]
 demon_baseline_death_rate: 0
-demon_s_driver_birth: [0.1, 0.15]
+demon_s_driver_birth: 0.1
 demon_s_passenger: 0
 demon_s_driver_migration: 0
 demon_max_relative_birth_rate: 10

diff --git a/tests/test3/config-Ubuntu.yml b/tests/test3/config-Ubuntu.yml
diff --git a/tests/test3/output-Ubuntu.md5 b/tests/test3/output-Ubuntu.md5
diff --git a/workflow/scripts/generate-summary-plots.R b/workflow/scripts/generate-summary-plots.R
@@ -67,8 +67,19 @@ if (opt$verbose) {
 # MAIN
 ###############################################################################
 
-plot_all_images(
-  path = opt$input_directory,
-  output_filename = "muller",
-  output_dir = opt$output_directory
-)
+fileConn = file(file.path(opt$output_directory, "muller.txt"))
+
+tryCatch({
+  plot_all_images(
+    path = opt$input_directory,
+    output_filename = "muller",
+    output_dir = opt$output_directory
+  )
+  writeLines("muller plots: OK | see file: muller.png", fileConn)
+}, error = function(e) {
+  # print the error message to the stderr
+  message(conditionMessage(e))
+  writeLines("muller plots: ERROR | see error stream", fileConn)
+})
+
+close(fileConn)