Merge pull request #731 from JuliaRobotics/bugfix/21Q1/fixesforj1.6beta

Bugfixes for julia 1.6.0-beta1

Author: Affie

src/services/AbstractDFG.jl

@@ -632,7 +632,7 @@ end
 
 function ls(dfg::G, ::Type{T}) where {G <: AbstractDFG, T <: FunctorInferenceType}
   xx = getFactors(dfg)
-  names = getfield.(typeof.(getFactorType.(xx)), :name) .|> Symbol
+  names = typeof.(getFactorType.(xx)) .|> nameof
   vxx = view(xx, names .== Symbol(T))
   map(x->x.label, vxx)
 end
@@ -694,7 +694,7 @@ function lsWho(dfg::AbstractDFG, type::Symbol)
     vars = getVariables(dfg)
     labels = Symbol[]
     for v in vars
-        varType = typeof(getVariableType(v)).name |> Symbol
+        varType = typeof(getVariableType(v)) |> nameof
         varType == type && push!(labels, v.label)
     end
     return labels
@@ -721,7 +721,7 @@ function lsfWho(dfg::AbstractDFG, type::Symbol)
     facs = getFactors(dfg)
     labels = Symbol[]
     for f in facs
-        facType = typeof(getFactorType(f)).name |> Symbol
+        facType = typeof(getFactorType(f)) |> nameof
         facType == type && push!(labels, f.label)
     end
     return labels
@@ -740,7 +740,7 @@ function lsTypes(dfg::AbstractDFG)
     vars = getVariables(dfg)
     alltypes = Set{Symbol}()
     for v in vars
-        varType = typeof(getVariableType(v)).name |> Symbol
+        varType = typeof(getVariableType(v)) |> nameof
         push!(alltypes, varType)
     end
     return collect(alltypes)
@@ -756,7 +756,7 @@ function lsTypesDict(dfg::AbstractDFG)
     vars = getVariables(dfg)
     alltypes = Dict{Symbol,Vector{Symbol}}()
     for v in vars
-        varType = typeof(getVariableType(v)).name |> Symbol
+        varType = typeof(getVariableType(v)) |> nameof
         d = get!(alltypes, varType, Symbol[])
         push!(d, v.label)
     end
@@ -772,7 +772,7 @@ function lsfTypes(dfg::AbstractDFG)
     facs = getFactors(dfg)
     alltypes = Set{Symbol}()
     for f in facs
-        facType = typeof(getFactorType(f)).name |> Symbol
+        facType = typeof(getFactorType(f)) |> nameof
         push!(alltypes, facType)
     end
     return collect(alltypes)
@@ -787,7 +787,7 @@ function lsfTypesDict(dfg::AbstractDFG)
     facs = getFactors(dfg)
     alltypes = Dict{Symbol,Vector{Symbol}}()
     for f in facs
-        facType = typeof(getFactorType(f)).name |> Symbol
+        facType = typeof(getFactorType(f)) |> nameof
         d = get!(alltypes, facType, Symbol[])
         push!(d, f.label)
     end
@@ -1099,7 +1099,7 @@ Related
 function isPathFactorsHomogeneous(dfg::AbstractDFG, from::Symbol, to::Symbol)
     # FIXME, must consider all paths, not just shortest...
     pth = intersect(findShortestPathDijkstra(dfg, from, to), lsf(dfg))
-    types = getFactorType.(dfg, pth) .|> typeof .|> x->(x).name
+    types = getFactorType.(dfg, pth) .|> typeof .|> nameof
     utyp = unique(types)
     (length(utyp) == 1), utyp
 end

test/interfaceTests.jl

@@ -63,7 +63,14 @@ end
     @test printFactor(fac1) === nothing
 
     @test printVariable(iobuf, var1, skipfields=[:timestamp, :solver, :ppe, :nstime]) === nothing
-    @test String(take!(iobuf)) == "DFGVariable{TestVariableType1}\nlabel:\n:a\ntags:\nSet([:VARIABLE, :POSE])\nsmallData:\nDict{Symbol,Union{Bool, Float64, Int64, Array{Bool,1}, Array{Float64,1}, Array{Int64,1}, Array{String,1}, String}}(:small=>\"data\")\ndataDict:\nDict{Symbol,AbstractDataEntry}()\nsolvable:\n0\n"
+    
+    if VERSION < v"1.6.0-beta1"
+        # for julia < v1.6
+        @test String(take!(iobuf)) == "DFGVariable{TestVariableType1}\nlabel:\n:a\ntags:\nSet([:VARIABLE, :POSE])\nsmallData:\nDict{Symbol,Union{Bool, Float64, Int64, Array{Bool,1}, Array{Float64,1}, Array{Int64,1}, Array{String,1}, String}}(:small=>\"data\")\ndataDict:\nDict{Symbol,AbstractDataEntry}()\nsolvable:\n0\n"
+    else
+        # for julia v1.6
+        @test String(take!(iobuf)) == "DFGVariable{TestVariableType1}\nlabel:\n:a\ntags:\nSet([:VARIABLE, :POSE])\nsmallData:\nDict{Symbol, Union{Bool, Float64, Int64, Vector{Bool}, Vector{Float64}, Vector{Int64}, Vector{String}, String}}(:small=>\"data\")\ndataDict:\nDict{Symbol, AbstractDataEntry}()\nsolvable:\n0\n"   
+    end
 
     @test printVariable(iobuf, var1, short=true) === nothing
     varstr = String(take!(iobuf))

test/testBlocks.jl

@@ -1409,8 +1409,8 @@ function ProducingDotFiles(testDFGAPI,
     #NOTE hardcoded toDot will have different results so test LightGraphs seperately
     if testDFGAPI <: LightDFG || testDFGAPI <: CloudGraphsDFG
         todotstr = toDot(dotdfg)
-        todota = todotstr == "graph G {\na [color=red, shape=ellipse];\nb [color=red, shape=ellipse];\nabf1 [color=blue, shape=box];\na -- abf1\nb -- abf1\n}\n"
-        todotb = todotstr == "graph G {\na [color=red, shape=ellipse];\nb [color=red, shape=ellipse];\nabf1 [color=blue, shape=box];\nb -- abf1\na -- abf1\n}\n"
+        todota = todotstr == "graph G {\na [color=red, shape=ellipse];\nb [color=red, shape=ellipse];\nabf1 [color=blue, shape=box, fontsize=8, fixedsize=false, height=0.1, width=0.1];\na -- abf1\nb -- abf1\n}\n"
+        todotb = todotstr == "graph G {\na [color=red, shape=ellipse];\nb [color=red, shape=ellipse];\nabf1 [color=blue, shape=box, fontsize=8, fixedsize=false, height=0.1, width=0.1];\nb -- abf1\na -- abf1\n}\n"
         @test (todota || todotb)
     else
         @test toDot(dotdfg) == "graph graphname {\n2 [\"label\"=\"b\",\"shape\"=\"ellipse\",\"fillcolor\"=\"red\",\"color\"=\"red\"]\n2 -- 3\n3 [\"label\"=\"abf1\",\"shape\"=\"box\",\"fillcolor\"=\"blue\",\"color\"=\"blue\"]\n1 [\"label\"=\"a\",\"shape\"=\"ellipse\",\"fillcolor\"=\"red\",\"color\"=\"red\"]\n1 -- 3\n}\n"