Compare nan (#347)

* close issue #346 * version bump
JuliaPy · May 23, 2020 · b6c85ed · b6c85ed · jverzani · May 28, 2020
1 parent 6ddb9ba
commit b6c85ed
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,6 +1,6 @@
 name = "SymPy"
 uuid = "24249f21-da20-56a4-8eb1-6a02cf4ae2e6"
-version = "1.0.20"
+version = "1.0.21"
 
 
 [deps]

diff --git a/src/generic.jl b/src/generic.jl
@@ -10,9 +10,9 @@ iterate(x::Sym) = (x.__pyobject__, 0)
 iterate(x::Sym, state) = nothing
 
 
-Base.isless(a::Sym, b::Sym) = sympy.Lt(a,b) == True
-Base.isless(a::Sym, b::Number) = sympy.Lt(promote(a,b)...) == True
-Base.isless(a::Number, b::Sym) = sympy.Lt(promote(a,b)...) == True
+Base.isless(a::Sym, b::Sym) = (a != sympy.nan && b != sympy.nan) && sympy.Lt(a,b) == True
+Base.isless(a::Sym, b::Number) = isless(promote(a,b)...)
+Base.isless(a::Number, b::Sym) = isless(promote(a,b)...)
 
 Base.isequal(a::Sym, b::Sym) = Eq(a,b) == True
 Base.isequal(a::Sym, b::Number) = Eq(promote(a,b)...) == True

diff --git a/test/test-math.jl b/test/test-math.jl
@@ -37,3 +37,14 @@ using SpecialFunctions
     @test eps(Sym) == 0
     #@test rewrite(sinc(x), "jn") == jn(0, PI * x)
 end
+
+@testset  "nan"  begin
+    #  issue  346
+    a=sympy.nan
+    a′ = NaN
+
+    @test (a < 0) == (a′ < 0)
+    @test (a > 0) == (a′ > 0)
+    @test (a == 0) == (a′ == 0)
+
+end