Cleaning up Graphs.jl

Author: GearsAD

src/GraphsDFG/services/GraphsDFG.jl

@@ -200,13 +200,6 @@ function deleteVariable!(dfg::GraphsDFG, label::Symbol)::DFGVariable
     return variable
 end
 
-#Alias
-"""
-    $(SIGNATURES)
-Delete a referenced DFGVariable from the DFG.
-"""
-deleteVariable!(dfg::GraphsDFG, variable::DFGVariable)::DFGVariable = deleteVariable!(dfg, variable.label)
-
 """
     $(SIGNATURES)
 Delete a DFGFactor from the DFG using its label.
@@ -221,13 +214,6 @@ function deleteFactor!(dfg::GraphsDFG, label::Symbol)::DFGFactor
     return factor
 end
 
-# Alias
-"""
-    $(SIGNATURES)
-Delete the referened DFGFactor from the DFG.
-"""
-deleteFactor!(dfg::GraphsDFG, factor::DFGFactor)::DFGFactor = deleteFactor!(dfg, factor.label)
-
 """
     $(SIGNATURES)
 List the DFGVariables in the DFG.
@@ -245,34 +231,6 @@ function getVariables(dfg::GraphsDFG, regexFilter::Union{Nothing, Regex}=nothing
 	return variables
 end
 
-"""
-    $(SIGNATURES)
-Get a list of IDs of the DFGVariables in the DFG.
-Optionally specify a label regular expression to retrieves a subset of the variables.
-
-Example
-```julia
-getVariableIds(dfg, r"l", tags=[:APRILTAG;])
-```
-
-Related
-
-ls
-"""
-function getVariableIds(dfg::GraphsDFG, regexFilter::Union{Nothing, Regex}=nothing; tags::Vector{Symbol}=Symbol[])::Vector{Symbol}
-  vars = getVariables(dfg, regexFilter, tags=tags)
-  # mask = map(v -> length(intersect(v.tags, tags)) > 0, vars )
-  map(v -> v.label, vars)
-end
-
-# Alias
-"""
-    $(SIGNATURES)
-List the DFGVariables in the DFG.
-Optionally specify a label regular expression to retrieves a subset of the variables.
-"""
-ls(dfg::GraphsDFG, regexFilter::Union{Nothing, Regex}=nothing; tags::Vector{Symbol}=Symbol[])::Vector{Symbol} = getVariableIds(dfg, regexFilter, tags=tags)
-
 """
     $(SIGNATURES)
 List the DFGFactors in the DFG.
@@ -286,29 +244,6 @@ function getFactors(dfg::GraphsDFG, regexFilter::Union{Nothing, Regex}=nothing):
 	return factors
 end
 
-"""
-    $(SIGNATURES)
-Get a list of the IDs of the DFGFactors in the DFG.
-Optionally specify a label regular expression to retrieves a subset of the factors.
-"""
-getFactorIds(dfg::GraphsDFG, regexFilter::Union{Nothing, Regex}=nothing)::Vector{Symbol} = map(f -> f.label, getFactors(dfg, regexFilter))
-
-"""
-    $(SIGNATURES)
-List the DFGFactors in the DFG.
-Optionally specify a label regular expression to retrieves a subset of the factors.
-"""
-# Alias
-lsf(dfg::GraphsDFG, regexFilter::Union{Nothing, Regex}=nothing)::Vector{Symbol} = getFactorIds(dfg, regexFilter)
-
-"""
-	$(SIGNATURES)
-Alias for getNeighbors - returns neighbors around a given node label.
-"""
-function lsf(dfg::GraphsDFG, label::Symbol)::Vector{Symbol}
-  return getNeighbors(dfg, label)
-end
-
 """
     $(SIGNATURES)
 Checks if the graph is fully connected, returns true if so.
@@ -317,14 +252,6 @@ function isFullyConnected(dfg::GraphsDFG)::Bool
     return length(Graphs.connected_components(dfg.g)) == 1
 end
 
-#Alias
-"""
-    $(SIGNATURES)
-Checks if the graph is not fully connected, returns true if it is not contiguous.
-"""
-hasOrphans(dfg::GraphsDFG)::Bool = !isFullyConnected(dfg)
-
-
 """
     $(SIGNATURES)
 Retrieve a list of labels of the immediate neighbors around a given variable or factor.
@@ -369,56 +296,40 @@ function getNeighbors(dfg::GraphsDFG, label::Symbol; ready::Union{Nothing, Int}=
     return map(n -> n.dfgNode.label, neighbors)
 end
 
-# Aliases
-"""
-    $(SIGNATURES)
-Retrieve a list of labels of the immediate neighbors around a given variable or factor.
-"""
-function ls(dfg::GraphsDFG, node::T)::Vector{Symbol} where T <: DFGNode
-    return getNeighbors(dfg, node)
-end
-"""
-    $(SIGNATURES)
-Retrieve a list of labels of the immediate neighbors around a given variable or factor specified by its label.
-"""
-function ls(dfg::GraphsDFG, label::Symbol)::Vector{Symbol} where T <: DFGNode
-    return getNeighbors(dfg, label)
-end
-
-function _copyIntoGraph!(sourceDFG::GraphsDFG, destDFG::GraphsDFG, variableFactorLabels::Vector{Symbol}, includeOrphanFactors::Bool=false)::Nothing
-    # Split into variables and factors
-    verts = map(id -> sourceDFG.g.vertices[sourceDFG.labelDict[id]], variableFactorLabels)
-    sourceVariables = filter(n -> n.dfgNode isa DFGVariable, verts)
-    sourceFactors = filter(n -> n.dfgNode isa DFGFactor, verts)
-
-    # Now we have to add all variables first,
-    for variable in sourceVariables
-        if !haskey(destDFG.labelDict, variable.dfgNode.label)
-            addVariable!(destDFG, deepcopy(variable.dfgNode))
-        end
-    end
-    # And then all factors to the destDFG.
-    for factor in sourceFactors
-        if !haskey(destDFG.labelDict, factor.dfgNode.label)
-            # Get the original factor variables (we need them to create it)
-            neighVarIds = getNeighbors(sourceDFG, factor.dfgNode.label) #OLD: in_neighbors(factor, sourceDFG.g)
-            # Find the labels and associated neighVarIds in our new subgraph
-            factVariables = DFGVariable[]
-            for neighVarId in neighVarIds
-                if haskey(destDFG.labelDict, neighVarId)
-                    push!(factVariables, getVariable(destDFG, neighVarId))
-                    #otherwise ignore
-                end
-            end
-
-            # Only if we have all of them should we add it (otherwise strange things may happen on evaluation)
-            if includeOrphanFactors || length(factVariables) == length(neighVarIds)
-                addFactor!(destDFG, factVariables, deepcopy(factor.dfgNode))
-            end
-        end
-    end
-    return nothing
-end
+# function _copyIntoGraph!(sourceDFG::GraphsDFG, destDFG::GraphsDFG, variableFactorLabels::Vector{Symbol}, includeOrphanFactors::Bool=false)::Nothing
+#     # Split into variables and factors
+#     verts = map(id -> sourceDFG.g.vertices[sourceDFG.labelDict[id]], variableFactorLabels)
+#     sourceVariables = filter(n -> n.dfgNode isa DFGVariable, verts)
+#     sourceFactors = filter(n -> n.dfgNode isa DFGFactor, verts)
+#
+#     # Now we have to add all variables first,
+#     for variable in sourceVariables
+#         if !haskey(destDFG.labelDict, variable.dfgNode.label)
+#             addVariable!(destDFG, deepcopy(variable.dfgNode))
+#         end
+#     end
+#     # And then all factors to the destDFG.
+#     for factor in sourceFactors
+#         if !haskey(destDFG.labelDict, factor.dfgNode.label)
+#             # Get the original factor variables (we need them to create it)
+#             neighVarIds = getNeighbors(sourceDFG, factor.dfgNode.label) #OLD: in_neighbors(factor, sourceDFG.g)
+#             # Find the labels and associated neighVarIds in our new subgraph
+#             factVariables = DFGVariable[]
+#             for neighVarId in neighVarIds
+#                 if haskey(destDFG.labelDict, neighVarId)
+#                     push!(factVariables, getVariable(destDFG, neighVarId))
+#                     #otherwise ignore
+#                 end
+#             end
+#
+#             # Only if we have all of them should we add it (otherwise strange things may happen on evaluation)
+#             if includeOrphanFactors || length(factVariables) == length(neighVarIds)
+#                 addFactor!(destDFG, factVariables, deepcopy(factor.dfgNode))
+#             end
+#         end
+#     end
+#     return nothing
+# end
 
 """
     $(SIGNATURES)