From 5d864dffa278d5352b2561c69cff3fe97e2319df Mon Sep 17 00:00:00 2001 From: CompatHelper Julia Date: Wed, 13 Dec 2023 01:04:45 +0000 Subject: [PATCH 1/4] CompatHelper: bump compat for RecursiveArrayTools to 3, (keep existing compat) --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 8d5b52fb..2ea74c4d 100644 --- a/Project.toml +++ b/Project.toml @@ -87,7 +87,7 @@ Optim = "1" OrderedCollections = "1" PrecompileTools = "1" ProgressMeter = "1" -RecursiveArrayTools = "2.31.1" +RecursiveArrayTools = "2.31.1, 3" Reexport = "1" SparseDiffTools = "2" StaticArrays = "1" From 6829eee410d934f86343fc047921aa9ba115d953 Mon Sep 17 00:00:00 2001 From: dehann Date: Sun, 14 Jan 2024 15:08:40 -0800 Subject: [PATCH 2/4] excess code cleanup heatmap sampler --- ext/HeatmapSampler.jl | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/ext/HeatmapSampler.jl b/ext/HeatmapSampler.jl index ce453a42..dbb3e041 100644 --- a/ext/HeatmapSampler.jl +++ b/ext/HeatmapSampler.jl @@ -124,12 +124,12 @@ function sampleHeatmap( 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 idx2d = findall(mask) # 2D indices pos = (v -> [x_grid[v[1]], y_grid[v[2]]]).(idx2d) @@ -235,21 +235,7 @@ function LevelSetGridNormal( 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 From 74972a99f3834ea954bd213ad8d00ab3107a6d2f Mon Sep 17 00:00:00 2001 From: Dehann Fourie <6412556+dehann@users.noreply.github.com> Date: Sun, 21 Jan 2024 01:23:34 -0800 Subject: [PATCH 3/4] bump v0.35.2 --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 2ea74c4d..2125b1c5 100644 --- a/Project.toml +++ b/Project.toml @@ -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" From 7910b27f76865aff0db21d74fbac33d46d1a903d Mon Sep 17 00:00:00 2001 From: Dehann Fourie <6412556+dehann@users.noreply.github.com> Date: Sun, 21 Jan 2024 01:36:28 -0800 Subject: [PATCH 4/4] CI on JL v1.10 --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 956d35b8..6e348318 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: fail-fast: false matrix: version: - - '1.9' + - '1.10' os: - ubuntu-latest arch: @@ -54,7 +54,7 @@ jobs: arch: - x64 version: - - '~1.10.0-0' + - '1.10' group: - 'basic_functional_group' steps: @@ -96,7 +96,7 @@ jobs: arch: - x64 version: - - '~1.10.0-0' + - '1.10' group: - 'test_cases_group' steps: @@ -139,7 +139,7 @@ jobs: os: - ubuntu-latest version: - - '1.9' + - '1.10' arch: - x64 group: