Skip to content

Commit 6505233

Browse files
authored
Merge pull request #550 from JuliaSymbolics/s/fix-Rational-div
Fix div with rational numbers to fix simplify_fractions
2 parents 7c28c42 + 7737865 commit 6505233

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

src/polyform.jl

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,15 @@ end
8181
# forward gcd
8282

8383
PF = :(PolyForm{promote_symtype(/, symtype(x), symtype(y))})
84+
const FriendlyCoeffType = Union{Integer, Rational}
8485
@eval begin
8586
Base.div(x::PolyForm, y::PolyForm) = $PF(div(x.p, y.p), mix_dicts(x, y)...)
86-
Base.div(x::Integer, y::PolyForm) = $PF(div(x, y.p), y.pvar2sym, y.sym2term)
87-
Base.div(x::PolyForm, y::Integer) = $PF(div(x.p, y), x.pvar2sym, x.sym2term)
87+
Base.div(x::FriendlyCoeffType, y::PolyForm) = $PF(div(x, y.p), y.pvar2sym, y.sym2term)
88+
Base.div(x::PolyForm, y::FriendlyCoeffType) = $PF(div(x.p, y), x.pvar2sym, x.sym2term)
8889

8990
Base.gcd(x::PolyForm, y::PolyForm) = $PF(_gcd(x.p, y.p), mix_dicts(x, y)...)
90-
Base.gcd(x::Integer, y::PolyForm) = $PF(_gcd(x, y.p), y.pvar2sym, y.sym2term)
91-
Base.gcd(x::PolyForm, y::Integer) = $PF(_gcd(x.p, y), x.pvar2sym, x.sym2term)
91+
Base.gcd(x::FriendlyCoeffType, y::PolyForm) = $PF(_gcd(x, y.p), y.pvar2sym, y.sym2term)
92+
Base.gcd(x::PolyForm, y::FriendlyCoeffType) = $PF(_gcd(x.p, y), x.pvar2sym, x.sym2term)
9293
end
9394

9495
_isone(p::PolyForm) = isone(p.p)

test/polyform.jl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ end
6363
##404#issuecomment-939404030
6464
a = 1 / (x - (2//1)) + ((-5//1) - x) / ((x - (2//1))^2)
6565
@test isequal(simplify_fractions(a), -7/(x-2)^2)
66+
67+
# https://github.com/JuliaSymbolics/Symbolics.jl/issues/968
68+
@eqtest simplify_fractions((x * y + (1//2) * x) / (2 * x)) == 1//4 * (1 + 2y)
6669
end
6770

6871
@testset "isone iszero" begin

0 commit comments

Comments
 (0)