Skip to content

Commit

Permalink
Big merge from bruno's branch, more info below
Browse files Browse the repository at this point in the history
This is a big merge from the work I was doing during my MsC thesis.
Amongst others, these are the changes : - Added rrbot and softbot batch
examples- Fixed multiple small bugs associated with batch execution. I
will test this thoroughly now when running the batches for Zau. I think
I was the last one using batch executions so my fixes still make sense.-
Added the plotting script for the batch execution.- Added a few utility
functions such as
"stripAutomaticSuffixes","mutually_inclusive_conditions","parse_list_of_transformations","deleteCollectionFromDataset".-
Change the name of function "addNoiseToJointParameters" to
"addBiasToJointParameter" to better reflect function behavior.- Reworked
how noise works with rotations. Now it uses a uniform function instead
of choice. Now all noises use a main "computeNoise" function.- Added the
functionality to add noise to specific transformations in the calibrate
script.
  • Loading branch information
brunofavs committed Oct 8, 2024
1 parent 1627511 commit fc1ea8f
Show file tree
Hide file tree
Showing 52 changed files with 892 additions and 80,579 deletions.
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
19 changes: 0 additions & 19 deletions atom_batch_execution/experiments/softbot_example/README.md

This file was deleted.

29 changes: 0 additions & 29 deletions atom_batch_execution/experiments/softbot_example/data.yml

This file was deleted.

Loading

0 comments on commit fc1ea8f

Please sign in to comment.