Skip to content

Commit

Permalink
Merge pull request #91 from jeremiahpslewis/auto-juliaformatter-pr
Browse files Browse the repository at this point in the history
Automatic JuliaFormatter.jl run
  • Loading branch information
jeremiahpslewis authored May 27, 2024
2 parents 2f14a5b + e88e335 commit 1f9e066
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ on:
branches: [main]
tags: ["*"]
pull_request:
issue_comment:
types: [created]
concurrency:
# Skip intermediate builds: always.
# Cancel intermediate builds: only if it is a pull request build.
Expand Down
5 changes: 3 additions & 2 deletions src/AIAPC2020/run_aiapc.jl
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@ function run_aiapc(;

for i = 1:n_parameter_iterations
println("Parameter iteration $i of $n_parameter_iterations")
file_name = joinpath(folder_name, savename((parameter_iteration = i, suffix = "csv")))
file_name =
joinpath(folder_name, savename((parameter_iteration = i, suffix = "csv")))
exp_list_ = AIAPCSummary[]
exp_list = @showprogress pmap(
run_and_extract,
Expand All @@ -124,6 +125,6 @@ function run_aiapc(;
exp_df = vcat(exp_df...)

CSV.write(folder_name * ".csv", exp_df)
rm(folder_name, recursive=true) # Remove folder after merging and writing to CSV
rm(folder_name, recursive = true) # Remove folder after merging and writing to CSV
return exp_df
end
4 changes: 2 additions & 2 deletions src/DDDC2023/run_dddc.jl
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ function run_dddc(;
n_parameter_iterations = 1,
max_iter = Int(1e9),
convergence_threshold = Int(1e5),
n_grid_increments = 100,
n_grid_increments = 100,
version = "v0.0.0",
start_timestamp = now(),
batch_size = 1,
Expand All @@ -41,7 +41,7 @@ function run_dddc(;

competition_solution_dict =
Dict(d_ => CompetitionSolution(competition_params_dict[d_]) for d_ in [:high, :low])

α = Float64(0.15)
β = Float64(4e-1)
δ = 0.95
Expand Down
7 changes: 5 additions & 2 deletions viz/a1_viz.jl
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,14 @@ using Statistics


job_id = "7799305"
csv_files = filter!(x -> occursin(Regex("data/SLURM_ARRAY_JOB_ID=$(job_id).*.csv"), x), readdir("data", join = true))
csv_files = filter!(
x -> occursin(Regex("data/SLURM_ARRAY_JOB_ID=$(job_id).*.csv"), x),
readdir("data", join = true),
)

df_ = DataFrame.(CSV.File.(csv_files))

for i in 1:length(df_)
for i = 1:length(df_)
df_[i][!, "metadata"] .= csv_files[i]
end
df = vcat(df_...)
Expand Down

0 comments on commit 1f9e066

Please sign in to comment.