WORK IN PROGRESS

Author: dehann

src/Common.jl

@@ -9,7 +9,8 @@ export lsTypes, lsfTypes
 export lsWho, lsfWho
 export *
 export findClosestTimestamp, findVariableNearTimestamp
-export hasTags
+export addTags!
+export hasTags, hasTagsNeighbors
 
 *(a::Symbol, b::AbstractString)::Symbol = Symbol(string(a,b))
 
@@ -405,16 +406,42 @@ function findVariableNearTimestamp(dfg::AbstractDFG,
   return RET
 end
 
+"""
+    $SIGNATURES
+
+Add tags to a variable or factor
+"""
+function addTags!(dfg::InMemoryDFGTypes, sym::Symbol, tags::Vector{Symbol})
+  union!(getTags(getFactor(fg, sym)), tags)
+end
 
 """
     $SIGNATURES
 
-Determine if a variable or factor has all the tags listed in `stags`.
+Determine if the variable or factor neighbors have the `tags:;Vector{Symbol}`, and `matchAll::Bool`.
 """
 function hasTags(dfg::InMemoryDFGTypes,
                  sym::Symbol,
-                 stags::Vector{Symbol})::Bool
+                 tags::Vector{Symbol};
+                 matchAll::Bool=true  )::Bool
+  #
+  alltags = getTags(dfg, sym)
+  length(filter(x->x in alltags, tags)) >= (matchAll ? length(tags) : 1)
+end
+
+
+"""
+    $SIGNATURES
+
+Determine if the variable or factor neighbors have the `tags:;Vector{Symbol}`, and `matchAll::Bool`.
+"""
+function hasTagsNeighbors(dfg::InMemoryDFGTypes,
+                          sym::Symbol,
+                          tags::Vector{Symbol};
+                          matchAll::Bool=true  )::Bool
   #
-  alltags = union( (ls(dfg, sym) .|> x->tags(getFactor(dfg,x)))...)
-  length(filter(x->x in alltags, stags)) == length(stags)
+  # assume only variables or factors are neighbors
+  getNeiFnc = isVariable(dfg, sym) ? getFactor : getVariable
+  alltags = union( (ls(dfg, sym) .|> x->DFG.tags(getNeiFnc(dfg,x)))... )
+  length(filter(x->x in alltags, tags)) >= (matchAll ? length(tags) : 1)
 end

src/CommonAccessors.jl

@@ -0,0 +1,111 @@
+# Common get and set methods
+
+# NOTE this could be reduced with macros and function generation to even less code.
+
+export getLabel, label
+export getTags, setTags!, tags
+export getTimestamp, setTimestamp!, timestamp
+export getInternalId, interalId
+
+
+const FactorDataLevel0 = Union{DFGFactor, DFGFactorSummary, SkeletonDFGFactor}
+const FactorDataLevel1 = Union{DFGFactor, DFGFactorSummary}
+# const FactorDataLevel2 = Union{DFGFactor}
+
+const DataLevel0 = Union{VariableDataLevel0, FactorDataLevel0}
+const DataLevel1 = Union{VariableDataLevel1, FactorDataLevel1}
+const DataLevel2 = Union{VariableDataLevel2, FactorDataLevel2}
+
+
+"""
+$SIGNATURES
+
+Return the label for a variable or factor.
+"""
+getLabel(v::DataLevel0) = v.label
+
+"""
+$SIGNATURES
+
+Return the label for a variable or factor.
+
+DEPRECATED label -> getLabel
+"""
+function label(v::DataLevel0)
+  @warn "Deprecated label, use getLabel instead."
+  getLabel(v)
+end
+
+
+"""
+$SIGNATURES
+
+Return the tags for a variable.
+"""
+getTags(v::DataLevel0) = v.tags
+
+"""
+$SIGNATURES
+
+Return the tags for a variable.
+
+DEPRECATED, tags -> getTags
+"""
+function tags(v::DataLevel0)
+  @warn "tags deprecated, use getTags instead"
+  getTags
+end
+
+"""
+$SIGNATURES
+
+Set the tags for a factor.
+"""
+setTags!(f::DataLevel0, tags::Vector{Symbol}) = f.tags = tags
+
+
+"""
+$SIGNATURES
+
+Get the timestamp from a DFGFactor object.
+"""
+getTimestamp(v::DataLevel1) = v.timestamp
+
+"""
+$SIGNATURES
+
+Get the timestamp from a DFGFactor object.
+
+DEPRECATED -> use getTimestamp instead.
+"""
+function timestamp(v::DataLevel1)
+    @warn "timestamp deprecated, use getTimestamp instead"
+    getTimestamp(v)
+end
+
+"""
+$SIGNATURES
+
+Set the timestamp of a DFGFactor object.
+"""
+setTimestamp!(v::DataLevel1, ts::DateTime) = v.timestamp = ts
+
+
+"""
+$SIGNATURES
+
+Return the internal ID for a variable.
+"""
+getInternalId(v::DataLevel1) = v._internalId
+
+"""
+$SIGNATURES
+
+Return the internal ID for a variable.
+
+DEPRECATED, internalId -> getInternalId
+"""
+function internalId(v::DataLevel1)
+  @warn "Deprecated interalId, use getInternalId instead."
+  getInternalId(v)
+end

src/entities/DFGFactor.jl

@@ -88,63 +88,7 @@ SkeletonDFGFactor(label::Symbol, variableOrderSymbols::Vector{Symbol} = Symbol[]
 
 # Accessors
 
-const FactorDataLevel0 = Union{DFGFactor, DFGFactorSummary, SkeletonDFGFactor}
-const FactorDataLevel1 = Union{DFGFactor, DFGFactorSummary}
-# const FactorDataLevel2 = Union{DFGFactor}
 
-"""
-$SIGNATURES
-
-Return the label for a factor.
-"""
-label(f::FactorDataLevel0) = f.label
-
-"""
-$SIGNATURES
-
-Return the tags for a variable.
-"""
-tags(f::FactorDataLevel0) = f.tags
-
-"""
-$SIGNATURES
-
-Set the tags for a factor.
-"""
-setTags!(f::FactorDataLevel0, tags::Vector{Symbol}) = f.tags = tags
-
-"""
-$SIGNATURES
-
-Get the timestamp from a DFGFactor object.
-
-DEPRECATED -> use getTimestamp instead.
-"""
-function timestamp(v::FactorDataLevel1)
-  @warn "timestamp deprecated, use getTimestamp instead"
-  v.timestamp
-end
-
-"""
-$SIGNATURES
-
-Get the timestamp from a DFGFactor object.
-"""
-getTimestamp(v::FactorDataLevel1) = v.timestamp
-
-"""
-$SIGNATURES
-
-Set the timestamp of a DFGFactor object.
-"""
-setTimestamp!(v::FactorDataLevel1, ts::DateTime) = v.timestamp = ts
-
-"""
-$SIGNATURES
-
-Return the internal ID for a variable.
-"""
-internalId(f::FactorDataLevel1) = f._internalId
 
 """
     $SIGNATURES

src/entities/DFGVariable.jl

@@ -190,52 +190,6 @@ SkeletonDFGVariable(label::Symbol) = SkeletonDFGVariable(label, Symbol[])
 const VariableDataLevel0 = Union{DFGVariable, DFGVariableSummary, SkeletonDFGVariable}
 const VariableDataLevel1 = Union{DFGVariable, DFGVariableSummary}
 
-"""
-$SIGNATURES
-
-Return the label for a variable.
-"""
-label(v::VariableDataLevel0) = v.label
-
-"""
-$SIGNATURES
-
-Return the tags for a variable.
-"""
-tags(v::VariableDataLevel0) = v.tags
-
-"""
-$SIGNATURES
-
-Set the tags for a variable.
-"""
-setTags!(v::VariableDataLevel0, tags::Vector{Symbol}) = v.tags = tags
-
-"""
-    $SIGNATURES
-
-Return the timestamp for a variable.
-
-DEPRECATED -> use getTimestamp instead.
-"""
-function timestamp(v::VariableDataLevel1)
-    @warn "timestamp is deprecated, use getTimestamp instead"
-    v.timestamp
-end
-
-"""
-    $SIGNATURES
-
-Return the timestamp for a variable.
-"""
-getTimestamp(v::VariableDataLevel1) = v.timestamp
-
-"""
-$SIGNATURES
-
-Set the timestamp for a variable.
-"""
-setTimestamp!(v::VariableDataLevel1, timestamp::DateTime) = v.timestamp = timestamp
 
 """
     $SIGNATURES