refactor: relax type constraints to allow callable parameters in pdeps

Author: SebastianM-C

src/systems/abstractsystem.jl

@@ -3090,7 +3090,7 @@ function process_parameter_dependencies(pdeps, ps)
                  end
                  for p in pdeps]
     end
-    lhss = BasicSymbolic[]
+    lhss = []
     for p in pdeps
         if !isparameter(p.lhs)
             error("LHS of parameter dependency must be a single parameter. Found $(p.lhs).")
@@ -3101,6 +3101,7 @@ function process_parameter_dependencies(pdeps, ps)
         end
         push!(lhss, p.lhs)
     end
+    lhss = map(identity, lhss)
     pdeps = topsort_equations(pdeps, union(ps, lhss))
     ps = filter(ps) do p
         !any(isequal(p), lhss)

src/systems/index_cache.jl

@@ -39,7 +39,7 @@ const UnknownIndexMap = Dict{
 const TunableIndexMap = Dict{BasicSymbolic,
     Union{Int, UnitRange{Int}, Base.ReshapedArray{Int, N, UnitRange{Int}} where {N}}}
 
-struct IndexCache
+struct IndexCache{D}
     unknown_idx::UnknownIndexMap
     # sym => (bufferidx, idx_in_buffer)
     discrete_idx::Dict{BasicSymbolic, DiscreteIndex}
@@ -49,7 +49,7 @@ struct IndexCache
     constant_idx::ParamIndexMap
     nonnumeric_idx::NonnumericMap
     observed_syms::Set{BasicSymbolic}
-    dependent_pars::Set{BasicSymbolic}
+    dependent_pars::Set{D}
     discrete_buffer_sizes::Vector{Vector{BufferTemplate}}
     tunable_buffer_size::BufferTemplate
     constant_buffer_sizes::Vector{BufferTemplate}
@@ -275,7 +275,15 @@ function IndexCache(sys::AbstractSystem)
         end
     end
 
-    dependent_pars = Set{BasicSymbolic}()
+    pdeps = parameter_dependencies(sys)
+
+    D = if isempty(pdeps)
+        BasicSymbolic
+    else
+        mapreduce(typeof, promote_type, getproperty.(pdeps, :lhs))
+    end
+    dependent_pars = Set{D}()
+
     for eq in parameter_dependencies(sys)
         sym = eq.lhs
         ttsym = default_toterm(sym)
@@ -289,7 +297,7 @@ function IndexCache(sys::AbstractSystem)
         end
     end
 
-    return IndexCache(
+    return IndexCache{D}(
         unk_idxs,
         disc_idxs,
         callback_to_clocks,