remove excessive paramterization of InterlaceOperator (#409)

* remove excessive paramterization of InterlaceOperator

* don't assert in plusop

Author: jishnub

src/Caching/almostbanded.jl

@@ -176,9 +176,8 @@ end
 
 # Grow cached interlace operator
 
-function resizedata!(co::CachedOperator{T,AlmostBandedMatrix{T},
-                              InterlaceOperator{T,1,DS,RS,DI,RI,BI}},
-           n::Integer,::Colon) where {T<:Number,DS,RS,DI,RI,BI}
+function resizedata!(co::CachedOperator{T,AlmostBandedMatrix{T},<:InterlaceOperator{T,1}},
+        n::Integer,::Colon) where {T<:Number}
     if n ≤ co.datasize[1]
         return co
     end
@@ -211,9 +210,8 @@ end
 
 
 
-function resizedata!(co::CachedOperator{T,AlmostBandedMatrix{T},
-                              InterlaceOperator{T,2,DS,RS,DI,RI,BI}},
-           n::Integer,::Colon) where {T<:Number,DS,RS,DI,RI,BI}
+function resizedata!(co::CachedOperator{T,AlmostBandedMatrix{T},<:InterlaceOperator{T,2}},
+        n::Integer,::Colon) where {T<:Number}
     if n ≤ co.datasize[1]
         return co
     end
@@ -259,14 +257,12 @@ function resizedata!(co::CachedOperator{T,AlmostBandedMatrix{T},
 end
 
 
-resizedata!(co::CachedOperator{T,AlmostBandedMatrix{T},
-                              InterlaceOperator{T,1,DS,RS,DI,RI,BI}},
-n::Integer,m::Integer) where {T<:Number,DS,RS,DI,RI,BI} = resizedata!(co,max(n,m+bandwidth(co.data.bands,1)),:)
+resizedata!(co::CachedOperator{T,AlmostBandedMatrix{T},<:InterlaceOperator{T,1}},
+    n::Integer,m::Integer) where {T<:Number} = resizedata!(co,max(n,m+bandwidth(co.data.bands,1)),:)
 
 
-resizedata!(co::CachedOperator{T,AlmostBandedMatrix{T},
-                               InterlaceOperator{T,2,DS,RS,DI,RI,BI}},
-n::Integer,m::Integer) where {T<:Number,DS,RS,DI,RI,BI} = resizedata!(co,max(n,m+bandwidth(co.data.bands,1)),:)
+resizedata!(co::CachedOperator{T,AlmostBandedMatrix{T},<:InterlaceOperator{T,2}},
+    n::Integer,m::Integer) where {T<:Number} = resizedata!(co,max(n,m+bandwidth(co.data.bands,1)),:)
 
 
 

src/Operators/general/InterlaceOperator.jl

@@ -346,8 +346,7 @@ end
 for TYP in (:BandedMatrix, :BlockBandedMatrix, :BandedBlockBandedMatrix, :RaggedMatrix,
                 :Matrix)
     @eval begin
-        function $TYP(S::SubOperator{T,InterlaceOperator{T,1,SS,PS,DI,RI,BI},
-                            NTuple{2,UnitRange{Int}}}) where {SS,PS,DI,RI,BI,T}
+        function $TYP(S::SubOperator{T,<:InterlaceOperator{T,1},NTuple{2,UnitRange{Int}}}) where {T}
             kr,jr=parentindices(S)
             L=parent(S)
 
@@ -370,8 +369,7 @@ for TYP in (:BandedMatrix, :BlockBandedMatrix, :BandedBlockBandedMatrix, :Ragged
             ret
         end
 
-        function $TYP(S::SubOperator{T,InterlaceOperator{T,2,SS,PS,DI,RI,BI},
-                      NTuple{2,UnitRange{Int}}}) where {SS,PS,DI,RI,BI,T}
+        function $TYP(S::SubOperator{T,<:InterlaceOperator{T,2},NTuple{2,UnitRange{Int}}}) where {T}
             kr,jr=parentindices(S)
             L=parent(S)
 
@@ -438,8 +436,8 @@ function blockbanded_interlace_convert!(S,ret)
 end
 
 for d in (:1,:2)
-    @eval BlockBandedMatrix(S::SubOperator{T,InterlaceOperator{T,$d,SS,PS,DI,RI,BI},
-                          Tuple{BlockRange1,BlockRange1}}) where {SS,PS,DI,RI,BI,T} =
+    @eval BlockBandedMatrix(S::SubOperator{T,<:InterlaceOperator{T,$d},
+                          Tuple{BlockRange1,BlockRange1}}) where {T} =
     blockbanded_interlace_convert!(S, BlockBandedMatrix(Zeros, S))
 end