🔀 Merge pull request #18 from robertdj/tensor

🔀 Fix tensorgrid

Project.toml

@@ -1,7 +1,7 @@
 name = "SparseGrids"
 uuid = "bafbe729-afc6-5148-bb4f-226bf3d46895"
 authors = ["Robert DJ <[email protected]>"]
-version = "2.0.1"
+version = "2.0.2"
 
 [deps]
 FastGaussQuadrature = "442a2c76-b920-505d-bb47-c5924d526838"

src/grids.jl

@@ -210,7 +210,7 @@ function tensorgrid(N::Vector, W::Vector, D::Integer)
 	WW = repeat([W], outer=[D; 1])
 
 	tensorN = combvec(NN[:])
-	tensorW = vec(prod(combvec(WW[:]), 1))
+	tensorW = map(prod, combvec(WW[:]))
 
 	return tensorN, tensorW
 end

test/quadtest.jl

@@ -46,20 +46,24 @@ end
 
     @testset "Quadrature rule $generator" for generator in [gausshermite, kpn]
         N, W = sparsegrid(dim, order, generator)
+        Ntensor, Wtensor = tensorgrid(dim, order, generator)
 
         # Maximum degree for which the generator gives correct results
         generator == kpn ? max_degree = dim * order : max_degree = 2 * order - 1
 
 		@testset "Gaussian moments $powers" for powers in even_powers
         	I = gaussmoment(powers) 
-        	Q = gaussquad(powers, N, W)
+        	sparse_quadrature = gaussquad(powers, N, W)
 
         	# Expected test result depends on the total degree
         	if sum(powers) <= max_degree
-        		@test I ≈ Q
+        		@test I ≈ sparse_quadrature
         	else
-        		@test abs(I - Q) > 1e-3
+        		@test abs(I - sparse_quadrature) > 1e-3
         	end
+
+        	tensor_quadrature = gaussquad(powers, Ntensor, Wtensor)
+        	@test I ≈ tensor_quadrature
         end
     end
 end