Merge branch 'master' into release/v0.10

Author: dehann

Project.toml

@@ -1,6 +1,6 @@
 name = "DistributedFactorGraphs"
 uuid = "b5cc3c7e-6572-11e9-2517-99fb8daf2f04"
-version = "0.10.8"
+version = "0.10.9"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
@@ -36,7 +36,7 @@ Pkg = "1.4, 1.5"
 Reexport = "0.2, 0.3, 0.4, 0.5, 1"
 Requires = "0.5, 0.6, 0.7, 0.8, 0.9, 0.10, 1"
 TimeZones = "1.3.1"
-Unmarshal = "= 0.4.0"
+Unmarshal = "0.4"
 julia = "1.2"
 
 [extras]

src/DistributedFactorGraphs.jl

@@ -232,6 +232,9 @@ export @defVariable
 export saveDFG, loadDFG!, loadDFG
 export toDot, toDotFile
 
+# shortest path
+export findShortestPathDijkstra
+
 # Comparisons
 export
     compare,

src/LightDFG/LightDFG.jl

@@ -45,7 +45,8 @@ import ...DistributedFactorGraphs:  setSolverParams!,
                                     getBiadjacencyMatrix,
                                     _getDuplicatedEmptyDFG,
                                     toDot,
-                                    toDotFile
+                                    toDotFile,
+                                    findShortestPathDijkstra
 
 include("FactorGraphs/FactorGraphs.jl")
 using .FactorGraphs

src/LightDFG/services/LightDFG.jl

@@ -359,3 +359,55 @@ function toDot(dfg::LightDFG)::String
     close(m)
     return String(data)
 end
+
+
+"""
+    $SIGNATURES
+
+Speciallized function available to only LightDFG at this time.
+
+Example
+```julia
+using IncrementalInference
+
+# canonical example graph as example
+fg = generateCanonicalFG_Kaess()
+
+@show path = findShortestPathDijkstra(fg, :x1, :x3)
+@show isVariable.(path)
+@show isFactor.(path)
+```
+
+DevNotes
+- # TODO expand to other AbstractDFG entities.
+
+Related
+
+[findFactorsBetweenNaive](@ref), `LightGraphs.dijkstra_shortest_paths`
+"""
+function findShortestPathDijkstra(  dfg::LightDFG, 
+                                    from::Symbol,
+                                    to::Symbol  )
+  #
+  # LightDFG internally uses Integers 
+  frI = dfg.g.labels[from]
+  toI = dfg.g.labels[to]
+  
+  path = LightGraphs.dijkstra_shortest_paths(dfg.g.graph, [toI;])
+  
+  # assemble into the list
+  dijkpath = Symbol[]
+  # test for connectivity
+  if path.dists[frI] < Inf
+    cursor = frI
+    push!(dijkpath, dfg.g.labels[cursor])
+    # walk the path
+    while cursor != toI
+      cursor = path.parents[cursor]
+      push!(dijkpath, dfg.g.labels[cursor])
+    end
+  end
+
+  # return the list of symbols
+  return dijkpath
+end

src/services/AbstractDFG.jl

@@ -1021,6 +1021,9 @@ end
 ## Automated Graph Searching
 ##==============================================================================
 
+
+function findShortestPathDijkstra end
+
 """
     $SIGNATURES
 
@@ -1029,7 +1032,11 @@ Relatively naive function counting linearly from-to
 DevNotes
 - Convert to using LightGraphs shortest path methods instead.
 """
-function findFactorsBetweenNaive(dfg::AbstractDFG, from::Symbol, to::Symbol, assertSingles::Bool=false)
+function findFactorsBetweenNaive(   dfg::AbstractDFG, 
+                                    from::Symbol,
+                                    to::Symbol, 
+                                    assertSingles::Bool=false)
+  #
   @info "findFactorsBetweenNaive is naive linear number method -- improvements welcome"
   SRT = getVariableLabelNumber(from)
   STP = getVariableLabelNumber(to)

src/services/Serialization.jl

@@ -88,7 +88,8 @@ function getTypeFromSerializationModule(softtypeString::String)
         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])"))
+            Core.eval(m, Base.Meta.parse("$(noparams[1])$(split_st[end][bidx:end])"))
+            # eval(Base.Meta.parse("Main.$(noparams[1])$(split_st[end][bidx:end])"))
         else
             getfield(m, Symbol(split_st[end]))
         end