cloud solve

Author: Affie

.gitignore

@@ -4,3 +4,4 @@
 deps/deps.jl
 docs/build
 Manifest.toml
+dev

Project.toml

@@ -20,10 +20,10 @@ Requires = "ae029012-a4dd-5104-9daa-d747884805df"
 Distributions = "≥ 0.18"
 DocStringExtensions = "≥ 0.7"
 Graphs = "≥ 0.10.3"
+MetaGraphs = "≥ 0.6.4"
 Reexport = "≥ 0.2"
 Requires = "≥ 0.5"
 julia = "0.7, 1"
-MetaGraphs = "≥ 0.6.4"
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

src/CloudGraphsDFG/services/CloudGraphsDFG.jl

@@ -720,6 +720,19 @@ function getSubgraphAroundNode(dfg::CloudGraphsDFG, node::T, distance::Int64=1,
     return addToDFG
 end
 
+function getSubgraphAroundNode(dfg::CloudGraphsDFG{<:AbstractParams}, node::DFGNode, distance::Int64=1, includeOrphanFactors::Bool=false, addToDFG::AbstractDFG=LightGraphsDFG{AbstractParams}())::AbstractDFG
+    distance < 1 && error("getSubgraphAroundNode() only works for distance > 0")
+
+
+    # Thank you Neo4j for 0..* awesomeness!!
+    neighborList = _getLabelsFromCyphonQuery(dfg.neo4jInstance, "(n:$(dfg.userId):$(dfg.robotId):$(dfg.sessionId):$(node.label))-[FACTORGRAPH*0..$distance]-(node:$(dfg.userId):$(dfg.robotId):$(dfg.sessionId))")
+
+    # Copy the section of graph we want
+    _copyIntoGraph!(dfg, addToDFG, neighborList, includeOrphanFactors)
+    return addToDFG
+end
+
+
 """
     $(SIGNATURES)
 Get a deep subgraph copy from the DFG given a list of variables and factors.

src/DistributedFactorGraphs.jl

@@ -75,12 +75,18 @@ function __init__()
         end
     end
 
+#FIXME JT not sure how to handle this
+#=
   @require Neo4j="d2adbeaf-5838-5367-8a2f-e46d570981db" begin
     # Include the Cloudgraphs API
     include("CloudGraphsDFG/CloudGraphsDFG.jl")
   end
+=#
 end
 
+#FIXME JT not sure how to handle this, is it not lightweitgh enought to always include?
+include("CloudGraphsDFG/CloudGraphsDFG.jl")
+
 # not sure where to put
 include("Common.jl")
 include("NeedsAHome.jl")

src/LightGraphsDFG/entities/LightGraphsDFG.jl

@@ -53,3 +53,14 @@ Base.getproperty(x::LightGraphsDFG,f::Symbol) = begin
         getfield(x,f)
     end
 end
+
+"""
+$(TYPEDEF)
+Basic Structure for just the LightGraphs object and keys
+"""
+struct LightGraphsSkeleton
+    G::LightGraphs.SimpleGraph
+    labels::Dict{Symbol, Int}
+end
+
+LightGraphsSkeleton(dfg::LightGraphsDFG) = LightGraphsSkeleton(dfg.g.graph, dfg.g.metaindex[:label])

src/LightGraphsDFG/services/LightGraphsDFG.jl

@@ -531,13 +531,12 @@ end
 Produces a dot-format of the graph for visualization.
 """
 function toDot(dfg::LightGraphsDFG)::String
-    # m = PipeBuffer()
-    # write(m,Graphs.to_dot(dfg.g))
-    # data = take!(m)
-    # close(m)
-    # return String(data)
-	@error "toDot(dfg::LightGraphsDFG) is not sopported yet"
-	return nothing
+	@error "toDot(dfg::LightGraphsDFG) is not sopported yet, see https://github.com/JuliaGraphs/MetaGraphs.jl/issues/86"
+    m = PipeBuffer()
+    MetaGraphs.savedot(m, dfg.g)
+    data = take!(m)
+    close(m)
+    return String(data)
 end
 
 """
@@ -551,11 +550,9 @@ Note
 - Based on graphviz.org
 """
 function toDotFile(dfg::LightGraphsDFG, fileName::String="/tmp/dfg.dot")::Nothing
-    # open(fileName, "w") do fid
-    #     write(fid,Graphs.to_dot(dfg.g))
-    # end
-    # return nothing
-	#TODO
-	@error "toDotFile(dfg::LightGraphsDFG,filename) is not sopported yet"
-	return nothing
+	@error "toDotFile(dfg::LightGraphsDFG,filename) is not sopported yet, see https://github.com/JuliaGraphs/MetaGraphs.jl/issues/86"
+    open(fileName, "w") do fid
+        MetaGraphs.savedot(fid, dfg.g)
+    end
+    return nothing
 end