Skip to content

Commit 04ce264

Browse files
authored
Merge pull request #1810 from JuliaRobotics/master
release v0.35.2-rc1
2 parents ed9ead0 + 7910b27 commit 04ce264

File tree

3 files changed

+8
-22
lines changed

3 files changed

+8
-22
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
version:
19-
- '1.9'
19+
- '1.10'
2020
os:
2121
- ubuntu-latest
2222
arch:
@@ -54,7 +54,7 @@ jobs:
5454
arch:
5555
- x64
5656
version:
57-
- '~1.10.0-0'
57+
- '1.10'
5858
group:
5959
- 'basic_functional_group'
6060
steps:
@@ -96,7 +96,7 @@ jobs:
9696
arch:
9797
- x64
9898
version:
99-
- '~1.10.0-0'
99+
- '1.10'
100100
group:
101101
- 'test_cases_group'
102102
steps:
@@ -139,7 +139,7 @@ jobs:
139139
os:
140140
- ubuntu-latest
141141
version:
142-
- '1.9'
142+
- '1.10'
143143
arch:
144144
- x64
145145
group:

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name = "IncrementalInference"
22
uuid = "904591bb-b899-562f-9e6f-b8df64c7d480"
33
keywords = ["MM-iSAMv2", "Bayes tree", "junction tree", "Bayes network", "variable elimination", "graphical models", "SLAM", "inference", "sum-product", "belief-propagation"]
44
desc = "Implements the Multimodal-iSAMv2 algorithm."
5-
version = "0.35.1"
5+
version = "0.35.2"
66

77
[deps]
88
ApproxManifoldProducts = "9bbbb610-88a1-53cd-9763-118ce10c1f89"
@@ -87,7 +87,7 @@ Optim = "1"
8787
OrderedCollections = "1"
8888
PrecompileTools = "1"
8989
ProgressMeter = "1"
90-
RecursiveArrayTools = "2.31.1"
90+
RecursiveArrayTools = "2.31.1, 3"
9191
Reexport = "1"
9292
SparseDiffTools = "2"
9393
StaticArrays = "1"

ext/HeatmapSampler.jl

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,12 @@ function sampleHeatmap(
124124
roi::AbstractMatrix{<:Real},
125125
x_grid::AbstractVector{<:Real},
126126
y_grid::AbstractVector{<:Real},
127-
thres::Real = 0,
127+
thres::Real = 1e-14,
128128
)
129129
#
130130

131131
# mask the region of interest above the sampling threshold value
132-
mask = thres .<= roi
132+
mask = thres .< roi
133133

134134
idx2d = findall(mask) # 2D indices
135135
pos = (v -> [x_grid[v[1]], y_grid[v[2]]]).(idx2d)
@@ -235,21 +235,7 @@ function LevelSetGridNormal(
235235
N::Int = 10000,
236236
)
237237
#
238-
239-
# select the support from raw data
240-
roi = data .- level
241-
# make Gaussian
242-
roi .^= 2
243-
roi .*= 0.5 / (sigma^2)
244-
roi .-= sigma_scale^2
245-
roi .*= -1
246-
# truncate sigma_scale*sigma below zero
247-
# h = heatmap; z = measurement
248-
# l = 1/2 (h-z/σ)^2
249-
# masked_roi = 0 .< κ^2 - l
250-
251238
hgd = HeatmapGridDensity(data, domain, hint_callback, bw_factor; N = N)
252-
253239
return LevelSetGridNormal(level, sigma, float(sigma_scale), hgd)
254240
end
255241

0 commit comments

Comments
 (0)