User OrderedDict to store variable and factors

Author: Affie

.gitignore

@@ -1,6 +1,7 @@
 *.jl.cov
 *.jl.*.cov
 *.jl.mem
+*.mem
 deps/deps.jl
 docs/build
 Manifest.toml

Project.toml

@@ -15,6 +15,7 @@ LightGraphs = "093fc24a-ae57-5d10-9952-331d41423f4d"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 ManifoldsBase = "3362f125-f0bb-47a3-aa74-596ffd7ef2fb"
 Neo4j = "d2adbeaf-5838-5367-8a2f-e46d570981db"
+OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 Requires = "ae029012-a4dd-5104-9daa-d747884805df"
@@ -29,8 +30,8 @@ Unmarshal = "cbff2730-442d-58d7-89d1-8e530c41eb02"
 Colors = "0.10, 0.11, 0.12"
 Distributions = "0.23, 0.24, 0.25"
 DocStringExtensions = "0.8, 0.9"
-Graphs = "1.4"
 GraphPlot = "0.5.0"
+Graphs = "1.4"
 JSON = "0.21"
 JSON2 = "0.3.1"
 LightGraphs = "1.2, 1.3"

src/GraphsDFG/FactorGraphs/FactorGraphs.jl

@@ -1,6 +1,8 @@
 module FactorGraphs
 using Graphs
 
+using OrderedCollections
+
 import Base:
     eltype, show, ==, Pair,
     Tuple, copy, length, size,
@@ -42,18 +44,18 @@ include("BiMaps.jl")
 struct FactorGraph{T <: Integer,V <: AbstractVariableType, F <: AbstractFactorType} <: AbstractGraph{T}
     graph::SimpleGraph{T}
     labels::BiDictMap{T}
-    variables::Dict{Symbol,V}
-    factors::Dict{Symbol,F}
+    variables::OrderedDict{Symbol,V}
+    factors::OrderedDict{Symbol,F}
 end
 
 function FactorGraph{T, V, F}(nv::Int=100, nf::Int=100) where {T <: Integer, V <: AbstractVariableType, F <: AbstractFactorType}
     fadjlist = Vector{Vector{T}}()
         sizehint!(fadjlist, nv + nf)
     g = SimpleGraph{T}(0, fadjlist)
     labels = BiDictMap{T}(sizehint=nv+nf)
-    variables = Dict{Symbol,V}()
+    variables = OrderedDict{Symbol,V}()
         sizehint!(variables, nv)
-    factors = Dict{Symbol,F}()
+    factors = OrderedDict{Symbol,F}()
         sizehint!(factors, nf)
     return FactorGraph{T, V, F}(g, labels, variables, factors)
 end

src/LightDFG/entities/LightDFG.jl

@@ -29,6 +29,7 @@ Create an in-memory LightDFG with the following parameters:
 - V: Variable type
 - F: Factor type
 """
+function LightDFG end
 function LightDFG{T,V,F}(g::FactorGraph{Int,V,F}=FactorGraph{Int,V,F}();
                            description::String="LightGraphs.jl implementation",
                            userId::String="DefaultUser",
@@ -48,14 +49,6 @@ end
 
 # LightDFG{T}(; kwargs...) where T <: AbstractParams = LightDFG{T,DFGVariable,DFGFactor}(;kwargs...)
 
-"""
-    $(SIGNATURES)
-
-Create an in-memory LightDFG with the following parameters:
-- T: Solver parameters (defaults to `NoSolverParams()`)
-- V: Variable type
-- F: Factor type
-"""
 function LightDFG{T}(g::FactorGraph{Int,DFGVariable,DFGFactor}=FactorGraph{Int,DFGVariable,DFGFactor}();
                      kwargs...) where T <: AbstractParams
     return LightDFG{T,DFGVariable,DFGFactor}(g; kwargs...)