better isapprox support

Author: matthijscox

src/MAT_types.jl

@@ -173,7 +173,7 @@ function Base.:(==)(m1::MatlabStructArray{N}, m2::MatlabStructArray{N}) where {N
 end
 
 function Base.isapprox(m1::MatlabStructArray, m2::MatlabStructArray; kwargs...)
-    return isequal(m1.names, m2.names) && isapprox(m1.values, m2.values; kwargs...)
+    return isequal(m1.class, m2.class) && isequal(m1.names, m2.names) && isapprox(m1.values, m2.values; kwargs...)
 end
 
 function find_index(m::MatlabStructArray, s::AbstractString)
@@ -312,6 +312,14 @@ Base.iterate(m::MatlabClassObject) = iterate(m.d)
 Base.haskey(m::MatlabClassObject, k) = haskey(m.d, k)
 Base.get(m::MatlabClassObject, k, default) = get(m.d, k, default)
 
+function Base.:(==)(m1::MatlabClassObject, m2::MatlabClassObject)
+    return m1.class == m2.class && m1.d == m2.d
+end
+
+function Base.isapprox(m1::MatlabClassObject, m2::MatlabClassObject; kwargs...)
+    return m1.class == m2.class && dict_isapprox(m1.d, m2.d; kwargs...)
+end
+
 function MatlabStructArray(arr::AbstractArray{MatlabClassObject})
     first_obj, remaining_obj = Iterators.peel(arr)
     class = first_obj.class

test/types.jl

@@ -59,13 +59,15 @@ using Dates
     d_symbol = Array{Dict{Symbol,Any}}(MatlabStructArray(d_arr))
     @test d_symbol[2][:x] == d_arr[2]["x"]
     @test Array(MatlabStructArray(d_symbol)) == d_arr
+    @test s_arr == MatlabStructArray(d_arr)
 
     # class object array conversion
-    s_arr = MatlabStructArray(d_arr, "TestClass")
-    c_arr = Array(s_arr)
+    s_arr_class = MatlabStructArray(d_arr, "TestClass")
+    c_arr = Array(s_arr_class)
     @test c_arr isa Array{MatlabClassObject}
     @test all(c->c.class=="TestClass", c_arr)
-    @test MatlabStructArray(c_arr) == s_arr
+    @test MatlabStructArray(c_arr) == s_arr_class
+    @test s_arr_class != s_arr
 
     # test error of unequal structs
     wrong_sarr = Dict{String, Any}[
@@ -86,15 +88,23 @@ end
     @test haskey(obj, "a")
     @test get(obj, "b", "default") == "default"
 
-    obj["b"] = 7
-    @test obj["b"] == 7
+    obj["b"] = "str"
+    @test obj["b"] == "str"
 
     c_arr = [MatlabClassObject(d, "TestClassOld"), MatlabClassObject(d, "TestClassOld")]
     s_arr = MatlabStructArray(c_arr)
     @test s_arr.class == "TestClassOld"
 
     wrong_arr = [MatlabClassObject(d, "TestClassOld"), MatlabClassObject(d, "Bah")]
     @test_throws ErrorException MatlabStructArray(wrong_arr)
+
+    d2 = deepcopy(obj.d)
+    @test obj == MatlabClassObject(d2, "TestClassOld")
+    @test obj != MatlabClassObject(obj.d, "Banana")
+    d2["a"] = 5.0 + 1e-9
+    @test obj != MatlabClassObject(d2, "TestClassOld")
+    @test obj ≈ MatlabClassObject(d2, "TestClassOld")
+    @test !(obj ≈ MatlabClassObject(d2, "Banana"))
 end
 
 @testset "MatlabOpaque string" begin