Generalize arguments of Summed (#18)

Author: mtfishman

Project.toml

@@ -1,7 +1,7 @@
 name = "MapBroadcast"
 uuid = "ebd9b9da-f48d-417c-9660-449667d60261"
 authors = ["ITensor developers <[email protected]> and contributors"]
-version = "0.1.10"
+version = "0.1.11"
 
 [deps]
 BlockArrays = "8e7c35d0-a365-5155-bbbb-fb81a777f24e"

src/linearcombination.jl

@@ -7,7 +7,7 @@ function (f::LinearCombination)(args...)
   return mapreduce(*,+,coefficients(f),args)
 end
 
-struct Summed{Style,N,C<:NTuple{N},A<:NTuple{N}}
+struct Summed{Style,N,C<:NTuple{N,Any},A<:NTuple{N,Any}}
   style::Style
   coefficients::C
   arguments::A

test/test_basics.jl

@@ -77,46 +77,71 @@ end
 
 @testset "Summed" begin
   elt = Float64
+
   a1 = randn(elt, 2, 2)
   a2 = randn(elt, 2, 2)
-
   s = Summed(a1)
   @test arguments(s) ≡ (a1,)
   @test coefficients(s) ≡ (one(elt),)
 
+  a1 = randn(elt, 2, 2)
+  a2 = randn(elt, 2, 2)
   s = -Summed(a1)
   @test arguments(s) ≡ (a1,)
   @test coefficients(s) ≡ (-one(elt),)
 
+  a1 = randn(elt, 2, 2)
+  a2 = randn(elt, 2, 2)
   s = 2 * Summed(a1)
   @test arguments(s) ≡ (a1,)
   @test coefficients(s) ≡ (2 * one(elt),)
 
+  a1 = randn(elt, 2, 2)
+  a2 = randn(elt, 2, 2)
   s = Summed(a1) * 2
   @test arguments(s) ≡ (a1,)
   @test coefficients(s) ≡ (2 * one(elt),)
 
+  a1 = randn(elt, 2, 2)
+  a2 = randn(elt, 2, 2)
   s = Summed(a1) / 2
   @test arguments(s) ≡ (a1,)
   @test coefficients(s) ≡ (one(elt) / 2,)
 
+  a1 = randn(elt, 2, 2)
+  a2 = randn(elt, 2, 2)
   s = 2 * Summed(a1) + 3 * Summed(a2)
   @test arguments(s) ≡ (a1, a2)
   @test coefficients(s) ≡ (2 * one(elt), 3 * one(elt))
 
+  a1 = randn(elt, 2, 2)
+  a2 = randn(elt, 2, 2)
   s = 2 * Summed(a1) - 3 * Summed(a2)
   @test arguments(s) ≡ (a1, a2)
   @test coefficients(s) ≡ (2 * one(elt), -3 * one(elt))
 
+  a1 = randn(elt, 2, 2)
+  a2 = randn(elt, 2, 2)
   s = 4 * (2 * Summed(a1) + 3 * Summed(a2))
   @test arguments(s) ≡ (a1, a2)
   @test coefficients(s) ≡ (8 * one(elt), 12 * one(elt))
 
+  a1 = randn(elt, 2, 2)
+  a2 = randn(elt, 2, 2)
   @test Summed(a1) + a2 ≡ Summed(a1) + Summed(a2)
   @test Summed(a1) - a2 ≡ Summed(a1) - Summed(a2)
   @test a1 + Summed(a2) ≡ Summed(a1) + Summed(a2)
   @test a1 - Summed(a2) ≡ Summed(a1) - Summed(a2)
 
+  # Regression test mixed types
+  a1 = [1, 2]
+  a2 = [1.0, 2.0]
+  s = Summed(a1) + Summed(a2)
+  @test arguments(s) ≡ (a1, a2)
+  @test coefficients(s) ≡ (1, 1.0)
+
+  a1 = randn(elt, 2, 2)
+  a2 = randn(elt, 2, 2)
   s = 2 * Summed(a1) + 3 * Summed(a2)
   @test arguments(s) ≡ (a1, a2)
   @test coefficients(s) ≡ (2 * one(elt), 3 * one(elt))
@@ -137,6 +162,9 @@ end
   @test copyto!(similar(s), s) ≈ 2 * a1 + 3 * a2
   @test s[1, 2] ≈ 2 * a1[1, 2] + 3 * a2[1, 2]
 
+  a1 = randn(elt, 2, 2)
+  a2 = randn(elt, 2, 2)
+  s = 2 * Summed(a1) + 3 * Summed(a2)
   @test Broadcasted(s) isa Broadcasted
   @test Broadcasted(s).style ≡ BroadcastStyle(typeof(a1))
   @test Broadcasted(s).f ≡ LinearCombination(s)