Skip to content

Commit 3ec2484

Browse files
committed
Merge branch 'master' into mergetest/devmaster
2 parents 989a1d0 + 478b67f commit 3ec2484

File tree

4 files changed

+45
-8
lines changed

4 files changed

+45
-8
lines changed

.github/workflows/TagBot.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: TagBot
2+
on:
3+
schedule:
4+
- cron: 0 * * * *
5+
jobs:
6+
TagBot:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: JuliaRegistries/TagBot@v1
10+
with:
11+
token: ${{ secrets.GITHUB_TOKEN }}

src/DistributedFactorGraphs.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ export getPPEDict
3939
export getSolvedCount, isSolved, setSolvedCount!
4040
export DFGVariableSummary, DFGFactorSummary, AbstractDFGSummary
4141
export getNeighborhood, getSubgraph, getSubgraphAroundNode
42+
export printFactor, printVariable
4243

4344
export getUserId, getRobotId, getSessionId
4445
export getDFGInfo

src/needsahome.jl

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,39 @@ function buildSubgraphFromLabels!(dfg::G,
6161
return subfg
6262
end
6363

64+
"""
65+
$SIGNATURES
66+
67+
Display and return to console the user factor identified by tag name.
68+
"""
69+
printFactor(fgl::AbstractDFG, fsym::Symbol) = @show getFactor(fgl,fsym)
70+
71+
72+
"""
73+
$SIGNATURES
74+
75+
Display the content of `VariableNodeData` to console for a given factor graph and variable tag`::Symbol`.
76+
77+
Dev Notes
78+
- TODO split as two show macros between AMP and DFG
79+
"""
80+
function printVariable(fgl::AbstractDFG, vsym::Symbol, solveKey::Symbol=:default)
81+
vert = getVariable(fgl, vsym)
82+
vnd = solverData(vert, solveKey)
83+
println("label: $(vert.label)")
84+
println("tags: $(getTags(vert))")
85+
println("size marginal samples $(size(vnd.val))")
86+
println("kde bandwidths: $((vnd.bw)[:,1])")
87+
if 0 < length(getVariablePPEs(vert))
88+
println("PPE.suggested: $(round.(getVariablePPE(vert).suggested,digits=4))")
89+
else
90+
println("No PPEs")
91+
end
92+
# println("kde max: $(round.(getKDEMax(getKDE(vnd)),digits=4))")
93+
# println("kde max: $(round.(getKDEMax(getKDE(vnd)),digits=4))")
94+
println()
95+
vnd
96+
end
6497

6598
## KEEPING COMMENT, WANT TO BE CONSOLIDATED WITH FUNCTION ABOVE -- KEEPING ONLY ONE FOR MAINTAINABILITY
6699
## STILL NEEDS TO BE CONSOLIDATED WITH `DFG._copyIntoGraph`

src/services/AbstractDFG.jl

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1066,14 +1066,6 @@ function getFactorFunction(dfg::G, fsym::Symbol) where G <: AbstractDFG
10661066
end
10671067

10681068

1069-
"""
1070-
$SIGNATURES
1071-
1072-
Display and return to console the user factor identified by tag name.
1073-
"""
1074-
showFactor(fgl::G, fsym::Symbol) where G <: AbstractDFG = @show getFactor(fgl,fsym)
1075-
1076-
10771069
"""
10781070
$(SIGNATURES)
10791071
Produces a dot-format of the graph for visualization.

0 commit comments

Comments
 (0)