Merge pull request #94 from bowenszhu/nw-EmptyQuad

Avoid construction of `EmptyQuad`
SciML · Nov 13, 2022 · 2a4c89f · 2a4c89f
2 parents 5a94c97 + 5d9eedb
commit 2a4c89f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/auxfuns.jl b/src/auxfuns.jl
@@ -23,7 +23,7 @@ nw(mop::MultiOrthoPoly)
 ```
 returns nodes and weights in matrix form
 """
-nw(quad::typeof(EmptyQuad())) = Array{Float64}(undef, 0, 2)
+nw(::EmptyQuad) = Array{Float64}(undef, 0, 2)
 
 function nw(quad::AbstractQuad)
  [quad.nodes quad.weights]
@@ -89,7 +89,7 @@ function integrate(f::Function, nodes::AbstractVector{<:Real},
 end
 
 function integrate(f::Function, quad::AbstractQuad)
- typeof(quad) == typeof(EmptyQuad()) &&
+ quad isa EmptyQuad &&
  throw(DomainError(quad, "supplied an empty quadrature"))
  integrate(f, quad.nodes, quad.weights)
 end

diff --git a/src/tensor.jl b/src/tensor.jl
@@ -29,13 +29,13 @@ function computeTensorizedSP(m::Integer, op::AbstractVector, ind::AbstractMatrix
 end
 
 function computeTensorizedSP(m::Integer, mop::MultiOrthoPoly)
- any([typeof(op.quad) == typeof(EmptyQuad()) for op in mop.uni]) &&
+ any(op.quad isa EmptyQuad for op in mop.uni) &&
  throw(InconsistencyError("at least one quadrature rule missing"))
  computeTensorizedSP(m, mop.uni, mop.ind)
 end
 
 function computeTensorizedSP(m::Integer, op::AbstractOrthoPoly)
- typeof(op.quad) == typeof(EmptyQuad()) &&
+ op.quad isa EmptyQuad &&
  throw(InconsistencyError("no quadrature rule provided"))
  computeTensorizedSP(m, [op], calculateMultiIndices(1, deg(op)))
 end