Make WeightingOp custom type for dispatch

Author: nHackel

src/LinearOperatorCollection.jl

@@ -7,6 +7,9 @@ using SparseArrays
 using Random
 using InteractiveUtils
 
+import Base: *, copy, getproperty, setproperty!
+import LinearOperators: storage_type
+
 using Reexport
 @reexport using LinearOperators
 
@@ -37,7 +40,6 @@ abstract type DSTOp{T} <: AbstractLinearOperatorFromCollection{T} end
 abstract type NFFTOp{T} <: AbstractLinearOperatorFromCollection{T} end
 abstract type SamplingOp{T} <: AbstractLinearOperatorFromCollection{T} end
 abstract type NormalOp{T} <: AbstractLinearOperatorFromCollection{T} end
-abstract type WeightingOp{T} <: AbstractLinearOperatorFromCollection{T} end
 abstract type GradientOp{T} <: AbstractLinearOperatorFromCollection{T} end
 
 
@@ -81,7 +83,6 @@ function createLinearOperator(op::String, ::Type{T}; kargs...) where T <: Number
 end
 
 
-
 include("GradientOp.jl")
 include("SamplingOp.jl")
 include("WeightingOp.jl")

src/WeightingOp.jl

@@ -1,13 +1,28 @@
 """
-  WeightingOp(::Type{T}; weights::Vector{T}, rep::Int=1) where T
+    WeightingOp(::Type{T}; weights::Vector{T}, rep::Int=1) where T
 
 generates a `LinearOperator` which multiplies an input vector index-wise with `weights`
 
 # Arguments
 * `weights::Vector{T}` - weights vector
 * `rep::Int=1`         - number of sub-arrays that need to be multiplied with `weights`
 """
-function WeightingOp(::Type{T}; weights::vecT, rep::Int=1) where {T <: Number, vecT<:AbstractVector}
-  weights_cat = repeat(weights,rep)
-  return opDiagonal(weights_cat)
+mutable struct WeightingOp{T} <: AbstractLinearOperatorFromCollection{T}
+  op::LinearOperator{T}
+  weights::Vector{T}
+  function WeightingOp(weights::vecT, rep::Int=1) where {T <: Number, vecT<:AbstractVector{T}}
+    weights_cat = repeat(weights,rep)
+    return new{T}(opDiagonal(weights_cat), weights_cat)
+  end
 end
+
+function Base.getproperty(wop::WeightingOp, field::Symbol)
+  if in(field, (:op, :weights)) 
+    return getfield(wop, field)
+  else
+    return getproperty(getfield(wop, :op), field)
+  end
+end
+Base.setproperty!(wop::WeightingOp, field::Symbol, value) = setproperty!(wop.op, field, value)
+
+storage_type(wop::WeightingOp) = storage_type(wop.op)