Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enh/minor polynomial improvements #128

Merged
merged 4 commits into from
Aug 20, 2021
Merged

Enh/minor polynomial improvements #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4d8ef88
Update JuliaFormatter to v0.15.7 and also format ./parse directory
Joel-Dahne Aug 19, 2021
53d9b96
Add isnan and isfinite methods for polynomials and series
Joel-Dahne Aug 19, 2021
12087a2
Add disambiguation methods for series to the power of Rational
Joel-Dahne Aug 19, 2021
521c7cd
Add power methods for number to the power of a series
Joel-Dahne Aug 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/format.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ jobs:
- uses: actions/checkout@v2
- name: Install JuliaFormatter and format
run: |
julia -e 'using Pkg; Pkg.add(PackageSpec(name="JuliaFormatter", version="0.14.1"))'
julia -e 'using JuliaFormatter; format(["./src", "./test"], verbose=true)'
julia -e 'using Pkg; Pkg.add(PackageSpec(name="JuliaFormatter", version="0.15.7"))'
julia -e 'using JuliaFormatter; format(["./src", "./test", "./parse"], verbose=true)'
- name: Format check
run: |
julia -e '
Expand Down
42 changes: 14 additions & 28 deletions parse/parse.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,40 +178,26 @@ function parse_and_generate_arbdoc(arb_doc_dir, out_dir = "src/arbcalls/")
"double arf_get_d(const arf_t x, arf_rnd_t rnd)" => "clashes with arf_get_si",
"slong arf_get_si(const arf_t x, arf_rnd_t rnd)" => "clashes with arf_get_d",
"void arf_print(const arf_t x)" => "clashes with Base.print",
"int arf_mul(arf_t res, const arf_t x, const arf_t y, slong prec, arf_rnd_t rnd)" =>
"defined using #DEFINE in C which doesn't work in Julia",
"int arf_mul(arf_t res, const arf_t x, const arf_t y, slong prec, arf_rnd_t rnd)" => "defined using #DEFINE in C which doesn't work in Julia",
"arb_ptr _arb_vec_init(slong n)" => "clashes with similar method for acb",
"double _arb_vec_estimate_allocated_bytes(slong len, slong prec)" =>
"clashes with similar method for acb",
"double _arb_vec_estimate_allocated_bytes(slong len, slong prec)" => "clashes with similar method for acb",
"void arb_print(const arb_t x)" => "clashes with Base.print",
"int arb_can_round_arf(const arb_t x, slong prec, arf_rnd_t rnd)" =>
"clashes with arb_can_round_mpfr",
"int arb_can_round_mpfr(const arb_t x, slong prec, mpfr_rnd_t rnd)" =>
"clashes with arb_can_round_arf",
"void arb_root(arb_t z, const arb_t x, ulong k, slong prec)" =>
"alias to arb_root_ui",
"int arb_can_round_arf(const arb_t x, slong prec, arf_rnd_t rnd)" => "clashes with arb_can_round_mpfr",
"int arb_can_round_mpfr(const arb_t x, slong prec, mpfr_rnd_t rnd)" => "clashes with arb_can_round_arf",
"void arb_root(arb_t z, const arb_t x, ulong k, slong prec)" => "alias to arb_root_ui",
"acb_ptr _acb_vec_init(slong n)" => "clashes with similar method for arb",
"double _acb_vec_estimate_allocated_bytes(slong len, slong prec)" =>
"clashes with similar method for arb",
"double _acb_vec_estimate_allocated_bytes(slong len, slong prec)" => "clashes with similar method for arb",
"void acb_print(const acb_t x)" => "clashes with Base.print",
"slong arb_poly_length(const arb_poly_t poly)" => "clashes with Base.length",
"void _arb_poly_add(arb_ptr C, arb_srcptr A, slong lenA, arb_srcptr B, slong lenB, slong prec)" =>
"clashes with _arb_vec_add",
"void _arb_poly_sub(arb_ptr C, arb_srcptr A, slong lenA, arb_srcptr B, slong lenB, slong prec)" =>
"clashes with _arb_vec_sub",
"void _arb_poly_add(arb_ptr C, arb_srcptr A, slong lenA, arb_srcptr B, slong lenB, slong prec)" => "clashes with _arb_vec_add",
"void _arb_poly_sub(arb_ptr C, arb_srcptr A, slong lenA, arb_srcptr B, slong lenB, slong prec)" => "clashes with _arb_vec_sub",
"slong acb_poly_length(const acb_poly_t poly)" => "clashes with Base.length",
"void _acb_poly_add(acb_ptr C, acb_srcptr A, slong lenA, acb_srcptr B, slong lenB, slong prec)" =>
"clashes with _acb_vec_add",
"void _acb_poly_sub(acb_ptr C, acb_srcptr A, slong lenA, acb_srcptr B, slong lenB, slong prec)" =>
"clashes with _acb_vec_sub",
"void _acb_poly_elliptic_k_series(acb_ptr res, acb_srcptr z, slong zlen, slong len, slong prec)" =>
"alias to _acb_elliptic_k_series",
"void acb_poly_elliptic_k_series(acb_poly_t res, const acb_poly_t z, slong n, slong prec)" =>
"alias to acb_elliptic_k_series",
"void _acb_poly_elliptic_p_series(acb_ptr res, acb_srcptr z, slong zlen, const acb_t tau, slong len, slong prec)" =>
"alias to _acb_elliptic_p_series",
"void acb_poly_elliptic_p_series(acb_poly_t res, const acb_poly_t z, const acb_t tau, slong n, slong prec)" =>
"alias to acb_elliptic_p_series",
"void _acb_poly_add(acb_ptr C, acb_srcptr A, slong lenA, acb_srcptr B, slong lenB, slong prec)" => "clashes with _acb_vec_add",
"void _acb_poly_sub(acb_ptr C, acb_srcptr A, slong lenA, acb_srcptr B, slong lenB, slong prec)" => "clashes with _acb_vec_sub",
"void _acb_poly_elliptic_k_series(acb_ptr res, acb_srcptr z, slong zlen, slong len, slong prec)" => "alias to _acb_elliptic_k_series",
"void acb_poly_elliptic_k_series(acb_poly_t res, const acb_poly_t z, slong n, slong prec)" => "alias to acb_elliptic_k_series",
"void _acb_poly_elliptic_p_series(acb_ptr res, acb_srcptr z, slong zlen, const acb_t tau, slong len, slong prec)" => "alias to _acb_elliptic_p_series",
"void acb_poly_elliptic_p_series(acb_poly_t res, const acb_poly_t z, const acb_t tau, slong n, slong prec)" => "alias to acb_elliptic_p_series",
)

for filename in filenames
Expand Down
14 changes: 14 additions & 0 deletions src/poly.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,12 +465,26 @@ function Base.:^(p::ArbSeries, e::Number)
res = AcbSeries(p)
return pow_acb_series!(res, res, convert(Acb, e), length(p))
end
function Base.:^(x::Real, p::ArbSeries)
res = ArbSeries(x, degree = degree(p), prec = precision(p))
return pow_series!(res, res, p, length(p))
end
function Base.:^(x::Number, p::ArbSeries)
res = AcbSeries(x, degree = degree(p), prec = precision(p))
return pow_series!(res, res, AcbSeries(p), length(p))
end

Base.:^(p::AcbSeries, e::Number) = pow_acb_series!(zero(p), p, convert(Acb, e), length(p))
function Base.:^(x::Number, p::AcbSeries)
res = AcbSeries(x, degree = degree(p), prec = precision(p))
return pow_series!(res, res, p, length(p))
end

# Disambiguation
Base.:^(p::ArbSeries, e::Integer) = pow_arb_series!(zero(p), p, convert(Arb, e), length(p))
Base.:^(p::AcbSeries, e::Integer) = pow_acb_series!(zero(p), p, convert(Acb, e), length(p))
Base.:^(p::ArbSeries, e::Rational) = pow_arb_series!(zero(p), p, convert(Arb, e), length(p))
Base.:^(p::AcbSeries, e::Rational) = pow_acb_series!(zero(p), p, convert(Acb, e), length(p))

##
## Series methods
Expand Down
5 changes: 5 additions & 0 deletions src/predicates.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,11 @@ end
Base.isnan(x::ArbOrRef) = isnan(midref(x))
Base.isnan(x::AcbOrRef) = isnan(midref(realref(x))) || isnan(midref(imagref(x)))

Base.isnan(p::Union{ArbPoly,ArbSeries,AcbPoly,AcbSeries}) =
any(isnan, @inbounds p[i] for i = 0:degree(p))
Base.isfinite(p::Union{ArbPoly,ArbSeries,AcbPoly,AcbSeries}) =
all(isfinite, @inbounds p[i] for i = 0:degree(p))

for ArbT in (ArfLike, ArbLike, AcbLike)
@eval begin
Base.isequal(y::$ArbT, x::$ArbT) = !iszero(equal(x, y))
Expand Down
17 changes: 17 additions & 0 deletions test/predicates-test.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,23 @@
@test !isnan(zero(Acb))
@test !isnan(one(Acb))
@test !isnan(Acb(Inf))

for T in [ArbPoly, ArbSeries, AcbPoly, AcbSeries]
@test isnan(T(NaN))
@test isnan(T([NaN, 0]))
@test isnan(T([0, NaN]))
@test !isnan(T(1))
@test !isnan(T([0, 1]))

@test isfinite(T(1))
@test isfinite(T([0, 1]))
@test !isfinite(T(NaN))
@test !isfinite(T([NaN, 0]))
@test !isfinite(T([0, NaN]))
@test !isfinite(T(Inf))
@test !isfinite(T([Inf, 0]))
@test !isfinite(T([0, Inf]))
end
end

@testset "isequal" begin
Expand Down
13 changes: 11 additions & 2 deletions test/series.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,11 +228,20 @@

@test p^q == TSeries([1, 4, 16])

@test p^T(2) == p^Int(2) == p^UInt(2) == p^2.0 == p^2 == TSeries([1, 4, 10])
@test p^T(-1) == p^Int(-1) == p^-1.0 == p^-1 == TSeries([1, -2, 1])
@test p^T(2) ==
p^Int(2) ==
p^UInt(2) ==
p^(2 // 1) ==
p^2.0 ==
p^2 ==
TSeries([1, 4, 10])
@test p^T(-1) == p^Int(-1) == p^(-1 // 1) == p^-1.0 == p^-1 == TSeries([1, -2, 1])

@test p^(2 + 2im) == AcbSeries([1, 4 + 4im, 2 + 18im])

@test 2^TSeries([1, 0]) == TSeries([2, 0])
@test (2 + im)^TSeries([1, 0]) == AcbSeries([2 + im, 0])

@test precision(setprecision(p, 80)^setprecision(q, 90)) == 90
@test precision(setprecision(p, 80)^T(2)) == 80
end
Expand Down