Summaries

Author: GearsAD

src/GraphsDFG/services/GraphsDFG.jl

@@ -527,3 +527,5 @@ function toDotFile(dfg::GraphsDFG, fileName::String="/tmp/dfg.dot")::Nothing
     end
     return nothing
 end
+
+function getSummary()::

src/entities/DFGFactor.jl

@@ -49,10 +49,40 @@ end
 
 label(f::F) where F <: DFGFactor = f.label
 data(f::F) where F <: DFGFactor = f.data
+<<<<<<< Updated upstream
 id(f::F) where F <: DFGFactor = f._internalId
+=======
+tags(f::F) where F <: DFGFactor = f.tags
+internalId(f::F) where F <: DFGFactor = f._internalId
+"""
+    $SIGNATURES
+
+Retrieve data structure stored in a node.
+"""
+getData(v::DFGFactor)::GenericFunctionNodeData = v.data
+>>>>>>> Stashed changes
 
 # Simply for convenience - don't export
 const PackedFunctionNodeData{T} = GenericFunctionNodeData{T, <: AbstractString}
 PackedFunctionNodeData(x1, x2, x3, x4, x5::S, x6::T, x7::String="", x8::Vector{Int}=Int[]) where {T <: PackedInferenceType, S <: AbstractString} = GenericFunctionNodeData(x1, x2, x3, x4, x5, x6, x7, x8)
 const FunctionNodeData{T} = GenericFunctionNodeData{T, Symbol}
 FunctionNodeData(x1, x2, x3, x4, x5::Symbol, x6::T, x7::String="", x8::Vector{Int}=Int[]) where {T <: Union{FunctorInferenceType, ConvolutionObject}}= GenericFunctionNodeData{T, Symbol}(x1, x2, x3, x4, x5, x6, x7, x8)
+<<<<<<< Updated upstream
+=======
+
+"""
+    $(SIGNATURES)
+Structure for first-class citizens of a DFGFactor.
+"""
+struct DFGFactorSummary <: DFGNode
+    label::Symbol
+    tags::Vector{Symbol}
+    _internalId::Int64
+    _variableOrderSymbols::Vector{Symbol}
+end
+
+label(f::DFGFactorSummary) = f.label
+data(f::DFGFactorSummary) = f.data
+tags(f::DFGFactorSummary) = f.tags
+internalId(f::DFGFactorSummary) = f._internalId
+>>>>>>> Stashed changes

src/entities/DFGVariable.jl

@@ -110,3 +110,20 @@ id(v::DFGVariable) = v._internalId
 # Todo: Complete this.
 smallData(v::DFGVariable) = v.smallData
 bigData(v::DFGVariable) = v.bigData
+
+"""
+    $(SIGNATURES)
+Structure for first-class citizens of a DFGVariable.
+"""
+struct DFGVariableSummary <: DFGNode
+    label::Symbol
+    timestamp::DateTime
+    tags::Vector{Symbol}
+    estimateDict::Dict{Symbol, Dict{Symbol, VariableEstimate}}
+    _internalId::Int64
+end
+label(v::DFGVariableSummary) = v.label
+timestamp(v::DFGVariableSummary) = v.timestamp
+tags(v::DFGVariableSummary) = v.tags
+estimates(v::DFGVariableSummary) = v.estimateDict
+internalId(v::DFGVariableSummary) = v._internalId

src/services/DFGFactor.jl

@@ -0,0 +1,4 @@
+
+function convert(::DFGFactorSummary, v::DFGFactor)
+    return DFGFactorSummary(v.label, deepcopy(v.tags), v._internalId, deepcopy(_variableOrderSymbols))
+end

src/services/DFGVariable.jl

@@ -46,7 +46,7 @@ function unpack(dfg::G, d::PackedVariableNodeData)::VariableNodeData where G <:
     st, d.initialized, d.inferdim, d.ismargin, d.dontmargin )
 end
 
-function compare(a::VariableNodeData,b::VariableNodeData)
+function compare(a::VariableNodeData, b::VariableNodeData)
     TP = true
     TP = TP && a.val == b.val
     TP = TP && a.bw == b.bw
@@ -65,3 +65,7 @@ end
 function ==(a::VariableNodeData,b::VariableNodeData, nt::Symbol=:var)
   return DistributedFactorGraphs.compare(a,b)
 end
+
+function convert(::DFGVariableSummary, v::DFGVariable)
+    return DFGVariableSummary(v.label, v.timestamp, deepcopy(v.tags), deepcopy(v.estimateDict), v._internalId)
+end

test/interfaceTests.jl

@@ -81,6 +81,7 @@ end
 
     # Accessors
     @test label(v1) == v1.label
+    @test tags(v1) = v1.tags
     @test timestamp(v1) == v1.timestamp
     @test estimates(v1) == v1.estimateDict
     @test estimate(v1, :notfound) == nothing
@@ -90,6 +91,7 @@ end
     @test id(v1) == v1._internalId
 
     @test label(f1) == f1.label
+    @test tags(f1) = f1.tags
     @test data(f1) == f1.data
     @test id(f1) == f1._internalId
 end