Skip to content
Snippets Groups Projects
Verified Commit 52f3edd6 authored by Michiel Cottaar's avatar Michiel Cottaar
Browse files

pathways might contain variables, not just numbers

parent d50728ca
No related branches found
No related tags found
No related merge requests found
...@@ -52,22 +52,22 @@ struct Pathway ...@@ -52,22 +52,22 @@ struct Pathway
readout_index :: Integer readout_index :: Integer
# computed # computed
duration_states :: Dict{Any, SVector{4, Float64}} duration_states :: Dict{Any, SVector{4, VariableType}}
qvec :: Dict{Any, SVector{3, Float64}} qvec :: Dict{Any, SVector{3, VariableType}}
bmat :: Dict{Any, SMatrix{3, 3, Float64, 9}} bmat :: Dict{Any, SMatrix{3, 3, VariableType, 9}}
end end
function Pathway(sequence::Sequence, pulse_effects::AbstractVector, readout_index::Integer) function Pathway(sequence::Sequence, pulse_effects::AbstractVector, readout_index::Integer)
walker = PathwayWalker(pulse_effects, readout_index) walker = PathwayWalker()
walk_pathway!(walker, sequence) walk_pathway!(sequence, copy(pulse_effects), walker, Ref(readout_index))
return Pathway( return Pathway(
sequence, sequence,
pulse_effects, pulse_effects,
readout_index, readout_index,
Dict(k => SVector{4, Float64}(v) for (k, v) in pairs(walker.duration_states)), Dict(k => SVector{4, VariableType}(v) for (k, v) in pairs(walker.duration_states)),
Dict(k => SVector{3, Float64}(v) for (k, v) in pairs(walker.qvec)), Dict(k => SVector{3, VariableType}(v) for (k, v) in pairs(walker.qvec)),
Dict(k => SMatrix{3, 3, Float64, 9}(v) for (k, v) in pairs(walker.bmat)), Dict(k => SMatrix{3, 3, VariableType, 9}(v) for (k, v) in pairs(walker.bmat)),
) )
end end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment