From 52f3edd6dc7a985ea15b1530b9849cdd8ca2db61 Mon Sep 17 00:00:00 2001
From: Michiel Cottaar <michiel.cottaar@ndcn.ox.ac.uk>
Date: Sun, 28 Jan 2024 15:56:43 +0000
Subject: [PATCH] pathways might contain variables, not just numbers
---
src/pathways.jl | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/pathways.jl b/src/pathways.jl
index 792ebfc..0255ebc 100644
--- a/src/pathways.jl
+++ b/src/pathways.jl
@@ -52,22 +52,22 @@ struct Pathway
readout_index :: Integer
# computed
- duration_states :: Dict{Any, SVector{4, Float64}}
- qvec :: Dict{Any, SVector{3, Float64}}
- bmat :: Dict{Any, SMatrix{3, 3, Float64, 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)
- walker = PathwayWalker(pulse_effects, readout_index)
- walk_pathway!(walker, sequence)
+ walker = PathwayWalker()
+ walk_pathway!(sequence, copy(pulse_effects), walker, Ref(readout_index))
return Pathway(
sequence,
pulse_effects,
readout_index,
- Dict(k => SVector{4, Float64}(v) for (k, v) in pairs(walker.duration_states)),
- Dict(k => SVector{3, Float64}(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 => 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)),
)
end
--
GitLab