Add validation, fine-tune docstrings and exports

NREL-Sienna · Sep 25, 2024 · fa6080f · fa6080f
1 parent 9af1bbd
commit fa6080f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/PowerSystems.jl b/src/PowerSystems.jl
@@ -480,10 +480,10 @@ export generate_struct_files
 export ComponentSelector
 export SingularComponentSelector
 export PluralComponentSelector
+export DynamicallyGroupedComponentSelector
 export subtype_to_string
 export component_to_qualified_string
 export make_selector
-export get_components
 export get_groups
 #################################################################################
 # Imports
@@ -605,7 +605,7 @@ import InfrastructureSystems:
     ComponentSelector,
     SingularComponentSelector,
     PluralComponentSelector,
-    DynamicallyGroupedPluralComponentSelector,
+    DynamicallyGroupedComponentSelector,
     NameComponentSelector,
     ListComponentSelector,
     SubtypeComponentSelector,

diff --git a/src/component_selector.jl b/src/component_selector.jl
@@ -26,7 +26,7 @@ get_groups(e::ComponentSelector, sys::System; filterby = nothing) =
 `PluralComponentSelector` represented by an `AggregationTopology` and a subtype of
 `Component`.
 """
-struct TopologyComponentSelector <: DynamicallyGroupedPluralComponentSelector
+struct TopologyComponentSelector <: DynamicallyGroupedComponentSelector
     component_subtype::Type{<:Component}
     topology_subtype::Type{<:AggregationTopology}
     topology_name::AbstractString
@@ -37,7 +37,7 @@ end
 # Construction
 """
 Make a `ComponentSelector` from an `AggregationTopology` and a type of component. Optionally
-provide a name for the `ComponentSelector`.
+provide a name and/or grouping behavior for the `ComponentSelector`.
 """
 make_selector(
     component_subtype::Type{<:Component},
@@ -50,7 +50,7 @@ make_selector(
     topology_subtype,
     topology_name,
     name,
-    groupby,
+    IS.validate_groupby(groupby),
 )
 
 # Naming