diff --git a/.gitignore b/.gitignore index 564feb53..142cbb7f 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,4 @@ matlab_runners/Action Unit Experiments/out_fera/ matlab_runners/Action Unit Experiments/out_SEMAINE/ matlab_runners/Gaze Experiments/mpii_out/ *.vspx +matlab_version/AU_training/experiments/full_model_training/mat_models_o/ diff --git a/lib/local/FaceAnalyser/AU_predictors/AU_all_best.txt b/lib/local/FaceAnalyser/AU_predictors/AU_all_best.txt index d944851d..e3556988 100644 --- a/lib/local/FaceAnalyser/AU_predictors/AU_all_best.txt +++ b/lib/local/FaceAnalyser/AU_predictors/AU_all_best.txt @@ -14,7 +14,7 @@ svm_combined/AU_20_dynamic.dat AU20 svm_combined/AU_23_static.dat AU23 svm_combined/AU_25_dynamic.dat AU25 svm_combined/AU_26_dynamic.dat AU26 -svm_combined/AU_28_static.dat AU28 +svm_combined/AU_28_dynamic.dat AU28 svm_combined/AU_45_dynamic.dat AU45 svr_combined/AU_1_dynamic_intensity_comb.dat AU01 svr_combined/AU_2_dynamic_intensity_comb.dat AU02 diff --git a/lib/local/FaceAnalyser/AU_predictors/AU_all_static.txt b/lib/local/FaceAnalyser/AU_predictors/AU_all_static.txt index 41e696b4..4d9504aa 100644 --- a/lib/local/FaceAnalyser/AU_predictors/AU_all_static.txt +++ b/lib/local/FaceAnalyser/AU_predictors/AU_all_static.txt @@ -16,7 +16,7 @@ svm_combined/AU_25_static.dat AU25 svm_combined/AU_26_static.dat AU26 svm_combined/AU_28_static.dat AU28 svm_combined/AU_45_static.dat AU45 -svr_combined/AU_1_static_intensity.dat AU01 +svr_combined/AU_1_static_intensity_comb.dat AU01 svr_combined/AU_2_static_intensity_comb.dat AU02 svr_combined/AU_4_static_intensity_comb.dat AU04 svr_combined/AU_5_static_intensity.dat AU05 diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_10_dynamic.dat b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_10_dynamic.dat index 169a5b8a..99d4b26c 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_10_dynamic.dat and b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_10_dynamic.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_10_static.dat b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_10_static.dat index 149fcf35..fe0e58b8 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_10_static.dat and b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_10_static.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_12_dynamic.dat b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_12_dynamic.dat index 2f36f6fd..4aa70baf 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_12_dynamic.dat and b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_12_dynamic.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_12_static.dat b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_12_static.dat index 2b0c3ab5..1f3eda67 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_12_static.dat and b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_12_static.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_14_dynamic.dat b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_14_dynamic.dat index c31894a1..86cb97e1 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_14_dynamic.dat and b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_14_dynamic.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_14_static.dat b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_14_static.dat index e067b63d..8bae8d50 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_14_static.dat and b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_14_static.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_15_dynamic.dat b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_15_dynamic.dat index 886c0d14..5ae29f54 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_15_dynamic.dat and b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_15_dynamic.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_15_static.dat b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_15_static.dat index 4e8c136f..bce32a44 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_15_static.dat and b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_15_static.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_17_dynamic.dat b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_17_dynamic.dat index 8764e93d..8098bd08 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_17_dynamic.dat and b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_17_dynamic.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_17_static.dat b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_17_static.dat index 4a44b6b1..0f3a1c55 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_17_static.dat and b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_17_static.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_1_dynamic.dat b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_1_dynamic.dat index 8da47385..29c746fd 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_1_dynamic.dat and b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_1_dynamic.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_1_static.dat b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_1_static.dat index 4a93caf7..1aff0990 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_1_static.dat and b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_1_static.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_20_dynamic.dat b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_20_dynamic.dat index 3b2eb5ae..a563caab 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_20_dynamic.dat and b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_20_dynamic.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_20_static.dat b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_20_static.dat index 64f27b30..1e85e3da 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_20_static.dat and b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_20_static.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_23_dynamic.dat b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_23_dynamic.dat index 8c8f7c8a..cf2a1327 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_23_dynamic.dat and b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_23_dynamic.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_23_static.dat b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_23_static.dat index 12ec7fde..68927fe1 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_23_static.dat and b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_23_static.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_25_dynamic.dat b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_25_dynamic.dat index ee7f6eea..1fb3ed0b 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_25_dynamic.dat and b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_25_dynamic.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_25_static.dat b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_25_static.dat index c0a3226b..193b34b7 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_25_static.dat and b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_25_static.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_26_dynamic.dat b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_26_dynamic.dat index 2b04a5ae..e5f04074 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_26_dynamic.dat and b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_26_dynamic.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_26_static.dat b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_26_static.dat index fbc41322..087d763d 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_26_static.dat and b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_26_static.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_28_dynamic.dat b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_28_dynamic.dat index 5f84b18b..d48f74a6 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_28_dynamic.dat and b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_28_dynamic.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_28_static.dat b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_28_static.dat index a9af4fdd..74d3dc37 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_28_static.dat and b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_28_static.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_2_dynamic.dat b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_2_dynamic.dat index 8f9cb984..60ead140 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_2_dynamic.dat and b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_2_dynamic.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_2_static.dat b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_2_static.dat index 288634e9..631a726f 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_2_static.dat and b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_2_static.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_45_dynamic.dat b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_45_dynamic.dat index b58b9277..c46d762c 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_45_dynamic.dat and b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_45_dynamic.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_45_static.dat b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_45_static.dat index 830aee7d..c2e19935 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_45_static.dat and b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_45_static.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_4_dynamic.dat b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_4_dynamic.dat index e56d1b20..87dc3310 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_4_dynamic.dat and b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_4_dynamic.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_4_static.dat b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_4_static.dat index 08e875a6..ae5a7457 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_4_static.dat and b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_4_static.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_5_dynamic.dat b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_5_dynamic.dat index fc0beebb..9f920e76 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_5_dynamic.dat and b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_5_dynamic.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_5_static.dat b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_5_static.dat index c6dd7e18..d2b532eb 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_5_static.dat and b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_5_static.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_6_dynamic.dat b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_6_dynamic.dat index e5dd4469..f643aab6 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_6_dynamic.dat and b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_6_dynamic.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_6_static.dat b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_6_static.dat index c53afee7..ae1ad6f0 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_6_static.dat and b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_6_static.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_7_dynamic.dat b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_7_dynamic.dat index 55ea2ee8..c5ee2da1 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_7_dynamic.dat and b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_7_dynamic.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_7_static.dat b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_7_static.dat index ec665e2d..f7e0d8e5 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_7_static.dat and b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_7_static.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_9_dynamic.dat b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_9_dynamic.dat index aa120df4..555fe74d 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_9_dynamic.dat and b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_9_dynamic.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_9_static.dat b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_9_static.dat index 0c460579..9f6cc197 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_9_static.dat and b/lib/local/FaceAnalyser/AU_predictors/svm_combined/AU_9_static.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_10_static_intensity_comb.dat b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_10_static_intensity_comb.dat index 624731e3..cebcf977 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_10_static_intensity_comb.dat and b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_10_static_intensity_comb.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_12_static_intensity_comb.dat b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_12_static_intensity_comb.dat index 406fd810..16467cc9 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_12_static_intensity_comb.dat and b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_12_static_intensity_comb.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_14_static_intensity.dat b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_14_static_intensity.dat index 83c864ee..7a8300bc 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_14_static_intensity.dat and b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_14_static_intensity.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_15_dynamic_intensity_comb.dat b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_15_dynamic_intensity_comb.dat index 00f802cf..3ff7e047 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_15_dynamic_intensity_comb.dat and b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_15_dynamic_intensity_comb.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_15_static_intensity_comb.dat b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_15_static_intensity_comb.dat index 3a22f41a..99820fcc 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_15_static_intensity_comb.dat and b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_15_static_intensity_comb.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_17_dynamic_intensity_comb.dat b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_17_dynamic_intensity_comb.dat index 8e5c2389..55630722 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_17_dynamic_intensity_comb.dat and b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_17_dynamic_intensity_comb.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_17_static_intensity_comb.dat b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_17_static_intensity_comb.dat index 109c7740..ec0a7670 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_17_static_intensity_comb.dat and b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_17_static_intensity_comb.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_1_dynamic_intensity_comb.dat b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_1_dynamic_intensity_comb.dat index db183754..df9f0062 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_1_dynamic_intensity_comb.dat and b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_1_dynamic_intensity_comb.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_1_static_intensity.dat b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_1_static_intensity.dat deleted file mode 100644 index 065b1c52..00000000 Binary files a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_1_static_intensity.dat and /dev/null differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_1_static_intensity_comb.dat b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_1_static_intensity_comb.dat new file mode 100644 index 00000000..58b65d88 Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_1_static_intensity_comb.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_20_dynamic_intensity.dat b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_20_dynamic_intensity.dat index 554df8c7..d6565e9a 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_20_dynamic_intensity.dat and b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_20_dynamic_intensity.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_20_static_intensity.dat b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_20_static_intensity.dat index eb78b669..cdc411b3 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_20_static_intensity.dat and b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_20_static_intensity.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_23_dynamic_intensity_comb.dat b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_23_dynamic_intensity_comb.dat index a6f437a7..a865a8e1 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_23_dynamic_intensity_comb.dat and b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_23_dynamic_intensity_comb.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_23_static_intensity_comb.dat b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_23_static_intensity_comb.dat index bd03fe24..ac63ad96 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_23_static_intensity_comb.dat and b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_23_static_intensity_comb.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_25_dynamic_intensity_comb.dat b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_25_dynamic_intensity_comb.dat index f161ad8c..8efd99ff 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_25_dynamic_intensity_comb.dat and b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_25_dynamic_intensity_comb.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_25_static_intensity.dat b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_25_static_intensity.dat index 411670da..bc93ba21 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_25_static_intensity.dat and b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_25_static_intensity.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_26_dynamic_intensity_comb.dat b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_26_dynamic_intensity_comb.dat index c5b2597e..0782756e 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_26_dynamic_intensity_comb.dat and b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_26_dynamic_intensity_comb.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_26_static_intensity_comb.dat b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_26_static_intensity_comb.dat index 3119305f..8da5e7b8 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_26_static_intensity_comb.dat and b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_26_static_intensity_comb.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_2_dynamic_intensity_comb.dat b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_2_dynamic_intensity_comb.dat index 89391784..b4093a46 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_2_dynamic_intensity_comb.dat and b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_2_dynamic_intensity_comb.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_2_static_intensity_comb.dat b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_2_static_intensity_comb.dat index 12f7ce84..f17cd021 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_2_static_intensity_comb.dat and b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_2_static_intensity_comb.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_45_dynamic_intensity_comb.dat b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_45_dynamic_intensity_comb.dat index 2f6c0b54..7ac45c76 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_45_dynamic_intensity_comb.dat and b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_45_dynamic_intensity_comb.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_45_static_intensity_comb.dat b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_45_static_intensity_comb.dat index 28bce9a0..7910f8e0 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_45_static_intensity_comb.dat and b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_45_static_intensity_comb.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_4_static_intensity_comb.dat b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_4_static_intensity_comb.dat index 8204a879..3b012f7a 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_4_static_intensity_comb.dat and b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_4_static_intensity_comb.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_5_dynamic_intensity.dat b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_5_dynamic_intensity.dat index 14f43f53..2be4f8dc 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_5_dynamic_intensity.dat and b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_5_dynamic_intensity.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_5_static_intensity.dat b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_5_static_intensity.dat index 5c3481b5..f200e45e 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_5_static_intensity.dat and b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_5_static_intensity.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_6_static_intensity_comb.dat b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_6_static_intensity_comb.dat index 69c3005d..1497ce9b 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_6_static_intensity_comb.dat and b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_6_static_intensity_comb.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_7_static_intensity_comb.dat b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_7_static_intensity_comb.dat index 04b4a112..f8465f1b 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_7_static_intensity_comb.dat and b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_7_static_intensity_comb.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_9_dynamic_intensity.dat b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_9_dynamic_intensity.dat index c809ddcd..469d863d 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_9_dynamic_intensity.dat and b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_9_dynamic_intensity.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_9_static_intensity.dat b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_9_static_intensity.dat index 7cdfc5d6..a71f6f2c 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_9_static_intensity.dat and b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_9_static_intensity.dat differ diff --git a/lib/local/LandmarkDetector/model/early_term_cen_of.txt b/lib/local/LandmarkDetector/model/early_term_cen_of.txt index f7c39aca..810a21db 100644 --- a/lib/local/LandmarkDetector/model/early_term_cen_of.txt +++ b/lib/local/LandmarkDetector/model/early_term_cen_of.txt @@ -1 +1 @@ -1.000 0.969 1.017 0.954 0.954 1.017 0.969 0.000 0.047 0.164 -0.375 -0.375 0.164 0.047 -0.270 -0.260 -0.170 0.250 0.250 -0.170 -0.260 \ No newline at end of file +1.000 1.005 1.054 0.976 0.976 1.054 1.005 0.000 0.049 0.121 -0.370 -0.370 0.121 0.049 -0.230 -0.200 -0.140 0.260 0.260 -0.140 -0.200 \ No newline at end of file diff --git a/lib/local/LandmarkDetector/src/LandmarkDetectorParameters.cpp b/lib/local/LandmarkDetector/src/LandmarkDetectorParameters.cpp index 2a3f7fd0..85121769 100644 --- a/lib/local/LandmarkDetector/src/LandmarkDetectorParameters.cpp +++ b/lib/local/LandmarkDetector/src/LandmarkDetectorParameters.cpp @@ -151,9 +151,7 @@ FaceModelParameters::FaceModelParameters(vector &arguments) else if (arguments[i].compare("-gaze") == 0) { track_gaze = true; - valid[i] = false; - i++; } else if (arguments[i].compare("-q") == 0) { @@ -308,7 +306,7 @@ void FaceModelParameters::init() limit_pose = true; multi_view = false; - reinit_video_every = 4; + reinit_video_every = 2; // Face detection haar_face_detector_location = "classifiers/haarcascade_frontalface_alt.xml"; diff --git a/lib/local/LandmarkDetector/src/LandmarkDetectorUtils.cpp b/lib/local/LandmarkDetector/src/LandmarkDetectorUtils.cpp index edae2638..e2b2aa4b 100644 --- a/lib/local/LandmarkDetector/src/LandmarkDetectorUtils.cpp +++ b/lib/local/LandmarkDetector/src/LandmarkDetectorUtils.cpp @@ -1612,8 +1612,8 @@ bool DetectSingleFaceMTCNN(cv::Rect_& o_region, const cv::Mat& image, La if (use_preferred) { - dist = sqrt((preference.x - (face_detections[0].width / 2 + face_detections[0].x)) * (preference.x - (face_detections[0].width / 2 + face_detections[0].x)) + - (preference.y - (face_detections[0].height / 2 + face_detections[0].y)) * (preference.y - (face_detections[0].height / 2 + face_detections[0].y))); + dist = sqrt((preference.x - (face_detections[i].width / 2 + face_detections[i].x)) * (preference.x - (face_detections[i].width / 2 + face_detections[i].x)) + + (preference.y - (face_detections[i].height / 2 + face_detections[i].y)) * (preference.y - (face_detections[i].height / 2 + face_detections[i].y))); better = dist < best_so_far; } else diff --git a/matlab_runners/Feature Point Experiments/results/300VW_49.txt b/matlab_runners/Feature Point Experiments/results/300VW_49.txt index 53ccdb9b..d3058a5c 100644 --- a/matlab_runners/Feature Point Experiments/results/300VW_49.txt +++ b/matlab_runners/Feature Point Experiments/results/300VW_49.txt @@ -8,4 +8,4 @@ PO-CR 2.95 3.08 3.68 CFAN 3.17 3.72 4.94 ------------------------------ OpenFace CLNF 2.83 3.38 3.82 -OpenFace CE-CLM 2.40 2.65 3.16 +OpenFace CE-CLM 2.41 2.67 3.21 diff --git a/matlab_runners/Feature Point Experiments/results/300VW_66.txt b/matlab_runners/Feature Point Experiments/results/300VW_66.txt index 737cafb1..b7e22c4d 100644 --- a/matlab_runners/Feature Point Experiments/results/300VW_66.txt +++ b/matlab_runners/Feature Point Experiments/results/300VW_66.txt @@ -6,4 +6,4 @@ ICCR 3.37 3.45 4.46 CFAN 3.93 4.43 6.39 ------------------------------ OpenFace CLNF 3.79 4.23 4.78 -OpenFace CE-CLM 3.15 3.54 4.12 +OpenFace CE-CLM 3.15 3.55 4.18 diff --git a/matlab_runners/Feature Point Experiments/results/300VW_OpenFace.mat b/matlab_runners/Feature Point Experiments/results/300VW_OpenFace.mat index ef9a672c..68dd6b0c 100644 Binary files a/matlab_runners/Feature Point Experiments/results/300VW_OpenFace.mat and b/matlab_runners/Feature Point Experiments/results/300VW_OpenFace.mat differ diff --git a/matlab_runners/Feature Point Experiments/results/300VWres_49_cat1.pdf b/matlab_runners/Feature Point Experiments/results/300VWres_49_cat1.pdf index 7a3cbd16..ac42bebf 100644 Binary files a/matlab_runners/Feature Point Experiments/results/300VWres_49_cat1.pdf and b/matlab_runners/Feature Point Experiments/results/300VWres_49_cat1.pdf differ diff --git a/matlab_runners/Feature Point Experiments/results/300VWres_49_cat2.pdf b/matlab_runners/Feature Point Experiments/results/300VWres_49_cat2.pdf index 99c68f41..c3faaf2d 100644 Binary files a/matlab_runners/Feature Point Experiments/results/300VWres_49_cat2.pdf and b/matlab_runners/Feature Point Experiments/results/300VWres_49_cat2.pdf differ diff --git a/matlab_runners/Feature Point Experiments/results/300VWres_49_cat3.pdf b/matlab_runners/Feature Point Experiments/results/300VWres_49_cat3.pdf index 602d844d..c84d2d6d 100644 Binary files a/matlab_runners/Feature Point Experiments/results/300VWres_49_cat3.pdf and b/matlab_runners/Feature Point Experiments/results/300VWres_49_cat3.pdf differ diff --git a/matlab_runners/Feature Point Experiments/results/300VWres_66_cat1.pdf b/matlab_runners/Feature Point Experiments/results/300VWres_66_cat1.pdf index 4bb8afe8..05c4c9de 100644 Binary files a/matlab_runners/Feature Point Experiments/results/300VWres_66_cat1.pdf and b/matlab_runners/Feature Point Experiments/results/300VWres_66_cat1.pdf differ diff --git a/matlab_runners/Feature Point Experiments/results/300VWres_66_cat2.pdf b/matlab_runners/Feature Point Experiments/results/300VWres_66_cat2.pdf index f3670a2b..5649e271 100644 Binary files a/matlab_runners/Feature Point Experiments/results/300VWres_66_cat2.pdf and b/matlab_runners/Feature Point Experiments/results/300VWres_66_cat2.pdf differ diff --git a/matlab_runners/Feature Point Experiments/results/300VWres_66_cat3.pdf b/matlab_runners/Feature Point Experiments/results/300VWres_66_cat3.pdf index 8fd46d9a..8673bdf3 100644 Binary files a/matlab_runners/Feature Point Experiments/results/300VWres_66_cat3.pdf and b/matlab_runners/Feature Point Experiments/results/300VWres_66_cat3.pdf differ diff --git a/matlab_runners/Feature Point Experiments/results/300W_res.pdf b/matlab_runners/Feature Point Experiments/results/300W_res.pdf index 6b2da33d..c4c5e3de 100644 Binary files a/matlab_runners/Feature Point Experiments/results/300W_res.pdf and b/matlab_runners/Feature Point Experiments/results/300W_res.pdf differ diff --git a/matlab_runners/Feature Point Experiments/results/fps_yt.mat b/matlab_runners/Feature Point Experiments/results/fps_yt.mat index 6fa9fb03..38b59576 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/fps_yt.txt b/matlab_runners/Feature Point Experiments/results/fps_yt.txt index ced72625..399ba970 100644 --- a/matlab_runners/Feature Point Experiments/results/fps_yt.txt +++ b/matlab_runners/Feature Point Experiments/results/fps_yt.txt @@ -1,4 +1,4 @@ Model, mean, median -OpenFace (CE-CLM): 0.0495, 0.0471 +OpenFace (CE-CLM): 0.0499, 0.0473 OpenFace (CLNF): 0.0553, 0.0515 -CLM: 0.0647, 0.0592 +CLM: 0.0632, 0.0588 diff --git a/matlab_runners/Feature Point Experiments/results/landmark_detections.mat b/matlab_runners/Feature Point Experiments/results/landmark_detections.mat index ef98e12a..5f3cf668 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/results/landmark_detections.txt b/matlab_runners/Feature Point Experiments/results/landmark_detections.txt index 9e65e7e5..6878f73a 100644 --- a/matlab_runners/Feature Point Experiments/results/landmark_detections.txt +++ b/matlab_runners/Feature Point Experiments/results/landmark_detections.txt @@ -1,4 +1,4 @@ Type, mean, median -err ce-clm: 0.042290, 0.034776 +err ce-clm: 0.042604, 0.034670 err clnf: 0.054960, 0.038257 err svr: 0.070022, 0.049925 diff --git a/matlab_runners/Full_test_suite.m b/matlab_runners/Full_test_suite.m index 43697d6e..f3200215 100644 --- a/matlab_runners/Full_test_suite.m +++ b/matlab_runners/Full_test_suite.m @@ -25,7 +25,7 @@ assert(median(clnf_error) < 0.053); run_300VW_dataset_OpenFace; assert(median(ceclm_error_49_cat_1) < 0.025); assert(median(ceclm_error_49_cat_2) < 0.027); -assert(median(ceclm_error_49_cat_3) < 0.032); +assert(median(ceclm_error_49_cat_3) < 0.033); assert(median(ceclm_error_66_cat_1) < 0.032); assert(median(ceclm_error_66_cat_2) < 0.036); assert(median(ceclm_error_66_cat_3) < 0.042); diff --git a/matlab_runners/Gaze Experiments/extract_mpii_gaze_test.m b/matlab_runners/Gaze Experiments/extract_mpii_gaze_test.m index f9dab8b9..734d28d2 100644 --- a/matlab_runners/Gaze Experiments/extract_mpii_gaze_test.m +++ b/matlab_runners/Gaze Experiments/extract_mpii_gaze_test.m @@ -40,7 +40,6 @@ parfor p=1:numel(p_dirs) out_p_loc = ['-opdir "', [output, p_dirs(p).name], '" ']; command_c = cat(2, command, input_loc, out_img_loc, out_p_loc); - command_c = cat(2, command_c, ' -wild'); if(isunix) unix(command_c, '-echo'); else diff --git a/matlab_runners/Gaze Experiments/mpii_1500_errs.mat b/matlab_runners/Gaze Experiments/mpii_1500_errs.mat index 00ffb607..018f08bf 100644 Binary files a/matlab_runners/Gaze Experiments/mpii_1500_errs.mat and b/matlab_runners/Gaze Experiments/mpii_1500_errs.mat differ diff --git a/matlab_runners/Gaze Experiments/mpii_1500_errs.txt b/matlab_runners/Gaze Experiments/mpii_1500_errs.txt index 34075850..c6d7ea13 100644 --- a/matlab_runners/Gaze Experiments/mpii_1500_errs.txt +++ b/matlab_runners/Gaze Experiments/mpii_1500_errs.txt @@ -1,2 +1,2 @@ Mean error, median error -9.096, 8.447 +9.098, 8.468 diff --git a/matlab_runners/Head Pose Experiments/results/Pose_OF.mat b/matlab_runners/Head Pose Experiments/results/Pose_OF.mat index 31c11041..6d9123cf 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 e292eb48..283921d1 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: 8.065, 6.022, 4.434, 6.173, 2.684 +biwi error: 8.046, 6.096, 4.443, 6.195, 2.681 bu error: 2.779, 3.348, 2.448, 2.859, 1.985 ict error: 3.814, 3.768, 3.503, 3.695, 1.933 diff --git a/matlab_runners/Head Pose Experiments/results/Pose_OF_CECLM.mat b/matlab_runners/Head Pose Experiments/results/Pose_OF_CECLM.mat index de57347f..0219b7bd 100644 Binary files a/matlab_runners/Head Pose Experiments/results/Pose_OF_CECLM.mat and b/matlab_runners/Head Pose Experiments/results/Pose_OF_CECLM.mat differ diff --git a/matlab_runners/Head Pose Experiments/results/Pose_OF_CECLM.txt b/matlab_runners/Head Pose Experiments/results/Pose_OF_CECLM.txt index 7625018d..4dd44c2c 100644 --- a/matlab_runners/Head Pose Experiments/results/Pose_OF_CECLM.txt +++ b/matlab_runners/Head Pose Experiments/results/Pose_OF_CECLM.txt @@ -1,4 +1,4 @@ Dataset and model, pitch, yaw, roll, mean, median -biwi error: 6.850, 6.165, 3.349, 5.454, 2.618 -bu error: 2.394, 3.245, 2.407, 2.682, 1.827 -ict error: 3.132, 3.482, 3.121, 3.245, 1.858 +biwi error: 6.767, 6.080, 3.428, 5.425, 2.616 +bu error: 2.398, 3.247, 2.409, 2.685, 1.834 +ict error: 3.132, 3.510, 3.137, 3.260, 1.867 diff --git a/matlab_version/AU_training/data extraction/extract_features_BP4D.m b/matlab_version/AU_training/data extraction/extract_features_BP4D.m index 80e53610..f55f34a1 100644 --- a/matlab_version/AU_training/data extraction/extract_features_BP4D.m +++ b/matlab_version/AU_training/data extraction/extract_features_BP4D.m @@ -32,7 +32,7 @@ for f1=1:numel(bp4d_dirs) command = cat(2, command, [' -fx 2000 -fy 2000 -rigid -asvid -fdir "' curr_vid '" -simalign "' output_file '" -simscale 0.7 -simsize 112']); command = cat(2, command, [' -hogalign "' output_hog '"']); - command = cat(2, command, [' -of "' output_params '" -no2Dfp -no3Dfp -noAUs -noPose -noGaze']); + command = cat(2, command, [' -of "' output_params '" -no2Dfp -no3Dfp -noAUs -noPose -noGaze -q ']); dos(command); end end @@ -65,7 +65,7 @@ for f1=1:numel(bp4d_dirs) command = cat(2, command, [' -fx 2000 -fy 2000 -rigid -q -asvid -fdir "' curr_vid '" -simalign "' output_file '" -simscale 0.7 -simsize 112']); command = cat(2, command, [' -hogalign "' output_hog '"']); - command = cat(2, command, [' -of "' output_params '" -no2Dfp -no3Dfp -noAUs -noPose -noGaze']); + command = cat(2, command, [' -of "' output_params '" -no2Dfp -no3Dfp -noAUs -noPose -noGaze -q ']); dos(command); end end diff --git a/matlab_version/AU_training/data extraction/extract_features_Bosphorus.m b/matlab_version/AU_training/data extraction/extract_features_Bosphorus.m index 5974a0e0..d80f856c 100644 --- a/matlab_version/AU_training/data extraction/extract_features_Bosphorus.m +++ b/matlab_version/AU_training/data extraction/extract_features_Bosphorus.m @@ -16,6 +16,10 @@ for f1=1:numel(bosph_dirs) for i=1:numel(curr_vids) command = features_exe; + % Do not do angled faces, does not add much information for AU + if(~isempty(strfind(curr_vids(i).name, 'YR')) || ~isempty(strfind(curr_vids(i).name, 'PR'))|| ~isempty(strfind(curr_vids(i).name, 'CR'))) + continue; + end input_file = [bosph_loc, '/' name '/', curr_vids(i).name]; [~, curr_name, ~] = fileparts(curr_vids(i).name); output_file = [out_loc, '/hog_aligned_rigid_b/', curr_name, '/']; diff --git a/matlab_version/AU_training/data extraction/extract_features_DISFA.m b/matlab_version/AU_training/data extraction/extract_features_DISFA.m index 9feca8b5..bcc18e4a 100644 --- a/matlab_version/AU_training/data extraction/extract_features_DISFA.m +++ b/matlab_version/AU_training/data extraction/extract_features_DISFA.m @@ -55,7 +55,7 @@ for i=1:numel(disfa_loc_1_files) command = cat(2, command, [' -rigid -f "' input_file '" -simalign "' output_file '" -simscale 0.7 -simsize 112']); command = cat(2, command, [' -hogalign "' output_hog '"' ]); - command = cat(2, command, [' -of "' output_params '" -no2Dfp -no3Dfp -noAUs -noPose -noGaze ']); + command = cat(2, command, [' -of "' output_params '" -no2Dfp -no3Dfp -noAUs -noPose -noGaze -q ']); dos(command); end @@ -76,7 +76,7 @@ for i=1:numel(disfa_loc_2_files) command = cat(2, command, [' -rigid -f "' input_file '" -simalign "' output_file '" -simscale 0.7 -simsize 112']); command = cat(2, command, [' -hogalign "' output_hog '"']); - command = cat(2, command, [' -of "' output_params '" -no2Dfp -no3Dfp -noAUs -noPose -noGaze ']); + command = cat(2, command, [' -of "' output_params '" -no2Dfp -no3Dfp -noAUs -noPose -noGaze -q ']); dos(command); end diff --git a/matlab_version/AU_training/data extraction/extract_features_FERA_2011.m b/matlab_version/AU_training/data extraction/extract_features_FERA_2011.m index 60c2b593..970fafb2 100644 --- a/matlab_version/AU_training/data extraction/extract_features_FERA_2011.m +++ b/matlab_version/AU_training/data extraction/extract_features_FERA_2011.m @@ -35,7 +35,7 @@ for f1=1:numel(fera_dirs) command = cat(2, command, [' -rigid -f "' curr_vid '" -simalign "' output_file '" -simscale 0.7 -simsize 112']); command = cat(2, command, [' -hogalign "' output_hog '"']); - command = cat(2, command, [' -of "' output_params '" -no2Dfp -no3Dfp -noAUs -noPose -noGaze ']); + command = cat(2, command, [' -of "' output_params '" -no2Dfp -no3Dfp -noAUs -noPose -noGaze -q ']); dos(command); diff --git a/matlab_version/AU_training/data extraction/extract_features_SEMAINE.m b/matlab_version/AU_training/data extraction/extract_features_SEMAINE.m index a3fbd093..f1a379c8 100644 --- a/matlab_version/AU_training/data extraction/extract_features_SEMAINE.m +++ b/matlab_version/AU_training/data extraction/extract_features_SEMAINE.m @@ -30,7 +30,7 @@ parfor f1=1:numel(semaine_dirs) command = cat(2, command, [' -rigid -f "' curr_vid '" -simalign "' output_file '" -simscale 0.7 -simsize 112']); command = cat(2, command, [' -hogalign "' output_hog '"']); - command = cat(2, command, [' -of "' output_params '" -no2Dfp -no3Dfp -noAUs -noPose -noGaze ']); + command = cat(2, command, [' -of "' output_params '" -no2Dfp -no3Dfp -noAUs -noPose -noGaze -q ']); dos(command); end @@ -63,7 +63,7 @@ parfor f1=1:numel(semaine_dirs) command = cat(2, command, [' -rigid -f "' curr_vid '" -simalign "' output_file '" -simscale 0.7 -simsize 112']); command = cat(2, command, [' -hogalign "' output_hog '"']); - command = cat(2, command, [' -of "' output_params '" -no2Dfp -no3Dfp -noAUs -noPose -noGaze ']); + command = cat(2, command, [' -of "' output_params '" -no2Dfp -no3Dfp -noAUs -noPose -noGaze -q ']); dos(command); end diff --git a/matlab_version/AU_training/data extraction/find_FERA2011.m b/matlab_version/AU_training/data extraction/find_FERA2011.m index 411fcba8..6c45ec3b 100644 --- a/matlab_version/AU_training/data extraction/find_FERA2011.m +++ b/matlab_version/AU_training/data extraction/find_FERA2011.m @@ -1,6 +1,9 @@ if(exist('D:\Datasets\fera/au_training', 'file')) FERA2011_dir = 'D:\Datasets\fera/au_training/'; hog_data_dir = 'D:\Datasets\face_datasets\hog_aligned_rigid/'; +elseif(exist('E:\Datasets\fera/au_training', 'file')) + FERA2011_dir = 'E:\Datasets\fera/au_training/'; + hog_data_dir = 'E:\Datasets\face_datasets\hog_aligned_rigid/'; else fprintf('FERA2011 location not found (or not defined)\n'); end diff --git a/matlab_version/AU_training/data extraction/find_SEMAINE.m b/matlab_version/AU_training/data extraction/find_SEMAINE.m index 647e1f27..9aec3f73 100644 --- a/matlab_version/AU_training/data extraction/find_SEMAINE.m +++ b/matlab_version/AU_training/data extraction/find_SEMAINE.m @@ -11,7 +11,7 @@ elseif(exist('D:\Datasets\FERA_2015\semaine\SEMAINE-Sessions/', 'file')) elseif(exist('D:/fera_2015/semaine/SEMAINE-Sessions/', 'file')) SEMAINE_dir = 'D:/fera_2015/semaine/SEMAINE-Sessions/'; else - fprintf('DISFA location not found (or not defined)\n'); + fprintf('SEMAINE location not found (or not defined)\n'); end if(exist('SEMAINE_dir', 'var')) diff --git a/matlab_version/AU_training/data extraction/find_UNBC.m b/matlab_version/AU_training/data extraction/find_UNBC.m index 06bb3733..57fd5bc8 100644 --- a/matlab_version/AU_training/data extraction/find_UNBC.m +++ b/matlab_version/AU_training/data extraction/find_UNBC.m @@ -1,6 +1,9 @@ if(exist('D:\Datasets\UNBC/', 'file')) UNBC_dir = 'D:\Datasets\UNBC/'; hog_data_dir = 'D:\Datasets\face_datasets\hog_aligned_rigid'; +elseif(exist('E:\Datasets\UNBC/', 'file')) + UNBC_dir = 'E:\Datasets\UNBC/'; + hog_data_dir = 'E:\Datasets\face_datasets\hog_aligned_rigid'; else fprintf('UNBC location not found (or not defined)\n'); end diff --git a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_10_dynamic.dat b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_10_dynamic.dat index 169a5b8a..99d4b26c 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_10_dynamic.dat and b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_10_dynamic.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_10_static.dat b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_10_static.dat index 149fcf35..fe0e58b8 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_10_static.dat and b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_10_static.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_12_dynamic.dat b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_12_dynamic.dat index 2f36f6fd..4aa70baf 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_12_dynamic.dat and b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_12_dynamic.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_12_static.dat b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_12_static.dat index 2b0c3ab5..1f3eda67 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_12_static.dat and b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_12_static.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_14_dynamic.dat b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_14_dynamic.dat index c31894a1..86cb97e1 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_14_dynamic.dat and b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_14_dynamic.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_14_static.dat b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_14_static.dat index e067b63d..8bae8d50 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_14_static.dat and b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_14_static.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_15_dynamic.dat b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_15_dynamic.dat index 886c0d14..5ae29f54 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_15_dynamic.dat and b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_15_dynamic.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_15_static.dat b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_15_static.dat index 4e8c136f..bce32a44 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_15_static.dat and b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_15_static.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_17_dynamic.dat b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_17_dynamic.dat index 8764e93d..8098bd08 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_17_dynamic.dat and b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_17_dynamic.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_17_static.dat b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_17_static.dat index 4a44b6b1..0f3a1c55 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_17_static.dat and b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_17_static.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_1_dynamic.dat b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_1_dynamic.dat index 8da47385..29c746fd 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_1_dynamic.dat and b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_1_dynamic.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_1_static.dat b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_1_static.dat index 4a93caf7..1aff0990 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_1_static.dat and b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_1_static.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_20_dynamic.dat b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_20_dynamic.dat index 3b2eb5ae..a563caab 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_20_dynamic.dat and b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_20_dynamic.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_20_static.dat b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_20_static.dat index 64f27b30..1e85e3da 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_20_static.dat and b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_20_static.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_23_dynamic.dat b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_23_dynamic.dat index 8c8f7c8a..cf2a1327 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_23_dynamic.dat and b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_23_dynamic.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_23_static.dat b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_23_static.dat index 12ec7fde..68927fe1 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_23_static.dat and b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_23_static.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_25_dynamic.dat b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_25_dynamic.dat index ee7f6eea..1fb3ed0b 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_25_dynamic.dat and b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_25_dynamic.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_25_static.dat b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_25_static.dat index c0a3226b..193b34b7 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_25_static.dat and b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_25_static.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_26_dynamic.dat b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_26_dynamic.dat index 2b04a5ae..e5f04074 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_26_dynamic.dat and b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_26_dynamic.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_26_static.dat b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_26_static.dat index fbc41322..087d763d 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_26_static.dat and b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_26_static.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_28_dynamic.dat b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_28_dynamic.dat index 5f84b18b..d48f74a6 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_28_dynamic.dat and b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_28_dynamic.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_28_static.dat b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_28_static.dat index a9af4fdd..74d3dc37 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_28_static.dat and b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_28_static.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_2_dynamic.dat b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_2_dynamic.dat index 8f9cb984..60ead140 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_2_dynamic.dat and b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_2_dynamic.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_2_static.dat b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_2_static.dat index 288634e9..631a726f 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_2_static.dat and b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_2_static.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_45_dynamic.dat b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_45_dynamic.dat index b58b9277..c46d762c 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_45_dynamic.dat and b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_45_dynamic.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_45_static.dat b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_45_static.dat index 830aee7d..c2e19935 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_45_static.dat and b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_45_static.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_4_dynamic.dat b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_4_dynamic.dat index e56d1b20..87dc3310 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_4_dynamic.dat and b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_4_dynamic.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_4_static.dat b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_4_static.dat index 08e875a6..ae5a7457 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_4_static.dat and b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_4_static.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_5_dynamic.dat b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_5_dynamic.dat index fc0beebb..9f920e76 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_5_dynamic.dat and b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_5_dynamic.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_5_static.dat b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_5_static.dat index c6dd7e18..d2b532eb 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_5_static.dat and b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_5_static.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_6_dynamic.dat b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_6_dynamic.dat index e5dd4469..f643aab6 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_6_dynamic.dat and b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_6_dynamic.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_6_static.dat b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_6_static.dat index c53afee7..ae1ad6f0 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_6_static.dat and b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_6_static.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_7_dynamic.dat b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_7_dynamic.dat index 55ea2ee8..c5ee2da1 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_7_dynamic.dat and b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_7_dynamic.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_7_static.dat b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_7_static.dat index ec665e2d..f7e0d8e5 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_7_static.dat and b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_7_static.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_9_dynamic.dat b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_9_dynamic.dat index aa120df4..555fe74d 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_9_dynamic.dat and b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_9_dynamic.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_9_static.dat b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_9_static.dat index 0c460579..9f6cc197 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_9_static.dat and b/matlab_version/AU_training/experiments/full_model_training/classifiers/AU_9_static.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/evaluate_best_models_DISFA_dyn.m b/matlab_version/AU_training/experiments/full_model_training/evaluate_best_models_DISFA_dyn.m index 14e6bc06..d90c5d6a 100644 --- a/matlab_version/AU_training/experiments/full_model_training/evaluate_best_models_DISFA_dyn.m +++ b/matlab_version/AU_training/experiments/full_model_training/evaluate_best_models_DISFA_dyn.m @@ -12,7 +12,6 @@ au = DISFA_aus(1); op = cd('../DISFA/'); rest_aus = setdiff(DISFA_aus, au); shared_defs; -users = users(1); % need to split the rest [~, ~, test_samples, test_labels, raw_data, PC, means, scaling, vid_ids, success] = Prepare_HOG_AU_data_generic_dynamic([], users, au, rest_aus, hog_data_dir); @@ -32,7 +31,7 @@ cd(op); % labels_gt_test(labels_gt_test > 1) = 1; %% -for a=1:1%numel(DISFA_aus) +for a=1:numel(DISFA_aus) name = sprintf('mat_models/AU_%d_dynamic_intensity_comb.mat', DISFA_aus(a)); load(name); diff --git a/matlab_version/AU_training/experiments/full_model_training/evaluate_best_models_DISFA_static.m b/matlab_version/AU_training/experiments/full_model_training/evaluate_best_models_DISFA_static.m index b76487d4..67160b77 100644 --- a/matlab_version/AU_training/experiments/full_model_training/evaluate_best_models_DISFA_static.m +++ b/matlab_version/AU_training/experiments/full_model_training/evaluate_best_models_DISFA_static.m @@ -30,7 +30,7 @@ end cd(op); %% -for a=1:4%numel(DISFA_aus) +for a=1:numel(DISFA_aus) name = sprintf('mat_models/AU_%d_static_intensity.mat', DISFA_aus(a)); load(name); diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_10_dynamic.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_10_dynamic.mat index 45356d6e..50d3ca75 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_10_dynamic.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_10_dynamic.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_10_dynamic_intensity.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_10_dynamic_intensity.mat index 9af95dba..3b8e5162 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_10_dynamic_intensity.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_10_dynamic_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_10_dynamic_intensity_comb.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_10_dynamic_intensity_comb.mat index 2dd78414..dd85900a 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_10_dynamic_intensity_comb.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_10_dynamic_intensity_comb.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_10_static.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_10_static.mat index 11408646..7cff8f1a 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_10_static.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_10_static.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_10_static_intensity.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_10_static_intensity.mat index e31fe3c5..da86a291 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_10_static_intensity.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_10_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_10_static_intensity_comb.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_10_static_intensity_comb.mat index 0da73b61..5fa8e444 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_10_static_intensity_comb.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_10_static_intensity_comb.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_12_dynamic.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_12_dynamic.mat index e32b877e..946bc8b2 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_12_dynamic.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_12_dynamic.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_12_dynamic_intensity.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_12_dynamic_intensity.mat index d689c488..e4e7031e 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_12_dynamic_intensity.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_12_dynamic_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_12_dynamic_intensity_comb.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_12_dynamic_intensity_comb.mat index 4a17759f..9c8ada9f 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_12_dynamic_intensity_comb.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_12_dynamic_intensity_comb.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_12_static.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_12_static.mat index 2c2cd8f2..684c54f7 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_12_static.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_12_static.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_12_static_intensity.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_12_static_intensity.mat index c3109e35..8aefb5bf 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_12_static_intensity.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_12_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_12_static_intensity_comb.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_12_static_intensity_comb.mat index 7ea294af..8c9d2df4 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_12_static_intensity_comb.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_12_static_intensity_comb.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_14_dynamic.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_14_dynamic.mat index 6852dfad..b5f5afc9 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_14_dynamic.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_14_dynamic.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_14_dynamic_intensity.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_14_dynamic_intensity.mat index 0c42700a..4add9924 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_14_dynamic_intensity.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_14_dynamic_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_14_static.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_14_static.mat index 6294fdfc..d63e585f 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_14_static.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_14_static.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_14_static_intensity.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_14_static_intensity.mat index a465cd6c..4c1d3fd9 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_14_static_intensity.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_14_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_15_dynamic.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_15_dynamic.mat index 5293cb3d..123ce07c 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_15_dynamic.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_15_dynamic.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_15_dynamic_intensity.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_15_dynamic_intensity.mat index ccdb4695..ef269f96 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_15_dynamic_intensity.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_15_dynamic_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_15_dynamic_intensity_comb.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_15_dynamic_intensity_comb.mat index 91d3bcb0..d33d5173 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_15_dynamic_intensity_comb.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_15_dynamic_intensity_comb.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_15_static.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_15_static.mat index 65c86e9d..460eb645 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_15_static.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_15_static.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_15_static_intensity.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_15_static_intensity.mat index a4401858..cfedf258 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_15_static_intensity.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_15_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_15_static_intensity_comb.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_15_static_intensity_comb.mat index 427e8ad7..c72254cf 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_15_static_intensity_comb.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_15_static_intensity_comb.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_17_dynamic.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_17_dynamic.mat index 77967b6f..197344fc 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_17_dynamic.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_17_dynamic.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_17_dynamic_intensity.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_17_dynamic_intensity.mat index 22def917..ba866228 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_17_dynamic_intensity.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_17_dynamic_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_17_dynamic_intensity_comb.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_17_dynamic_intensity_comb.mat index f4303d89..187f649e 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_17_dynamic_intensity_comb.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_17_dynamic_intensity_comb.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_17_static.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_17_static.mat index a4f11079..10965b34 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_17_static.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_17_static.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_17_static_intensity.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_17_static_intensity.mat index 56d9d615..0335723d 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_17_static_intensity.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_17_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_17_static_intensity_comb.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_17_static_intensity_comb.mat index 3268166c..96b7b8c1 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_17_static_intensity_comb.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_17_static_intensity_comb.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_1_dynamic.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_1_dynamic.mat index e6d8838b..b566fb78 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_1_dynamic.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_1_dynamic.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_1_dynamic_intensity.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_1_dynamic_intensity.mat index 0e0caec0..01feae66 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_1_dynamic_intensity.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_1_dynamic_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_1_dynamic_intensity_comb.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_1_dynamic_intensity_comb.mat index 51cfa191..06b89a13 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_1_dynamic_intensity_comb.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_1_dynamic_intensity_comb.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_1_static.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_1_static.mat index e73448bf..6a47c117 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_1_static.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_1_static.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_1_static_intensity.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_1_static_intensity.mat index eda562d4..2080d5c4 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_1_static_intensity.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_1_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_1_static_intensity_comb.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_1_static_intensity_comb.mat index 11d11378..cf3fbef5 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_1_static_intensity_comb.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_1_static_intensity_comb.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_20_dynamic.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_20_dynamic.mat index f0d546ff..64e9de38 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_20_dynamic.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_20_dynamic.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_20_dynamic_intensity.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_20_dynamic_intensity.mat index de83425f..1d131b95 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_20_dynamic_intensity.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_20_dynamic_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_20_static.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_20_static.mat index dd5bdb86..e5894d7d 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_20_static.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_20_static.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_20_static_intensity.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_20_static_intensity.mat index 81bca509..2fb48849 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_20_static_intensity.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_20_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_23_dynamic.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_23_dynamic.mat index 04bc4114..fac4a592 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_23_dynamic.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_23_dynamic.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_23_dynamic_intensity.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_23_dynamic_intensity.mat index 8775c912..bb295dc9 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_23_dynamic_intensity.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_23_dynamic_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_23_dynamic_intensity_comb.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_23_dynamic_intensity_comb.mat index 51bae919..e68f32d7 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_23_dynamic_intensity_comb.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_23_dynamic_intensity_comb.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_23_static.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_23_static.mat index 7faed42a..6e385a89 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_23_static.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_23_static.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_23_static_intensity.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_23_static_intensity.mat index f69dda36..6276989d 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_23_static_intensity.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_23_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_23_static_intensity_comb.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_23_static_intensity_comb.mat index 12209e31..b1899f6e 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_23_static_intensity_comb.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_23_static_intensity_comb.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_25_dynamic.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_25_dynamic.mat index 733b3604..af72cc7a 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_25_dynamic.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_25_dynamic.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_25_dynamic_intensity.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_25_dynamic_intensity.mat index 9eab9649..30f217a7 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_25_dynamic_intensity.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_25_dynamic_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_25_dynamic_intensity_comb.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_25_dynamic_intensity_comb.mat index d5246526..15b30f83 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_25_dynamic_intensity_comb.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_25_dynamic_intensity_comb.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_25_static.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_25_static.mat index 9bbd2d8e..6455fd49 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_25_static.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_25_static.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_25_static_intensity.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_25_static_intensity.mat index 2e4ebdcc..4d523243 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_25_static_intensity.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_25_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_25_static_intensity_comb.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_25_static_intensity_comb.mat index cb4fd924..254fc254 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_25_static_intensity_comb.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_25_static_intensity_comb.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_26_dynamic.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_26_dynamic.mat index 14c951ad..2f8f42dc 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_26_dynamic.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_26_dynamic.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_26_dynamic_intensity.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_26_dynamic_intensity.mat index 4bdaa900..1a593388 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_26_dynamic_intensity.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_26_dynamic_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_26_dynamic_intensity_comb.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_26_dynamic_intensity_comb.mat index a479a71a..fdd899ef 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_26_dynamic_intensity_comb.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_26_dynamic_intensity_comb.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_26_static.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_26_static.mat index a575e0e6..e628f9cd 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_26_static.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_26_static.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_26_static_intensity.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_26_static_intensity.mat index 9284bae1..ec759e54 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_26_static_intensity.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_26_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_26_static_intensity_comb.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_26_static_intensity_comb.mat index 00f914bd..9c4258dd 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_26_static_intensity_comb.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_26_static_intensity_comb.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_28_dynamic.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_28_dynamic.mat index b6594e87..c3339f1f 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_28_dynamic.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_28_dynamic.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_28_static.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_28_static.mat index a41e835e..c6638d30 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_28_static.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_28_static.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_2_dynamic.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_2_dynamic.mat index ad269846..0096854c 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_2_dynamic.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_2_dynamic.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_2_dynamic_intensity.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_2_dynamic_intensity.mat index 2c713516..91c3cfc3 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_2_dynamic_intensity.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_2_dynamic_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_2_dynamic_intensity_comb.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_2_dynamic_intensity_comb.mat index 00e7ae35..e73b77d1 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_2_dynamic_intensity_comb.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_2_dynamic_intensity_comb.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_2_static.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_2_static.mat index 526b29cf..dc53ec12 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_2_static.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_2_static.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_2_static_intensity.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_2_static_intensity.mat index 89ca6629..9e4a3d57 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_2_static_intensity.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_2_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_2_static_intensity_comb.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_2_static_intensity_comb.mat index 23e2af9f..3aa69e07 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_2_static_intensity_comb.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_2_static_intensity_comb.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_45_dynamic.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_45_dynamic.mat index 640dfdfd..0129f72b 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_45_dynamic.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_45_dynamic.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_45_dynamic_intensity.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_45_dynamic_intensity.mat index 20960be9..4718512c 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_45_dynamic_intensity.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_45_dynamic_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_45_dynamic_intensity_comb.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_45_dynamic_intensity_comb.mat index e9d35ba9..3ec2241a 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_45_dynamic_intensity_comb.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_45_dynamic_intensity_comb.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_45_static.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_45_static.mat index 82bc298b..6c12719f 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_45_static.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_45_static.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_45_static_intensity.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_45_static_intensity.mat index a0ed805d..da6416f4 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_45_static_intensity.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_45_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_45_static_intensity_comb.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_45_static_intensity_comb.mat index fbbfbf84..228c88fe 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_45_static_intensity_comb.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_45_static_intensity_comb.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_4_dynamic.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_4_dynamic.mat index 1e869153..6ab10660 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_4_dynamic.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_4_dynamic.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_4_dynamic_intensity.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_4_dynamic_intensity.mat index 1d2f3908..e12c5210 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_4_dynamic_intensity.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_4_dynamic_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_4_dynamic_intensity_comb.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_4_dynamic_intensity_comb.mat index 22f9a0a0..480e37ba 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_4_dynamic_intensity_comb.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_4_dynamic_intensity_comb.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_4_static.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_4_static.mat index ab755c69..ca31b492 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_4_static.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_4_static.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_4_static_intensity.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_4_static_intensity.mat index 68e2edd7..add16c41 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_4_static_intensity.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_4_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_4_static_intensity_comb.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_4_static_intensity_comb.mat index b7f272d6..4bd65784 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_4_static_intensity_comb.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_4_static_intensity_comb.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_5_dynamic.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_5_dynamic.mat index c21da056..55db0593 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_5_dynamic.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_5_dynamic.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_5_dynamic_intensity.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_5_dynamic_intensity.mat index caf5644c..5ba66edf 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_5_dynamic_intensity.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_5_dynamic_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_5_static.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_5_static.mat index 1b2f4c43..cf0e50fd 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_5_static.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_5_static.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_5_static_intensity.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_5_static_intensity.mat index 986fda51..96bbd2c0 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_5_static_intensity.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_5_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_6_dynamic.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_6_dynamic.mat index b86b300c..a85213d0 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_6_dynamic.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_6_dynamic.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_6_dynamic_intensity.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_6_dynamic_intensity.mat index 2a4b810b..f0db8d29 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_6_dynamic_intensity.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_6_dynamic_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_6_dynamic_intensity_comb.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_6_dynamic_intensity_comb.mat index f5331b32..7b113a63 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_6_dynamic_intensity_comb.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_6_dynamic_intensity_comb.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_6_static.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_6_static.mat index ee25eb80..7bdc539a 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_6_static.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_6_static.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_6_static_intensity.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_6_static_intensity.mat index f282f27c..0f2f6145 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_6_static_intensity.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_6_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_6_static_intensity_comb.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_6_static_intensity_comb.mat index dac6d3dd..1c29c856 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_6_static_intensity_comb.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_6_static_intensity_comb.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_7_dynamic.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_7_dynamic.mat index d14f28ab..102f2100 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_7_dynamic.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_7_dynamic.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_7_dynamic_intensity.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_7_dynamic_intensity.mat index 20b734dd..d21be009 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_7_dynamic_intensity.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_7_dynamic_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_7_dynamic_intensity_comb.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_7_dynamic_intensity_comb.mat index b8808ed1..38bbe830 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_7_dynamic_intensity_comb.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_7_dynamic_intensity_comb.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_7_static.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_7_static.mat index 677e2847..0737daba 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_7_static.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_7_static.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_7_static_intensity.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_7_static_intensity.mat index ad2a20c2..06b2bc57 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_7_static_intensity.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_7_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_7_static_intensity_comb.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_7_static_intensity_comb.mat index 0704ce2c..89a359ee 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_7_static_intensity_comb.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_7_static_intensity_comb.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_9_dynamic.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_9_dynamic.mat index 021f572c..f3e5d485 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_9_dynamic.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_9_dynamic.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_9_dynamic_intensity.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_9_dynamic_intensity.mat index 85d838e8..b5340c26 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_9_dynamic_intensity.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_9_dynamic_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_9_static.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_9_static.mat index 52472752..26996cba 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_9_static.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_9_static.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_9_static_intensity.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_9_static_intensity.mat index b2695713..12a85b18 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_9_static_intensity.mat and b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_9_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_10_dynamic_intensity.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_10_dynamic_intensity.dat index 241f61e0..7d701978 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_10_dynamic_intensity.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_10_dynamic_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_10_dynamic_intensity_comb.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_10_dynamic_intensity_comb.dat index fe9ce795..0fc2de6b 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_10_dynamic_intensity_comb.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_10_dynamic_intensity_comb.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_10_static_intensity.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_10_static_intensity.dat index c3888555..fe82b622 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_10_static_intensity.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_10_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_10_static_intensity_comb.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_10_static_intensity_comb.dat index 624731e3..cebcf977 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_10_static_intensity_comb.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_10_static_intensity_comb.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_12_dynamic_intensity.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_12_dynamic_intensity.dat index ebb8053c..573565ca 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_12_dynamic_intensity.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_12_dynamic_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_12_dynamic_intensity_comb.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_12_dynamic_intensity_comb.dat index 491f94d0..7d956e1f 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_12_dynamic_intensity_comb.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_12_dynamic_intensity_comb.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_12_static_intensity.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_12_static_intensity.dat index b74a655d..016ed451 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_12_static_intensity.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_12_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_12_static_intensity_comb.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_12_static_intensity_comb.dat index 406fd810..16467cc9 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_12_static_intensity_comb.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_12_static_intensity_comb.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_14_dynamic_intensity.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_14_dynamic_intensity.dat index 706d585e..43af2aea 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_14_dynamic_intensity.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_14_dynamic_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_14_static_intensity.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_14_static_intensity.dat index 83c864ee..7a8300bc 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_14_static_intensity.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_14_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_15_dynamic_intensity.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_15_dynamic_intensity.dat index 42de54ac..4e0e2dae 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_15_dynamic_intensity.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_15_dynamic_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_15_dynamic_intensity_comb.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_15_dynamic_intensity_comb.dat index 00f802cf..3ff7e047 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_15_dynamic_intensity_comb.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_15_dynamic_intensity_comb.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_15_static_intensity.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_15_static_intensity.dat index 472a768d..61cac0a7 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_15_static_intensity.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_15_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_15_static_intensity_comb.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_15_static_intensity_comb.dat index 3a22f41a..99820fcc 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_15_static_intensity_comb.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_15_static_intensity_comb.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_17_dynamic_intensity.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_17_dynamic_intensity.dat index 649dec0f..51ad5fb2 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_17_dynamic_intensity.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_17_dynamic_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_17_dynamic_intensity_comb.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_17_dynamic_intensity_comb.dat index 8e5c2389..55630722 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_17_dynamic_intensity_comb.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_17_dynamic_intensity_comb.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_17_static_intensity.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_17_static_intensity.dat index 362dd687..4a4fd0be 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_17_static_intensity.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_17_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_17_static_intensity_comb.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_17_static_intensity_comb.dat index 109c7740..ec0a7670 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_17_static_intensity_comb.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_17_static_intensity_comb.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_1_dynamic_intensity.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_1_dynamic_intensity.dat index 67a80a5d..10065c6a 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_1_dynamic_intensity.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_1_dynamic_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_1_dynamic_intensity_comb.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_1_dynamic_intensity_comb.dat index db183754..df9f0062 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_1_dynamic_intensity_comb.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_1_dynamic_intensity_comb.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_1_static_intensity.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_1_static_intensity.dat index 065b1c52..f7942f62 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_1_static_intensity.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_1_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_1_static_intensity_comb.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_1_static_intensity_comb.dat index d85541b9..58b65d88 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_1_static_intensity_comb.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_1_static_intensity_comb.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_20_dynamic_intensity.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_20_dynamic_intensity.dat index 554df8c7..d6565e9a 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_20_dynamic_intensity.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_20_dynamic_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_20_static_intensity.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_20_static_intensity.dat index eb78b669..cdc411b3 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_20_static_intensity.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_20_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_23_dynamic_intensity.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_23_dynamic_intensity.dat index 2afaa3f0..0977f20f 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_23_dynamic_intensity.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_23_dynamic_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_23_dynamic_intensity_comb.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_23_dynamic_intensity_comb.dat index a6f437a7..a865a8e1 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_23_dynamic_intensity_comb.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_23_dynamic_intensity_comb.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_23_static_intensity.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_23_static_intensity.dat index 335d7c7b..f92d3a2c 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_23_static_intensity.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_23_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_23_static_intensity_comb.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_23_static_intensity_comb.dat index bd03fe24..ac63ad96 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_23_static_intensity_comb.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_23_static_intensity_comb.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_25_dynamic_intensity.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_25_dynamic_intensity.dat index a6679646..1759fac3 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_25_dynamic_intensity.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_25_dynamic_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_25_dynamic_intensity_comb.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_25_dynamic_intensity_comb.dat index f161ad8c..8efd99ff 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_25_dynamic_intensity_comb.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_25_dynamic_intensity_comb.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_25_static_intensity.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_25_static_intensity.dat index 411670da..bc93ba21 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_25_static_intensity.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_25_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_25_static_intensity_comb.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_25_static_intensity_comb.dat index 254f819c..8d2e0ebf 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_25_static_intensity_comb.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_25_static_intensity_comb.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_26_dynamic_intensity.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_26_dynamic_intensity.dat index a9939992..1c918c36 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_26_dynamic_intensity.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_26_dynamic_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_26_dynamic_intensity_comb.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_26_dynamic_intensity_comb.dat index c5b2597e..0782756e 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_26_dynamic_intensity_comb.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_26_dynamic_intensity_comb.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_26_static_intensity.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_26_static_intensity.dat index 39c61b9a..2ae33dd3 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_26_static_intensity.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_26_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_26_static_intensity_comb.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_26_static_intensity_comb.dat index 3119305f..8da5e7b8 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_26_static_intensity_comb.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_26_static_intensity_comb.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_2_dynamic_intensity.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_2_dynamic_intensity.dat index b384ad37..a61c0ee2 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_2_dynamic_intensity.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_2_dynamic_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_2_dynamic_intensity_comb.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_2_dynamic_intensity_comb.dat index 89391784..b4093a46 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_2_dynamic_intensity_comb.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_2_dynamic_intensity_comb.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_2_static_intensity.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_2_static_intensity.dat index eb9ae935..5a24a216 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_2_static_intensity.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_2_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_2_static_intensity_comb.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_2_static_intensity_comb.dat index 12f7ce84..f17cd021 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_2_static_intensity_comb.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_2_static_intensity_comb.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_45_dynamic_intensity.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_45_dynamic_intensity.dat index 0da415b7..66d18869 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_45_dynamic_intensity.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_45_dynamic_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_45_dynamic_intensity_comb.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_45_dynamic_intensity_comb.dat index 2f6c0b54..7ac45c76 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_45_dynamic_intensity_comb.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_45_dynamic_intensity_comb.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_45_static_intensity.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_45_static_intensity.dat index fb3b9d32..8d977485 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_45_static_intensity.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_45_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_45_static_intensity_comb.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_45_static_intensity_comb.dat index 28bce9a0..7910f8e0 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_45_static_intensity_comb.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_45_static_intensity_comb.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_4_dynamic_intensity.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_4_dynamic_intensity.dat index 67598c08..2392051d 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_4_dynamic_intensity.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_4_dynamic_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_4_dynamic_intensity_comb.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_4_dynamic_intensity_comb.dat index c5c8edaf..1dec3e74 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_4_dynamic_intensity_comb.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_4_dynamic_intensity_comb.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_4_static_intensity.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_4_static_intensity.dat index 7ee65b02..0f3484ed 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_4_static_intensity.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_4_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_4_static_intensity_comb.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_4_static_intensity_comb.dat index 8204a879..3b012f7a 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_4_static_intensity_comb.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_4_static_intensity_comb.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_5_dynamic_intensity.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_5_dynamic_intensity.dat index 14f43f53..2be4f8dc 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_5_dynamic_intensity.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_5_dynamic_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_5_static_intensity.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_5_static_intensity.dat index 5c3481b5..f200e45e 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_5_static_intensity.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_5_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_6_dynamic_intensity.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_6_dynamic_intensity.dat index afbc2670..4e0a553a 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_6_dynamic_intensity.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_6_dynamic_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_6_dynamic_intensity_comb.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_6_dynamic_intensity_comb.dat index 58727998..29d1853d 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_6_dynamic_intensity_comb.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_6_dynamic_intensity_comb.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_6_static_intensity.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_6_static_intensity.dat index 5c33712c..ffd18674 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_6_static_intensity.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_6_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_6_static_intensity_comb.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_6_static_intensity_comb.dat index 69c3005d..1497ce9b 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_6_static_intensity_comb.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_6_static_intensity_comb.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_7_dynamic_intensity.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_7_dynamic_intensity.dat index 221c6d21..ee6323c4 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_7_dynamic_intensity.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_7_dynamic_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_7_dynamic_intensity_comb.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_7_dynamic_intensity_comb.dat index f13ba04d..0652a7a6 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_7_dynamic_intensity_comb.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_7_dynamic_intensity_comb.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_7_static_intensity.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_7_static_intensity.dat index 785ccc74..d586b468 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_7_static_intensity.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_7_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_7_static_intensity_comb.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_7_static_intensity_comb.dat index 04b4a112..f8465f1b 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_7_static_intensity_comb.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_7_static_intensity_comb.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_9_dynamic_intensity.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_9_dynamic_intensity.dat index c809ddcd..469d863d 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_9_dynamic_intensity.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_9_dynamic_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_9_static_intensity.dat b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_9_static_intensity.dat index 7cdfc5d6..a71f6f2c 100644 Binary files a/matlab_version/AU_training/experiments/full_model_training/regressors/AU_9_static_intensity.dat and b/matlab_version/AU_training/experiments/full_model_training/regressors/AU_9_static_intensity.dat differ diff --git a/matlab_version/AU_training/pca_generation/generic_face_lower.mat b/matlab_version/AU_training/pca_generation/generic_face_lower.mat index 1cb17298..8dddfcf6 100644 Binary files a/matlab_version/AU_training/pca_generation/generic_face_lower.mat and b/matlab_version/AU_training/pca_generation/generic_face_lower.mat differ diff --git a/matlab_version/AU_training/pca_generation/generic_face_rigid.mat b/matlab_version/AU_training/pca_generation/generic_face_rigid.mat index 7107e845..5d3f65f1 100644 Binary files a/matlab_version/AU_training/pca_generation/generic_face_rigid.mat and b/matlab_version/AU_training/pca_generation/generic_face_rigid.mat differ diff --git a/matlab_version/AU_training/pca_generation/generic_face_upper.mat b/matlab_version/AU_training/pca_generation/generic_face_upper.mat index 3c9652f4..256d655e 100644 Binary files a/matlab_version/AU_training/pca_generation/generic_face_upper.mat and b/matlab_version/AU_training/pca_generation/generic_face_upper.mat differ diff --git a/matlab_version/fitting/Fitting_from_bb.m b/matlab_version/fitting/Fitting_from_bb.m index aa9e1f4d..5ce1e558 100644 --- a/matlab_version/fitting/Fitting_from_bb.m +++ b/matlab_version/fitting/Fitting_from_bb.m @@ -217,13 +217,13 @@ function [ shape2D, global_params, local_params, final_lhood, landmark_lhoods, v % deal with the fact that params might be different for different % scales if(numel(clmParams_old.regFactor) > 1) - clmParams.regFactor = clmParams_old.regFactor(i); + clmParams.regFactor = clmParams_old.regFactor(scale); end if(numel(clmParams_old.sigmaMeanShift) > 1) - clmParams.sigmaMeanShift = clmParams_old.sigmaMeanShift(i); + clmParams.sigmaMeanShift = clmParams_old.sigmaMeanShift(scale); end if(numel(clmParams_old.tikhonov_factor) > 1) - clmParams.tikhonov_factor = clmParams_old.tikhonov_factor(i); + clmParams.tikhonov_factor = clmParams_old.tikhonov_factor(scale); end % The actual NU-RLMS step diff --git a/matlab_version/fitting/Fitting_from_bb_precomp.m b/matlab_version/fitting/Fitting_from_bb_precomp.m new file mode 100644 index 00000000..76575e52 --- /dev/null +++ b/matlab_version/fitting/Fitting_from_bb_precomp.m @@ -0,0 +1,273 @@ +function [ shape2D, global_params, local_params, final_lhood, landmark_lhoods, view_used, precomp_resps ] = Fitting_from_bb_precomp( Image, DepthImage, bounding_box, PDM, patchExperts, clmParams, precomp_resps, varargin) +%FITTING Summary of this function goes here +% Detailed explanation goes here + + % the bounding box format is [minX, minY, maxX, maxY]; + + % the mean model shape + M = PDM.M; + + num_points = numel(M) / 3; + + if(any(strcmp(varargin,'orientation'))) + orientation = varargin{find(strcmp(varargin, 'orientation'))+1}; + rot = Euler2Rot(orientation); + else + rot = eye(3); + orientation = [0;0;0]; + end + + rot_m = rot * reshape(M, num_points, 3)'; + width_model = max(rot_m(1,:)) - min(rot_m(1,:)); + height_model = max(rot_m(2,:)) - min(rot_m(2,:)); + + a = (((bounding_box(3) - bounding_box(1)) / width_model) + ((bounding_box(4) - bounding_box(2))/ height_model)) / 2; + + tx = (bounding_box(3) + bounding_box(1))/2; + ty = (bounding_box(4) + bounding_box(2))/2; + + % correct it so that the bounding box is just around the minimum + % and maximum point in the initialised face + tx = tx - a*(min(rot_m(1,:)) + max(rot_m(1,:)))/2; + ty = ty - a*(min(rot_m(2,:)) + max(rot_m(2,:)))/2; + + % visualisation of the initial state + %hold off;imshow(Image);hold on;plot(a*rot_m(1,:)+tx, a*rot_m(2,:)+ty,'.r');hold on;rectangle('Position', [bounding_box(1), bounding_box(2), bounding_box(3)-bounding_box(1), bounding_box(4)-bounding_box(2)]); + global_params = [a, 0, 0, 0, tx, ty]'; + global_params(2:4) = orientation; + + local_params = zeros(numel(PDM.E), 1); + + if(any(strcmp(varargin,'gparam'))) + global_params = varargin{find(strcmp(varargin, 'gparam'))+1}; + end + + if(any(strcmp(varargin,'lparam'))) + local_params = varargin{find(strcmp(varargin, 'lparam'))+1}; + end + + scale = clmParams.startScale; + + if(isempty(precomp_resps)) + if(size(Image, 3) == 1) + GrayImage = Image; + else + GrayImage = rgb2gray(Image); + end + + [heightImg, widthImg] = size(GrayImage); + + % Some predefinitions for faster patch extraction + [xi, yi] = meshgrid(0:widthImg-1,0:heightImg-1); + xi = double(xi); + yi = double(yi); + + GrayImageDb = double(GrayImage); + end + clmParams_old = clmParams; + + % In case there are no iterations initialize thes to empty + view = GetView(patchExperts(scale).centers, global_params(2:4)); + final_lhood = 0; + [shape2D] = GetShapeOrtho(M, PDM.V, local_params, global_params); + landmark_lhoods = zeros(size(shape2D,1),1); + + % multi iteration refinement using NU-RLMS in each one + for i=1:clmParams.numPatchIters + + current_patch_scaling = patchExperts(scale).trainingScale; + visibilities = patchExperts(scale).visibilities; + + view = GetView(patchExperts(scale).centers, global_params(2:4)); + + % The shape fitting is performed in the reference frame of the + % patch training scale + refGlobal = [current_patch_scaling, 0, 0, 0, 0, 0]'; + + % the reference shape + refShape = GetShapeOrtho(M, PDM.V, local_params, refGlobal); + + % shape around which the patch experts will be evaluated in the original image + [shape2D] = GetShapeOrtho(M, PDM.V, local_params, global_params); + shape2D_img = shape2D(:,1:2); + + % Create transform using a slightly modified version of Kabsch that + % takes scaling into account as well, in essence we get a + % similarity transform from current estimate to reference shape + [A_img2ref, T_img2ref, ~, ~] = AlignShapesWithScale(shape2D_img(:,1:2),refShape(:,1:2)); + + % Create a transform, from shape in image to reference shape + T = maketform('affine', [A_img2ref;T_img2ref]); + + shape_2D_ref = tformfwd(T, shape2D_img); + + % transform the current shape to the reference one, so we can + % interpolate + shape2D_in_ref = (A_img2ref * shape2D_img')'; + + sideSizeX = (clmParams.window_size(i,1) - 1)/2; + sideSizeY = (clmParams.window_size(i,2) - 1)/2; + + if(isempty(precomp_resps)) + patches = zeros(size(shape2D_in_ref,1), clmParams.window_size(i,1) * clmParams.window_size(i,2)); + + Ainv = inv(A_img2ref); + + % extract patches on which patch experts will be evaluted + for l=1:size(shape2D_in_ref,1) + if(visibilities(view,l)) + + xs = (shape2D_in_ref(l,1)-sideSizeX):(shape2D_in_ref(l,1)+sideSizeX); + ys = (shape2D_in_ref(l,2)-sideSizeY):(shape2D_in_ref(l,2)+sideSizeY); + + [xs, ys] = meshgrid(xs, ys); + + pairs = [xs(:), ys(:)]; + + actualLocs = (Ainv * pairs')'; + + actualLocs(actualLocs(:,1) < 0,1) = 0; + actualLocs(actualLocs(:,2) < 0,2) = 0; + actualLocs(actualLocs(:,1) > widthImg - 1,1) = widthImg - 1; + actualLocs(actualLocs(:,2) > heightImg - 1,2) = heightImg - 1; + + [t_patch] = interp2_mine(xi, yi, GrayImageDb, actualLocs(:,1), actualLocs(:,2), 'bilinear'); + t_patch = reshape(t_patch, size(xs)); + + patches(l,:) = t_patch(:); + + end + end + + % Calculate patch responses, either SVR or CCNF + if(strcmp(patchExperts(scale).type, 'SVR')) + responses = PatchResponseSVM_multi_modal( patches, patchExperts(scale).patch_experts(view,:), visibilities(view,:), patchExperts(scale).normalisationOptionsCol, clmParams, clmParams.window_size(i,:)); + elseif(strcmp(patchExperts(scale).type, 'CCNF')) + responses = PatchResponseCCNF( patches, patchExperts(scale).patch_experts(view,:), visibilities(view,:), patchExperts(scale), clmParams.window_size(i,:)); + elseif(strcmp(patchExperts(scale).type, 'CEN')) + responses = PatchResponseCEN_sparse( patches, patchExperts(scale).patch_experts(view,:), visibilities(view,:), clmParams.window_size(i,:), patchExperts(scale).normalisationOptionsCol.patchSize); + end + precomp_resps = responses; + else + responses = precomp_resps; + end + + + % If a depth image is provided compute patch experts around it as + % well (unless it's the final iteration) + if(~isempty(DepthImage) && (i ~= clmParams.numPatchIters)) + + % Extracting the depth patches here + patches_depth = zeros(size(shape2D_in_ref,1), clmParams.window_size(i,1) * clmParams.window_size(i,2)); + + % extract patches on which patch experts will be evaluted + for l=1:size(shape2D_in_ref,1) + if(visibilities(view,l)) + + xs = (shape2D_in_ref(l,1)-sideSizeX):(shape2D_in_ref(l,1)+sideSizeX); + ys = (shape2D_in_ref(l,2)-sideSizeY):(shape2D_in_ref(l,2)+sideSizeY); + + [xs, ys] = meshgrid(xs, ys); + + pairs = [xs(:), ys(:)]; + + actualLocs = (Ainv * pairs')'; + + actualLocs(actualLocs(:,1) < 1,1) = 1; + actualLocs(actualLocs(:,2) < 1,2) = 1; + actualLocs(actualLocs(:,1) > widthImg,1) = widthImg; + actualLocs(actualLocs(:,2) > heightImg,2) = heightImg; + + % use nearest neighbour interpolation as bilinear would + % produce artefacts in depth image (when missing data + % is there) + [t_patch] = interp2_mine(xi, yi, DepthImage, actualLocs(:,1), actualLocs(:,2), 'nearest'); + t_patch = reshape(t_patch, size(xs)); + + patches_depth(l,:) = t_patch(:); + + end + end + + old_mm = clmParams.use_multi_modal; + clmParams.use_multi_modal = 0; + responses_depth = PatchResponseSVM_multi_modal( patches_depth, patchExperts(scale).patch_experts_depth(view,:), visibilities(view,:), patchExperts(scale).normalisationOptionsDepth, clmParams, clmParams.window_size(i,:)); + clmParams.use_multi_modal = old_mm; + + % Combining the patch responses from different channels here + for l=1:size(shape2D_in_ref,1) + responses{l} = responses{l} + responses_depth{l}; + end + end + + % the better the correlation in training the more reliable the feature + % the reliabilities are independent for every modality in SVR, so + % combine them (also correlation is inverse to variance) + if(strcmp(patchExperts(scale).type, 'SVR')) + if(clmParams.use_multi_modal) + reliabilities = patchExperts(scale).patch_experts{1,1}(end).correlations{1}; + else + reliabilities = patchExperts(scale).patch_experts{1,1}(1).correlations{1}; + end + else + % for CCNF the modalities work together + reliabilities = patchExperts(scale).correlations; + end + reliabilities = reliabilities(view,:); + + % deal with the fact that params might be different for different + % scales + if(numel(clmParams_old.regFactor) > 1) + clmParams.regFactor = clmParams_old.regFactor(scale); + end + if(numel(clmParams_old.sigmaMeanShift) > 1) + clmParams.sigmaMeanShift = clmParams_old.sigmaMeanShift(scale); + end + if(numel(clmParams_old.tikhonov_factor) > 1) + clmParams.tikhonov_factor = clmParams_old.tikhonov_factor(scale); + end + + % The actual NU-RLMS step + + % first the rigid transform + [global_params, local_params] = NU_RLMS(global_params, local_params, PDM, responses, visibilities, view, reliabilities, shape2D_img, T, true, clmParams, []); + + % second the combined transform + [global_params, local_params, final_lhood, landmark_lhoods] = ... + NU_RLMS(global_params, local_params, PDM, responses, visibilities, view, reliabilities, shape2D_img, T, false, clmParams, []); + + % Clamp orientation and make sure it doesn't get out of hand + orientation = global_params(2:4); + orientation(orientation < -pi/2) = -pi/2; + orientation(orientation > pi/2) = pi/2; + global_params(2:4) = orientation; + + % move up a scale if possible + if(clmParams.useMultiScale && scale ~= numel(patchExperts)) + + % only go up a scale if we don't need to upsample + if(0.9 * patchExperts(scale+1).trainingScale < global_params(1)) + scale = scale + 1; + else + break; + end + end + end + + % the view in last iteration + view_used = view; + + % See how good the tracking was in the end + [shape2D] = GetShapeOrtho(M, PDM.V, local_params, global_params); + + % Moving to matlab format + shape2D = shape2D(:,1:2) + 1; + +end + + +function [id] = GetView(centers, rotation) + + [~,id] = min(sum((centers * pi/180 - repmat(rotation', size(centers,1), 1)).^2,2)); + +end \ No newline at end of file diff --git a/matlab_version/learn_error_mapping/Script_CECLM_menpo_sparse_sel_frontal.m b/matlab_version/learn_error_mapping/Script_CECLM_menpo_sparse_sel_frontal.m new file mode 100644 index 00000000..0574ac48 --- /dev/null +++ b/matlab_version/learn_error_mapping/Script_CECLM_menpo_sparse_sel_frontal.m @@ -0,0 +1,225 @@ +clear +addpath(genpath('../')); + +[images, detections, labels] = Collect_menpo_train_imgs('G:\datasets\menpo/'); + +%% Setup recording +[~, pdm, ~, ~] = Load_CECLM_OF(); + +%% Identify orientation of each of the training images +orientations = zeros(numel(images), 3); +for i=1:numel(images) + landmarks = standardise_landmarks(labels{i}); + [ a, R, T, T3D, params, error, shapeOrtho ] = fit_PDM_ortho_proj_to_2D(pdm.M, pdm.E, pdm.V, landmarks); + orientations(i,:) = Rot2Euler(R); +end + +%% Keep only the relevant orientations for that view + +angle_dist = sum(abs(orientations)')'; + +to_keep = angle_dist < 25 * pi/180; +images = images(to_keep); +detections = detections(to_keep,:); +labels = labels(to_keep); + +%% + +% Change if you want to visualize the outputs +verbose = false; + +if(verbose) + f = figure; +end + +view = 1; + +%% Mirror indices +mirror_inds = [1,17;2,16;3,15;4,14;5,13;6,12;7,11;8,10;18,27;19,26;20,25;21,24;22,23;... + 32,36;33,35;37,46;38,45;39,44;40,43;41,48;42,47;49,55;50,54;51,53;60,56;59,57;... + 61,65;62,64;68,66]; + +remove_all = cell(4, 1); +errors_all_med = cell(4,1); +errors_all_mean = cell(4,1); + +% To start where we finished across scales +gparams = cell(numel(images), 1); +lparams = cell(numel(images), 1); + +for scale = 1:4 + + remove_all_c = []; + errors_all_med_c = []; + errors_all_mean_c = []; + + [patches, pdm, clmParams, early_term_params] = Load_CECLM_OF(); + + clmParams.numPatchIters = 1; + clmParams.startScale = scale; + + patches = patches(1:scale); + + for s=1:scale + patches(s).correlations = patches(s).correlations(view,:); + patches(s).centers = patches(s).centers(view,:); + patches(s).rms_errors = patches(s).rms_errors(view,:); + patches(s).visibilities = patches(s).visibilities(view,:); + patches(s).patch_experts = patches(s).patch_experts(view,:); + end + visi_old = patches(scale).visibilities; + + shapes_base = cell(numel(labels), 1); + + % First establish the basic error without removing landmarks at this + % scale + for i=1:numel(images) + + image = imread(images(i).img); + image_orig = image; + + if(size(image,3) == 3) + image = rgb2gray(image); + end + + bbox = squeeze(detections(i,:)); + + % Precomputing patch experts + if(scale == 1) + [shape] = Fitting_from_bb(image, [], bbox, pdm, patches, clmParams, []); + else + [shape] = Fitting_from_bb(image, [], bbox, pdm, patches, clmParams, 'gparam', gparams{i}, 'lparam', lparams{i}); + end + shapes_base{i} = shape; + +% v_points = logical(patches(scale).visibilities(1,:))'; +% DrawFaceOnFig(image_orig, shape, bbox, v_points); + end + + error_base_mean = mean(compute_error_menpo_1(labels, shapes_base)); + error_base_med = median(compute_error_menpo_1(labels, shapes_base)); + fprintf('Base error scale %d - %.3f\n', scale, error_base_med); + + for s=1:30 + + % First remove the indicies already decided to remove + patches(scale).visibilities = visi_old; + patches(scale).visibilities(view, remove_all_c) = 0; + + % Indices to test removing + + % Identify which indices to remove + to_rem_potential = find(patches(scale).visibilities(view,:)); + % Now remove the mirror inds from them + to_remove = intersect(mirror_inds(:,2), to_rem_potential); + + for i=numel(to_remove):-1:1 + to_rem_potential(to_rem_potential==to_remove(i)) = []; + end + + to_test_num = numel(to_rem_potential); + + gparams_all = cell(numel(images), to_test_num); + lparams_all = cell(numel(images), to_test_num); + + shapes_all = cell(numel(images), to_test_num); + labels_all = cell(numel(images), to_test_num); + + to_rems = to_rem_potential; + for i=1:numel(images) + + image = imread(images(i).img); + image_orig = image; + + if(size(image,3) == 3) + image = rgb2gray(image); + end + + bbox = squeeze(detections(i,:)); + + % Precomputing patch experts + if(scale == 1) + [~,~,~,~,~,~, precomp] = Fitting_from_bb_precomp(image, [], bbox, pdm, patches, clmParams, []); + else + [~,~,~,~,~,~, precomp] = Fitting_from_bb_precomp(image, [], bbox, pdm, patches, clmParams, [], 'gparam', gparams{i}, 'lparam', lparams{i}); + end + for v=1:numel(to_rem_potential) + + patches(scale).visibilities(view, to_rem_potential(v)) = 0; + + mirr_id = union(mirror_inds(find(mirror_inds(:,1)==to_rem_potential(v),1),2),... ; + mirror_inds(find(mirror_inds(:,2)==to_rem_potential(v),1),1)); + + if(~isempty(mirr_id)) + patches(scale).visibilities(view, mirr_id) = 0; + end + + %% Fitting the model to the provided images + if(scale == 1) + [shape,gparams_all{i,v},lparams_all{i,v},lhood,lmark_lhood,view_used] = Fitting_from_bb_precomp(image, [], bbox, pdm, patches, clmParams, precomp); + else + [shape,gparams_all{i,v},lparams_all{i,v},lhood,lmark_lhood,view_used] = Fitting_from_bb_precomp(image, [], bbox, pdm, patches, clmParams, precomp, 'gparam', gparams{i}, 'lparam', lparams{i}); + end + shapes_all{i,v} = shape; + labels_all{i,v} = labels{i}; + + if(mod(i, 200)==0) + fprintf('%d done\n', i ); + end + + if(verbose) + v_points = logical(patches(scale).visibilities(view_used,:))'; + DrawFaceOnFig(image_orig, shape, bbox, v_points); + end + + % Clean up + patches(scale).visibilities = visi_old; + patches(scale).visibilities(view, remove_all_c) = 0; + end + + end + errors_mean = zeros(numel(to_rem_potential),1); + errors_median = zeros(numel(to_rem_potential),1); + for v=1:numel(to_rem_potential) + errors_mean(v) = mean(compute_error_menpo_1(labels_all(:,v), shapes_all(:,v))); + errors_median(v) = median(compute_error_menpo_1(labels_all(:,v), shapes_all(:,v))); + end + + [~, id] = min(errors_mean); + + val_med = errors_median(id); + val_mean = errors_mean(id); + + remove_all_c = cat(2, remove_all_c, to_rems(id)); + errors_all_med_c = cat(2, errors_all_med_c, val_med); + errors_all_mean_c = cat(2, errors_all_mean_c, val_mean); + + mirr_id = mirror_inds(find(mirror_inds(:,1)==to_rems(id),1),2); + + if(~isempty(mirr_id)) + remove_all_c = cat(2, remove_all_c, mirr_id); + errors_all_med_c = cat(2, errors_all_med_c, val_med); + errors_all_mean_c = cat(2, errors_all_mean_c, val_mean); + end + + remove_all{scale} = remove_all_c; + errors_all_med{scale} = errors_all_med_c; + errors_all_mean{scale} = errors_all_mean_c; + + %% + output_results = 'sparse_selection/menpo_frontal_sparse.mat'; + save(output_results, 'remove_all', 'errors_all_med', 'errors_all_mean'); + + fprintf('Curr error rem %d - %.3f\n', s, errors_all_med_c(end)); + + % Going to the next scale + if(0.99 * errors_all_med_c(end) > error_base_med) + break; + end + + end + + gparams = gparams_all(:,id); + lparams = lparams_all(:,id); + +end diff --git a/matlab_version/learn_error_mapping/Script_CECLM_menpo_sparse_sel_profile.m b/matlab_version/learn_error_mapping/Script_CECLM_menpo_sparse_sel_profile.m new file mode 100644 index 00000000..66350ea0 --- /dev/null +++ b/matlab_version/learn_error_mapping/Script_CECLM_menpo_sparse_sel_profile.m @@ -0,0 +1,187 @@ +function Script_CECLM_menpo_sparse_sel_profile() + +addpath(genpath('../')); + +[images, detections, labels] = Collect_menpo_train_imgs('G:\datasets\menpo/'); + + +%% loading the CE-CLM model and parameters +[patches, pdm, clmParams, early_term_params] = Load_CECLM_menpo(); +patches = patches(1); + +%% Setup recording +clmParams.numPatchIters = 1; +experiment.params = clmParams; + +num_points = numel(pdm.M)/3; + + +%% Identify orientation of each of the training images +orientations = zeros(numel(images), 3); +centres_all = patches.centers; +num_centers = size(centres_all,1); +views_all = zeros(numel(images), 1); +for i=1:numel(images) + landmarks = standardise_landmarks(labels{i}); + [ a, R, T, T3D, params, error, shapeOrtho ] = fit_PDM_ortho_proj_to_2D(pdm.M, pdm.E, pdm.V, landmarks); + orientations(i,:) = Rot2Euler(R); + [~, view] = min(sum(abs(centres_all * pi/180 - repmat(orientations(i,:) , num_centers, 1)),2)); +% views_all(i) = view; +end + +%% Keep only the relevant orientations for that view +or_id = 2; +view = or_id; +mirr_view = 9 - view; +orientation_1 = patches.centers(or_id,:) * pi/180; +orientation_2 = orientation_1; +orientation_2(2) = -orientation_2(2); + +% Keep the ones closest to orientation of interest + +angle_dist_1 = sum(abs(bsxfun(@plus, orientations, -orientation_1))')'; +to_keep_1 = angle_dist_1 < 15 * pi/180; + +angle_dist_2 = sum(abs(bsxfun(@plus, orientations, -orientation_2))')'; +to_keep_2 = angle_dist_2 < 15 * pi/180; + +to_keep = to_keep_1 | to_keep_2; + +% Keep track of which view is used +to_keep_1 = to_keep_1(to_keep); +to_keep_2 = to_keep_2(to_keep); + +images = images(to_keep); +detections = detections(to_keep,:); +labels = labels(to_keep); + +shapes_all = cell(numel(images), 1); +labels_all = cell(numel(images), 1); +lhoods = zeros(numel(images),1); +all_lmark_lhoods = zeros(num_points, numel(images)); +all_views_used = zeros(numel(images),1); + +%% + +% Change if you want to visualize the outputs +verbose = false; + +if(verbose) + f = figure; +end + +remove_all = []; +remove_all_mirr = []; +errors_all_med = []; +errors_all_mean = []; +visi_old = patches(1).visibilities; +rng(0); + +%% Mirror indices +mirror_inds = [1,17;2,16;3,15;4,14;5,13;6,12;7,11;8,10;18,27;19,26;20,25;21,24;22,23;... + 32,36;33,35;37,46;38,45;39,44;40,43;41,48;42,47;49,55;50,54;51,53;60,56;59,57;... + 61,65;62,64;68,66]; + +for s=1:30 + + % First remove the indicies already decided to remove + patches(1).visibilities = visi_old; + patches(1).visibilities(view, remove_all) = 0; + patches(1).visibilities(mirr_view, remove_all_mirr) = 0; + + % Indices to test removing + + % Identify which indices are up for removal + to_rem_potential = find(patches(1).visibilities(view,:)); + + to_test_num = numel(to_rem_potential); + + errors_mean = zeros(to_test_num, 1); + errors_median = zeros(to_test_num, 1); + to_rems = zeros(to_test_num, 1); + to_rems_mirr = zeros(to_test_num, 1); + + for v=1:numel(to_rem_potential) + + to_rem_c = to_rem_potential(v); + + % See if there's a mirror index to this and remove both + patches(1).visibilities(view, to_rem_c) = 0; + to_rems(v) = to_rem_c; + + mirr_id = union(mirror_inds(find(mirror_inds(:,1)==to_rem_c,1),2),... ; + mirror_inds(find(mirror_inds(:,2)==to_rem_c,1),1)); + if(~isempty(mirr_id)) + patches(1).visibilities(mirr_view, mirr_id) = 0; + to_rems_mirr(v) = mirr_id; + else + patches(1).visibilities(mirr_view, to_rem_c) = 0; + to_rems_mirr(v) = to_rem_c; + end + + %% Fitting the model to the provided images + tic + for i=1:numel(images) + image = imread(images(i).img); + image_orig = image; + + if(size(image,3) == 3) + image = rgb2gray(image); + end + + bbox = squeeze(detections(i,:)); + + % pick the view + if(to_keep_1(i)) + or = orientation_1; + else + or = orientation_2; + end + [shape,~,~,lhood,lmark_lhood,view_used] = Fitting_from_bb(image, [], bbox, pdm, patches, clmParams, 'orientation', or); + + all_lmark_lhoods(:,i) = lmark_lhood; + all_views_used(i) = view_used; + + shapes_all{i} = shape; + labels_all{i} = labels{i}; + + if(mod(i, 200)==0) + fprintf('%d done\n', i ); + end + + lhoods(i) = lhood; + + if(verbose) + v_points = logical(patches(1).visibilities(view_used,:))'; + DrawFaceOnFig(image_orig, shape, bbox, v_points); + end + end + + % Reset the visibilities + patches(1).visibilities = visi_old; + patches(1).visibilities(view, remove_all) = 0; + patches(1).visibilities(mirr_view, remove_all_mirr) = 0; + + errors_mean(v) = mean(compute_error_menpo_1(labels_all(1:i), shapes_all(1:i))); + errors_median(v) = median(compute_error_menpo_1(labels_all(1:i), shapes_all(1:i))); + + end + + [~, id] = min(errors_mean); + + val_med = errors_median(id); + val_mean = errors_mean(id); + + remove_all = cat(2, remove_all, to_rems(id)); + remove_all_mirr = cat(2, remove_all_mirr, to_rems_mirr(id)); + errors_all_med = cat(2, errors_all_med, val_med); + errors_all_mean = cat(2, errors_all_mean, val_mean); + + + %% + output_results = 'sparse_selection/menpo_profile_1_sparse.mat'; + save(output_results, 'remove_all', 'remove_all_mirr', 'errors_all_med', 'errors_all_mean'); +end +toc + +end diff --git a/matlab_version/learn_error_mapping/Script_CECLM_of_multi_hyp.m b/matlab_version/learn_error_mapping/Script_CECLM_of_multi_hyp.m new file mode 100644 index 00000000..80d67a72 --- /dev/null +++ b/matlab_version/learn_error_mapping/Script_CECLM_of_multi_hyp.m @@ -0,0 +1,71 @@ +function Script_CECLM_of_multi_hyp() + +addpath(genpath('../')); + +[images, detections, labels] = Collect_menpo_train_imgs('G:\datasets\menpo/'); + +%% loading the patch experts +[patches, pdm, clmParams] = Load_CECLM_OF(); + +%% Fitting the model to the provided image +views = [0,0,0; 0,-30,0; 0,30,0; 0,-55,0; 0,55,0; 0,0,30; 0,0,-30; 0,-90,0; 0,90,0; 0,-70,40; 0,70,-40]; +views = views * pi/180; +num_views = size(views,1); + +clmParams.numPatchIters = 1; + +% for recording purposes +experiment.params = clmParams; + +num_points = numel(pdm.M)/3; + +shapes_all = cell(numel(images), num_views); +labels_all = cell(numel(images), 1); +lhoods = zeros(numel(images),num_views); +all_lmark_lhoods = zeros(num_points, numel(images),num_views); +all_views_used = zeros(numel(images),num_views); +errors_view = zeros(numel(images),num_views); +% Use the multi-hypothesis model, as bounding box tells nothing about +% orientation +verbose = true; +tic + +for i=1:numel(images) + + image = imread(images(i).img); + image_orig = image; + + if(size(image,3) == 3) + image = rgb2gray(image); + end + + bbox = squeeze(detections(i,:)); + + + % Find the best orientation + for v = 1:size(views,1) + [shape,~,~,lhood,lmark_lhoods,view_used] = Fitting_from_bb(image, [], bbox, pdm, patches, clmParams, 'orientation', views(v,:)); + shapes_all{i,v} = shape; + all_views_used(i,v) = view_used; + all_lmark_lhoods(:, i,v) = lmark_lhoods; + lhoods(i,v) = lhood; + errors_view(i,v) = compute_error_menpo_1(labels(i), {shape}); + end + + labels_all{i} = labels{i}; + + if(mod(i, 200)==0) + fprintf('%d done\n', i ); + end + +end +toc + +experiment.lhoods = lhoods; +experiment.errors_view = errors_view; +experiment.all_views_used = all_views_used; + +%% +output_results = ['results/results_ceclm_of.mat']; +save(output_results, 'experiment'); +end diff --git a/matlab_version/learn_error_mapping/cen_menpo_mapping_of.mat b/matlab_version/learn_error_mapping/cen_menpo_mapping_of.mat new file mode 100644 index 00000000..f8c93339 Binary files /dev/null and b/matlab_version/learn_error_mapping/cen_menpo_mapping_of.mat differ diff --git a/matlab_version/learn_error_mapping/early_term_cen_of.txt b/matlab_version/learn_error_mapping/early_term_cen_of.txt index f7c39aca..810a21db 100644 --- a/matlab_version/learn_error_mapping/early_term_cen_of.txt +++ b/matlab_version/learn_error_mapping/early_term_cen_of.txt @@ -1 +1 @@ -1.000 0.969 1.017 0.954 0.954 1.017 0.969 0.000 0.047 0.164 -0.375 -0.375 0.164 0.047 -0.270 -0.260 -0.170 0.250 0.250 -0.170 -0.260 \ No newline at end of file +1.000 1.005 1.054 0.976 0.976 1.054 1.005 0.000 0.049 0.121 -0.370 -0.370 0.121 0.049 -0.230 -0.200 -0.140 0.260 0.260 -0.140 -0.200 \ No newline at end of file diff --git a/matlab_version/learn_error_mapping/learn_error_pred_of.m b/matlab_version/learn_error_mapping/learn_error_pred_of.m new file mode 100644 index 00000000..3527cc8d --- /dev/null +++ b/matlab_version/learn_error_mapping/learn_error_pred_of.m @@ -0,0 +1,78 @@ +clear; + +load('./results/results_ceclm_menpo.mat'); + +% Generate a lot of possibilities and find best +weights = [1,1,1,0,0,0]; +score_base = ranking_score(weights, experiment.lhoods, experiment.all_views_used, experiment.errors_view); +scores = zeros(1,1000); +score = score_base; +weights_all = zeros(1000,6); +for i=1:1000 + + scores(i) = score; + weights_all(i,:) = weights; +% weights = weights + (0.999^i)*0.3 * ranking_score_grad(weights, l_hoods_view, experiment.all_views_used, errors_view); + weights = weights + (0.999^i)*0.3 * ranking_score_grad(weights, experiment.lhoods, experiment.all_views_used, experiment.errors_view); + score = ranking_score(weights, experiment.lhoods, experiment.all_views_used, experiment.errors_view); +end +[~,id] = max(scores); +weights_lhoods = weights_all(id,:); + +%% Learn the cuttof +view_used = experiment.all_views_used; +weights_scale = ones(size( experiment.lhoods)); +% As views 2-7, 3-6, 4-5 are mirrors of each other, trust their +% assessment the same amount +weights_scale(view_used == 2) = weights_lhoods(1); +weights_scale(view_used == 3) = weights_lhoods(2); +weights_scale(view_used == 4) = weights_lhoods(3); +weights_scale(view_used == 5) = weights_lhoods(3); +weights_scale(view_used == 6) = weights_lhoods(2); +weights_scale(view_used == 7) = weights_lhoods(1); + +weights_add = zeros(size(experiment.lhoods)); +weights_add(view_used == 2) = weights_lhoods(4); +weights_add(view_used == 3) = weights_lhoods(5); +weights_add(view_used == 4) = weights_lhoods(6); +weights_add(view_used == 5) = weights_lhoods(6); +weights_add(view_used == 6) = weights_lhoods(5); +weights_add(view_used == 7) = weights_lhoods(4); + +lhoods = experiment.lhoods .* weights_scale + weights_add; + +% As a very reliable detection, make sure that 98% of cases have high +% accuracy (less than 0.1) +% That is find the smallest number which leads to good accuracy +cutoffs = []; +for i=1:4 + ids = view_used==i; + if(i > 1) + if(i==2) + mirr_id = 7; + elseif(i==3) + mirr_id = 6; + elseif(i==4) + mirr_id = 5; + end + ids = ids | view_used==mirr_id; + end + lhood_view = lhoods(ids); + error = experiment.errors_view(ids); + + for c=-2:0.01:2 + if(mean(error(lhood_view >c)<0.1) >= 0.99) + break; + end + end + cutoffs = cat(1, cutoffs, c); +end +cutoffs = [cutoffs(1), cutoffs(2), cutoffs(3), cutoffs(4), cutoffs(4), cutoffs(3), cutoffs(2)]; +weights_scale = weights_lhoods(1:end/2); +weights_scale = [1, weights_scale(1), weights_scale(2), weights_scale(3), weights_scale(3), weights_scale(2), weights_scale(1)]; +weights_add = weights_lhoods(end/2+1:end); +weights_add = [0, weights_add(1), weights_add(2), weights_add(3), weights_add(3), weights_add(2), weights_add(1)]; +early_term_params.weights_scale = weights_scale; +early_term_params.weights_add = weights_add; +early_term_params.cutoffs = cutoffs; +save('cen_menpo_mapping', 'early_term_params'); \ No newline at end of file diff --git a/matlab_version/learn_error_mapping/output_corrections.m b/matlab_version/learn_error_mapping/output_corrections.m index cab5bf2a..a80b39e7 100644 --- a/matlab_version/learn_error_mapping/output_corrections.m +++ b/matlab_version/learn_error_mapping/output_corrections.m @@ -1,7 +1,7 @@ clear; -load('cen_menpo_mapping.mat'); +load('cen_of_mapping.mat'); -fe = fopen('early_term_cen.txt', 'w'); +fe = fopen('early_term_cen_of.txt', 'w'); for i=1:numel(early_term_params.weights_scale) fprintf(fe, '%.3f ', early_term_params.weights_scale(i)); diff --git a/matlab_version/learn_error_mapping/readme.txt b/matlab_version/learn_error_mapping/readme.txt index fef49698..845a74bf 100644 --- a/matlab_version/learn_error_mapping/readme.txt +++ b/matlab_version/learn_error_mapping/readme.txt @@ -4,9 +4,11 @@ detection likelihoods and the resulting landmark error. First run: Script_CECLM_general_cross_data_multi_hyp.m Script_CECLM_menpo_multi_hyp.m +Script_CECLM_of.m Then: learn_error_pred_general.m learn_error_pred_menpo.m +learn_error_pred_of.m To use in C++ also generate the early_term_cen_of.txt file using output_corrections.m, this is already generated so no need to re-run it. \ No newline at end of file diff --git a/matlab_version/learn_error_mapping/sparse_selection/menpo_frontal_sparse.mat b/matlab_version/learn_error_mapping/sparse_selection/menpo_frontal_sparse.mat new file mode 100644 index 00000000..fb6a5586 Binary files /dev/null and b/matlab_version/learn_error_mapping/sparse_selection/menpo_frontal_sparse.mat differ diff --git a/matlab_version/learn_error_mapping/standardise_landmarks.m b/matlab_version/learn_error_mapping/standardise_landmarks.m new file mode 100644 index 00000000..20c280bc --- /dev/null +++ b/matlab_version/learn_error_mapping/standardise_landmarks.m @@ -0,0 +1,46 @@ +function [landmark_labels] = standardise_landmarks(landmarks) + + left_to_frontal_map = [17,28; 18,29; 19,30; 20,31; + 21,34; 22,32; 23,39; 24,38; 25,37; 26,42; 27,41; + 28,52; 29,51; 30,50; 31,49; 32,60; 33,59; 34,58; + 35,63; 36,62; 37,61; 38,68; 39,67]; + + right_to_frontal_map = [17,28; 18,29; 19,30; 20,31; + 21,34; 22,36; 23,44; 24,45; 25,46; 26,47; 27,48; + 28,52; 29,53; 30,54; 31,55; 32,56; 33,57; 34,58; + 35,63; 36,64; 37,65; 38,66; 39,67]; + + landmark_labels = zeros(68,2); + + if(size(landmarks,1) == 39) + % Determine if the points are clock-wise or counter clock-wise + % Clock-wise points are facing left, counter-clock-wise right + sum = 0; + for k=1:11 + step = (landmarks(k+1,1) - landmarks(k,1)) * (landmarks(k+1,2) + landmarks(k,2)); + sum = sum + step; + end + + if(sum > 0) + % First need to resample the face outline as there are 9 + % points in the near-frontal and 10 points in profile for + % the outline of the face + + outline = iterate_piece_wise(landmarks(1:10,:), 9); + brow = iterate_piece_wise(landmarks(13:16,:), 5); + landmark_labels(1:9,:) = outline; + landmark_labels(18:22,:) = brow; + landmark_labels(left_to_frontal_map(:,2),:) = landmarks(left_to_frontal_map(:,1),:); + else + outline = iterate_piece_wise(landmarks(10:-1:1,:), 9); + brow = iterate_piece_wise(landmarks(16:-1:13,:), 5); + + landmark_labels(9:17,:) = outline; + landmark_labels(23:27,:) = brow; + + landmark_labels(right_to_frontal_map(:,2),:) = landmarks(right_to_frontal_map(:,1),:); + end + else + landmark_labels = landmarks; + end +end \ No newline at end of file diff --git a/matlab_version/models/Load_CECLM_OF.m b/matlab_version/models/Load_CECLM_OF.m new file mode 100644 index 00000000..993e39cd --- /dev/null +++ b/matlab_version/models/Load_CECLM_OF.m @@ -0,0 +1,38 @@ +function [patches, pdm, clmParams, early_term_params] = Load_CECLM_of() +%LOAD_PATCH_EXPERTS Summary of this function goes here +% Detailed explanation goes here + + % Load the patch experts/local detectors + [patches] = Load_CECLM_Patch_Experts( '../models/cen/', 'cen_patches_*_of.mat'); + + % the default PDM to use + pdmLoc = ['../models/pdm/pdm_68_aligned_menpo.mat']; + + load(pdmLoc); + + pdm = struct; + pdm.M = double(M); + pdm.E = double(E); + pdm.V = double(V); + + clmParams = struct; + + clmParams.window_size = [25,25; 23,23; 21,21; 21,21]; + clmParams.numPatchIters = size(clmParams.window_size,1); + + clmParams.regFactor = 0.9*[35, 27, 20, 20]; + clmParams.sigmaMeanShift = 1.5*[1.25, 1.375, 1.5, 1.5]; + clmParams.tikhonov_factor = [2.5, 5, 7.5, 7.5]; + + clmParams.startScale = 1; + clmParams.num_RLMS_iter = 10; + clmParams.fTol = 0.01; + clmParams.useMultiScale = true; + clmParams.use_multi_modal = 1; + clmParams.multi_modal_types = patches(1).multi_modal_types; + clmParams.numPatchIters = 4; + + % As the orientations are not equally reliable reweigh them + load('../learn_error_mapping/cen_menpo_mapping_of.mat'); +end + diff --git a/matlab_version/models/cen/create_cen_experts_OF.m b/matlab_version/models/cen/create_cen_experts_OF.m index 653e432c..c44c1f63 100644 --- a/matlab_version/models/cen/create_cen_experts_OF.m +++ b/matlab_version/models/cen/create_cen_experts_OF.m @@ -8,7 +8,7 @@ mirror_inds = [1:68]; mirror_inds(mirrorInds(:,1)) = mirrorInds(:,2); mirror_inds(mirrorInds(:,2)) = mirrorInds(:,1); -scales = {'0.25', '0.35', '0.50', '1.00'}; +scales = {'0.50', '1.00'}; for s=scales @@ -31,6 +31,63 @@ for s=scales end end + + trainingScale = str2num(s{1}); + save(['cen_patches_', s{1} '_of.mat'], 'trainingScale', 'centers', 'visiIndex', 'patch_experts', 'normalisationOptions'); + + % Work out the frontal view and remove mirror indices for it + [~, frontal] = min(mean(abs(bsxfun(@plus, centers, [0,0,0])'))); + + % First clean up the frontal view + patch_experts.patch_experts(frontal, mirrorInds(:,2)) = {[]}; + + % Work out which views have mirrors of each other, and keep only one set + % of them + n_views = size(visiIndex,1); + + mirror_view = 1:n_views; + + for i = 1:n_views + [~, mirror_view(i)] = min(mean(abs(bsxfun(@plus, centers, centers(i,:))'))); + end + + % Remove a set of mirror indices + to_rem = mirror_view < 1:n_views; + + patch_experts.patch_experts(to_rem, :) = {[]}; + + trainingScale = str2num(s{1}); + write_patch_expert_bin_simple(['cen_patches_', s{1} '_of.dat'], trainingScale, centers, visiIndex, patch_experts, mirror_inds - 1, mirror_view - 1); + +end + +scales = {'0.25', '0.35'}; + +for s=scales + + gen_experts = load(sprintf('cen_patches_%s_general_model_half.mat', s{1})); + load(sprintf('cen_patches_%s_menpo_model_half.mat', s{1})); + + for c=1:size(visiIndex,1) + for i=1:size(visiIndex,2) + % If present in general and not menpo replace + if(gen_experts.visiIndex(c,i) && ~visiIndex(c,i)) + visiIndex(c,i) = 1; + patch_experts.correlations(c,i) = gen_experts.patch_experts.correlations(c,i); + patch_experts.rms_errors(c,i) = gen_experts.patch_experts.rms_errors(c,i); + patch_experts.patch_experts(c,i) = gen_experts.patch_experts.patch_experts(c,i); + elseif(~visiIndex(c,i)) + patch_experts.correlations(c,i) = 0; + patch_experts.rms_errors(c,i) = 0; + patch_experts.patch_experts(c,i) = {[]}; + end + + end + end + + trainingScale = str2num(s{1}); + save(['cen_patches_', s{1} '_of.mat'], 'trainingScale', 'centers', 'visiIndex', 'patch_experts', 'normalisationOptions'); + % Work out the frontal view and remove mirror indices for it [~, frontal] = min(mean(abs(bsxfun(@plus, centers, [0,0,0])')));