Merge pull request #673 from JuliaRobotics/master

v0.10.6-rc1

Author: dehann

Project.toml

@@ -1,6 +1,6 @@
 name = "DistributedFactorGraphs"
 uuid = "b5cc3c7e-6572-11e9-2517-99fb8daf2f04"
-version = "0.10.5"
+version = "0.10.6"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

src/Common.jl

@@ -5,8 +5,13 @@ _getname(t::T) where T = T.name.name
 
 
 convertPackedType(t::Union{T, Type{T}}) where {T <: FunctorInferenceType} = getfield(_getmodule(t), Symbol("Packed$(_getname(t))"))
-convertStructType(::Type{PT}) where {PT <: PackedInferenceType} = getfield(PT.name.module, Symbol(string(PT.name.name)[7:end]))
-
+function convertStructType(::Type{PT}) where {PT <: PackedInferenceType}
+    # see #668 for expanded reasoning.  PT may be ::UnionAll if the type is of template type.
+    ptt = PT isa DataType ? PT.name.name : PT
+    moduleName = PT isa DataType ? PT.name.module : Main
+    symbolName = Symbol(string(ptt)[7:end])
+    getfield(moduleName, symbolName)
+end
 
 ##==============================================================================
 ## Sorting

src/DistributedFactorGraphs.jl

@@ -306,8 +306,8 @@ if get(ENV, "DFG_USE_CGDFG", "") == "true"
 end
 
 function __init__()
-    @warn("BREAKING CHANGE v0.12: deprecating AbstractRelativeFactor, use AbstractRelativeRoots instead")
-    @warn("BREAKING CHANGE v0.12: deprecating AbstractRelativeFactorMinimize, use AbstractRelativeMinimize instead")
+    @warn("BREAKING CHANGE coming to DistributedFactorGraphs v0.12: deprecating AbstractRelativeFactor, use AbstractRelativeRoots instead")
+    @warn("BREAKING CHANGE coming to DistributedFactorGraphs v0.12: deprecating AbstractRelativeFactorMinimize, use AbstractRelativeMinimize instead")
 
     @require GraphPlot = "a2cc645c-3eea-5389-862e-a155d0052231" begin
         @info "Including Plots"

src/services/Serialization.jl

@@ -84,7 +84,16 @@ function getTypeFromSerializationModule(softtypeString::String)
         else
             m = Main
         end
-        return getfield(m, Symbol(split_st[end]))        
+        noparams = split(split_st[end], r"{") 
+        ret = if 1 < length(noparams)
+            # fix #671, but does not work with specific module yet
+            bidx = findfirst(r"{", split_st[end])[1]
+            eval(Base.Meta.parse("Main.$(noparams[1])$(split_st[end][bidx:end])"))
+        else
+            getfield(m, Symbol(split_st[end]))
+        end
+
+        return ret 
 
     catch ex
         @error "Unable to deserialize soft type $(softtypeString)"