Fix comparison of zero NBodyMatrixElements (#19)

* Fix comparison of zero NBodyMatrixElements * Bump version * Update CI config
JuliaAtoms · Sep 12, 2022 · a299d73 · a299d73 · jagot · Sep 12, 2022
1 parent 542da81
commit a299d73
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -13,8 +13,7 @@ jobs:
       matrix:
         version:
           - '1.6'
-          - '1.7'
-          - 'nightly'
+          - '1'
         os:
           - ubuntu-latest
           - macOS-latest

diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "EnergyExpressions"
 uuid = "f4b57a2e-27c7-11e9-0cb0-edd185b706f6"
 authors = ["Stefanos Carlström <[email protected]>"]
-version = "0.1.0"
+version = "0.1.1"
 
 [deps]
 AtomicLevels = "10933b4c-d60f-11e8-1fc6-bd9035a249a1"

diff --git a/src/nbody_matrix_elements.jl b/src/nbody_matrix_elements.jl
@@ -387,6 +387,7 @@ an expression with a reference, generated otherwise. It may not be
 performant. It may also fail on edge cases.
 """
 function compare(a::NBodyMatrixElement, op, b::NBodyMatrixElement; kwargs...)
+    iszero(a) && iszero(b) && return op(0, 0)
     ad,bd = map((a,b)) do o
         od = Dict{Vector{NBodyTermFactor},Number}()
         for term in o.terms

diff --git a/test/nbody_matrix_elements.jl b/test/nbody_matrix_elements.jl
@@ -85,12 +85,18 @@
     @testset "NBodyMatrixElement" begin
         o = one(NBodyMatrixElement)
         z = zero(NBodyMatrixElement)
+        az = convert(NBodyMatrixElement, 0)
+        bz = 0convert(NBodyMatrixElement, 1)
 
         @test o == one(z)
         @test isone(o)
 
         @test z == zero(o)
         @test iszero(z)
+        @test z == az
+        @test z == bz
+        @test z ≈ az
+        @test z ≈ bz
 
 
         h = FieldFreeOneBodyHamiltonian()