Merge pull request #692 from JuliaRobotics/master

v0.10.10-rc1

Author: dehann

Project.toml

@@ -1,6 +1,6 @@
 name = "DistributedFactorGraphs"
 uuid = "b5cc3c7e-6572-11e9-2517-99fb8daf2f04"
-version = "0.10.9"
+version = "0.10.10"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

src/CloudGraphsDFG/services/CGStructure.jl

@@ -1,6 +1,6 @@
 function isValidLabel(abstractNode::N)::Bool where N <: AbstractCGNode
     id = String(abstractNode.id)
-    return all(t -> t != uppercase(id), _invalidIds) && match(_validLabelRegex, id) != nothing
+    return all(t -> t != uppercase(id), _invalidIds) && match(_validLabelRegex, id) !== nothing
 end
 
 # Fastest way I can think to convert the data into a dict

src/DistributedFactorGraphs.jl

@@ -29,6 +29,8 @@ using SparseArrays
 using UUIDs
 using Pkg
 
+import Base: getindex
+
 
 ##==============================================================================
 # Exports
@@ -76,6 +78,8 @@ export exists,
        getVariables, getFactors,
        isVariable, isFactor
 
+export getindex
+
 export isConnected
 
 export getBiadjacencyMatrix

src/services/AbstractDFG.jl

@@ -247,6 +247,17 @@ Get a DFGFactor from a DFG using its label.
 function getFactor(dfg::G, label::Union{Symbol, String}) where G <: AbstractDFG
     error("getFactor not implemented for $(typeof(dfg))")
 end
+
+function Base.getindex(dfg::AbstractDFG, lbl::Union{Symbol, String})
+    if isVariable(dfg, lbl)
+        getVariable(dfg, lbl)
+    elseif isFactor(dfg, lbl)
+        getFactor(dfg, lbl)
+    else
+        error("Cannot find $lbl in this $(typeof(dfg))")
+    end
+end
+
 """
     $(SIGNATURES)
 Update a complete DFGVariable in the DFG.