Mix fixes / adapting to renaming

Author: gaurav-arya

src/dct.jl

@@ -172,4 +172,4 @@ end
 
 *(p::DCTPlan{T,K,true}, x::StridedArray{T}) where {T,K} = mul!(x, p, x)
 
-AbstractFFTs.ProjectionStyle(::DCTPlan) = AbstractFFTs.UnitaryProjectionStyle()
+AbstractFFTs.AdjointStyle(::DCTPlan) = AbstractFFTs.UnitaryAdjointStyle()

src/fft.jl

@@ -1053,41 +1053,30 @@ end
 #######################################################################
 
 """
-    UnitaryProjectionStyle()
-
-Projection style for transforms that are unitary
-"""
-struct UnitaryProjectionStyle <: AbstractFFTs.ProjectionStyle end
-
-"""
-    R2RProjectionStyle(kinds)
+    R2RAdjointStyle(kinds)
 
 Projection style for real to real transforms
 """
-struct R2RProjectionStyle{K} <: AbstractFFTs.ProjectionStyle
+struct R2RAdjointStyle{K} <: AbstractFFTs.AdjointStyle
     kinds::K
 end
 
-AbstractFFTs.ProjectionStyle(::cFFTWPlan) = AbstractFFTs.NoProjectionStyle()
-AbstractFFTs.ProjectionStyle(::rFFTWPlan{T, FORWARD}) where {T} = AbstractFFTs.RealProjectionStyle()
-AbstractFFTs.ProjectionStyle(P::rFFTWPlan{T, BACKWARD}) where {T} = AbstractFFTs.RealInverseProjectionStyle(P.osz[first(P.region)])
-AbstractFFTs.ProjectionStyle(P::r2rFFTWPlan) = AbstractFFTs.R2RProjectionStyle(P.kinds)
-
-AbstractFFTs._output_size(p::Plan, ::UnitaryProjectionStyle) = size(p)
-AbstractFFTs._output_size(p::Plan, ::R2RProjectionStyle) = size(p)
+AbstractFFTs.AdjointStyle(::cFFTWPlan) = AbstractFFTs.FFTAdjointStyle()
+AbstractFFTs.AdjointStyle(::rFFTWPlan{T, FORWARD}) where {T} = AbstractFFTs.RFFTAdjointStyle()
+AbstractFFTs.AdjointStyle(P::rFFTWPlan{T, BACKWARD}) where {T} = AbstractFFTs.IRFFTAdjointStyle(P.osz[first(P.region)])
+AbstractFFTs.AdjointStyle(P::r2rFFTWPlan) = AbstractFFTs.R2RAdjointStyle(P.kinds)
 
-function _mul(p::AdjointPlan{T}, x::AbstractArray, ::UnitaryProjectionStyle) where {T}
-    return p.p \ x
-end
+AbstractFFTs._output_size(p::Plan, ::R2RAdjointStyle) = size(p)
 
-function _mul(p::AdjointPlan{T}, x::AbstractArray, PS::R2RProjectionStyle) where {T}
+# TODO: this needs finishing
+function AbstractFFTs.adjoint_mul(p::Plan{T}, x::AbstractArray, PS::R2RAdjointStyle) where {T}
     kinds = PS.kinds
     dims = fftdims(p)
 
     N = 1
     # Ref: https://www.fftw.org/fftw3_doc/1d-Real_002deven-DFTs-_0028DCTs_0029.html
     # Normalization: P \ P * u = K * u
-    # 0, 1 , 2   : NoProjectionStyle() type: K = prod(size(N))
+    # 0, 1 , 2   : FFTAdjointStyle() type: K = prod(size(N))
     # 3, 6 : DCTs: K = 2 * (N - 1)
     # 4, 5 : DCTs: K = 2 * N
     # 7, 10: DSTs: K = 2 * (N + 1)