Don't forward size to SpaceOperator (#443)

* Don't forward size to SpaceOperator

* bump version to v0.8.13

Author: jishnub

Project.toml

@@ -1,6 +1,6 @@
 name = "ApproxFunBase"
 uuid = "fbd15aa5-315a-5a7d-a8a4-24992e37be05"
-version = "0.8.12"
+version = "0.8.13"
 
 [deps]
 AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"

src/Operators/Operator.jl

@@ -492,19 +492,31 @@ haswrapperstructure(_) = false
 # not necessarily the same entries
 #
 #  Ex: c*op or real(op)
-macro wrapperstructure(Wrap)
-    v1 = map((:(ApproxFunBase.bandwidths),:(LinearAlgebra.stride),
-                 :(ApproxFunBase.isbandedblockbanded),:(ApproxFunBase.isblockbanded),
-                 :(ApproxFunBase.israggedbelow),:(Base.size),:(ApproxFunBase.isbanded),
-                 :(ApproxFunBase.blockbandwidths),:(ApproxFunBase.subblockbandwidths),
-                 :(LinearAlgebra.issymmetric))) do func
+macro wrapperstructure(Wrap, forwardsize = true)
+    fns = [:(ApproxFunBase.bandwidths),:(LinearAlgebra.stride),
+             :(ApproxFunBase.isbandedblockbanded),:(ApproxFunBase.isblockbanded),
+             :(ApproxFunBase.israggedbelow),:(ApproxFunBase.isbanded),
+             :(ApproxFunBase.blockbandwidths),:(ApproxFunBase.subblockbandwidths),
+             :(LinearAlgebra.issymmetric)]
+
+    if forwardsize
+        fns = [fns; :(Base.size)]
+    end
+
+    v1 = map(fns) do func
 
         :($func(D::$Wrap) = $func(D.op))
     end
 
-    v2 = map((:(ApproxFunBase.bandwidth),:(ApproxFunBase.colstart),:(ApproxFunBase.colstop),
-                     :(ApproxFunBase.rowstart),:(ApproxFunBase.rowstop),:(ApproxFunBase.blockbandwidth),
-                     :(Base.size),:(ApproxFunBase.subblockbandwidth))) do func
+    fns2 = [:(ApproxFunBase.bandwidth),:(ApproxFunBase.colstart),:(ApproxFunBase.colstop),
+             :(ApproxFunBase.rowstart),:(ApproxFunBase.rowstop),:(ApproxFunBase.blockbandwidth),
+             :(ApproxFunBase.subblockbandwidth)]
+
+    if forwardsize
+        fns2 = [fns2; :(Base.size)]
+    end
+
+    v2 = map(fns2) do func
         quote
              $func(D::$Wrap,k::Integer) = $func(D.op,k)
              $func(A::$Wrap,i::ApproxFunBase.PosInfinity) = ℵ₀ # $func(A.op,i) | see PR #42
@@ -525,7 +537,7 @@ end
 # use this for wrapper operators that have the same entries but
 # not necessarily the same spaces
 #
-macro wrappergetindex(Wrap)
+macro wrappergetindex(Wrap, forwardsize = true)
     v = map((:(ApproxFunBase.BandedMatrix),:(ApproxFunBase.RaggedMatrix),
                 :Matrix,:Vector,:AbstractVector)) do TYP
         quote
@@ -602,7 +614,7 @@ macro wrappergetindex(Wrap)
             end
         end
 
-        ApproxFunBase.@wrapperstructure($Wrap) # structure is automatically inherited
+        ApproxFunBase.@wrapperstructure($Wrap, $forwardsize) # structure is automatically inherited
     end
 
     esc(ret)

src/Operators/spacepromotion.jl

@@ -46,7 +46,7 @@ end
 
 # Similar to wrapper, but different domain/domainspace/rangespace
 
-@wrappergetindex SpaceOperator
+@wrappergetindex SpaceOperator false
 
 # SpaceOperator can change blocks, so we need to override this
 getindex(A::SpaceOperator,KR::BlockRange, JR::BlockRange) = defaultgetindex(A,KR,JR)

test/runtests.jl

@@ -418,6 +418,13 @@ end
         test_matrices(F)
         test_matrices(im*F)
     end
+    @testset "SpaceOperator" begin
+        # somewhat contrived test
+        sp = PointSpace(1:3)
+        M = Multiplication(Fun(sp)) # no spaces attached, so size is undefined (infinite by default)
+        S = ApproxFunBase.SpaceOperator(M, sp, sp)
+        @test size(S) == (3,3)
+    end
 end
 
 @testset "RowVector" begin