Bump version to 0.3.4 and improve plan handling for vectors of parameters

Author: nHackel

Project.toml

@@ -1,7 +1,7 @@
 name = "AbstractImageReconstruction"
 uuid = "a4b4fdbf-6459-4ec9-990d-77e1fa24a91b"
 authors = ["nHackel <[email protected]> and contributors"]
-version = "0.3.3"
+version = "0.3.4"
 
 [deps]
 LRUCache = "8ac3fa9e-de4c-5943-b1dc-09c6b5f20637"

src/RecoPlans/RecoPlans.jl

@@ -96,6 +96,7 @@ validvalue(plan, ::Type{T}, value::RecoPlan{<:T}) where T = true
 validvalue(plan, t::UnionAll, ::RecoPlan{T}) where T = T <: t || T <: Base.typename(t).wrapper # Last case doesnt work for Union{...} that is a UnionAll, such as ProcessCache Unio
 validvalue(plan, t::Type{Union}, value) = validvalue(plan, t.a, value) || validvalue(plan, t.b, value)
 validvalue(plan, t, value) = false
+validvalue(plan, ::Type{arrT}, value::AbstractArray) where {T, arrT <: AbstractArray{T}} = all(x -> validvalue(plan, T, x), value)
 
 #X <: t || X <: RecoPlan{<:t} || ismissing(x)
 
@@ -111,7 +112,7 @@ end
 export setAll!
 function setAll!(plan::RecoPlan{T}, name::Symbol, x) where {T<:AbstractImageReconstructionParameters}
   fields = getfield(plan, :values)
-  nestedPlans = filter(entry -> isa(last(entry), RecoPlan), fields)
+  nestedPlans = filter(entry -> isa(last(entry), RecoPlan) || isa(last(entry), AbstractArray{<:RecoPlan}), fields)
   for (key, nested) in nestedPlans
     key != name && setAll!(nested, name, x)
   end
@@ -123,6 +124,7 @@ function setAll!(plan::RecoPlan{T}, name::Symbol, x) where {T<:AbstractImageReco
     end
   end
 end
+setAll!(plans::AbstractArray{<:RecoPlan}, name::Symbol, x) = foreach(p -> setAll!(p, name, x), plans) 
 setAll!(plan::RecoPlan{<:AbstractImageReconstructionAlgorithm}, name::Symbol, x) = setAll!(plan.parameter, name, x)
 function setAll!(plan; kwargs...)
   for key in keys(kwargs)
@@ -181,13 +183,14 @@ Base.ismissing(plan::RecoPlan, name::Symbol) = ismissing(getfield(plan, :values)
 export build
 function build(plan::RecoPlan{T}) where {T<:AbstractImageReconstructionParameters}
   fields = copy(getfield(plan, :values))
-  nestedPlans = filter(entry -> isa(last(entry), RecoPlan), fields)
+  nestedPlans = filter(entry -> isa(last(entry), RecoPlan) || isa(last(entry), AbstractArray{<:RecoPlan}), fields)
   for (name, nested) in nestedPlans
     fields[name] = build(nested)
   end
   fields = filter(entry -> !ismissing(last(entry)), fields)
   return T(;fields...)
 end
+build(plans::AbstractArray{<:RecoPlan}) = map(build, plans)
 function build(plan::RecoPlan{T}) where {T<:AbstractImageReconstructionAlgorithm}
   parameter = build(plan[:parameter])
   return T(parameter)

src/RecoPlans/Serialization.jl

@@ -99,9 +99,9 @@ function loadPlan!(plan::RecoPlan{T}, dict::Dict{String, Any}, modDict) where {T
       if t <: AbstractImageReconstructionAlgorithm || t <: AbstractImageReconstructionParameters
         param = loadPlan!(dict[key], modDict)
         parent!(param, plan)
-
-        if param isa RecoPlan{ProcessResultCache}
-        end
+      elseif t <: Vector{<:AbstractImageReconstructionAlgorithm} || t <: Vector{<:AbstractImageReconstructionParameters}
+        param = map(x-> loadPlan!(x, modDict), dict[key])
+        foreach(p -> parent!(p, plan), param)
       else
         param = loadPlanValue(T, name, t, dict[key], modDict)
       end