remove wierd DataSet inheritance hack

use CompositeStructs.jl instead

Author: marius311

src/CMBLensing.jl

@@ -82,7 +82,7 @@ export
     IEBFourier, IEBMap, InterpolatedCℓs, IQUFourier, IQUMap, kde,
     lasthalf, LazyBinaryOp, LenseBasis, LenseFlow, FieldOp, lnP, load_camb_Cℓs,
     load_chains, load_sim, LowPass, make_mask, Map, MAP_joint, MAP_marg,
-    mean_std_and_errors, MidPass, mix, nan2zero, new_dataset, noiseCℓs,
+    mean_std_and_errors, MidPass, mix, nan2zero, noiseCℓs,
     ParamDependentOp, pixwin, PowerLens, ProjLambert, QUFourier, QUMap, resimulate!,
     resimulate, RK4Solver, sample_joint, shiftℓ, 
     simulate, SymmetricFuncOp, symplectic_integrate, Taylens, toCℓ, toDℓ,

src/dataset.jl

@@ -1,28 +1,8 @@
 
 
-abstract type DataSet{DS} end
-
-getproperty(ds::DS, k::Symbol) where {DS<:DataSet{<:DataSet}} = 
-    hasfield(DS, k) ? getfield(ds, k) : getproperty(getfield(ds, :_super), k)
-setproperty!(ds::DS, k::Symbol, v) where {DS<:DataSet{<:DataSet}} = 
-    hasfield(DS, k) ? setfield!(ds, k, v) : setproperty!(getfield(ds, :_super), k, v)
-propertynames(ds::DS) where {DS<:DataSet} = propertynames(DS)
-propertynames(::Type{DS}) where {DS′<:DataSet, DS<:DataSet{DS′}} = 
-    union(propertynames(DS′), fieldnames(DS))
-propertynames(::Type{DS}) where {DS<:DataSet{Nothing}} = fieldnames(DS)
-
-function new_dataset(::Type{DS}; kwargs...) where {DS′<:DataSet, DS<:DataSet{DS′}}
-    kw  = Dict(k => v for (k,v) in kwargs if   k in fieldnames(DS))
-    kw′ = Dict(k => v for (k,v) in kwargs if !(k in fieldnames(DS)))
-    DS(; kw..., _super=new_dataset(DS′; kw′...))
-end
-
-function new_dataset(::Type{DS}; kwargs...) where {DS<:DataSet{Nothing}}
-    DS(; kwargs...)
-end
+abstract type DataSet end
 
-copy(ds::DS) where {DS<:DataSet} = 
-    DS(((k==:_super ? copy(v) : v) for (k,v) in pairs(fields(ds)))...)
+copy(ds::DS) where {DS<:DataSet} = DS(fields(ds)...)
 
 hash(ds::DataSet, h::UInt64) = foldr(hash, (typeof(ds), fieldvalues(ds)...), init=h)
 
@@ -35,10 +15,6 @@ function show(io::IO, ds::DataSet)
 end
 
 
-# needed until fix to https://github.com/FluxML/Zygote.jl/issues/685
-Zygote.grad_mut(ds::DataSet) = Ref{Any}((;(propertynames(ds) .=> nothing)...))
-
-
 # util for distributing a singleton global dataset to workers
 """
     set_distributed_dataset(ds)
@@ -68,7 +44,7 @@ _distributed_dataset_hash = nothing
 
 
 # Stores variables needed to construct the posterior
-@kwdef mutable struct BaseDataSet <: DataSet{Nothing}
+@kwdef mutable struct BaseDataSet <: DataSet
     d                # data
     Cϕ               # ϕ covariance
     Cf               # unlensed field covariance