Started with the basics, add, rem, list working

TODO Connectivity tests

Author: Affie

Project.toml

@@ -9,7 +9,9 @@ Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
 DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
 Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
 JSON2 = "2535ab7d-5cd8-5a07-80ac-9b1792aadce3"
+LightGraphs = "093fc24a-ae57-5d10-9952-331d41423f4d"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
+MetaGraphs = "626554b9-1ddb-594c-aa3c-2596fe9399a5"
 Neo4j = "d2adbeaf-5838-5367-8a2f-e46d570981db"
 Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 Requires = "ae029012-a4dd-5104-9daa-d747884805df"

src/DistributedFactorGraphs.jl

@@ -44,6 +44,9 @@ include("GraphsDFG/GraphsDFG.jl")
 # Include the FilesDFG API.
 include("FileDFG/FileDFG.jl")
 
+# Include the LightGraphs.jl (MetaGraphs.jl) API.
+include("LightGraphsDFG/LightGraphsDFG.jl")
+
 export saveDFG, loadDFG
 
 function __init__()

src/GraphsDFG/services/GraphsDFG.jl

@@ -224,7 +224,7 @@ List the DFGVariables in the DFG.
 Optionally specify a label regular expression to retrieves a subset of the variables.
 """
 function getVariables(dfg::GraphsDFG, regexFilter::Union{Nothing, Regex}=nothing; tags::Vector{Symbol}=Symbol[])::Vector{DFGVariable}
-    variables = map(v -> v.dfgNode, filter(n -> n.dfgNode isa DFGVariable, vertices(dfg.g)))
+    variables = map(v -> v.dfgNode, filter(n -> n.dfgNode isa DFGVariable, Graphs.vertices(dfg.g)))
     if regexFilter != nothing
         variables = filter(v -> occursin(regexFilter, String(v.label)), variables)
     end
@@ -269,7 +269,7 @@ List the DFGFactors in the DFG.
 Optionally specify a label regular expression to retrieves a subset of the factors.
 """
 function getFactors(dfg::GraphsDFG, regexFilter::Union{Nothing, Regex}=nothing)::Vector{DFGFactor}
-	factors = map(v -> v.dfgNode, filter(n -> n.dfgNode isa DFGFactor, vertices(dfg.g)))
+	factors = map(v -> v.dfgNode, filter(n -> n.dfgNode isa DFGFactor, Graphs.vertices(dfg.g)))
 	if regexFilter != nothing
 		factors = filter(f -> occursin(regexFilter, String(f.label)), factors)
 	end

src/LightGraphsDFG/LightGraphsDFG.jl

@@ -0,0 +1,25 @@
+using LightGraphs
+using MetaGraphs
+
+# Imports
+include("entities/LightGraphsDFG.jl")
+# include("services/LightGraphsDFG.jl")
+
+# Exports
+export LightGraphsDFG
+# export exists
+# export getLabelDict, getDescription, setDescription, getInnerGraph, getAddHistory, getSolverParams, setSolverParams
+#
+# export getAddHistory, getDescription, getLabelDict
+# export addVariable!, addFactor!
+# export ls, lsf, getVariables, getFactors, getVariableIds, getFactorIds
+# export getVariable, getFactor
+# export updateVariable!, updateFactor!
+# export deleteVariable!, deleteFactor!
+# export getAdjacencyMatrix
+# export getAdjacencyMatrixDataFrame
+# export getNeighbors
+# export getSubgraphAroundNode
+# export getSubgraph
+# export isFullyConnected, hasOrphans
+# export toDot, toDotFile

src/LightGraphsDFG/entities/LightGraphsDFG.jl

@@ -0,0 +1,43 @@
+# Starting of with Graph.jl implementation. There are a lot of overlap with metagraphs and some data can be moved there.
+"""
+$(TYPEDEF)
+Encapsulation structure for a DFGNode (Variable or Factor) in LightGraphs.jl graph.
+"""
+mutable struct LightGraphsNode
+    index::Int
+    dfgNode::DFGNode
+end
+
+const LFGType = MetaGraph{Int64,Float64}
+
+mutable struct LightGraphsDFG{T <: AbstractParams} <: AbstractDFG
+    g::LFGType
+    description::String
+    userId::String
+    robotId::String
+    sessionId::String
+    #TODO Remove nodeCounter
+    nodeCounter::Int64 #TODO pos 'n paar van die veranderlikes dalk aan na MetaGraphs calls
+    #TODO verander na label vector of gebruik matagrapsh sin
+    labelDict::Dict{Symbol, Int64}
+    addHistory::Vector{Symbol} #TODO: Discuss more - is this an audit trail?
+    solverParams::T # Solver parameters
+end
+
+#TODO? do we not want props such as userId, robotId, sessionId, etc...
+function LightGraphsDFG{T}(g::LFGType=MetaGraph(),
+                           d::String="LightGraphs.jl implementation",
+                           userId::String="User ID",
+                           robotId::String="Robot ID",
+                           sessionId::String="Session ID",
+                           n::Int64=0,
+                           l::Dict{Symbol, Int64}=Dict{Symbol, Int64}(),
+                           a::Vector{Symbol}=Symbol[];
+                           params::T=NoSolverParams()) where T <: AbstractParams
+    set_prop!(g, :description, d)
+    set_prop!(g, :userId, userId)
+    set_prop!(g, :robotId, robotId)
+    set_prop!(g, :sessionId, sessionId)
+    set_indexing_prop!(g, :label)
+    LightGraphsDFG{T}(g, d, userId, robotId, sessionId, n, l, a, params)
+end