relax compare types for NamedTuple case

Author: dehann

Project.toml

@@ -46,7 +46,8 @@ GraphPlot = "a2cc645c-3eea-5389-862e-a155d0052231"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Manifolds = "1cead3c2-87b3-11e9-0ccd-23c62b72b94e"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
+Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Test", "GraphPlot", "LinearAlgebra", "Manifolds", "Pkg"]
+test = ["Test", "GraphPlot", "LinearAlgebra", "Manifolds", "Pkg", "Statistics"]

src/services/CompareUtils.jl

@@ -130,12 +130,15 @@ function compareAll(Al::T,
   return true
 end
 
-function compareAll(Al::T, Bl::T; show::Bool=true, skip::Vector{Symbol}=Symbol[]) where T
-  @debug "Comparing types $T:"
+function compareAll(Al::T1, Bl::T2; show::Bool=true, skip::Vector{Symbol}=Symbol[]) where {T1,T2}
+  @debug "Comparing types $T1, $T2"
+  if T1 != T2
+    @warn "Types are different" T1 T2
+  end
   # @debug "  Al = $Al"
   # @debug "  Bl = $Bl"
   !compareFields(Al, Bl, show=show, skip=skip) && return false
-  for field in fieldnames(T)
+  for field in fieldnames(T1)
     field in skip && continue
     @debug("  Checking field: $field")
     (!isdefined(Al, field) && !isdefined(Al, field)) && return true
@@ -236,8 +239,14 @@ function compareFactor(A::DFGFactor,
                        skipsamples::Bool=true,
                        skipcompute::Bool=true  )
   #
-  skip_ = 
-  TP =  compareAll(A, B, skip=union([:attributes;:solverData;:_variableOrderSymbols;:_gradients],skip), show=show)
+  skip_ = union([:attributes;:solverData;:_variableOrderSymbols;:_gradients],skip)
+  TP =  compareAll(A, B, skip=skip_, show=show)
+  # TP =  compareAll(A.label, B.label, skip=skip_, show=show)
+  # TP =  compareAll(A.timestamp, B.timestamp, skip=skip_, show=show)
+  # TP =  compareAll(A.nstime, B.nstime, skip=skip_, show=show)
+  # TP =  compareAll(A.tags, B.tags, skip=skip_, show=show)
+  # TP =  compareAll(A.solvable, B.solvable, skip=skip_, show=show)
+  # TP =  compareAll(A._variableOrderSymbols, B._variableOrderSymbols, skip=skip_, show=show)
   # TP = TP & compareAll(A.attributes, B.attributes, skip=[:data;], show=show)
   TP = TP & compareAllSpecial(getSolverData(A), getSolverData(B), skip=union([:fnc;:_gradients], skip), show=show)
   if :fnc in skip