Skip to content

Commit 84df84c

Browse files
authored
Merge pull request #1432 from NREL-Sienna/feat/get-num-components
Add get_num_components for System
2 parents c9da2a4 + 868143b commit 84df84c

4 files changed

Lines changed: 9 additions & 5 deletions

File tree

src/PowerSystems.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,7 @@ export ReservoirConnectedDevicesKey
382382
export ReservoirConnectedDevicesMapping
383383
export get_component
384384
export get_components
385+
export get_num_components
385386
export get_associated_components
386387
export show_components
387388
export get_subcomponents
@@ -631,6 +632,7 @@ import InfrastructureSystems:
631632
get_resolution,
632633
get_window,
633634
get_name,
635+
get_num_components,
634636
get_component_uuids,
635637
get_supplemental_attribute,
636638
get_supplemental_attributes,

src/base.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2960,3 +2960,5 @@ attributes.
29602960
function get_forecast_summary_table(sys::System)
29612961
return IS.get_forecast_summary_table(sys.data)
29622962
end
2963+
2964+
IS.get_base_component_type(sys::System) = Component

src/utils/print.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ end
77
function Base.show(io::IO, sys::System)
88
show_system_table(io, sys; backend = Val(:auto))
99

10-
if IS.get_num_components(sys.data.components) > 0
10+
if IS.get_num_components(sys) > 0
1111
show_components_table(io, sys; backend = Val(:auto))
1212
end
1313

@@ -21,7 +21,7 @@ Base.show(io::IO, ::MIME"text/plain", sys::System) = show(io, sys)
2121
function Base.show(io::IO, ::MIME"text/html", sys::System)
2222
show_system_table(io, sys; backend = Val(:html), standalone = false)
2323

24-
if IS.get_num_components(sys.data.components) > 0
24+
if get_num_components(sys) > 0
2525
show_components_table(
2626
io,
2727
sys;
@@ -44,7 +44,7 @@ end
4444

4545
function show_system_table(io::IO, sys::System; kwargs...)
4646
header = ["Property", "Value"]
47-
num_components = IS.get_num_components(sys.data.components)
47+
num_components = get_num_components(sys)
4848
table = [
4949
"Name" isnothing(get_name(sys)) ? "" : get_name(sys)
5050
"Description" isnothing(get_description(sys)) ? "" : get_description(sys)

test/test_parse_psse.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,8 +339,8 @@ end
339339

340340
@test get_base_power(original_sys) == get_base_power(deserialized_sys)
341341
@test get_frequency(original_sys) == get_frequency(deserialized_sys)
342-
@test IS.get_num_components(original_sys.data.components) ==
343-
IS.get_num_components(deserialized_sys.data.components)
342+
@test get_num_components(original_sys) ==
343+
get_num_components(deserialized_sys)
344344

345345
gen1_names = sort(get_name.(get_components(ThermalStandard, original_sys)))
346346
gen2_names = sort(get_name.(get_components(ThermalStandard, deserialized_sys)))

0 commit comments

Comments
 (0)