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

[WIP] New photometric VS features + improvements to vpFeatureLuminance #1359

Open
wants to merge 28 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
7b5888f
Structuring vpFeatureLuminancePCA class
SamFlt Dec 15, 2023
dd43fea
work done during holidays
SamFlt Jan 8, 2024
e425ab1
rework classes, remove uneeded templating
SamFlt Jan 9, 2024
8d9a58e
learn PCA, needs testing
SamFlt Feb 13, 2024
46c8d28
Learn PCA, start test
SamFlt Feb 13, 2024
6f4aef0
working on luminance
SamFlt Feb 14, 2024
01b5e48
testing learning pca
SamFlt Feb 15, 2024
8c0e2de
More testing of pca, explained variance
SamFlt Feb 17, 2024
a67c811
commit before merge master
SamFlt Feb 17, 2024
9687b53
Merge remote-tracking branch 'upstream/master' into feat_luminance_pr…
SamFlt Feb 17, 2024
3807899
rework test case, mapping etc.
SamFlt Feb 19, 2024
6c9cf8c
PCA servoing works
SamFlt Feb 20, 2024
e43978b
Start work on dct
SamFlt Mar 20, 2024
9f26f6b
DCT working, example with lm control law
SamFlt Mar 22, 2024
dd8238d
Add documentation, fix doxygen warnings
SamFlt Mar 25, 2024
70af294
Merge upstream master
SamFlt Mar 25, 2024
0dffb03
Update test values to take less time
SamFlt May 21, 2024
03953c1
Merge master and resolve conflicts
SamFlt May 21, 2024
5cac988
Try and fix ZigZag library export on Windows
SamFlt May 22, 2024
c8e76e3
rename buildFrom to build
SamFlt May 22, 2024
a235ee2
Fix undefined symbols in vpLuminanceDCT
SamFlt May 23, 2024
e6237a4
GUI include guards for mapping vs example
SamFlt May 23, 2024
e92e8e7
reintroduce VISP_EXPORT for inner class
SamFlt May 23, 2024
947174f
Add guard for C++ standard around newly introduced classes, which rel…
SamFlt May 23, 2024
e0a6595
Fix include guard
SamFlt May 23, 2024
b869ace
Rerunning tests with a bit more info
SamFlt May 24, 2024
d001324
Added a bit more testing on PCA
SamFlt May 24, 2024
6564493
Fix Fallback version of matrix transpose with SimdLib for architectur…
SamFlt May 28, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
420 changes: 212 additions & 208 deletions 3rdparty/simdlib/Simd/SimdBaseCustomFunctions.cpp

Large diffs are not rendered by default.

24 changes: 24 additions & 0 deletions doc/biblio/references.bib
Original file line number Diff line number Diff line change
Expand Up @@ -674,13 +674,37 @@ @article{Malvar2004HighqualityLI
volume = {3},
pages = {iii-485}
}

@inproceedings{Labbe2022Megapose,
title = {{{MegaPose}}: {{6D Pose Estimation}} of {{Novel Objects}} via {{Render}} \& {{Compare}}},
booktitle = {CoRL},
author = {Labb\'e, Yann and Manuelli, Lucas and Mousavian, Arsalan and Tyree, Stephen and Birchfield, Stan and Tremblay, Jonathan and Carpentier, Justin and Aubry, Mathieu and Fox, Dieter and Sivic, Josef},
date = {2022}
}

@ARTICLE{Marchand19a,
author={Marchand, Eric},
journal={IEEE Robotics and Automation Letters},
title={Subspace-Based Direct Visual Servoing},
year={2019},
volume={4},
number={3},
pages={2699-2706},
keywords={Visual servoing;Feature extraction;Principal component analysis;Voltage control;Image reconstruction;Task analysis;Cameras;Visual servoing;sensor-based control},
doi={10.1109/LRA.2019.2916263}
}

@ARTICLE{Marchand20a,
author={Marchand, Eric},
journal={IEEE Robotics and Automation Letters},
title={Direct Visual Servoing in the Frequency Domain},
year={2020},
volume={5},
number={2},
pages={620-627},
keywords={Discrete cosine transforms;Visual servoing;Frequency-domain analysis;Feature extraction;Visualization;Cameras;Visual servoing;sensor-based control},
doi={10.1109/LRA.2020.2965027}

@InProceedings{Oliva22c,
Author = {Oliva, A. and Spindler, F. and Robuffo Giordano, P. and Chaumette, F.},
Title = {{A Dynamic Simulator for the Franka Emika Robot with Visual-Servoing Enabled Capabilities}},
Expand Down
5 changes: 4 additions & 1 deletion example/direct-visual-servoing/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ find_package(VISP REQUIRED visp_core visp_robot visp_visual_features visp_vs vis

set(example_cpp
photometricVisualServoing.cpp
photometricMappingVisualServoing.cpp
photometricVisualServoingWithoutVpServo.cpp
)

Expand All @@ -53,7 +54,9 @@ endforeach()

visp_set_source_file_compile_flag(photometricVisualServoing.cpp -Wno-strict-overflow)
visp_set_source_file_compile_flag(photometricVisualServoingWithoutVpServo.cpp -Wno-strict-overflow)

visp_set_source_file_compile_flag(photometricMappingVisualServoing.cpp -Wno-strict-overflow)
# Only if dataset found for isolated build
visp_add_test(photometricVisualServoing photometricVisualServoing -c -n 20 ${OPTION_TO_DESACTIVE_DISPLAY})
visp_add_test(photometricVisualServoingWithoutVpServo photometricVisualServoingWithoutVpServo -c -n 20 ${OPTION_TO_DESACTIVE_DISPLAY})
visp_add_test(photometricMappingPCAVisualServoing photometricMappingVisualServoing -c -n 200 -m pca -k 64 -p 100 -l 30.0 ${OPTION_TO_DESACTIVE_DISPLAY})
visp_add_test(photometricMappingDCTVisualServoing photometricMappingVisualServoing -c -n 200 -m dct -k 64 -l 30.0 ${OPTION_TO_DESACTIVE_DISPLAY})