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

Big merge from bruno's branch, more info below #989

Open
wants to merge 5 commits into
base: noetic-devel
Choose a base branch
from
Open
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ venv.bak/
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf
pyrightconfig.json

# Generated files
.idea/**/contentModel.xml
Expand Down Expand Up @@ -217,6 +218,7 @@ snaps/
*.vsix
.vscode/settings.json
atom_calibration/scripts/deprecated/calibration.code-workspace
*.code-workspace
atom.code-workspace
/atom_evaluation/scripts/incomplete.txt
/atom_evaluation/scripts/output_total.txt
Expand Down
2 changes: 2 additions & 0 deletions atom_batch_execution/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
cmake_minimum_required(VERSION 3.0.2)
project(atom_batch_execution)

catkin_python_setup()

## Compile as C++11, supported in ROS Kinetic and newer
# add_compile_options(-std=c++11)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ experiments:
rosrun atom_calibration calibrate -json {{ dataset_path }}/dataset.json \
-v -max_nfev 2 -ss {{ run }} \
-nig {{ e.nig_value }} {{ e.nig_value }} \
-csf 'lambda x: int(x) in {{ fold[0] }}' \
-csf 'lambda x: x in {{ fold[0] }}' \
&& \
rosrun atom_evaluation rgb_to_rgb_evaluation \
-train_json {{ dataset_path }}/atom_calibration.json \
-test_json {{ dataset_path }}/dataset.json \
-ss rgb_left -st rgb_right \
-csf 'lambda x: int(x) in {{ fold[1] }}' \
-csf 'lambda x: x in {{ fold[1] }}' \
-sfr -sfrn /tmp/rgb_rgb_evaluation.csv
files_to_collect:
- '{{ dataset_path }}/atom_calibration.json'
Expand Down
Loading