Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fast-forward integration test #1813

Merged
merged 8 commits into from
Jan 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
fail-fast: false
matrix:
version:
- '1.9'
- '1.10'
os:
- ubuntu-latest
arch:
Expand Down Expand Up @@ -54,7 +54,7 @@ jobs:
arch:
- x64
version:
- '~1.10.0-0'
- '1.10'
group:
- 'basic_functional_group'
steps:
Expand Down Expand Up @@ -96,7 +96,7 @@ jobs:
arch:
- x64
version:
- '~1.10.0-0'
- '1.10'
group:
- 'test_cases_group'
steps:
Expand Down Expand Up @@ -139,7 +139,7 @@ jobs:
os:
- ubuntu-latest
version:
- '1.9'
- '1.10'
arch:
- x64
group:
Expand Down
11 changes: 6 additions & 5 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name = "IncrementalInference"
uuid = "904591bb-b899-562f-9e6f-b8df64c7d480"
keywords = ["MM-iSAMv2", "Bayes tree", "junction tree", "Bayes network", "variable elimination", "graphical models", "SLAM", "inference", "sum-product", "belief-propagation"]
desc = "Implements the Multimodal-iSAMv2 algorithm."
version = "0.35.1"
version = "0.35.2"

[deps]
ApproxManifoldProducts = "9bbbb610-88a1-53cd-9763-118ce10c1f89"
Expand Down Expand Up @@ -78,25 +78,26 @@ FiniteDifferences = "0.12"
FunctionalStateMachine = "0.2.9"
JSON3 = "1"
KernelDensityEstimate = "0.5.6"
LinearAlgebra = "1.10"
ManifoldDiff = "0.3"
Manifolds = "0.9"
Manifolds = "0.9.12"
ManifoldsBase = "0.15"
Manopt = "0.4.40"
MetaGraphs = "0.7"
Optim = "1"
OrderedCollections = "1"
PrecompileTools = "1"
ProgressMeter = "1"
RecursiveArrayTools = "2.31.1"
RecursiveArrayTools = "2.31.1, 3"
Reexport = "1"
SparseDiffTools = "2"
StaticArrays = "1"
Statistics = "1"
Statistics = "1.10"
StatsBase = "0.32, 0.33, 0.34"
StructTypes = "1"
TensorCast = "0.3.3, 0.4"
TimeZones = "1.3.1"
julia = "1.9"
julia = "1.10"

[extras]
AMD = "14f7f29c-3bd6-536c-9a0b-7339e30b5a3e"
Expand Down
18 changes: 2 additions & 16 deletions ext/HeatmapSampler.jl
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,12 @@
roi::AbstractMatrix{<:Real},
x_grid::AbstractVector{<:Real},
y_grid::AbstractVector{<:Real},
thres::Real = 0,
thres::Real = 1e-14,
)
#

# mask the region of interest above the sampling threshold value
mask = thres .<= roi
mask = thres .< roi

Check warning on line 132 in ext/HeatmapSampler.jl

View check run for this annotation

Codecov / codecov/patch

ext/HeatmapSampler.jl#L132

Added line #L132 was not covered by tests

idx2d = findall(mask) # 2D indices
pos = (v -> [x_grid[v[1]], y_grid[v[2]]]).(idx2d)
Expand Down Expand Up @@ -235,21 +235,7 @@
N::Int = 10000,
)
#

# select the support from raw data
roi = data .- level
# make Gaussian
roi .^= 2
roi .*= 0.5 / (sigma^2)
roi .-= sigma_scale^2
roi .*= -1
# truncate sigma_scale*sigma below zero
# h = heatmap; z = measurement
# l = 1/2 (h-z/σ)^2
# masked_roi = 0 .< κ^2 - l

hgd = HeatmapGridDensity(data, domain, hint_callback, bw_factor; N = N)

return LevelSetGridNormal(level, sigma, float(sigma_scale), hgd)
end

Expand Down
Loading