diff --git a/matlab_runners/Action Unit Experiments/helpers/find_FERA2011.m b/matlab_runners/Action Unit Experiments/helpers/find_FERA2011.m index fd5bdbd..4b760a5 100644 --- a/matlab_runners/Action Unit Experiments/helpers/find_FERA2011.m +++ b/matlab_runners/Action Unit Experiments/helpers/find_FERA2011.m @@ -2,6 +2,8 @@ if(exist('D:\Datasets\fera/au_training', 'file')) FERA2011_dir = 'D:\Datasets\fera/au_training/'; elseif(exist('/multicomp/datasets/fera2011/', 'file')) FERA2011_dir = '/multicomp/datasets/fera2011/au_training/'; +elseif(exist('E:\Datasets\fera/au_training', 'file')) + FERA2011_dir = 'E:\Datasets\fera/au_training/'; else fprintf('FERA2011 location not found (or not defined)\n'); end diff --git a/matlab_runners/Action Unit Experiments/results/DISFA_valid_res.txt b/matlab_runners/Action Unit Experiments/results/DISFA_valid_res.txt index a0631d7..6104679 100644 --- a/matlab_runners/Action Unit Experiments/results/DISFA_valid_res.txt +++ b/matlab_runners/Action Unit Experiments/results/DISFA_valid_res.txt @@ -1,12 +1,12 @@ -AU1 results - corr 0.825, rms 0.413, ccc - 0.803 -AU2 results - corr 0.758, rms 0.448, ccc - 0.652 +AU1 results - corr 0.827, rms 0.412, ccc - 0.804 +AU2 results - corr 0.762, rms 0.446, ccc - 0.656 AU4 results - corr 0.874, rms 0.565, ccc - 0.848 -AU5 results - corr 0.747, rms 0.180, ccc - 0.717 +AU5 results - corr 0.744, rms 0.181, ccc - 0.714 AU6 results - corr 0.702, rms 0.604, ccc - 0.657 -AU9 results - corr 0.740, rms 0.384, ccc - 0.688 -AU12 results - corr 0.864, rms 0.511, ccc - 0.850 -AU15 results - corr 0.744, rms 0.269, ccc - 0.712 -AU17 results - corr 0.641, rms 0.520, ccc - 0.572 -AU20 results - corr 0.619, rms 0.311, ccc - 0.581 +AU9 results - corr 0.741, rms 0.384, ccc - 0.688 +AU12 results - corr 0.864, rms 0.510, ccc - 0.850 +AU15 results - corr 0.745, rms 0.269, ccc - 0.712 +AU17 results - corr 0.640, rms 0.521, ccc - 0.571 +AU20 results - corr 0.618, rms 0.311, ccc - 0.580 AU25 results - corr 0.926, rms 0.500, ccc - 0.920 AU26 results - corr 0.803, rms 0.449, ccc - 0.763 diff --git a/matlab_runners/Action Unit Experiments/results/FERA2011_res_class.txt b/matlab_runners/Action Unit Experiments/results/FERA2011_res_class.txt index 1666163..f17b145 100644 --- a/matlab_runners/Action Unit Experiments/results/FERA2011_res_class.txt +++ b/matlab_runners/Action Unit Experiments/results/FERA2011_res_class.txt @@ -1,11 +1,11 @@ -AU1 class, Precision - 0.590, Recall - 0.715, F1 - 0.647 -AU2 class, Precision - 0.473, Recall - 0.749, F1 - 0.580 +AU1 class, Precision - 0.590, Recall - 0.714, F1 - 0.646 +AU2 class, Precision - 0.474, Recall - 0.750, F1 - 0.581 AU4 class, Precision - 0.509, Recall - 0.745, F1 - 0.605 -AU6 class, Precision - 0.834, Recall - 0.667, F1 - 0.741 +AU6 class, Precision - 0.835, Recall - 0.667, F1 - 0.741 AU7 class, Precision - 0.686, Recall - 0.792, F1 - 0.735 -AU10 class, Precision - 0.520, Recall - 0.737, F1 - 0.610 -AU12 class, Precision - 0.919, Recall - 0.657, F1 - 0.766 -AU15 class, Precision - 0.363, Recall - 0.638, F1 - 0.462 +AU10 class, Precision - 0.522, Recall - 0.738, F1 - 0.612 +AU12 class, Precision - 0.919, Recall - 0.658, F1 - 0.767 +AU15 class, Precision - 0.361, Recall - 0.638, F1 - 0.461 AU17 class, Precision - 0.231, Recall - 0.280, F1 - 0.253 AU25 class, Precision - 0.205, Recall - 0.871, F1 - 0.332 AU26 class, Precision - 0.122, Recall - 0.974, F1 - 0.217 diff --git a/matlab_runners/Action Unit Experiments/results/SEMAINE_valid_res.txt b/matlab_runners/Action Unit Experiments/results/SEMAINE_valid_res.txt index 946c6e1..f776d82 100644 --- a/matlab_runners/Action Unit Experiments/results/SEMAINE_valid_res.txt +++ b/matlab_runners/Action Unit Experiments/results/SEMAINE_valid_res.txt @@ -1,6 +1,6 @@ -AU2 class, Precision - 0.360, Recall - 0.743, F1 - 0.485 -AU12 class, Precision - 0.427, Recall - 0.782, F1 - 0.553 -AU17 class, Precision - 0.114, Recall - 0.819, F1 - 0.201 +AU2 class, Precision - 0.360, Recall - 0.742, F1 - 0.485 +AU12 class, Precision - 0.427, Recall - 0.781, F1 - 0.552 +AU17 class, Precision - 0.111, Recall - 0.813, F1 - 0.195 AU25 class, Precision - 0.337, Recall - 0.523, F1 - 0.410 -AU28 class, Precision - 0.443, Recall - 0.482, F1 - 0.462 -AU45 class, Precision - 0.293, Recall - 0.615, F1 - 0.397 +AU28 class, Precision - 0.430, Recall - 0.471, F1 - 0.450 +AU45 class, Precision - 0.295, Recall - 0.615, F1 - 0.399 diff --git a/matlab_runners/Action Unit Experiments/run_AU_prediction_DISFA.m b/matlab_runners/Action Unit Experiments/run_AU_prediction_DISFA.m index 2506ee3..9eeeab5 100644 --- a/matlab_runners/Action Unit Experiments/run_AU_prediction_DISFA.m +++ b/matlab_runners/Action Unit Experiments/run_AU_prediction_DISFA.m @@ -8,6 +8,8 @@ end if(exist('D:/Datasets/DISFA/Videos_LeftCamera/', 'file')) DISFA_dir = 'D:/Datasets/DISFA/Videos_LeftCamera/'; +elseif(exist('E:/Datasets/DISFA/Videos_LeftCamera/', 'file')) + DISFA_dir = 'E:/Datasets/DISFA/Videos_LeftCamera/'; else DISFA_dir = '/multicomp/datasets/face_datasets/DISFA/Videos_LeftCamera/'; end diff --git a/matlab_runners/Feature Point Experiments/results/fps_yt.mat b/matlab_runners/Feature Point Experiments/results/fps_yt.mat index a55410f..37cae7b 100644 Binary files a/matlab_runners/Feature Point Experiments/results/fps_yt.mat and b/matlab_runners/Feature Point Experiments/results/fps_yt.mat differ diff --git a/matlab_runners/Feature Point Experiments/results/in-the-wild-res-no-outline.pdf b/matlab_runners/Feature Point Experiments/results/in-the-wild-res-no-outline.pdf index 4ae585b..74eaf56 100644 Binary files a/matlab_runners/Feature Point Experiments/results/in-the-wild-res-no-outline.pdf and b/matlab_runners/Feature Point Experiments/results/in-the-wild-res-no-outline.pdf differ diff --git a/matlab_runners/Feature Point Experiments/results/landmark_detections.mat b/matlab_runners/Feature Point Experiments/results/landmark_detections.mat index 2465000..6c78696 100644 Binary files a/matlab_runners/Feature Point Experiments/results/landmark_detections.mat and b/matlab_runners/Feature Point Experiments/results/landmark_detections.mat differ diff --git a/matlab_runners/Feature Point Experiments/run_OpenFace_feature_point_tests_300W.m b/matlab_runners/Feature Point Experiments/run_OpenFace_feature_point_tests_300W.m index ae81947..b997f55 100644 --- a/matlab_runners/Feature Point Experiments/run_OpenFace_feature_point_tests_300W.m +++ b/matlab_runners/Feature Point Experiments/run_OpenFace_feature_point_tests_300W.m @@ -7,6 +7,8 @@ if(exist([getenv('USERPROFILE') '/Dropbox/AAM/test data/'], 'file')) database_root = [getenv('USERPROFILE') '/Dropbox/AAM/test data/']; elseif(exist('D:/Dropbox/Dropbox/AAM/test data/', 'file')) database_root = 'D:/Dropbox/Dropbox/AAM/test data/'; +elseif(exist('F:/Dropbox/AAM/test data/', 'file')) + database_root = 'F:/Dropbox/AAM/test data/'; else database_root = '/multicomp/datasets/300-W/'; end diff --git a/matlab_runners/Feature Point Experiments/run_yt_dataset.m b/matlab_runners/Feature Point Experiments/run_yt_dataset.m index 5c38e45..8d3c29a 100644 --- a/matlab_runners/Feature Point Experiments/run_yt_dataset.m +++ b/matlab_runners/Feature Point Experiments/run_yt_dataset.m @@ -16,6 +16,8 @@ if(exist([getenv('USERPROFILE') '/Dropbox/AAM/test data/'], 'file')) database_root = [getenv('USERPROFILE') '/Dropbox/AAM/test data/']; elseif(exist('D:/Dropbox/Dropbox/AAM/test data/', 'file')) database_root = 'D:/Dropbox/Dropbox/AAM/test data/'; +elseif(exist('F:/Dropbox/AAM/test data/', 'file')) + database_root = 'F:/Dropbox/AAM/test data/'; else database_root = '/multicomp/datasets/'; end diff --git a/matlab_runners/Head Pose Experiments/results/Pose_OF.mat b/matlab_runners/Head Pose Experiments/results/Pose_OF.mat index baa1c11..74a248e 100644 Binary files a/matlab_runners/Head Pose Experiments/results/Pose_OF.mat and b/matlab_runners/Head Pose Experiments/results/Pose_OF.mat differ diff --git a/matlab_runners/Head Pose Experiments/results/Pose_OF.txt b/matlab_runners/Head Pose Experiments/results/Pose_OF.txt index e05007a..36f94a1 100644 --- a/matlab_runners/Head Pose Experiments/results/Pose_OF.txt +++ b/matlab_runners/Head Pose Experiments/results/Pose_OF.txt @@ -1,4 +1,4 @@ Dataset and model, pitch, yaw, roll, mean, median -biwi error: 7.163, 5.314, 4.760, 5.746, 2.617 +biwi error: 7.092, 5.170, 4.657, 5.640, 2.607 bu error: 2.769, 4.105, 2.569, 3.147, 2.118 ict error: 3.489, 3.632, 3.538, 3.553, 2.029 diff --git a/matlab_runners/Head Pose Experiments/run_head_pose_tests_OpenFace.m b/matlab_runners/Head Pose Experiments/run_head_pose_tests_OpenFace.m index d8a7c0e..7059f13 100644 --- a/matlab_runners/Head Pose Experiments/run_head_pose_tests_OpenFace.m +++ b/matlab_runners/Head Pose Experiments/run_head_pose_tests_OpenFace.m @@ -10,6 +10,8 @@ elseif(exist([getenv('USERPROFILE') '/Dropbox/AAM/test data/'], 'file')) database_root = [getenv('USERPROFILE') '/Dropbox/AAM/test data/']; elseif(exist([getenv('USERPROFILE') 'F:/Dropbox/Dropbox/AAM/test data/'], 'file')) database_root = 'F:/Dropbox/Dropbox/AAM/test data/'; +elseif(exist('F:/Dropbox/AAM/test data/', 'file')) + database_root = 'F:/Dropbox/AAM/test data/'; else database_root = '/multicomp/datasets/head_pose_dbs/'; end