Skip to content

Commit 6e42f59

Browse files
authored
Merge branch 'master' into 23Q1/enh/blobidsarehard
2 parents 995f01c + c9e0323 commit 6e42f59

File tree

5 files changed

+17
-24
lines changed

5 files changed

+17
-24
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Graphs = "1.4"
3535
JSON = "0.21"
3636
JSON2 = "0.3.1"
3737
JSON3 = "1"
38-
ManifoldsBase = "0.11, 0.12, 0.13"
38+
ManifoldsBase = "0.12, 0.13, 0.14"
3939
OrderedCollections = "1.4"
4040
Pkg = "1.4, 1.5"
4141
ProgressMeter = "1"

src/DataBlobs/services/AbstractDataEntries.jl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,10 @@ end
147147

148148
"""
149149
$(SIGNATURES)
150-
List the data entries associated with a particular variable.
150+
List the blob entries associated with a particular variable.
151+
152+
DevNotes
153+
- TODO rename to listBlobEntries (drop noun Data in lower level calls)
151154
"""
152155
function listDataEntries(var::AbstractDFGVariable)
153156
collect(keys(var.dataDict))

src/DataBlobs/services/DataEntryBlob.jl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ Related
6969
[`updateDataEntry!`](@ref)
7070
7171
$(METHODLIST)
72+
73+
DevNotes
74+
- TODO TBD update verb on data since data blobs and entries are restricted to immutable only.
7275
"""
7376
function updateData! end
7477

src/entities/DFGVariable.jl

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Base.@kwdef mutable struct VariableNodeData{T<:InferenceVariable, P}
2424
"""
2525
Vector of on-manifold points used to represent a ManifoldKernelDensity (or parametric) belief.
2626
"""
27-
val::Vector{P}
27+
val::Vector{P} = Vector{P}()
2828
"""
2929
Common kernel bandwith parameter used with ManifoldKernelDensity, and as legacy also stores covariance until a dedicated field is created for parametric case.
3030
"""
@@ -42,7 +42,7 @@ Base.@kwdef mutable struct VariableNodeData{T<:InferenceVariable, P}
4242
"""
4343
Variables each have a type, such as Position1, or RoME.Pose2, etc.
4444
"""
45-
variableType::T
45+
variableType::T = T()
4646
"""
4747
False if initial numerical values are not yet available or stored values are not ready for further processing yet.
4848
"""
@@ -70,7 +70,7 @@ Base.@kwdef mutable struct VariableNodeData{T<:InferenceVariable, P}
7070
"""
7171
solveKey identifier associated with thsi VariableNodeData object.
7272
"""
73-
solveKey::Symbol
73+
solveKey::Symbol = :default
7474
"""
7575
Future proofing field for when more multithreading operations on graph nodes are implemented, these conditions are meant to be used for atomic write transactions to this VND.
7676
"""
@@ -81,20 +81,8 @@ end
8181

8282
##------------------------------------------------------------------------------
8383
## Constructors
84-
85-
VariableNodeData{T,P}(;solveKey::Symbol=:default) where {T <: InferenceVariable, P} = VariableNodeData(; val=Vector{P}(), variableType=T(), solveKey)
86-
VariableNodeData{T}(;solveKey::Symbol=:default ) where T <: InferenceVariable = VariableNodeData(; solveKey, variableType=T(), val=Vector{getPointType(T)}()) # {T, getPointType(T)}
87-
88-
function VariableNodeData(variableType::T; solveKey::Symbol=:default) where T <: InferenceVariable
89-
#
90-
# p0 = getPointIdentity(T)
91-
val = Vector{getPointType(T)}()
92-
# P0[1] = p0
93-
bw = zeros(0,0)
94-
# bw[1] = zeros(getDimension(T))
95-
VariableNodeData(; val, bw, solveKey, variableType )
96-
end
97-
84+
VariableNodeData{T}(; kwargs...) where T <: InferenceVariable = VariableNodeData{T,getPointType(T)}(; kwargs...)
85+
VariableNodeData(variableType::InferenceVariable; kwargs...) = VariableNodeData{typeof(variableType)}(; kwargs...)
9886

9987

10088
##==============================================================================

src/services/AbstractDFG.jl

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -466,20 +466,19 @@ end
466466
##------------------------------------------------------------------------------
467467
"""
468468
$(SIGNATURES)
469-
Get a list of IDs of the DFGVariables in the DFG.
469+
Get a list of labels of the DFGVariables in the graph.
470470
Optionally specify a label regular expression to retrieves a subset of the variables.
471471
Tags is a list of any tags that a node must have (at least one match).
472472
473-
NOtes
473+
Notes
474474
- Returns `::Vector{Symbol}`
475475
476476
Example
477477
```julia
478478
listVariables(dfg, r"l", tags=[:APRILTAG;])
479479
```
480480
481-
Related:
482-
- ls
481+
See also: [`ls`](@ref)
483482
"""
484483
function listVariables( dfg::AbstractDFG,
485484
regexFilter::Union{Nothing, Regex}=nothing;
@@ -502,7 +501,7 @@ end
502501

503502
"""
504503
$(SIGNATURES)
505-
Get a list of the IDs (labels) of the DFGFactors in the DFG.
504+
Get a list of the labels of the DFGFactors in the DFG.
506505
Optionally specify a label regular expression to retrieves a subset of the factors.
507506
"""
508507
function listFactors(dfg::G, regexFilter::Union{Nothing, Regex}=nothing; tags::Vector{Symbol}=Symbol[], solvable::Int=0)::Vector{Symbol} where G <: AbstractDFG

0 commit comments

Comments
 (0)