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

Particle Filter #1419

Merged
merged 36 commits into from
Jul 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
063eeb2
[CLEAN] Removed unused typedef
Jun 11, 2024
bbfd049
[CORE] First draft of the header of the particle filter class
Jun 11, 2024
cd854cc
[CORE] Began the implementation of the vpParticleFilter class
Jun 11, 2024
19e4c0d
[CORE] Working on the monothread functions of the Particle Filter
Jun 12, 2024
a540af0
[CORE] Normalize weights and thus adapted the condition of resampling
Jun 12, 2024
cbce2fa
Merge branch 'master' into feat_particle_filter
Jun 17, 2024
0699838
[FIX] Fixed segfault due to m_w non-initialized + [EXAMPLE] created a…
Jun 17, 2024
cb9c3ee
[EXAMPLE][WIP] Working onthe Particle Filter example: improved accura…
Jun 17, 2024
cc6d1e8
[CORE] Improved vpDisplayFactory
Jun 19, 2024
cc1a9c1
[EXAMPLE] Use vpDisplayFactory in the PF example + added warmup loop …
Jun 19, 2024
7f19db2
[EXAMPLE] The PF example can now be set up using arguments
Jun 19, 2024
8448f48
[EXAMPLE] Fine-tuned the PF
Jun 19, 2024
357acea
[CORE] Added multi-threaded methods for the PF
Jun 19, 2024
8e1945b
[TEST] Transformed the PF example in two unit tests
Jun 19, 2024
7d1826e
Merge branch 'master' into feat_particle_filter
Jun 19, 2024
60dd61e
[FIX] Fix for cases where the sum of the weights is null + [FIX] The …
Jun 19, 2024
c10bb08
[TEST] Made the vpUniRand static to be able to have the same seed use…
Jun 19, 2024
a6d3ffa
[CORE] Reinitialize the weights in initParticles, to permit to reinit…
Jun 19, 2024
9d28644
Merge branch 'master' into feat_particle_filter
Jun 26, 2024
fd71cd2
[CORE] Added VP_EXPLICIT to the constructor of vpParticleFitler
Jun 26, 2024
8ad942b
Fix typo
fspindle Jun 27, 2024
c25547e
[FIX] Forgot protection around vpParticleFIlter.cpp
Jun 27, 2024
70591bb
[CORE] Renamed vpDisplayFactory::displayFactory() method into vpDispl…
Jul 1, 2024
9057c9f
[MERGE] Merged master, fixed merge conflicts related to vpDisplayFact…
Jul 1, 2024
9ac540b
[CORE] Made the vpParticleFilter a template class to be able to use o…
Jul 1, 2024
18c68de
[FIX] Fix compilation error when VISP_HAVE_DISPLAY is not defined
Jul 1, 2024
5dabd56
[FIX] Removed VISP_EXPORT in vpParticleFilter.h because the class is …
Jul 1, 2024
f228e1e
[MERGE] Merged master into feat_particle_filter
Jul 7, 2024
fc34274
[CLEAN] Removed merge conflict trace in the comments
Jul 8, 2024
bf07808
Merge branch 'master' into feat_particle_filter
Jul 16, 2024
5ef1d3e
Merge branch 'master' into feat_particle_filter
Jul 22, 2024
f2a1475
Pass title parameter as reference
fspindle Jul 22, 2024
e56c6d9
Fix typo
fspindle Jul 22, 2024
b1cb64a
Make msg more explicit
fspindle Jul 22, 2024
cd65982
Improve helper msg and return codes
fspindle Jul 22, 2024
70e8e7e
Fix particle filter tests by reverting somes changes
fspindle Jul 22, 2024
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
1 change: 1 addition & 0 deletions example/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ visp_add_subdirectory(moments/points REQUIRED_DEPS visp_core visp_vs v
visp_add_subdirectory(moments/polygon REQUIRED_DEPS visp_core visp_vs visp_robot visp_gui)
visp_add_subdirectory(ogre-simulator REQUIRED_DEPS visp_core visp_vision visp_ar visp_blob visp_io visp_gui)
visp_add_subdirectory(parse-argv REQUIRED_DEPS visp_core visp_io)
visp_add_subdirectory(particle-filter REQUIRED_DEPS visp_core visp_gui)
visp_add_subdirectory(pose-estimation REQUIRED_DEPS visp_core visp_blob visp_vision visp_io visp_gui)
visp_add_subdirectory(reflex-takktile REQUIRED_DEPS visp_core visp_robot)
visp_add_subdirectory(robot-simulator/afma6 REQUIRED_DEPS visp_core visp_vs visp_robot visp_io visp_gui)
Expand Down
2 changes: 1 addition & 1 deletion example/kalman/ukf-linear-example.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ int main(const int argc, const char *argv[])
#else
int main()
{
std::cout << "vpUnscentedKalman is only available if you compile ViSP in C++11 standard or higher." << std::endl;
std::cout << "This example is only available if you compile ViSP in C++11 standard or higher." << std::endl;
return 0;
}
#endif
2 changes: 1 addition & 1 deletion example/kalman/ukf-nonlinear-complex-example.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -677,7 +677,7 @@ int main(const int argc, const char *argv[])
#else
int main()
{
std::cout << "vpUnscentedKalman is only available if you compile ViSP in C++11 standard or higher." << std::endl;
std::cout << "This example is only available if you compile ViSP in C++11 standard or higher." << std::endl;
return 0;
}
#endif
2 changes: 1 addition & 1 deletion example/kalman/ukf-nonlinear-example.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ int main(const int argc, const char *argv[])
#else
int main()
{
std::cout << "vpUnscentedKalman is only available if you compile ViSP in C++11 standard or higher." << std::endl;
std::cout << "This example is only available if you compile ViSP in C++11 standard or higher." << std::endl;
return 0;
}
#endif
19 changes: 19 additions & 0 deletions example/particle-filter/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
cmake_minimum_required(VERSION 3.5)

project(example-kalman)

find_package(VISP REQUIRED visp_core visp_gui)

set(example_cpp)

list(APPEND example_cpp pf-nonlinear-example.cpp)

foreach(cpp ${example_cpp})
visp_add_target(${cpp})
if(COMMAND visp_add_dependency)
visp_add_dependency(${cpp} "examples")
endif()
endforeach()

visp_add_test(pf-nonlinear-example-monothread pf-nonlinear-example --nb-particles 500 --ampli-max-X 0.02 --ampli-max-Y 0.02 --ampli-max-Z 0.01 --nb-steps-main 300 --max-distance-likelihood 10 --nb-threads 1 --seed 4224 ${OPTION_TO_DESACTIVE_DISPLAY})
visp_add_test(pf-nonlinear-example-multithread pf-nonlinear-example --nb-particles 500 --ampli-max-X 0.02 --ampli-max-Y 0.02 --ampli-max-Z 0.01 --nb-steps-main 300 --max-distance-likelihood 10 --nb-threads -1 --seed 4224 ${OPTION_TO_DESACTIVE_DISPLAY})
Loading
Loading