despecialize VertexModel/EdgeModel

Author: hexaeder

src/component_functions.jl

@@ -247,22 +247,22 @@ Directed(s::AbstractVector{<:Symbol}) = AnnotatedSym(Directed, s)
 
 abstract type ComponentModel end
 
-struct VertexModel{F,G,FFT,OF,MM,EX<:Union{Nothing,Vector{<:SymbolicIndex}}} <: ComponentModel
+struct VertexModel <: ComponentModel
     name::Symbol
     # main function
-    f::F
+    f::Any
     sym::Vector{Symbol}
-    mass_matrix::MM
+    mass_matrix::Any
     # outputs
-    g::G
+    g::Any
     outsym::Vector{Symbol}
-    ff::FFT
+    ff::FeedForwardType
     # parameters, optional input sym and optional external inputs
     psym::Vector{Symbol}
     insym::Union{Nothing, Vector{Symbol}}
-    extin::EX
+    extin::Union{Nothing, Vector{<:SymbolicIndex}}
     # observed
-    obsf::OF
+    obsf::Any
     obssym::Vector{Symbol}
     # metadata
     symmetadata::Dict{Symbol,Dict{Symbol, Any}}
@@ -302,22 +302,22 @@ All Symbol arguments can be used to set default values, i.e. `psym=[:K=>1, :p]`.
 VertexModel(; kwargs...) = _construct_comp(VertexModel, Base.inferencebarrier(kwargs))
 VertexModel(v::VertexModel; kwargs...) = _reconstruct_comp(VertexModel, v, Base.inferencebarrier(kwargs))
 
-struct EdgeModel{F,G,FFT,OF,MM,EX<:Union{Nothing,Vector{<:SymbolicIndex}}} <: ComponentModel
+struct EdgeModel <: ComponentModel
     name::Symbol
     # main function
-    f::F
+    f::Any
     sym::Vector{Symbol}
-    mass_matrix::MM
+    mass_matrix::Any
     # outputs
-    g::G
+    g::Any
     outsym::@NamedTuple{src::Vector{Symbol},dst::Vector{Symbol}}
-    ff::FFT
+    ff::FeedForwardType
     # parameters, optional input sym and optional external inputs
     psym::Vector{Symbol}
     insym::Union{Nothing, @NamedTuple{src::Vector{Symbol},dst::Vector{Symbol}}}
-    extin::EX
+    extin::Union{Nothing, Vector{<:SymbolicIndex}}
     # observed
-    obsf::OF
+    obsf::Any
     obssym::Vector{Symbol}
     # metadata
     symmetadata::Dict{Symbol,Dict{Symbol, Any}}
@@ -576,8 +576,8 @@ Fills up type parameters with `nothing` to ensure `Core.Compiler.isconstType`
 for GPU compatibility.
 """
 dispatchT(::T) where {T<:ComponentModel} = dispatchT(T)
-dispatchT(T::Type{<:VertexModel}) = VertexModel{nothing,nothing,nothing,nothing,nothing,Nothing}
-dispatchT(T::Type{<:EdgeModel}) = EdgeModel{nothing,nothing,nothing,nothing,nothing,Nothing}
+dispatchT(T::Type{<:VertexModel}) = VertexModel
+dispatchT(T::Type{<:EdgeModel}) = EdgeModel
 
 # TODO: introduce batchequal hash for faster batching of component models
 batchequal(a, b) = false

src/show.jl

@@ -41,7 +41,7 @@ Base.show(io::IO, s::KAAggregator) = print(io, "KAAggregator($(repr(s.f)))")
 Base.show(io::IO, s::SequentialAggregator) = print(io, "SequentialAggregator($(repr(s.f)))")
 Base.show(io::IO, s::PolyesterAggregator) = print(io, "PolyesterAggregator($(repr(s.f)))")
 
-function Base.show(io::IO, ::MIME"text/plain", @nospecialize(c::ComponentModel))
+function Base.show(io::IO, ::MIME"text/plain", c::ComponentModel)
     type = match(r"^(.*?)\{", string(typeof(c)))[1]
     print(io, type, styled" {NetworkDynamics_name::$(c.name)}")
     print(io, styled" {NetworkDynamics_fftype:$(fftype(c))}")
@@ -101,14 +101,14 @@ function print_states_params(io, @nospecialize(c::ComponentModel), styling)
 
     print_treelike(io, align_strings(info))
 end
-function _inout_string(@nospecialize(c::VertexModel), f, name)
+function _inout_string(c::VertexModel, f, name)
     sym = f(c)
     num, word = maybe_plural(length(sym), name)
     defs = get_defaults_or_inits(c, sym)
     guesses = get_guesses(c, sym)
     styled"$num &$word: &&$(stylesymbolarray(sym, defs, guesses))"
 end
-function _inout_string(@nospecialize(c::EdgeModel), f, name)
+function _inout_string(c::EdgeModel, f, name)
     sym = f(c)
     word = name*"s"
     srcnum = length(sym.src)