Skip to content

optimize files reading #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
abdelrahman-ayad wants to merge 4 commits into
base: pg/market_runs_2026
Choose a base branch
from
Open

optimize files reading #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
878d7cf
refactor reading the system_availability_data files once per scenario…
abdelrahman-ayad Jul 2, 2026
c86a022
Revert "refactor reading the system_availability_data files once per …
abdelrahman-ayad Jul 2, 2026
b9a6498
refactor reading files once per investor
abdelrahman-ayad Jul 2, 2026
8829b9c
fix typo
abdelrahman-ayad Jul 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 39 additions & 3 deletions src/struct_creators/simulation_structs/investor_creator.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ function create_investors(simulation_data::AgentSimulationData)
dir_name = joinpath(get_data_dir(get_case(simulation_data)), "investors")
investor_names = readdir(dir_name)
investors = Vector{Investor}(undef, length(investor_names))

# Build once and use for all investors
system_availability_dict = Dict{String, DataFrames.DataFrame}()
system_availability_rt_dict = Dict{String, DataFrames.DataFrame}()

for i = 1:length(investor_names)
investor_dir = joinpath(dir_name, "$(investor_names[i])")

Expand Down Expand Up @@ -143,9 +148,40 @@ function create_investors(simulation_data::AgentSimulationData)

for scenario in scenario_names
for sim_year in collect(1:horizon)
println(scenario)
println(sim_year)
add_investor_project_availability!(simulation_data_dir, scenario, sim_year, projects, sys_UC)
@info "Adding availability data for investor $(investor_names[i]) for scenario $(scenario) and simulation year $(sim_year)"
sys_name = "$(sim_year)_$(scenario)"
if !haskey(system_availability_dict, sys_name)
system_availability_dict[sys_name] = DataFrames.DataFrame(
CSV.File(
joinpath(
simulation_data_dir,
"timeseries_data_files",
scenario,
"sim_year_$(sim_year)",
"Availability",
"DAY_AHEAD_availability.csv",
),
))
system_availability_rt_dict[sys_name] = DataFrames.DataFrame(
CSV.File(
joinpath(
simulation_data_dir,
"timeseries_data_files",
scenario,
"sim_year_$(sim_year)",
"Availability",
"REAL_TIME_availability.csv",
),
))
end
add_investor_project_availability!(
simulation_data_dir,
scenario,
sim_year,
projects,
sys_UC,
system_availability_dict[sys_name],
system_availability_rt_dict[sys_name])
end
end

Expand Down
7 changes: 4 additions & 3 deletions src/struct_creators/simulation_structs/project_creator.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,10 @@ function add_investor_project_availability!(simulation_dir::String,
scenario::String,
sim_year::Int64,
projects::Vector{Project},
sys_UC::Union{Nothing, PSY.System})
system_availability_data = DataFrames.DataFrame(CSV.File(joinpath(simulation_dir, "timeseries_data_files", scenario, "sim_year_$(sim_year)", "Availability", "DAY_AHEAD_availability.csv")))
system_availability_data_rt = DataFrames.DataFrame(CSV.File(joinpath(simulation_dir, "timeseries_data_files", scenario, "sim_year_$(sim_year)", "Availability", "REAL_TIME_availability.csv")))
sys_UC::Union{Nothing, PSY.System},
system_availability_data::DataFrames.DataFrame,
system_availability_data_rt::DataFrames.DataFrame)

gennames = names(system_availability_data)[5:length(names(system_availability_data))] #################

for project in projects
Expand Down