Skip to content
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

Jump to bottom

Pass horizon as Period in transform_single_time_series #90

Merged
merged 1 commit into from
May 15, 2024
Merged

Pass horizon as Period in transform_single_time_series #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions src/library/psi_library.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ function build_5_bus_hydro_uc_sys(; add_forecasts, raw_data, sys_kwargs...)
time_series_in_memory = true,
sys_kwargs...,
)
PSY.transform_single_time_series!(c_sys5_hy_uc, 24, Hour(24))
PSY.transform_single_time_series!(c_sys5_hy_uc, Hour(24), Hour(24))
else
c_sys5_hy_uc = PSY.System(rawsys; sys_kwargs...)
end
Expand All @@ -280,7 +280,7 @@ function build_5_bus_hydro_uc_sys_targets(; add_forecasts, raw_data, sys_kwargs.
time_series_in_memory = true,
sys_kwargs...,
)
PSY.transform_single_time_series!(c_sys5_hy_uc, 24, Hour(24))
PSY.transform_single_time_series!(c_sys5_hy_uc, Hour(24), Hour(24))
else
c_sys5_hy_uc = PSY.System(rawsys; sys_kwargs...)
end
Expand Down Expand Up @@ -310,7 +310,7 @@ function build_5_bus_hydro_ed_sys(; raw_data, kwargs...)
time_series_in_memory = true,
sys_kwargs...,
)
PSY.transform_single_time_series!(c_sys5_hy_ed, 12, Hour(1))
PSY.transform_single_time_series!(c_sys5_hy_ed, Hour(12), Hour(1))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GabrielKS this should be Hour(1). My bad when I did the review


return c_sys5_hy_ed
end
Expand Down Expand Up @@ -338,7 +338,7 @@ function build_5_bus_hydro_ed_sys_targets(; raw_data, kwargs...)
for hy in get_components(HydroEnergyReservoir, c_sys5_hy_ed)
set_operation_cost!(hy, cost)
end
PSY.transform_single_time_series!(c_sys5_hy_ed, 12, Hour(1))
PSY.transform_single_time_series!(c_sys5_hy_ed, Hour(12), Hour(1))

return c_sys5_hy_ed
end
Expand All @@ -362,7 +362,7 @@ function build_5_bus_hydro_wk_sys(; raw_data, kwargs...)
time_series_in_memory = true,
sys_kwargs...,
)
PSY.transform_single_time_series!(c_sys5_hy_wk, 2, Hour(48))
PSY.transform_single_time_series!(c_sys5_hy_wk, Hour(2), Hour(48))

return c_sys5_hy_wk
end
Expand Down Expand Up @@ -390,7 +390,7 @@ function build_5_bus_hydro_wk_sys_targets(; raw_data, kwargs...)
for hy in get_components(HydroEnergyReservoir, c_sys5_hy_wk)
set_operation_cost!(hy, cost)
end
PSY.transform_single_time_series!(c_sys5_hy_wk, 2, Hour(48))
PSY.transform_single_time_series!(c_sys5_hy_wk, Hour(2), Hour(48))

return c_sys5_hy_wk
end
Expand All @@ -409,7 +409,7 @@ function build_RTS_GMLC_DA_sys(; raw_data, kwargs...)
resolution = get(sys_kwargs, :time_series_resolution, Dates.Hour(1))
sys = PSY.System(rawsys; time_series_resolution = resolution, sys_kwargs...)
interval = get(sys_kwargs, :interval, Dates.Hour(24))
horizon = get(sys_kwargs, :horizon, 48)
horizon = Hour(get(sys_kwargs, :horizon, 48))
PSY.transform_single_time_series!(sys, horizon, interval)
return sys
end
Expand All @@ -428,7 +428,7 @@ function build_RTS_GMLC_RT_sys(; raw_data, kwargs...)
resolution = get(sys_kwargs, :time_series_resolution, Dates.Minute(5))
sys = PSY.System(rawsys; time_series_resolution = resolution, sys_kwargs...)
interval = get(sys_kwargs, :interval, Dates.Minute(5))
horizon = get(sys_kwargs, :horizon, 24)
horizon = Hour(get(sys_kwargs, :horizon, 24))
PSY.transform_single_time_series!(sys, horizon, interval)
return sys
end
Expand Down Expand Up @@ -591,7 +591,7 @@ end

function build_modified_RTS_GMLC_DA_sys(; kwargs...)
sys = make_modified_RTS_GMLC_sys(; kwargs...)
PSY.transform_single_time_series!(sys, 48, Hour(24))
PSY.transform_single_time_series!(sys, Hour(48), Hour(24))
return sys
end

Expand All @@ -616,7 +616,7 @@ end

function build_modified_RTS_GMLC_RT_sys(; kwargs...)
sys = build_modified_RTS_GMLC_realization_sys(; kwargs...)
PSY.transform_single_time_series!(sys, 12, Minute(15))
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jd-lara Was this change correct?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same Hour(1)

PSY.transform_single_time_series!(sys, Hour(12), Minute(15))
return sys
end

Expand Down
8 changes: 4 additions & 4 deletions src/library/psitest_library.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2528,7 +2528,7 @@ function build_5_bus_matpower_DA(; raw_data, kwargs...)
end

add_time_series!(sys, tsp)
transform_single_time_series!(sys, 48, Hour(24))
transform_single_time_series!(sys, Hour(48), Hour(24))

return sys
end
Expand All @@ -2546,7 +2546,7 @@ function build_5_bus_matpower_RT(; raw_data, kwargs...)
sys = System(raw_data; sys_kwargs...)

add_time_series!(sys, tsp)
transform_single_time_series!(sys, 12, Hour(1))
transform_single_time_series!(sys, Hour(12), Hour(1))

return sys
end
Expand Down Expand Up @@ -2579,7 +2579,7 @@ function build_test_RTS_GMLC_sys(; raw_data, add_forecasts, kwargs...)
generator_mapping_file = joinpath(raw_data, "generator_mapping.yaml"),
)
sys = PSY.System(rawsys; time_series_resolution = Dates.Hour(1), sys_kwargs...)
PSY.transform_single_time_series!(sys, 24, Dates.Hour(24))
PSY.transform_single_time_series!(sys, Hour(24), Dates.Hour(24))
return sys
else
rawsys = PSY.PowerSystemTableData(
Expand Down Expand Up @@ -2775,7 +2775,7 @@ function build_c_sys5_pglib_sim(; add_forecasts, add_reserves, raw_data, kwargs.
add_time_series!(c_sys5_uc, serv, SingleTimeSeries("requirement", data))
end
end
PSY.transform_single_time_series!(c_sys5_uc, 24, Dates.Hour(14))
PSY.transform_single_time_series!(c_sys5_uc, Hour(24), Dates.Hour(14))
return c_sys5_uc
end

Expand Down
Loading