|
33 | 33 | ## Compare
|
34 | 34 | ##==============================================================================
|
35 | 35 |
|
36 |
| -function compareField(Allc, Bllc, syms)::Bool |
| 36 | +function compareField(Allc, Bllc, syms) |
37 | 37 | (!isdefined(Allc, syms) && !isdefined(Bllc, syms)) && return true
|
38 | 38 | !isdefined(Allc, syms) && return false
|
39 | 39 | !isdefined(Bllc, syms) && return false
|
40 | 40 | a = getproperty(Allc, syms)
|
41 | 41 | b = getproperty(Bllc, syms)
|
| 42 | + @debug "Comparing field directly a vs b" syms a b |
42 | 43 | if a isa Base.RefValue
|
43 | 44 | return a[] == b[]
|
44 | 45 | else
|
|
72 | 73 | function compareFields( Al::T,
|
73 | 74 | Bl::T;
|
74 | 75 | show::Bool=true,
|
75 |
| - skip::Vector{Symbol}=Symbol[] )::Bool where {T <: Union{Number, AbstractString}} |
| 76 | + skip::Vector{Symbol}=Symbol[] ) where {T <: Union{Number, AbstractString}} |
76 | 77 | #
|
77 | 78 | return Al == Bl
|
78 | 79 | end
|
79 | 80 |
|
80 | 81 | function compareAll(Al::T,
|
81 | 82 | Bl::T;
|
82 | 83 | show::Bool=true,
|
83 |
| - skip::Vector{Symbol}=Symbol[] )::Bool where {T <: Union{AbstractString,Symbol}} |
| 84 | + skip::Vector{Symbol}=Symbol[] ) where {T <: Union{AbstractString,Symbol}} |
84 | 85 | #
|
85 | 86 | return Al == Bl
|
86 | 87 | end
|
87 | 88 |
|
88 | 89 | function compareAll(Al::T,
|
89 | 90 | Bl::T;
|
90 | 91 | show::Bool=true,
|
91 |
| - skip::Vector{Symbol}=Symbol[] )::Bool where {T <: Union{Array{<:Number}, Number}} |
| 92 | + skip::Vector{Symbol}=Symbol[] ) where {T <: Union{Array{<:Number}, Number}} |
92 | 93 | #
|
93 | 94 | (length(Al) != length(Bl)) && return false
|
94 | 95 | return norm(Al - Bl) < 1e-6
|
|
97 | 98 | function compareAll(Al::T,
|
98 | 99 | Bl::T;
|
99 | 100 | show::Bool=true,
|
100 |
| - skip::Vector{Symbol}=Symbol[] )::Bool where {T <: Array} |
| 101 | + skip::Vector{Symbol}=Symbol[] ) where {T <: Array} |
101 | 102 | #
|
102 | 103 | (length(Al) != length(Bl)) && return false
|
103 | 104 | for i in 1:length(Al)
|
|
131 | 132 | function compareAll(Al::T,
|
132 | 133 | Bl::T;
|
133 | 134 | show::Bool=true,
|
134 |
| - skip::Vector{Symbol}=Symbol[] )::Bool where {T <: Dict} |
| 135 | + skip::Vector{Symbol}=Symbol[] ) where {T <: Dict} |
135 | 136 | #
|
136 | 137 | (length(Al) != length(Bl)) && return false
|
137 | 138 | for (id, val) in Al
|
|
0 commit comments