From 10af0452760a86bd1f3d38f688fc34bb90a683a9 Mon Sep 17 00:00:00 2001
From: Michiel Cottaar <michiel.cottaar@ndcn.ox.ac.uk>
Date: Tue, 30 Jan 2024 14:29:29 +0000
Subject: [PATCH] Allow subtyping in final pathway
---
src/pathways.jl | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/pathways.jl b/src/pathways.jl
index f89d9ba..20b8d40 100644
--- a/src/pathways.jl
+++ b/src/pathways.jl
@@ -51,13 +51,13 @@ You can select which gradients to consider when accessing these values.
struct Pathway
# user provided
sequence :: Sequence
- pulse_effects :: Vector{Union{Symbol, Number}}
+ pulse_effects :: Vector{<:Union{Symbol, Number}}
readout_index :: Integer
# computed
- duration_states :: Dict{Any, SVector{4, VariableType}}
- qvec :: Dict{Any, SVector{3, VariableType}}
- bmat :: Dict{Any, SMatrix{3, 3, VariableType, 9}}
+ duration_states :: Dict{Any, SVector{4, <:VariableType}}
+ qvec :: Dict{Any, SVector{3, <:VariableType}}
+ bmat :: Dict{Any, SMatrix{3, 3, <:VariableType, 9}}
end
function Pathway(sequence::Sequence, pulse_effects::AbstractVector, readout_index::Integer=1)
@@ -67,9 +67,9 @@ function Pathway(sequence::Sequence, pulse_effects::AbstractVector, readout_inde
sequence,
pulse_effects,
readout_index,
- Dict(k => SVector{4, VariableType}(v) for (k, v) in pairs(walker.duration_states)),
- Dict(k => SVector{3, VariableType}(v) for (k, v) in pairs(walker.qvec)),
- Dict(k => SMatrix{3, 3, VariableType, 9}(v) for (k, v) in pairs(walker.bmat)),
+ Dict(k => SVector{4}(v) for (k, v) in pairs(walker.duration_states)),
+ Dict(k => SVector{3}(v) for (k, v) in pairs(walker.qvec)),
+ Dict(k => SMatrix{3, 3}(v) for (k, v) in pairs(walker.bmat)),
)
end
--
GitLab