Rename light graphs (#87)

* LightGraphsDFG -> MetaGraphsDFG name change
It makes more sense as a name and makes space for LightDFG name (directly based on LightGraphs).

Author: Affie

src/CloudGraphsDFG/services/CloudGraphsDFG.jl

@@ -720,7 +720,7 @@ function getSubgraphAroundNode(dfg::CloudGraphsDFG, node::DFGNode, distance::Int
     return addToDFG
 end
 
-function getSubgraphAroundNode(dfg::CloudGraphsDFG{<:AbstractParams}, node::DFGNode, distance::Int64, includeOrphanFactors::Bool, addToDFG::LightGraphsDFG{AbstractParams})::AbstractDFG
+function getSubgraphAroundNode(dfg::CloudGraphsDFG{<:AbstractParams}, node::DFGNode, distance::Int64, includeOrphanFactors::Bool, addToDFG::MetaGraphsDFG{AbstractParams})::AbstractDFG
     distance < 1 && error("getSubgraphAroundNode() only works for distance > 0")
 
 

src/DFGPlots/DFGPlots.jl

@@ -28,7 +28,7 @@ DFGPlotProps() = DFGPlotProps(  (var=colorant"seagreen", fac=colorant"cyan3"),
                                 true)
 
 
-function dfgplot(dfg::LightGraphsDFG)
+function dfgplot(dfg::MetaGraphsDFG)
 
     nodesize = [has_prop(dfg.g,i,:factor) ? 0.3 : 1.0 for i=vertices(dfg.g)]
     nodelabel = [has_prop(dfg.g,i,:factor) ? "" : string(get_prop(dfg.g,i,:label)) for i=vertices(dfg.g)]
@@ -38,14 +38,14 @@ function dfgplot(dfg::LightGraphsDFG)
 
 end
 
-function gplot(dfg::LightGraphsDFG; keyargs...)
+function gplot(dfg::MetaGraphsDFG; keyargs...)
     gplot(dfg.g; keyargs...)
 end
 
 function dfgplot(dfg::AbstractDFG)
     # TODO implement convert functions
     @warn "TODO Implement convert"
-    ldfg = LightGraphsDFG{AbstractParams}()
+    ldfg = MetaGraphsDFG{AbstractParams}()
     DistributedFactorGraphs._copyIntoGraph!(dfg, ldfg, union(getVariableIds(dfg), getFactorIds(dfg)), true)
 
     nodesize = [has_prop(ldfg.g,i,:factor) ? 0.3 : 1.0 for i=vertices(ldfg.g)]

src/DistributedFactorGraphs.jl

@@ -50,7 +50,7 @@ include("GraphsDFG/GraphsDFG.jl")
 include("FileDFG/FileDFG.jl")
 
 # Include the LightGraphs.jl (MetaGraphs.jl) API.
-include("LightGraphsDFG/LightGraphsDFG.jl")
+include("MetaGraphsDFG/MetaGraphsDFG.jl")
 
 include("SymbolDFG/SymbolDFG.jl")
 @reexport using .SymbolDFGs
@@ -69,7 +69,7 @@ function __init__()
             Rows are all factors, columns are all variables, and each cell contains either nothing or the symbol of the relating factor.
             The first column is the factor headings.
             """
-            function getAdjacencyMatrixDataFrame(dfg::Union{GraphsDFG, LightGraphsDFG, SymbolDFG, LightDFG})::Main.DataFrames.DataFrame
+            function getAdjacencyMatrixDataFrame(dfg::Union{GraphsDFG, MetaGraphsDFG, SymbolDFG, LightDFG})::Main.DataFrames.DataFrame
                 varLabels = sort(map(v->v.label, getVariables(dfg)))
                 factLabels = sort(map(f->f.label, getFactors(dfg)))
                 adjDf = DataFrames.DataFrame(:Factor => Union{Missing, Symbol}[])

src/LightGraphsDFG/LightGraphsDFG.jl renamed to src/MetaGraphsDFG/MetaGraphsDFG.jl

@@ -2,11 +2,11 @@ using LightGraphs
 using MetaGraphs
 
 # Imports
-include("entities/LightGraphsDFG.jl")
-include("services/LightGraphsDFG.jl")
+include("entities/MetaGraphsDFG.jl")
+include("services/MetaGraphsDFG.jl")
 
 # Exports
-export LightGraphsDFG
+export MetaGraphsDFG
 export exists
 export getLabelDict, getDescription, setDescription, getInnerGraph, getAddHistory, getSolverParams, setSolverParams
 #

src/LightGraphsDFG/entities/LightGraphsDFG.jl renamed to src/MetaGraphsDFG/entities/MetaGraphsDFG.jl

@@ -10,7 +10,7 @@ end
 
 const LFGType = MetaGraph{Int64,Float64}
 
-mutable struct LightGraphsDFG{T <: AbstractParams} <: AbstractDFG
+mutable struct MetaGraphsDFG{T <: AbstractParams} <: AbstractDFG
     g::LFGType
     description::String
     userId::String
@@ -25,7 +25,7 @@ mutable struct LightGraphsDFG{T <: AbstractParams} <: AbstractDFG
 end
 
 #TODO? do we not want props such as userId, robotId, sessionId, etc...
-function LightGraphsDFG{T}(g::LFGType=MetaGraph();
+function MetaGraphsDFG{T}(g::LFGType=MetaGraph();
                            description::String="LightGraphs.jl implementation",
                            userId::String="User ID",
                            robotId::String="Robot ID",
@@ -36,14 +36,14 @@ function LightGraphsDFG{T}(g::LFGType=MetaGraph();
     set_prop!(g, :robotId, robotId)
     set_prop!(g, :sessionId, sessionId)
     set_indexing_prop!(g, :label)
-    LightGraphsDFG{T}(g, description, userId, robotId, sessionId, Symbol[], params)
+    MetaGraphsDFG{T}(g, description, userId, robotId, sessionId, Symbol[], params)
 end
 
-Base.propertynames(x::LightGraphsDFG, private::Bool=false) =
+Base.propertynames(x::MetaGraphsDFG, private::Bool=false) =
     (:g, :description, :userId, :robotId, :sessionId, :nodeCounter, :labelDict, :addHistory, :solverParams)
         # (private ? fieldnames(typeof(x)) : ())...)
 
-Base.getproperty(x::LightGraphsDFG,f::Symbol) = begin
+Base.getproperty(x::MetaGraphsDFG,f::Symbol) = begin
     if f == :nodeCounter
         nv(x.g)
     elseif f == :labelDict
@@ -63,4 +63,4 @@ struct LightGraphsSkeleton
     labels::Dict{Symbol, Int}
 end
 
-LightGraphsSkeleton(dfg::LightGraphsDFG) = LightGraphsSkeleton(dfg.g.graph, dfg.g.metaindex[:label])
+LightGraphsSkeleton(dfg::MetaGraphsDFG) = LightGraphsSkeleton(dfg.g.graph, dfg.g.metaindex[:label])