more concise typing

Author: kingaa

.gitignore

@@ -1,3 +1,4 @@
 Manifest.toml
 /coverage/**
 /docs/build/**
+\.vscode/**

Project.toml

@@ -1,6 +1,6 @@
 name = "PartiallyObservedMarkovProcesses"
 uuid = "32433216-4d85-4b2d-94ed-a614743ba12b"
-version = "0.5.1-1"
+version = "0.5.1-2"
 authors = ["Aaron A. King <kingaa@umich.edu>"]
 
 [deps]

src/flow.jl

@@ -32,10 +32,10 @@ vectorfield(
     end
     integrator!(
         x::AbstractVector{X},
-        t::AbstractVector{<:RealTime},
+        t::AbstractVector{T},
         x0::X,
         params::P,
-    ) where {X<:NamedTuple,P<:NamedTuple} = begin
+    ) where {T<:RealTime,X<:NamedTuple,P<:NamedTuple} = begin
         tspan = extrema(t)
         ic = [x0[statenames]...]
         prob = ODEProblem{true,SciMLBase.NoSpecialize}(

src/pfilter.jl

@@ -104,7 +104,7 @@ pfilter_internal!(
     eff_sample_size::AbstractVector{LogLik},
     cond_logLik::AbstractVector{LogLik},
     perm::AbstractArray{Int64,2}
-) where {T,X,Y} = begin
+) where {T<:Time,X<:NamedTuple,Y<:NamedTuple} = begin
     for k ∈ eachindex(t)
         rprocess!(
             object,

src/rinit.jl

@@ -16,7 +16,7 @@ rinit(
     t0::T=timezero(object),
     params::Union{P,AbstractVector{P}}=coef(object),
     nsim::Integer=1,
-) where {T,P<:NamedTuple} = begin
+) where {T<:Time,P<:NamedTuple} = begin
     params = val_array(params)
     rinit_internal(pomp(object).rinit, t0, params, pomp(object).userdata, nsim)
 end
@@ -31,7 +31,7 @@ rinit!(
     x0::AbstractArray{X,2};
     t0::T=timezero(object),
     params::Union{P,AbstractVector{P}}=coef(object),
-) where {T,X,P<:NamedTuple} = begin
+) where {T<:Time,X<:NamedTuple,P<:NamedTuple} = begin
     params = val_array(params)
     rinit_internal!(x0, pomp(object).rinit, t0, params, pomp(object).userdata)
 end
@@ -52,13 +52,13 @@ rinit_internal(
     userdata::U,
     nsim::Integer=1,
 ) where {T<:Time,P<:NamedTuple,U<:NamedTuple} =
-    [f(; params[i]..., userdata..., t0=t0) for i ∈ eachindex(params), _ ∈ 1:nsim]
+    [f(; params[i]..., userdata..., t0=t0)::NamedTuple for i ∈ eachindex(params), _ ∈ 1:nsim]
 
 rinit_internal!(                # COV_EXCL_LINE
     x0::AbstractArray{X},
     f::Nothing,
     _...,
-) where {X} = begin
+) where {X<:NamedTuple} = begin
     fill!(x0, (;))
     nothing
 end
@@ -69,7 +69,7 @@ rinit_internal!(
     t0::T,
     params::AbstractVector{P},
     userdata::U,
-) where {T<:Time,X,P<:NamedTuple,U<:NamedTuple} = begin
+) where {T<:Time,X<:NamedTuple,P<:NamedTuple,U<:NamedTuple} = begin
     for i ∈ eachindex(params), j ∈ axes(x0, 2)
         x0[i, j] = X(f(; params[i]..., userdata..., t0=t0))
     end                         # COV_EXCL_LINE

src/rmeasure.jl

@@ -8,7 +8,7 @@ rmeasure(
     x::Union{X,AbstractArray{X}} = states(object),
     times::Union{T,AbstractVector{T}} = times(object),
     params::Union{P,AbstractVector{P}} = coef(object),
-) where {T,X<:NamedTuple,P<:NamedTuple} = begin
+) where {T<:Time,X<:NamedTuple,P<:NamedTuple} = begin
     times = val_array(times)
     params = val_array(params)
     x = val_array(x,length(times),length(params))
@@ -33,7 +33,7 @@ rmeas_internal(
     times::AbstractVector{T},
     params::AbstractVector{P},
     userdata::U,
-) where {T,X<:NamedTuple,P<:NamedTuple,U<:NamedTuple} = begin
+) where {T<:Time,X<:NamedTuple,P<:NamedTuple,U<:NamedTuple} = begin
     @assert(size(x,1)==length(times))
     @assert(size(x,2)==length(params))
     @inbounds(