🚧 Upgrade default_model.

src/EcologicalNetworksDynamics.jl

@@ -97,8 +97,8 @@ include("./expose_data.jl")
 include("./components/main.jl")
 
 # HERE: now that all components have been upgraded, upgrade the following!
-#  # Additional exposed utils built on top of components and methods.
-#  include("./default_model.jl")
+# Additional exposed utils built on top of components and methods.
+include("./default_model.jl")
 #  include("./nontrophic_layers.jl")
 #  include("./simulate.jl")
 #  include("./topology.jl")

src/Framework/component.jl

@@ -39,6 +39,12 @@ singleton_instance(C::CompType) = throw("No concrete singleton instance of '$C'.
 # Extract underlying system wrapped value type from a component.
 system_value_type(::CompRef{V}) where {V} = V
 
+# Typecheck regardless of the instance/type.
+isacomponent(::CompType) = true
+isacomponent(::Component) = true
+isacomponent(::Any) = false
+export isacomponent
+
 #-------------------------------------------------------------------------------------------
 # Requirements.
 

src/components/args_to_fields.jl

@@ -15,6 +15,8 @@ end
 # fall back attempt to convert to its 'Union' field, which is not a constructor.
 pass_args_kwargs(BF::Type{<:F.BroughtField}, ::Nothing) = BF(nothing)
 pass_args_kwargs(BF::Type{<:F.BroughtField}, C::F.CompType) = BF(C)
+pass_args_kwargs(BF::Type{<:F.BroughtField}, C::F.Component) = BF(C)
+pass_args_kwargs(BF::Type{<:F.BroughtField}, bp::F.Blueprint) = BF(bp)
 function pass_args_kwargs(BF::Type{<:F.BroughtField}, input)
     ak = to_args_kwargs(input)
     convert(BF, ak)
@@ -25,7 +27,8 @@ end
 # unless the input is already of the right type
 # and then there is no need to construct more.
 function pass_args_kwargs_to_type(type, input)
-    input isa type ? input : pass_args_kwargs(type, input)
+    res = input isa type
+    res ? input : pass_args_kwargs(type, input)
 end
 
 # Given a struct type,

src/components/nontrophic_layers/competition.jl

@@ -80,6 +80,4 @@ export Layer
 # Calling the component is like calling the (single) corresponding blueprint constructor.
 (::_Layer)(args...; kwargs...) = Pack(args...; kwargs...)
 
-F.shortline(io::IO, ::Model, ::_Layer) = print(io, "Competition Layer.")
-
 end

src/components/nontrophic_layers/facilitation.jl

@@ -79,6 +79,4 @@ export Layer
 # Calling the component is like calling the (single) corresponding blueprint constructor.
 (::_Layer)(args...; kwargs...) = Pack(args...; kwargs...)
 
-F.shortline(io::IO, ::Model, ::_Layer) = print(io, "Facilitation Layer.")
-
 end

src/components/nontrophic_layers/interference.jl

@@ -73,6 +73,4 @@ export Layer
 # Calling the component is like calling the (single) corresponding blueprint constructor.
 (::_Layer)(args...; kwargs...) = Pack(args...; kwargs...)
 
-F.shortline(io::IO, ::Model, ::_Layer) = print(io, "Interference Layer.")
-
 end

src/components/nontrophic_layers/refuge.jl

@@ -78,6 +78,4 @@ export Layer
 # Calling the component is like calling the (single) corresponding blueprint constructor.
 (::_Layer)(args...; kwargs...) = Pack(args...; kwargs...)
 
-F.shortline(io::IO, ::Model, ::_Layer) = print(io, "Refuge Layer.")
-
 end

src/components/nutrients/nodes.jl

@@ -100,9 +100,9 @@ F.add_trigger!(
     end,
 )
 
-(::_Nodes)() = Nodes.PerProducer()
-(::_Nodes)(names) = Nodes.Names(names)
 (::_Nodes)(n::Integer) = Nodes.Number(n)
+(::_Nodes)(names) = Nodes.Names(names)
+(::_Nodes)(; per_producer = 1) = Nodes.PerProducer(per_producer)
 
 function F.shortline(io::IO, model::Model, ::_Nodes)
     N = model.nutrients.number

src/dedicate_framework_to_model.jl

@@ -13,15 +13,16 @@ import .F:
     System,
     add!,
     blueprints,
-    embedded,
     checkfails,
     checkrefails,
     components,
     does_bring,
     does_embed,
     does_imply,
+    embedded,
     has_component,
-    implied
+    implied,
+    isacomponent
 
 # Direct re-exports from the framework module.
 export add!
@@ -33,11 +34,14 @@ export does_imply
 export embedded
 export has_component
 export implied
+export isacomponent
 export properties
 
 const Internal = Internals.ModelParameters # <- TODO: rename when refactoring Internals.
+
 const Blueprint = F.Blueprint{Internal}
 const BlueprintSum = F.BlueprintSum{Internal}
+const CompType = F.CompType{Internal}
 const Component = F.Component{Internal}
 
 const Model = F.System{Internal}