Merge pull request #1719 from wsphillips/wsp/hash-discrete-cb

hashing for discrete cb conditions

Author: YingboMa

src/systems/callbacks.jl

@@ -201,7 +201,7 @@ function Base.:(==)(e1::SymbolicDiscreteCallback, e2::SymbolicDiscreteCallback)
     isequal(e1.condition, e2.condition) && isequal(e1.affects, e2.affects)
 end
 function Base.hash(cb::SymbolicDiscreteCallback, s::UInt)
-    s = foldr(hash, cb.condition, init = s)
+    s = hash(cb.condition, s)
     cb.affects isa AbstractVector ? foldr(hash, cb.affects, init = s) : hash(cb.affects, s)
 end
 

test/funcaffect.jl

@@ -16,20 +16,22 @@ i4 = findfirst(==(4.0), sol[:t])
 @test sol.u[i4 + 1][1] > 10.0
 
 # callback
-cb = ModelingToolkit.SymbolicDiscreteCallback([t ~ 0],
+cb = ModelingToolkit.SymbolicDiscreteCallback(t == 0,
                                               (f = affect1!, sts = [], pars = [],
                                                ctx = [1]))
-cb1 = ModelingToolkit.SymbolicDiscreteCallback([t ~ 0], (affect1!, [], [], [1]))
+cb1 = ModelingToolkit.SymbolicDiscreteCallback(t == 0, (affect1!, [], [], [1]))
 @test ModelingToolkit.affects(cb) isa ModelingToolkit.FunctionalAffect
 @test cb == cb1
 @test ModelingToolkit.SymbolicDiscreteCallback(cb) === cb # passthrough
+@test hash(cb) == hash(cb1)
 
 cb = ModelingToolkit.SymbolicContinuousCallback([t ~ 0],
                                                 (f = affect1!, sts = [], pars = [],
                                                  ctx = [1]))
 cb1 = ModelingToolkit.SymbolicContinuousCallback([t ~ 0], (affect1!, [], [], [1]))
 @test cb == cb1
 @test ModelingToolkit.SymbolicContinuousCallback(cb) === cb # passthrough
+@test hash(cb) == hash(cb1)
 
 # named tuple
 sys1 = ODESystem(eqs, t, [u], [], name = :sys,