Update charts to account for new datafile/charts folders

scripts/charts/combined_fault_rates_per_instruction.r

@@ -3,30 +3,38 @@ library(dplyr)
 library(readr)
 library(stringr)
 
-# Usage: Rscript combined_fault_rates.r exp_abspath1 exp_abspath2 ... [faults_file]
+# Usage: Rscript combined_fault_rates_per_instruction.r exp1 exp2 ... queries_dir charts_dir [faults_file]
 
 args <- commandArgs(trailingOnly = TRUE)
-if (length(args) < 1) {
-  stop("Need at least 1 experiment")
-}
 
 csv_suffix <- if (grepl("\\.csv$", args[length(args)])) {
   args[length(args)]
 } else {
   "faults.csv"
 }
-exp_args <- if (grepl("\\.csv$", args[length(args)])) {
+tail_args <- if (grepl("\\.csv$", args[length(args)])) {
   args[-length(args)]
 } else {
   args
 }
 
+if (length(tail_args) < 3) {
+  stop(paste(
+    "Usage: combined_fault_rates_per_instruction.r",
+    "<exp1> <exp2> ... <queries_dir> <charts_dir> [faults_file]"
+  ))
+}
+
+charts_dir <- tail_args[length(tail_args)]
+queries_dir <- tail_args[length(tail_args) - 1]
+exp_args <- tail_args[-c(length(tail_args) - 1, length(tail_args))]
+
 # Faults / instruction count, per experiment
 rates <- data.frame()
 
 for (arg in exp_args) {
-  faults_file <- file.path(arg, csv_suffix)
-  mnem_file <- file.path(arg, "mnemonics.csv")
+  faults_file <- file.path(queries_dir, paste0(arg, "_", csv_suffix))
+  mnem_file <- file.path(queries_dir, paste0(arg, "_mnemonics.csv"))
 
   if (!file.exists(faults_file)) {
     warning(paste("Missing:", faults_file))
@@ -110,6 +118,10 @@ plot <- ggplot(
   )
 
 suffix <- gsub("^faults|\\.csv$", "", csv_suffix)
-outfile <- paste0("injections/fault_rates_per_instruction", suffix, ".svg")
+dir.create(charts_dir, showWarnings = FALSE, recursive = TRUE)
+outfile <- file.path(
+  charts_dir,
+  paste0("fault_rates_per_instruction", suffix, ".svg")
+)
 ggsave(outfile, plot = plot, width = 12, height = 6)
 print(paste("Saved", outfile))