make component selector tests pass

NREL-Sienna · Mar 24, 2024 · a72bb5e · a72bb5e
1 parent 92bd5e8
commit a72bb5e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/src/component_selector.jl b/src/component_selector.jl
@@ -24,6 +24,10 @@ function get_components(e::SingleComponentSelector, sys::System)
 end
 
 # ListComponentSelector
+#Construction
+select_components(content::ComponentSelector...; name::Union{String, Nothing} = nothing) =
+    IS.select_components(content...; name)
+
 #Contents
 function get_components(e::ListComponentSelector, sys::System)
     sub_components = Iterators.map(x -> get_components(x, sys), e.content)
@@ -33,6 +37,10 @@ function get_components(e::ListComponentSelector, sys::System)
     )
 end
 
+function get_subselectors(e::ListComponentSelector)
+    return IS.get_subselectors(e)
+end
+
 # SubtypeComponentSelector
 # Construction
 """
@@ -43,15 +51,15 @@ ComponentSelectorSet.
 select_components(
     component_subtype::Type{<:Component};
     name::Union{String, Nothing} = nothing,
-) = IS.select_components(component_subtype, name)
+) = IS.select_components(component_subtype; name)
 
 # Contents
 function get_subselectors(e::SubtypeComponentSelector, sys::System)
-    return IS.get_subselectors(e, sys.data)
+    return Iterators.map(select_components, get_components(e, sys))
 end
 
 function get_components(e::SubtypeComponentSelector, sys::System)
-    return Iterators.filter(get_available, get_components(e.component_subtype, sys.data))
+    return Iterators.filter(get_available, IS.get_components(e.component_subtype, sys.data))
 end
 
 # FilterComponentSelector
@@ -71,7 +79,7 @@ end
 
 # Contents
 function get_subselectors(e::FilterComponentSelector, sys::System)
-    return IS.get_subselectors(e, sys.data)
+    return Iterators.map(select_components, get_components(e, sys))
 end
 
 function get_components(e::FilterComponentSelector, sys::System)

diff --git a/test/test_component_selector.jl b/test/test_component_selector.jl
@@ -70,9 +70,9 @@ end
     @test get_component(ThermalStandard, test_sys, "Solitude") in the_components
     @test get_component(RenewableDispatch, test_sys, "WindBusA") in the_components
 
-    @test collect(get_subselectors(select_components(), test_sys)) ==
+    @test collect(get_subselectors(select_components())) ==
           Vector{ComponentSelector}()
-    the_subselectors = collect(get_subselectors(test_list_ent, test_sys))
+    the_subselectors = collect(get_subselectors(test_list_ent))
     @test length(the_subselectors) == 2
     @test comp_ent_1 in the_subselectors
     @test comp_ent_2 in the_subselectors