some improvements to complex

Author: baggepinnen

src/complex.jl

@@ -1,3 +1,6 @@
+function Base.show(io::IO, p::Complex{<:AbstractParticles})
+    print(io, to_num_str(p, 3))
+end
 
 for PT in (:Particles, :StaticParticles)
     @eval begin
@@ -75,8 +78,8 @@ for ff in (sqrt, exp, sin, cos)
     @eval $(Symbol(f,:!))(s, z::Complex{<: AbstractParticles}) = ℂ2ℂ_function!($f, s, z)
 end
 
-Base.isinf(p::Complex{<: AbstractParticles}) = @show isinf(real(p)) || isinf(imag(p))
-Base.isfinite(p::Complex{<: AbstractParticles}) = @show isfinite(real(p)) && isfinite(imag(p))
+Base.isinf(p::Complex{<: AbstractParticles}) = isinf(real(p)) || isinf(imag(p))
+Base.isfinite(p::Complex{<: AbstractParticles}) = isfinite(real(p)) && isfinite(imag(p))
 
 function Base.:(/)(a::Complex{T}, b::Complex{T}) where T<:AbstractParticles
     are = real(a); aim = imag(a); bre = real(b); bim = imag(b)

src/particles.jl

@@ -124,7 +124,7 @@ function Base.show(io::IO, ::MIME"text/plain", p::AbstractParticles{T,N}) where
     end
 end
 
-function Base.show(io::IO, ::MIME"text/plain", z::Complex{<:AbstractParticles})
+function Base.show(io::IO, z::Complex{<:AbstractParticles})
     r, i = reim(z)
     compact = get(io, :compact, false)
     print(io, "(")
@@ -243,9 +243,9 @@ for PT in ParticleSymbols
         Helper function for performing uncertainty propagation through complex-valued functions with vector inputs.
         Applies  `f : ℝⁿ → Cⁿ` to an array of particles. E.g., `LinearAlgebra.eigvals(p::Matrix{<:AbstractParticles}) = ℝⁿ2ℂⁿ_function(eigvals,p)`
         """
-        function ℝⁿ2ℂⁿ_function(f::F, p::AbstractArray{$PT{T,N}}) where {F,T,N}
+        function ℝⁿ2ℂⁿ_function(f::F, p::AbstractArray{$PT{T,N}}; kwargs...) where {F,T,N}
             individuals = map(1:length(p[1])) do i
-                f(getindex.(p,i))
+                f(getindex.(p,i); kwargs...)
             end
             PRT = $PT{T,N}
             RT = eltype(eltype(individuals))
@@ -558,7 +558,7 @@ LinearAlgebra.norm(x::AbstractParticles, args...) = abs(x)
 
 
 Base.log(p::Matrix{<:AbstractParticles}) = ℝⁿ2ℂⁿ_function(log,p) # Matrix more specific than StridedMatrix used in Base.log
-LinearAlgebra.eigvals(p::Matrix{<:AbstractParticles}) = ℝⁿ2ℂⁿ_function(eigvals,p)
+# LinearAlgebra.eigvals(p::Matrix{<:AbstractParticles}; kwargs...) = ℝⁿ2ℂⁿ_function(eigvals,p; kwargs...) # Replaced with implementation below
 Base.exp(p::AbstractMatrix{<:AbstractParticles}) = ℝⁿ2ℝⁿ_function(exp, p)
 LinearAlgebra.lyap(p1::Matrix{<:AbstractParticles}, p2::Matrix{<:AbstractParticles}) = ℝⁿ2ℝⁿ_function(lyap, p1, p2)
 

test/runtests.jl

@@ -470,8 +470,8 @@ Random.seed!(0)
                                                 0.0 + (1.0 ± 0.0005)*im])) < 0.002
 
         e = eigvals([1 ± 0.001 0; 0 1.])
-        @test e isa Vector{Particles{Float64,DEFAULT_NUM_PARTICLES}}
-        @test e ≈ [1.0 ± 0.00058, 1.0 ± 0.00058]
+        @test e isa Vector{Complex{Particles{Float64, DEFAULT_NUM_PARTICLES}}}
+        @test all(isapprox.(e, [1.0 ± 0.00058, 1.0 ± 0.00058], atol=1e-2))
 
         @test (1 .. 2) isa Particles
         @test std(diff(sort((1 .. 2).particles))) < sqrt(eps())