Merge branch 'original-paper' of https://github.com/pat-alt/AlgorithmicRecourseDynamics.jl into original-paper

Author: pat-alt

docs/src/paper/experiments/_synthetic.qmd

@@ -269,7 +269,7 @@ end
 #### Bootstrap
 
 ```{julia}
-n_bootstrap = 1000
+n_bootstrap = 100
 df = run_bootstrap(results, n_bootstrap; filename=joinpath(output_path,"bootstrap.csv"))
 ```
 

src/base.jl

@@ -66,7 +66,7 @@ function run!(
     # Pre-allocate memory:
     output = [DataFrame() for i in 1:M]
 
-    p_fold = Progress(K; desc="Progress on folds:", showspeed=true, enabled=show_progress, output=stderr)
+    p_fold = Progress(K; desc="Total Progress:", showspeed=true, enabled=show_progress, output=stderr, color=:yellow)
     @info "Running experiment ..."
     for k in 1:K
         recourse_systems = experiment.recourse_systems[k]
@@ -77,7 +77,7 @@ function run!(
         end
         # Recursion over N rounds:
         chosen_individuals = zeros(size(recourse_systems))
-        p_round = Progress(N; desc="Progress on rounds:", showspeed=true, enabled=show_progress, output=stderr)
+        p_round = Progress(N; desc="Progress on round:", showspeed=true, enabled=show_progress, output=stderr, color=:green)
         for n in 1:N
             # Choose individuals that shall receive recourse:
             chosen_individuals_n = choose_individuals(experiment, recourse_systems; intersect_=intersect_)
@@ -96,7 +96,7 @@ function run!(
                     output[m] = vcat(output[m], output_checkpoint, cols=:union)
                 end
             end
-            next!(p_round, showvalues=[(:Fold, k), (:Round, n)])
+            next!(p_round, showvalues=[(:Fold, k//K), (:Round, n//N)])
         end
         next!(p_fold)
     end

src/post_processing.jl

@@ -12,12 +12,14 @@ function run_bootstrap(
     filename::String="bootstrapped_results.csv", show_progress=!is_logging(stderr)
 )
     df = DataFrame()
+    n_total = length(results)
+    p_total = Progress(n_total; desc="Total Progress:", showspeed=true, enabled=show_progress, output = stderr, color=:yellow)
     for (key, val) in results
         n_folds = length(val.experiment.recourse_systems)
-        p_fold = Progress(n_folds; desc="Progress on folds:", showspeed=true, enabled=show_progress, output = stderr)
+        p_fold = Progress(n_folds; desc="Progress on fold:", showspeed=true, enabled=show_progress, output = stderr, color=:green)
         for fold in 1:n_folds
             N = length(val.experiment.system_identifiers)
-            p_sys = Progress(N; desc="Progress on systems:", showspeed=true, enabled=show_progress, output = stderr)
+            p_sys = Progress(N; desc="Progress on system:", showspeed=true, enabled=show_progress, output = stderr, color=:blue)
             Threads.@threads for i in 1:N
                 rec_sys = val.experiment.recourse_systems[fold][i]
                 model_name, gen_name = collect(val.experiment.system_identifiers)[i]
@@ -27,10 +29,11 @@ function run_bootstrap(
                 df_.generator .= gen_name
                 df_.fold .= fold
                 df = vcat(df, df_)
-                next!(p_sys, showvalues = [(:Model, model_name), (:Generator, gen_name)])
+                next!(p_sys, showvalues = [(:Model, model_name), (:Generator, gen_name), (:System, i//N)])
             end
-            next!(p_fold)
+            next!(p_fold, showvalues = [(:Fold, fold//n_folds)])
         end
+        next!(p_total)
     end
     df = mapcols(x -> typeof(x) == Vector{Symbol} ? string.(x) : x, df)
     CSV.write(filename, df)