Towards final Agent and GraphRoot

Author: Affie

src/GraphsDFG/GraphsDFG.jl

@@ -11,7 +11,7 @@ using ...DistributedFactorGraphs:
     Agent,
     LabelNotFoundError,
     LabelExistsError,
-    FactorgraphRoot,
+    GraphRoot,
     AbstractGraphVariable,
     AbstractGraphFactor,
     NoSolverParams,

src/GraphsDFG/entities/GraphsDFG.jl

@@ -15,7 +15,7 @@ mutable struct GraphsDFG{
     addHistory::Vector{Symbol} #TODO: Discuss more - is this an audit trail?
     solverParams::T # Solver parameters
     blobStores::Dict{Symbol, AbstractBlobstore}
-    graph::FactorgraphRoot
+    graph::GraphRoot
     agent::Agent
 end
 
@@ -54,7 +54,7 @@ function GraphsDFG{T, V, F}(
     graphBlobEntries = OrderedDict{Symbol, Blobentry}(),
     description::String = "",
     graphDescription::String = description,
-    graph::FactorgraphRoot = FactorgraphRoot(
+    graph::GraphRoot = GraphRoot(
         graphLabel,
         graphDescription,
         graphTags,

src/GraphsDFG/services/GraphsDFGSerialization.jl

@@ -22,7 +22,7 @@ end
     typePackedVariable::Bool = false # Are variables packed or full
     typePackedFactor::Bool = false # Are factors packed or full
     blobStores::Union{Nothing, Dict{Symbol, FolderStore{Vector{UInt8}}}} #FIXME allow more types of blobstores
-    graph::FactorgraphRoot
+    graph::GraphRoot
     agent::Agent
 end
 
@@ -35,7 +35,7 @@ function PackedGraphsDFG(old::_OldPackedGraphsDFG)
         old.typePackedVariable,
         old.typePackedFactor,
         old.blobStores,
-        FactorgraphRoot(
+        GraphRoot(
             old.graphLabel,
             old.description,
             old.graphTags,

src/entities/AbstractDFG.jl

@@ -7,7 +7,7 @@
 # abstract type AbstractGraphNode end <: AbstractDFGNode
 # the rest of the nodes are also AbstractDFGNodes, eg.
 # Agent <: AbstractDFGNode
-# FactorgraphRoot <: AbstractDFGNode
+# GraphRoot <: AbstractDFGNode
 
 """
 $(TYPEDEF)

src/entities/Agent_and_Graph.jl

@@ -2,15 +2,15 @@
 @kwdef mutable struct Agent
     label::Symbol = :DefaultAgent
     description::String = ""
-    tags::Vector{Symbol} = Symbol[]
-    metadata::Dict{Symbol, MetadataTypes} = Dict{Symbol, MetadataTypes}()
-    blobEntries::OrderedDict{Symbol, Blobentry} = OrderedDict{Symbol, Blobentry}()
+    tags::Set{Symbol} = Set{Symbol}()
+    bloblets::Bloblets = Bloblets()
+    blobentries::OrderedDict{Symbol, Blobentry} = OrderedDict{Symbol, Blobentry}()
 end
 
-@kwdef mutable struct FactorgraphRoot
+@kwdef mutable struct GraphRoot
     label::Symbol = :DefaultFactorgraph
     description::String = ""
-    tags::Vector{Symbol} = Symbol[]
-    metadata::Dict{Symbol, MetadataTypes} = Dict{Symbol, MetadataTypes}()
-    blobEntries::OrderedDict{Symbol, Blobentry} = OrderedDict{Symbol, Blobentry}()
+    tags::Set{Symbol} = Set{Symbol}()
+    bloblets::Bloblets = Bloblets()
+    blobentries::OrderedDict{Symbol, Blobentry} = OrderedDict{Symbol, Blobentry}()
 end