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 169a5b8..93574ed 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 149fcf3..2421693 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 2f36f6f..bb6dec3 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 2b0c3ab..b7fb2cf 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 c31894a..24901fb 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 e067b63..993339f 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 886c0d1..4c45efc 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 4e8c136..5949a27 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 8764e93..be1bf45 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 4a44b6b..7d115bf 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 8da4738..c1066ae 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 4a93caf..4f8ee1a 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 3b2eb5a..d5778cf 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 64f27b3..6ee8fa6 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 8c8f7c8..46c0b01 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 12ec7fd..5e96940 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 ee7f6ee..660c097 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 c0a3226..8473378 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 2b04a5a..775fae1 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 fbc4132..2bf99d2 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 5f84b18..e03d753 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 a9af4fd..2e59766 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 8f9cb98..bf00352 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 288634e..8feb16b 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 b58b927..f0eae5d 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 830aee7..0f52afa 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 e56d1b2..0d18470 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 08e875a..58956f2 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 fc0beeb..867eb19 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 c6dd7e1..6851b01 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 e5dd446..f6b54e9 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 c53afee..4ef0344 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 55ea2ee..b685578 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 ec665e2..4d6f556 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 aa120df..7ae9ac9 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 0c46057..1c13b46 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 624731e..693a324 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 406fd81..d6fee88 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 83c864e..b55c1e4 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 00f802c..c5260eb 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 3a22f41..dcac02c 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 8e5c238..bbe11a5 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 109c774..e627a50 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 db18375..b0d7aa3 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 index 065b1c5..c9df2fc 100644 Binary files a/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_1_static_intensity.dat and b/lib/local/FaceAnalyser/AU_predictors/svr_combined/AU_1_static_intensity.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 554df8c..51fb7ac 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 eb78b66..b4354c6 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 a6f437a..d727f08 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 bd03fe2..99bc81e 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 f161ad8..cb6e5ab 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 411670d..a89629e 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 c5b2597..df13ff3 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 3119305..444f20e 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 8939178..dbb45f2 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 12f7ce8..cafc388 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 2f6c0b5..dbf29e8 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 28bce9a..b30604a 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 8204a87..1989c3f 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 14f43f5..5ce3630 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 5c3481b..bdbb41d 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 69c3005..d96626a 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 04b4a11..a4143bc 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 c809ddc..5be5d07 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 7cdfc5d..3fca4a5 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/matlab_runners/Action Unit Experiments/results/BP4D_valid_res_class.txt b/matlab_runners/Action Unit Experiments/results/BP4D_valid_res_class.txt index 47205c9..f9ff112 100644 --- a/matlab_runners/Action Unit Experiments/results/BP4D_valid_res_class.txt +++ b/matlab_runners/Action Unit Experiments/results/BP4D_valid_res_class.txt @@ -1,11 +1,11 @@ -AU1 class, Precision - 0.555, Recall - 0.533, F1 - 0.544 -AU2 class, Precision - 0.403, Recall - 0.439, F1 - 0.420 -AU4 class, Precision - 0.491, Recall - 0.513, F1 - 0.502 -AU6 class, Precision - 0.741, Recall - 0.776, F1 - 0.758 -AU7 class, Precision - 0.764, Recall - 0.727, F1 - 0.745 -AU10 class, Precision - 0.849, Recall - 0.840, F1 - 0.845 -AU12 class, Precision - 0.887, Recall - 0.820, F1 - 0.852 -AU14 class, Precision - 0.542, Recall - 0.807, F1 - 0.649 -AU15 class, Precision - 0.402, Recall - 0.417, F1 - 0.409 -AU17 class, Precision - 0.631, Recall - 0.596, F1 - 0.613 -AU23 class, Precision - 0.335, Recall - 0.598, F1 - 0.429 +AU1 class, Precision - 0.538, Recall - 0.532, F1 - 0.535 +AU2 class, Precision - 0.400, Recall - 0.454, F1 - 0.425 +AU4 class, Precision - 0.478, Recall - 0.516, F1 - 0.497 +AU6 class, Precision - 0.742, Recall - 0.769, F1 - 0.755 +AU7 class, Precision - 0.760, Recall - 0.745, F1 - 0.753 +AU10 class, Precision - 0.840, Recall - 0.851, F1 - 0.845 +AU12 class, Precision - 0.890, Recall - 0.816, F1 - 0.851 +AU14 class, Precision - 0.567, Recall - 0.803, F1 - 0.665 +AU15 class, Precision - 0.362, Recall - 0.406, F1 - 0.382 +AU17 class, Precision - 0.623, Recall - 0.588, F1 - 0.605 +AU23 class, Precision - 0.331, Recall - 0.552, F1 - 0.414 diff --git a/matlab_runners/Action Unit Experiments/results/BP4D_valid_res_int.txt b/matlab_runners/Action Unit Experiments/results/BP4D_valid_res_int.txt index 55c5d15..60c3502 100644 --- a/matlab_runners/Action Unit Experiments/results/BP4D_valid_res_int.txt +++ b/matlab_runners/Action Unit Experiments/results/BP4D_valid_res_int.txt @@ -1,5 +1,5 @@ -AU6 results - rms 0.858, corr 0.786, ccc - 0.737 -AU10 results - rms 1.044, corr 0.736, ccc - 0.678 -AU12 results - rms 0.828, corr 0.865, ccc - 0.827 -AU14 results - rms 1.104, corr 0.532, ccc - 0.485 -AU17 results - rms 0.833, corr 0.591, ccc - 0.490 +AU6 results - rms 0.869, corr 0.777, ccc - 0.730 +AU10 results - rms 1.024, corr 0.735, ccc - 0.694 +AU12 results - rms 0.819, corr 0.862, ccc - 0.833 +AU14 results - rms 1.123, corr 0.537, ccc - 0.492 +AU17 results - rms 0.842, corr 0.582, ccc - 0.476 diff --git a/matlab_runners/Action Unit Experiments/results/Bosphorus_res_class.txt b/matlab_runners/Action Unit Experiments/results/Bosphorus_res_class.txt index d7792c0..b5a3ab3 100644 --- a/matlab_runners/Action Unit Experiments/results/Bosphorus_res_class.txt +++ b/matlab_runners/Action Unit Experiments/results/Bosphorus_res_class.txt @@ -1,17 +1,17 @@ -AU1 class, Precision - 0.434, Recall - 0.673, F1 - 0.528 -AU2 class, Precision - 0.298, Recall - 0.818, F1 - 0.437 -AU4 class, Precision - 0.564, Recall - 0.861, F1 - 0.681 -AU5 class, Precision - 0.387, Recall - 0.915, F1 - 0.544 -AU6 class, Precision - 0.355, Recall - 0.811, F1 - 0.494 -AU7 class, Precision - 0.778, Recall - 0.783, F1 - 0.780 -AU9 class, Precision - 0.370, Recall - 0.953, F1 - 0.533 -AU10 class, Precision - 0.340, Recall - 0.788, F1 - 0.475 -AU12 class, Precision - 0.690, Recall - 0.842, F1 - 0.758 -AU14 class, Precision - 0.185, Recall - 0.881, F1 - 0.305 -AU15 class, Precision - 0.171, Recall - 0.851, F1 - 0.285 -AU17 class, Precision - 0.309, Recall - 0.861, F1 - 0.455 -AU20 class, Precision - 0.130, Recall - 0.921, F1 - 0.228 -AU23 class, Precision - 0.104, Recall - 0.837, F1 - 0.186 -AU25 class, Precision - 0.869, Recall - 0.860, F1 - 0.865 -AU26 class, Precision - 0.368, Recall - 0.809, F1 - 0.506 -AU45 class, Precision - 0.367, Recall - 0.754, F1 - 0.494 +AU1 class, Precision - 0.417, Recall - 0.834, F1 - 0.556 +AU2 class, Precision - 0.313, Recall - 0.816, F1 - 0.453 +AU4 class, Precision - 0.536, Recall - 0.856, F1 - 0.659 +AU5 class, Precision - 0.419, Recall - 0.958, F1 - 0.583 +AU6 class, Precision - 0.354, Recall - 0.804, F1 - 0.492 +AU7 class, Precision - 0.812, Recall - 0.783, F1 - 0.798 +AU9 class, Precision - 0.410, Recall - 0.953, F1 - 0.574 +AU10 class, Precision - 0.336, Recall - 0.788, F1 - 0.471 +AU12 class, Precision - 0.702, Recall - 0.873, F1 - 0.778 +AU14 class, Precision - 0.189, Recall - 0.854, F1 - 0.309 +AU15 class, Precision - 0.178, Recall - 0.879, F1 - 0.296 +AU17 class, Precision - 0.303, Recall - 0.864, F1 - 0.449 +AU20 class, Precision - 0.129, Recall - 0.956, F1 - 0.228 +AU23 class, Precision - 0.102, Recall - 0.830, F1 - 0.182 +AU25 class, Precision - 0.883, Recall - 0.900, F1 - 0.892 +AU26 class, Precision - 0.383, Recall - 0.800, F1 - 0.518 +AU45 class, Precision - 0.374, Recall - 0.765, F1 - 0.502 diff --git a/matlab_runners/Action Unit Experiments/results/Bosphorus_res_int.txt b/matlab_runners/Action Unit Experiments/results/Bosphorus_res_int.txt index c066a02..e4664d6 100644 --- a/matlab_runners/Action Unit Experiments/results/Bosphorus_res_int.txt +++ b/matlab_runners/Action Unit Experiments/results/Bosphorus_res_int.txt @@ -1,17 +1,17 @@ -AU1 intensity, Corr - 0.712, RMS - 0.925, CCC - 0.652 -AU2 intensity, Corr - 0.696, RMS - 0.772, CCC - 0.626 -AU4 intensity, Corr - 0.797, RMS - 0.623, CCC - 0.764 -AU5 intensity, Corr - 0.767, RMS - 0.740, CCC - 0.694 -AU6 intensity, Corr - 0.541, RMS - 0.786, CCC - 0.506 -AU7 intensity, Corr - 0.830, RMS - 0.750, CCC - 0.811 -AU9 intensity, Corr - 0.763, RMS - 0.611, CCC - 0.701 -AU10 intensity, Corr - 0.491, RMS - 0.759, CCC - 0.461 -AU12 intensity, Corr - 0.804, RMS - 0.715, CCC - 0.766 -AU14 intensity, Corr - 0.357, RMS - 0.931, CCC - 0.277 -AU15 intensity, Corr - 0.516, RMS - 0.565, CCC - 0.431 -AU17 intensity, Corr - 0.554, RMS - 0.893, CCC - 0.477 -AU20 intensity, Corr - 0.411, RMS - 0.901, CCC - 0.277 -AU23 intensity, Corr - 0.351, RMS - 0.736, CCC - 0.274 -AU25 intensity, Corr - 0.846, RMS - 0.809, CCC - 0.822 -AU26 intensity, Corr - 0.516, RMS - 0.995, CCC - 0.453 -AU45 intensity, Corr - 0.840, RMS - 0.662, CCC - 0.791 +AU1 intensity, Corr - 0.733, RMS - 0.898, CCC - 0.672 +AU2 intensity, Corr - 0.721, RMS - 0.750, CCC - 0.645 +AU4 intensity, Corr - 0.799, RMS - 0.621, CCC - 0.764 +AU5 intensity, Corr - 0.790, RMS - 0.717, CCC - 0.719 +AU6 intensity, Corr - 0.552, RMS - 0.773, CCC - 0.519 +AU7 intensity, Corr - 0.868, RMS - 0.670, CCC - 0.848 +AU9 intensity, Corr - 0.798, RMS - 0.590, CCC - 0.737 +AU10 intensity, Corr - 0.480, RMS - 0.789, CCC - 0.444 +AU12 intensity, Corr - 0.822, RMS - 0.687, CCC - 0.784 +AU14 intensity, Corr - 0.359, RMS - 0.946, CCC - 0.273 +AU15 intensity, Corr - 0.535, RMS - 0.671, CCC - 0.427 +AU17 intensity, Corr - 0.576, RMS - 0.911, CCC - 0.494 +AU20 intensity, Corr - 0.437, RMS - 0.910, CCC - 0.286 +AU23 intensity, Corr - 0.330, RMS - 0.713, CCC - 0.225 +AU25 intensity, Corr - 0.864, RMS - 0.772, CCC - 0.837 +AU26 intensity, Corr - 0.557, RMS - 0.964, CCC - 0.490 +AU45 intensity, Corr - 0.853, RMS - 0.659, CCC - 0.794 diff --git a/matlab_runners/Action Unit Experiments/results/DISFA_valid_res.txt b/matlab_runners/Action Unit Experiments/results/DISFA_valid_res.txt index 884b143..d509418 100644 --- a/matlab_runners/Action Unit Experiments/results/DISFA_valid_res.txt +++ b/matlab_runners/Action Unit Experiments/results/DISFA_valid_res.txt @@ -1,12 +1,12 @@ -AU1 results - corr 0.826, rms 0.412, ccc - 0.803 -AU2 results - corr 0.763, rms 0.445, ccc - 0.656 -AU4 results - corr 0.874, rms 0.565, ccc - 0.848 -AU5 results - corr 0.745, rms 0.181, ccc - 0.711 -AU6 results - corr 0.706, rms 0.592, ccc - 0.665 -AU9 results - corr 0.740, rms 0.385, ccc - 0.687 -AU12 results - corr 0.869, rms 0.494, ccc - 0.856 -AU15 results - corr 0.745, rms 0.269, ccc - 0.712 -AU17 results - corr 0.642, rms 0.517, ccc - 0.574 -AU20 results - corr 0.619, rms 0.311, ccc - 0.581 -AU25 results - corr 0.926, rms 0.500, ccc - 0.920 -AU26 results - corr 0.802, rms 0.449, ccc - 0.762 +AU1 results - corr 0.831, rms 0.407, ccc - 0.802 +AU2 results - corr 0.717, rms 0.481, ccc - 0.582 +AU4 results - corr 0.873, rms 0.568, ccc - 0.846 +AU5 results - corr 0.741, rms 0.182, ccc - 0.712 +AU6 results - corr 0.696, rms 0.612, ccc - 0.651 +AU9 results - corr 0.744, rms 0.383, ccc - 0.679 +AU12 results - corr 0.872, rms 0.493, ccc - 0.858 +AU15 results - corr 0.747, rms 0.274, ccc - 0.718 +AU17 results - corr 0.636, rms 0.519, ccc - 0.566 +AU20 results - corr 0.640, rms 0.302, ccc - 0.595 +AU25 results - corr 0.924, rms 0.507, ccc - 0.917 +AU26 results - corr 0.802, rms 0.448, ccc - 0.772 diff --git a/matlab_runners/Action Unit Experiments/results/FERA2011_res_class.txt b/matlab_runners/Action Unit Experiments/results/FERA2011_res_class.txt index 3788a50..e29d509 100644 --- a/matlab_runners/Action Unit Experiments/results/FERA2011_res_class.txt +++ b/matlab_runners/Action Unit Experiments/results/FERA2011_res_class.txt @@ -1,11 +1,11 @@ -AU1 class, Precision - 0.587, Recall - 0.720, F1 - 0.647 -AU2 class, Precision - 0.470, Recall - 0.797, F1 - 0.591 -AU4 class, Precision - 0.499, Recall - 0.753, F1 - 0.600 -AU6 class, Precision - 0.836, Recall - 0.674, F1 - 0.746 -AU7 class, Precision - 0.683, Recall - 0.791, F1 - 0.733 -AU10 class, Precision - 0.524, Recall - 0.748, F1 - 0.616 -AU12 class, Precision - 0.919, Recall - 0.659, F1 - 0.768 -AU15 class, Precision - 0.358, Recall - 0.639, F1 - 0.459 -AU17 class, Precision - 0.229, Recall - 0.287, F1 - 0.255 -AU25 class, Precision - 0.205, Recall - 0.869, F1 - 0.332 -AU26 class, Precision - 0.122, Recall - 0.972, F1 - 0.216 +AU1 class, Precision - 0.506, Recall - 0.820, F1 - 0.626 +AU2 class, Precision - 0.471, Recall - 0.744, F1 - 0.577 +AU4 class, Precision - 0.482, Recall - 0.755, F1 - 0.588 +AU6 class, Precision - 0.777, Recall - 0.685, F1 - 0.728 +AU7 class, Precision - 0.672, Recall - 0.778, F1 - 0.721 +AU10 class, Precision - 0.508, Recall - 0.751, F1 - 0.606 +AU12 class, Precision - 0.885, Recall - 0.698, F1 - 0.781 +AU15 class, Precision - 0.323, Recall - 0.664, F1 - 0.434 +AU17 class, Precision - 0.243, Recall - 0.318, F1 - 0.275 +AU25 class, Precision - 0.206, Recall - 0.892, F1 - 0.335 +AU26 class, Precision - 0.126, Recall - 0.974, F1 - 0.222 diff --git a/matlab_runners/Action Unit Experiments/results/SEMAINE_valid_res.txt b/matlab_runners/Action Unit Experiments/results/SEMAINE_valid_res.txt index a682c73..4b972e8 100644 --- a/matlab_runners/Action Unit Experiments/results/SEMAINE_valid_res.txt +++ b/matlab_runners/Action Unit Experiments/results/SEMAINE_valid_res.txt @@ -1,6 +1,6 @@ -AU2 class, Precision - 0.361, Recall - 0.746, F1 - 0.486 -AU12 class, Precision - 0.424, Recall - 0.781, F1 - 0.550 -AU17 class, Precision - 0.110, Recall - 0.812, F1 - 0.194 -AU25 class, Precision - 0.338, Recall - 0.525, F1 - 0.411 -AU28 class, Precision - 0.432, Recall - 0.475, F1 - 0.453 -AU45 class, Precision - 0.295, Recall - 0.615, F1 - 0.399 +AU2 class, Precision - 0.344, Recall - 0.752, F1 - 0.472 +AU12 class, Precision - 0.430, Recall - 0.783, F1 - 0.555 +AU17 class, Precision - 0.111, Recall - 0.857, F1 - 0.196 +AU25 class, Precision - 0.335, Recall - 0.520, F1 - 0.408 +AU28 class, Precision - 0.393, Recall - 0.475, F1 - 0.430 +AU45 class, Precision - 0.310, Recall - 0.591, F1 - 0.406 diff --git a/matlab_runners/Feature Point Experiments/results/fps_yt.mat b/matlab_runners/Feature Point Experiments/results/fps_yt.mat index 340269d..096fc70 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 8fd3bfc..f48a216 100644 --- a/matlab_runners/Feature Point Experiments/results/fps_yt.txt +++ b/matlab_runners/Feature Point Experiments/results/fps_yt.txt @@ -1,3 +1,3 @@ Model, mean, median OpenFace (CLNF): 0.0564, 0.0515 -CLM: 0.0630, 0.0586 +CLM: 0.0631, 0.0587 diff --git a/matlab_runners/Feature Point Experiments/results/in-the-wild-res-no-outline.pdf b/matlab_runners/Feature Point Experiments/results/in-the-wild-res-no-outline.pdf index bb6cc81..c05e02b 100644 Binary files a/matlab_runners/Feature Point Experiments/results/in-the-wild-res-no-outline.pdf and b/matlab_runners/Feature Point Experiments/results/in-the-wild-res-no-outline.pdf differ diff --git a/matlab_runners/Feature Point Experiments/results/landmark_detections.mat b/matlab_runners/Feature Point Experiments/results/landmark_detections.mat index 8b5e179..58a0157 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/Gaze Experiments/mpii_1500_errs.mat b/matlab_runners/Gaze Experiments/mpii_1500_errs.mat index 65d3b63..62374ce 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 9cd6e06..99b3432 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.431, 8.611 +9.428, 8.611 diff --git a/matlab_runners/Head Pose Experiments/results/Pose_OF.mat b/matlab_runners/Head Pose Experiments/results/Pose_OF.mat index 5e8179b..943bafe 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 a3fdb8a..6a395fb 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: 6.981, 5.174, 4.571, 5.575, 2.612 -bu error: 2.738, 3.349, 2.459, 2.849, 1.975 -ict error: 3.497, 3.985, 3.298, 3.593, 1.965 +biwi error: 7.091, 5.170, 4.657, 5.639, 2.609 +bu error: 2.739, 3.349, 2.459, 2.849, 1.974 +ict error: 3.498, 3.986, 3.298, 3.594, 1.966 diff --git a/matlab_version/AU_training/data extraction/extract_FERA2011_labels.m b/matlab_version/AU_training/data extraction/extract_FERA2011_labels.m index 09392f1..01fd49b 100644 --- a/matlab_version/AU_training/data extraction/extract_FERA2011_labels.m +++ b/matlab_version/AU_training/data extraction/extract_FERA2011_labels.m @@ -18,7 +18,20 @@ function [ labels, valid_ids, filenames ] = extract_FERA2011_labels( FERA2011_d [~, filename,~] = fileparts(file); filenames{file_id} = filename; - data = csvread(file); %import annotations for one video file + delimiter = {' '}; + formatSpec = '%f%f%f%f%f%f%f%f%f%f%f%f%f%f%f%f%f%f%f%f%f%f%f%f%f%f%f%f%f%f%f%f%f%f%f%f%f%f%f%f%f%f%f%f%f%f%f%f%f%f%[^\n\r]'; + + %% Open the text file. + fileID = fopen(file,'r'); + + %% Read columns of data according to the format. + data = textscan(fileID, formatSpec, 'Delimiter', delimiter, 'MultipleDelimsAsOne', true, 'TextType', 'string', 'ReturnOnError', false); + data = [data{1:end-1}]; + + %% Close the text file. + fclose(fileID); + + %data = dlmread(file, ' '); %import annotations for one video file speech = data(:,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 6f82b27..07b5411 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 @@ -26,8 +26,9 @@ parfor f1=1:numel(fera_dirs) for v=1:numel(vid_files) input_file = [FERA2011_dir, fera_dirs(f1).name, '/', fera_dirs_level_2(f2).name, '/', vid_files(v).name]; - - command = sprintf('%s -f "%s" -out_dir "%s" -hogalign -pdmparams', features_exe, input_file, output_dir ); + [~, name, ~] = fileparts(vid_files(v).name); + out_name = [fera_dirs(f1).name '_' name]; + command = sprintf('%s -f "%s" -out_dir "%s" -hogalign -pdmparams -of %s', features_exe, input_file, output_dir, out_name ); 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 4eea5ab..af477b2 100644 --- a/matlab_version/AU_training/data extraction/extract_features_SEMAINE.m +++ b/matlab_version/AU_training/data extraction/extract_features_SEMAINE.m @@ -24,7 +24,7 @@ parfor f1=1:numel(semaine_dirs) input_file = [SEMAINE_dir, f1_dir, '/', vid_files(v).name]; - command = sprintf('%s -f "%s" -out_dir "%s" -hogalign -pdmparams', features_exe, input_file, output_dir ); + command = sprintf('%s -f "%s" -out_dir "%s" -hogalign -pdmparams -of %s', features_exe, input_file, output_dir, f1_dir ); dos(command); end @@ -47,7 +47,7 @@ parfor f1=1:numel(semaine_dirs) input_file = [SEMAINE_dir, f1_dir, '/', vid_files(v).name]; - command = sprintf('%s -f "%s" -out_dir "%s" -hogalign -pdmparams', features_exe, input_file, output_dir ); + command = sprintf('%s -f "%s" -out_dir "%s" -hogalign -pdmparams -of %s', features_exe, input_file, output_dir, f1_dir ); dos(command); diff --git a/matlab_version/AU_training/data extraction/find_SEMAINE.m b/matlab_version/AU_training/data extraction/find_SEMAINE.m index 647e1f2..5d061c7 100644 --- a/matlab_version/AU_training/data extraction/find_SEMAINE.m +++ b/matlab_version/AU_training/data extraction/find_SEMAINE.m @@ -15,7 +15,7 @@ else end if(exist('SEMAINE_dir', 'var')) - hog_data_dir = [SEMAINE_dir, '../processed_data/']; + hog_data_dir = 'E:\datasets\face_datasets_processed\semaine/'; end train_recs = {'rec1', 'rec12', 'rec14', 'rec19', 'rec23', 'rec25', 'rec37', 'rec39', 'rec43', 'rec45', 'rec48', 'rec50', 'rec52', 'rec54', 'rec56', 'rec60'}; diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_10_dyn.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_10_dyn.dat index 17fc916..ade4356 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_10_dyn.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_10_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_10_static.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_10_static.dat index 44d3bef..7c390df 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_10_static.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_10_static.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_10_static_intensity.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_10_static_intensity.dat index ca82621..6dbfb98 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_10_static_intensity.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_10_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_12_dyn.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_12_dyn.dat index b76bad5..97ff4af 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_12_dyn.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_12_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_12_static.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_12_static.dat index 39bd2ae..1be30f5 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_12_static.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_12_static.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_12_static_intensity.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_12_static_intensity.dat index 62e11b8..415673c 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_12_static_intensity.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_12_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_14_dyn.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_14_dyn.dat index d6d9d8f..7abd5cf 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_14_dyn.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_14_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_14_static.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_14_static.dat index 0da9a6f..471ac9a 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_14_static.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_14_static.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_14_static_intensity.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_14_static_intensity.dat index 7c99eab..21763ed 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_14_static_intensity.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_14_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_15_dyn.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_15_dyn.dat index 1f2610e..db71de5 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_15_dyn.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_15_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_15_static.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_15_static.dat index 18b0c05..1c3c2af 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_15_static.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_15_static.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_15_static_intensity.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_15_static_intensity.dat index d4bfc0e..3e0a8a6 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_15_static_intensity.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_15_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_17_dyn.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_17_dyn.dat index c14f0cc..ccf3e49 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_17_dyn.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_17_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_17_static.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_17_static.dat index 61ee709..5e2a25e 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_17_static.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_17_static.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_17_static_intensity.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_17_static_intensity.dat index 80c8240..5afffbb 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_17_static_intensity.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_17_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_1_dyn.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_1_dyn.dat index 6478216..d31b16b 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_1_dyn.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_1_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_1_static.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_1_static.dat index 5f9d4b3..345681b 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_1_static.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_1_static.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_1_static_intensity.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_1_static_intensity.dat index a663af7..7f6b459 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_1_static_intensity.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_1_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_20_dyn.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_20_dyn.dat index 4a792ec..5f17b56 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_20_dyn.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_20_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_20_static.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_20_static.dat index f69ac0e..ea1a455 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_20_static.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_20_static.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_20_static_intensity.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_20_static_intensity.dat index dd1be4f..f050fe7 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_20_static_intensity.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_20_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_23_dyn.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_23_dyn.dat index 404f153..7eebbc9 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_23_dyn.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_23_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_23_static.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_23_static.dat index 903dc26..2cbd7dd 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_23_static.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_23_static.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_23_static_intensity.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_23_static_intensity.dat index 3b5c44c..74609a6 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_23_static_intensity.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_23_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_25_dyn.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_25_dyn.dat index 6b93570..5819937 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_25_dyn.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_25_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_25_static.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_25_static.dat index 9dbe45f..ce8fefa 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_25_static.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_25_static.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_25_static_intensity.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_25_static_intensity.dat index 6ac2bdc..94e75fc 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_25_static_intensity.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_25_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_26_dyn.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_26_dyn.dat index de38942..05765f0 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_26_dyn.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_26_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_26_static.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_26_static.dat index b1d0ecf..dc721d9 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_26_static.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_26_static.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_26_static_intensity.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_26_static_intensity.dat index d94c270..f32db26 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_26_static_intensity.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_26_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_2_dyn.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_2_dyn.dat index ee55d62..7be7f34 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_2_dyn.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_2_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_2_static.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_2_static.dat index 9da3e55..88271ff 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_2_static.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_2_static.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_2_static_intensity.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_2_static_intensity.dat index 6f75d1c..d473efc 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_2_static_intensity.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_2_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_43_dyn.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_43_dyn.dat index a1ef551..2bdc64f 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_43_dyn.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_43_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_43_static.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_43_static.dat index cea84bb..cf3023e 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_43_static.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_43_static.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_43_static_intensity.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_43_static_intensity.dat index 23ee422..d2b691f 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_43_static_intensity.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_43_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_4_dyn.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_4_dyn.dat index b2c9d18..80da19a 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_4_dyn.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_4_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_4_static.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_4_static.dat index 1d016d5..6dd18d9 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_4_static.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_4_static.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_4_static_intensity.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_4_static_intensity.dat index 24acef8..6db9d64 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_4_static_intensity.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_4_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_5_dyn.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_5_dyn.dat index cd8b845..3cedb20 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_5_dyn.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_5_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_5_static.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_5_static.dat index 1bcb8e0..5a929f7 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_5_static.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_5_static.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_5_static_intensity.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_5_static_intensity.dat index 5bc85a1..559c0a3 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_5_static_intensity.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_5_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_6_dyn.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_6_dyn.dat index 2ebd85c..9b0d41f 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_6_dyn.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_6_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_6_static.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_6_static.dat index 5175fda..88de555 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_6_static.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_6_static.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_6_static_intensity.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_6_static_intensity.dat index a3ccf65..adf4955 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_6_static_intensity.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_6_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_7_dyn.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_7_dyn.dat index d0eb5b3..0574c65 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_7_dyn.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_7_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_7_static.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_7_static.dat index 9335dd3..75ce477 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_7_static.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_7_static.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_7_static_intensity.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_7_static_intensity.dat index 5a58ccb..53ad716 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_7_static_intensity.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_7_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_9_dyn.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_9_dyn.dat index 2d0306c..bb19665 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_9_dyn.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_9_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_9_static.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_9_static.dat index b1eaac8..d06d08f 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_9_static.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_9_static.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/models/AU_9_static_intensity.dat b/matlab_version/AU_training/experiments/Bosphorus/models/AU_9_static_intensity.dat index 2ba73ee..50eaa2e 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/models/AU_9_static_intensity.dat and b/matlab_version/AU_training/experiments/Bosphorus/models/AU_9_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_10_dyn.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_10_dyn.mat index 9eecd6c..750ff95 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_10_dyn.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_10_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_10_dyn_intensity.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_10_dyn_intensity.mat index 208dfbb..d7e6023 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_10_dyn_intensity.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_10_dyn_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_10_static.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_10_static.mat index 7745956..11ec2de 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_10_static.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_10_static.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_10_static_intensity.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_10_static_intensity.mat index c6b6a05..bfe2599 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_10_static_intensity.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_10_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_12_dyn.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_12_dyn.mat index f5f995a..4b15509 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_12_dyn.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_12_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_12_dyn_intensity.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_12_dyn_intensity.mat index d1ad4d7..7ab361a 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_12_dyn_intensity.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_12_dyn_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_12_static.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_12_static.mat index 637dcc7..2bc6daf 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_12_static.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_12_static.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_12_static_intensity.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_12_static_intensity.mat index 6c0efda..8e7f1e8 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_12_static_intensity.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_12_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_14_dyn.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_14_dyn.mat index c87abf1..9a5932d 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_14_dyn.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_14_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_14_dyn_intensity.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_14_dyn_intensity.mat index c58ed46..bae7c42 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_14_dyn_intensity.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_14_dyn_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_14_static.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_14_static.mat index 9820cda..f87ba2d 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_14_static.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_14_static.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_14_static_intensity.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_14_static_intensity.mat index c72ba6f..ae970da 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_14_static_intensity.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_14_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_15_dyn.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_15_dyn.mat index 9b5ab37..0a30fe9 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_15_dyn.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_15_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_15_dyn_intensity.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_15_dyn_intensity.mat index 59b0c24..7c965ec 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_15_dyn_intensity.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_15_dyn_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_15_static.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_15_static.mat index 9f7e4eb..80c5bbc 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_15_static.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_15_static.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_15_static_intensity.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_15_static_intensity.mat index 6815ded..fae262b 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_15_static_intensity.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_15_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_17_dyn.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_17_dyn.mat index b053b4c..2a5b609 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_17_dyn.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_17_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_17_dyn_intensity.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_17_dyn_intensity.mat index 042f3f4..32688bb 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_17_dyn_intensity.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_17_dyn_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_17_static.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_17_static.mat index bb4c506..2fa8669 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_17_static.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_17_static.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_17_static_intensity.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_17_static_intensity.mat index 43afaf1..0da3881 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_17_static_intensity.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_17_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_1_dyn.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_1_dyn.mat index 6f50988..e729220 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_1_dyn.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_1_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_1_dyn_intensity.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_1_dyn_intensity.mat index bed0299..10afa07 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_1_dyn_intensity.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_1_dyn_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_1_static.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_1_static.mat index 9a6c664..0f146ae 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_1_static.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_1_static.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_1_static_intensity.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_1_static_intensity.mat index c739647..b0390e1 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_1_static_intensity.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_1_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_20_dyn.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_20_dyn.mat index 96a6876..409041f 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_20_dyn.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_20_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_20_dyn_intensity.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_20_dyn_intensity.mat index a47b862..c90a757 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_20_dyn_intensity.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_20_dyn_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_20_static.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_20_static.mat index 92595bf..cf40f39 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_20_static.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_20_static.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_20_static_intensity.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_20_static_intensity.mat index cc10bba..232532b 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_20_static_intensity.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_20_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_23_dyn.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_23_dyn.mat index 1db1172..c930cf6 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_23_dyn.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_23_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_23_dyn_intensity.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_23_dyn_intensity.mat index bb83311..e6a57d9 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_23_dyn_intensity.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_23_dyn_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_23_static.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_23_static.mat index e674ebc..79eb610 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_23_static.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_23_static.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_23_static_intensity.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_23_static_intensity.mat index 70a8049..29784e8 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_23_static_intensity.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_23_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_25_dyn.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_25_dyn.mat index 733610b..26735c1 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_25_dyn.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_25_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_25_dyn_intensity.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_25_dyn_intensity.mat index 4e1ff1e..2120ad1 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_25_dyn_intensity.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_25_dyn_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_25_static.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_25_static.mat index 4782bbe..cff6419 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_25_static.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_25_static.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_25_static_intensity.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_25_static_intensity.mat index e2b0f6b..c282fe7 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_25_static_intensity.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_25_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_26_dyn.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_26_dyn.mat index 7066cbe..03dce78 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_26_dyn.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_26_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_26_dyn_intensity.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_26_dyn_intensity.mat index 7e5615b..df72958 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_26_dyn_intensity.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_26_dyn_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_26_static.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_26_static.mat index 89b4616..2b3be0f 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_26_static.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_26_static.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_26_static_intensity.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_26_static_intensity.mat index 2b64b3c..7104448 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_26_static_intensity.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_26_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_2_dyn.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_2_dyn.mat index 714cdaa..ecc3528 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_2_dyn.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_2_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_2_dyn_intensity.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_2_dyn_intensity.mat index 2e551c7..e242e3f 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_2_dyn_intensity.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_2_dyn_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_2_static.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_2_static.mat index edd71ba..f5d9490 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_2_static.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_2_static.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_2_static_intensity.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_2_static_intensity.mat index 97fcba4..29fda44 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_2_static_intensity.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_2_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_43_dyn.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_43_dyn.mat index 1827d55..8f37374 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_43_dyn.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_43_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_43_dyn_intensity.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_43_dyn_intensity.mat index 21965b8..742a05f 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_43_dyn_intensity.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_43_dyn_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_43_static.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_43_static.mat index 6f0256d..87cb32c 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_43_static.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_43_static.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_43_static_intensity.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_43_static_intensity.mat index 0de00b3..1777f06 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_43_static_intensity.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_43_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_4_dyn.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_4_dyn.mat index 4b7f553..bb6fd5f 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_4_dyn.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_4_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_4_dyn_intensity.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_4_dyn_intensity.mat index 8276919..f6f2c0e 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_4_dyn_intensity.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_4_dyn_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_4_static.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_4_static.mat index 680ff70..359148f 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_4_static.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_4_static.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_4_static_intensity.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_4_static_intensity.mat index 168bc51..4e2c47e 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_4_static_intensity.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_4_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_5_dyn.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_5_dyn.mat index 239ddec..289f6c4 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_5_dyn.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_5_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_5_dyn_intensity.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_5_dyn_intensity.mat index 14d9a41..43777c7 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_5_dyn_intensity.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_5_dyn_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_5_static.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_5_static.mat index 5943d83..c49ac41 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_5_static.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_5_static.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_5_static_intensity.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_5_static_intensity.mat index 508a03c..39b6ea5 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_5_static_intensity.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_5_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_6_dyn.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_6_dyn.mat index 4439f74..793a45f 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_6_dyn.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_6_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_6_dyn_intensity.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_6_dyn_intensity.mat index 5a6e659..a7a2743 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_6_dyn_intensity.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_6_dyn_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_6_static.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_6_static.mat index bd7781d..7f5a85b 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_6_static.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_6_static.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_6_static_intensity.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_6_static_intensity.mat index 4198b87..8b6e905 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_6_static_intensity.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_6_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_7_dyn.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_7_dyn.mat index e934f5f..2ad7488 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_7_dyn.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_7_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_7_dyn_intensity.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_7_dyn_intensity.mat index fae2113..66c2233 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_7_dyn_intensity.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_7_dyn_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_7_static.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_7_static.mat index 28b896c..72bb150 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_7_static.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_7_static.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_7_static_intensity.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_7_static_intensity.mat index 2064b5c..cec9f55 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_7_static_intensity.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_7_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_9_dyn.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_9_dyn.mat index 50d902d..58eca04 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_9_dyn.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_9_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_9_dyn_intensity.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_9_dyn_intensity.mat index 827ab44..1d0182a 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_9_dyn_intensity.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_9_dyn_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_9_static.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_9_static.mat index a87e7d1..3982c2c 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_9_static.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_9_static.mat differ diff --git a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_9_static_intensity.mat b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_9_static_intensity.mat index 834566b..f777c7c 100644 Binary files a/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_9_static_intensity.mat and b/matlab_version/AU_training/experiments/Bosphorus/results_Bosphorus_devel/AU_9_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_12_dyn_shift.mat b/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_12_dyn_shift.mat index fab4765..425d20d 100644 Binary files a/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_12_dyn_shift.mat and b/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_12_dyn_shift.mat differ diff --git a/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_15_dyn_shift.mat b/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_15_dyn_shift.mat index 60bb8d3..51864f9 100644 Binary files a/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_15_dyn_shift.mat and b/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_15_dyn_shift.mat differ diff --git a/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_17_dyn_shift.mat b/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_17_dyn_shift.mat index c809514..9753dfd 100644 Binary files a/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_17_dyn_shift.mat and b/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_17_dyn_shift.mat differ diff --git a/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_1_dyn_shift.mat b/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_1_dyn_shift.mat index fd4e053..934ec5b 100644 Binary files a/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_1_dyn_shift.mat and b/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_1_dyn_shift.mat differ diff --git a/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_20_dyn_shift.mat b/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_20_dyn_shift.mat index 95983d4..bb74c40 100644 Binary files a/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_20_dyn_shift.mat and b/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_20_dyn_shift.mat differ diff --git a/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_25_dyn_shift.mat b/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_25_dyn_shift.mat index a6a064b..f1a2994 100644 Binary files a/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_25_dyn_shift.mat and b/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_25_dyn_shift.mat differ diff --git a/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_26_dyn_shift.mat b/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_26_dyn_shift.mat index 15a1345..3599147 100644 Binary files a/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_26_dyn_shift.mat and b/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_26_dyn_shift.mat differ diff --git a/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_2_dyn_shift.mat b/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_2_dyn_shift.mat index 630410b..07311b8 100644 Binary files a/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_2_dyn_shift.mat and b/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_2_dyn_shift.mat differ diff --git a/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_4_dyn_shift.mat b/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_4_dyn_shift.mat index c7a6124..7e51d20 100644 Binary files a/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_4_dyn_shift.mat and b/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_4_dyn_shift.mat differ diff --git a/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_5_dyn_shift.mat b/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_5_dyn_shift.mat index f553998..00933f6 100644 Binary files a/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_5_dyn_shift.mat and b/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_5_dyn_shift.mat differ diff --git a/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_6_dyn_shift.mat b/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_6_dyn_shift.mat index bfef00c..e45d668 100644 Binary files a/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_6_dyn_shift.mat and b/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_6_dyn_shift.mat differ diff --git a/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_9_dyn_shift.mat b/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_9_dyn_shift.mat index 7c7b749..e7ac11e 100644 Binary files a/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_9_dyn_shift.mat and b/matlab_version/AU_training/experiments/DISFA/5_fold_shift/AU_9_dyn_shift.mat differ diff --git a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_12_dyn.mat b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_12_dyn.mat index 8a06655..bd81c16 100644 Binary files a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_12_dyn.mat and b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_12_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_12_stat.mat b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_12_stat.mat index d9f839f..bcc69ef 100644 Binary files a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_12_stat.mat and b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_12_stat.mat differ diff --git a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_15_dyn.mat b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_15_dyn.mat index cf247e9..3420ad9 100644 Binary files a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_15_dyn.mat and b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_15_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_15_stat.mat b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_15_stat.mat index 5d77809..985fce2 100644 Binary files a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_15_stat.mat and b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_15_stat.mat differ diff --git a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_17_dyn.mat b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_17_dyn.mat index e4fb027..df8f25c 100644 Binary files a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_17_dyn.mat and b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_17_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_17_stat.mat b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_17_stat.mat index f7b9b12..a066c66 100644 Binary files a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_17_stat.mat and b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_17_stat.mat differ diff --git a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_1_dyn.mat b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_1_dyn.mat index e0991ae..28d604d 100644 Binary files a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_1_dyn.mat and b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_1_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_1_stat.mat b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_1_stat.mat index 60239d8..79f704d 100644 Binary files a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_1_stat.mat and b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_1_stat.mat differ diff --git a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_20_dyn.mat b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_20_dyn.mat index 36ee0d5..4cebc67 100644 Binary files a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_20_dyn.mat and b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_20_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_20_stat.mat b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_20_stat.mat index 5f69280..dfbc600 100644 Binary files a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_20_stat.mat and b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_20_stat.mat differ diff --git a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_25_dyn.mat b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_25_dyn.mat index 2948bd6..ff65ef2 100644 Binary files a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_25_dyn.mat and b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_25_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_25_stat.mat b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_25_stat.mat index f22875e..38549cc 100644 Binary files a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_25_stat.mat and b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_25_stat.mat differ diff --git a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_26_dyn.mat b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_26_dyn.mat index 94d23b3..0d6958c 100644 Binary files a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_26_dyn.mat and b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_26_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_26_stat.mat b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_26_stat.mat index c52d30f..bda8f35 100644 Binary files a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_26_stat.mat and b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_26_stat.mat differ diff --git a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_2_dyn.mat b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_2_dyn.mat index 1050a52..85a4566 100644 Binary files a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_2_dyn.mat and b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_2_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_2_stat.mat b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_2_stat.mat index 552dc5d..5bac19c 100644 Binary files a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_2_stat.mat and b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_2_stat.mat differ diff --git a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_4_dyn.mat b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_4_dyn.mat index 11196ff..72a50a4 100644 Binary files a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_4_dyn.mat and b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_4_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_4_stat.mat b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_4_stat.mat index 2538bb0..0add81c 100644 Binary files a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_4_stat.mat and b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_4_stat.mat differ diff --git a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_5_dyn.mat b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_5_dyn.mat index d3bc683..80613a6 100644 Binary files a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_5_dyn.mat and b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_5_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_5_stat.mat b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_5_stat.mat index b6d53eb..1a7dfa1 100644 Binary files a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_5_stat.mat and b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_5_stat.mat differ diff --git a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_6_dyn.mat b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_6_dyn.mat index e440ee6..2bf157f 100644 Binary files a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_6_dyn.mat and b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_6_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_6_stat.mat b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_6_stat.mat index 88b6e20..ffa2d57 100644 Binary files a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_6_stat.mat and b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_6_stat.mat differ diff --git a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_9_dyn.mat b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_9_dyn.mat index 5eb6418..aff86a1 100644 Binary files a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_9_dyn.mat and b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_9_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_9_stat.mat b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_9_stat.mat index 2a07b8d..7d3847c 100644 Binary files a/matlab_version/AU_training/experiments/DISFA/classifiers/AU_9_stat.mat and b/matlab_version/AU_training/experiments/DISFA/classifiers/AU_9_stat.mat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/Prepare_HOG_AU_data_generic.m b/matlab_version/AU_training/experiments/FERA2011/Prepare_HOG_AU_data_generic.m index bf59c1b..4f98069 100644 --- a/matlab_version/AU_training/experiments/FERA2011/Prepare_HOG_AU_data_generic.m +++ b/matlab_version/AU_training/experiments/FERA2011/Prepare_HOG_AU_data_generic.m @@ -1,19 +1,19 @@ function [data_train, labels_train, data_devel, labels_devel, raw_devel, PC, means_norm, stds_norm, vid_ids_devel_string, valid_ids_devel] = ... - Prepare_HOG_AU_data_generic(train_users, devel_users, au_train, rest_aus, unbc_dir, hog_data_dir) + Prepare_HOG_AU_data_generic(train_users, devel_users, au_train, rest_aus, fera_dir, features_dir) %% addpath(genpath('../../data extraction/')); % First extracting the labels -[ labels_train, valid_ids_train, filenames ] = extract_FERA2011_labels(unbc_dir, train_users, au_train); +[ labels_train, valid_ids_train, filenames ] = extract_FERA2011_labels(fera_dir, train_users, au_train); -[ labels_other, ~, ~ ] = extract_FERA2011_labels(unbc_dir, train_users, rest_aus); +[ labels_other, ~, ~ ] = extract_FERA2011_labels(fera_dir, train_users, rest_aus); labels_other = cat(1, labels_other{:}); % Reading in the HOG data (of only relevant frames) -[train_appearance_data, valid_ids_train_hog, vid_ids_train_string] = Read_HOG_files(train_users, hog_data_dir); +[train_appearance_data, valid_ids_train_hog, vid_ids_train_string] = Read_HOG_files(train_users, features_dir); -[train_geom_data] = Read_geom_files(train_users, [hog_data_dir, '/../model_params']); +[train_geom_data] = Read_geom_files(train_users, features_dir); % Subsample the data to make training quicker labels_train = cat(1, labels_train{:}); @@ -59,12 +59,12 @@ vid_ids_train_string = vid_ids_train_string(reduced_inds,:); %% Extract devel data % First extracting the labels -[ labels_devel, valid_ids_devel, filenames_devel ] = extract_FERA2011_labels(unbc_dir, devel_users, au_train); +[ labels_devel, valid_ids_devel, filenames_devel ] = extract_FERA2011_labels(fera_dir, devel_users, au_train); % Reading in the HOG data (of only relevant frames) -[devel_appearance_data, valid_ids_devel_hog, vid_ids_devel_string] = Read_HOG_files(devel_users, hog_data_dir); +[devel_appearance_data, valid_ids_devel_hog, vid_ids_devel_string] = Read_HOG_files(devel_users, features_dir); -[devel_geom_data] = Read_geom_files(devel_users, [hog_data_dir, '/../model_params']); +[devel_geom_data] = Read_geom_files(devel_users, features_dir); labels_devel = cat(1, labels_devel{:}); diff --git a/matlab_version/AU_training/experiments/FERA2011/Prepare_HOG_AU_data_generic_dynamic.m b/matlab_version/AU_training/experiments/FERA2011/Prepare_HOG_AU_data_generic_dynamic.m index 7f8f49e..af2c8d1 100644 --- a/matlab_version/AU_training/experiments/FERA2011/Prepare_HOG_AU_data_generic_dynamic.m +++ b/matlab_version/AU_training/experiments/FERA2011/Prepare_HOG_AU_data_generic_dynamic.m @@ -1,5 +1,5 @@ function [data_train, labels_train, data_devel, labels_devel, raw_devel, PC, means_norm, stds_norm, vid_ids_devel_string] = ... - Prepare_HOG_AU_data_generic_dynamic(train_users, devel_users, au_train, rest_aus, semaine_dir, hog_data_dir) + Prepare_HOG_AU_data_generic_dynamic(train_users, devel_users, au_train, rest_aus, semaine_dir, features_dir) %% addpath(genpath('../../data extraction/')); @@ -11,9 +11,9 @@ addpath(genpath('../../data extraction/')); labels_other = cat(1, labels_other{:}); % Reading in the HOG data (of only relevant frames) -[train_appearance_data, valid_ids_train_hog, vid_ids_train_string] = Read_HOG_files_dynamic(train_users, hog_data_dir); +[train_appearance_data, valid_ids_train_hog, vid_ids_train_string] = Read_HOG_files_dynamic(train_users, features_dir); -[train_geom_data] = Read_geom_files_dynamic(train_users, [hog_data_dir, '/../model_params']); +[train_geom_data] = Read_geom_files_dynamic(train_users, features_dir); % Subsample the data to make training quicker labels_train = cat(1, labels_train{:}); @@ -62,9 +62,9 @@ vid_ids_train_string = vid_ids_train_string(reduced_inds,:); [ labels_devel, valid_ids_devel, vid_ids_devel ] = extract_FERA2011_labels(semaine_dir, devel_users, au_train); % Reading in the HOG data (of only relevant frames) -[devel_appearance_data, valid_ids_devel_hog, vid_ids_devel_string] = Read_HOG_files_dynamic(devel_users, hog_data_dir); +[devel_appearance_data, valid_ids_devel_hog, vid_ids_devel_string] = Read_HOG_files_dynamic(devel_users, features_dir); -[devel_geom_data] = Read_geom_files_dynamic(devel_users, [hog_data_dir, '/../model_params']); +[devel_geom_data] = Read_geom_files_dynamic(devel_users, features_dir); labels_devel = cat(1, labels_devel{:}); diff --git a/matlab_version/AU_training/experiments/FERA2011/Read_HOG_files.m b/matlab_version/AU_training/experiments/FERA2011/Read_HOG_files.m index 5fc7d72..4555874 100644 --- a/matlab_version/AU_training/experiments/FERA2011/Read_HOG_files.m +++ b/matlab_version/AU_training/experiments/FERA2011/Read_HOG_files.m @@ -8,7 +8,7 @@ function [hog_data, valid_data, vid_id] = Read_HOG_files(users, hog_data_dir) for i=1:numel(users) - hog_file = [hog_data_dir, '/au_training_', users{i} '.hog']; + hog_file = [hog_data_dir, '/au_training_' users{i} '.hog']; f = fopen(hog_file, 'r'); diff --git a/matlab_version/AU_training/experiments/FERA2011/Read_HOG_files_dynamic.m b/matlab_version/AU_training/experiments/FERA2011/Read_HOG_files_dynamic.m index 1d40dcc..576f6fb 100644 --- a/matlab_version/AU_training/experiments/FERA2011/Read_HOG_files_dynamic.m +++ b/matlab_version/AU_training/experiments/FERA2011/Read_HOG_files_dynamic.m @@ -37,7 +37,7 @@ function [hog_data, valid_data, vid_id] = Read_HOG_files_dynamic(users, hog_data for i=1:numel(users) - hog_file = [hog_data_dir, '/au_training_', users{i} '.hog']; + hog_file = [hog_data_dir, '/au_training_' users{i} '.hog']; f = fopen(hog_file, 'r'); diff --git a/matlab_version/AU_training/experiments/FERA2011/Read_geom_files.m b/matlab_version/AU_training/experiments/FERA2011/Read_geom_files.m index 879b1e1..54477bb 100644 --- a/matlab_version/AU_training/experiments/FERA2011/Read_geom_files.m +++ b/matlab_version/AU_training/experiments/FERA2011/Read_geom_files.m @@ -7,18 +7,23 @@ function [geom_data, valid_ids] = Read_geom_files(users, params_data_dir) for i=1:numel(users) - geom_file = [params_data_dir, '/au_training_' users{i} '.txt']; - m_file = [params_data_dir, '/au_training_' users{i} '.params.mat']; - - if(~exist(m_file, 'file')) - res = dlmread(geom_file, ',', 1, 0); - save(m_file, 'res'); - else - load(m_file); - end + geom_file = [params_data_dir, '/au_training_' users{i} '.csv']; - valid = res(:, 4); - res = res(:, 11:end); + if(i == 1) + tab = readtable(geom_file); + column_names = tab.Properties.VariableNames; + valid_ind = cellfun(@(x) ~isempty(x) && x==1, strfind(column_names, 'success')); + shape_inds = cellfun(@(x) ~isempty(x) && x==1, strfind(column_names, 'p_')); + end + + res = dlmread(geom_file, ',', 1, 0); + + % Check the confidence of detection + valid = logical(res(:, valid_ind)); + res = res(:, shape_inds); + + % Do not consider global parameters + res = res(:, 7:end); actual_locs = res * V'; res = cat(2, actual_locs, res); diff --git a/matlab_version/AU_training/experiments/FERA2011/Read_geom_files_dynamic.m b/matlab_version/AU_training/experiments/FERA2011/Read_geom_files_dynamic.m index c340ca0..3f71f30 100644 --- a/matlab_version/AU_training/experiments/FERA2011/Read_geom_files_dynamic.m +++ b/matlab_version/AU_training/experiments/FERA2011/Read_geom_files_dynamic.m @@ -35,19 +35,24 @@ function [geom_data, valid_ids] = Read_geom_files_dynamic(users, params_data_dir user_inds = []; for i=1:numel(users) + + geom_file = [params_data_dir, '/au_training_' users{i} '.csv']; - geom_file = [params_data_dir, '/au_training_' users{i} '.txt']; - m_file = [params_data_dir, '/au_training_' users{i} '.params.mat']; - - if(~exist(m_file, 'file')) - res = dlmread(geom_file, ',', 1, 0); - save(m_file, 'res'); - else - load(m_file); + if(i == 1) + tab = readtable(geom_file); + column_names = tab.Properties.VariableNames; + valid_ind = cellfun(@(x) ~isempty(x) && x==1, strfind(column_names, 'success')); + shape_inds = cellfun(@(x) ~isempty(x) && x==1, strfind(column_names, 'p_')); end - - valid = res(:, 4); - res = res(:, 11:end); + + res = dlmread(geom_file, ',', 1, 0); + + % Check the confidence of detection + valid = logical(res(:, valid_ind)); + res = res(:, shape_inds); + + % Do not consider global parameters + res = res(:, 7:end); for k=1:numel(users_group) if(~isempty(strmatch(users{i}, users_group{k}))) diff --git a/matlab_version/AU_training/experiments/FERA2011/Script_HOG_SVM_train.m b/matlab_version/AU_training/experiments/FERA2011/Script_HOG_SVM_train.m index ab9a13c..759c69a 100644 --- a/matlab_version/AU_training/experiments/FERA2011/Script_HOG_SVM_train.m +++ b/matlab_version/AU_training/experiments/FERA2011/Script_HOG_SVM_train.m @@ -32,7 +32,7 @@ for a=1:numel(all_aus) [train_recs, devel_recs] = get_balanced_fold(FERA2011_dir, all_recs, au, 1/3, 1); % load the training and testing data for the current fold - [train_samples, train_labels, valid_samples, valid_labels, ~, PC, means, scaling] = Prepare_HOG_AU_data_generic(train_recs, devel_recs, au, rest_aus, FERA2011_dir, hog_data_dir); + [train_samples, train_labels, valid_samples, valid_labels, ~, PC, means, scaling] = Prepare_HOG_AU_data_generic(train_recs, devel_recs, au, rest_aus, FERA2011_dir, features_dir); train_samples = sparse(train_samples); valid_samples = sparse(valid_samples); diff --git a/matlab_version/AU_training/experiments/FERA2011/Script_HOG_SVM_train_dyn.m b/matlab_version/AU_training/experiments/FERA2011/Script_HOG_SVM_train_dyn.m index fa46462..56b05a5 100644 --- a/matlab_version/AU_training/experiments/FERA2011/Script_HOG_SVM_train_dyn.m +++ b/matlab_version/AU_training/experiments/FERA2011/Script_HOG_SVM_train_dyn.m @@ -33,7 +33,7 @@ for a=1:numel(all_aus) [train_recs, devel_recs] = get_balanced_fold(FERA2011_dir, all_recs, au, 1/3, 1); % load the training and testing data for the current fold - [train_samples, train_labels, valid_samples, valid_labels, ~, PC, means, scaling] = Prepare_HOG_AU_data_generic_dynamic(train_recs, devel_recs, au, rest_aus, FERA2011_dir, hog_data_dir); + [train_samples, train_labels, valid_samples, valid_labels, ~, PC, means, scaling] = Prepare_HOG_AU_data_generic_dynamic(train_recs, devel_recs, au, rest_aus, FERA2011_dir, features_dir); train_samples = sparse(train_samples); valid_samples = sparse(valid_samples); diff --git a/matlab_version/AU_training/experiments/FERA2011/models/AU_10_dyn.dat b/matlab_version/AU_training/experiments/FERA2011/models/AU_10_dyn.dat index 25a255f..299fff7 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/models/AU_10_dyn.dat and b/matlab_version/AU_training/experiments/FERA2011/models/AU_10_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/models/AU_10_static.dat b/matlab_version/AU_training/experiments/FERA2011/models/AU_10_static.dat index 2bebe0f..07358b0 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/models/AU_10_static.dat and b/matlab_version/AU_training/experiments/FERA2011/models/AU_10_static.dat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/models/AU_12_dyn.dat b/matlab_version/AU_training/experiments/FERA2011/models/AU_12_dyn.dat index 9f36672..43a0a44 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/models/AU_12_dyn.dat and b/matlab_version/AU_training/experiments/FERA2011/models/AU_12_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/models/AU_12_static.dat b/matlab_version/AU_training/experiments/FERA2011/models/AU_12_static.dat index 77eef41..a3c2640 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/models/AU_12_static.dat and b/matlab_version/AU_training/experiments/FERA2011/models/AU_12_static.dat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/models/AU_15_dyn.dat b/matlab_version/AU_training/experiments/FERA2011/models/AU_15_dyn.dat index e9d188c..40ba212 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/models/AU_15_dyn.dat and b/matlab_version/AU_training/experiments/FERA2011/models/AU_15_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/models/AU_15_static.dat b/matlab_version/AU_training/experiments/FERA2011/models/AU_15_static.dat index 212ed98..f2ce496 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/models/AU_15_static.dat and b/matlab_version/AU_training/experiments/FERA2011/models/AU_15_static.dat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/models/AU_17_dyn.dat b/matlab_version/AU_training/experiments/FERA2011/models/AU_17_dyn.dat index 148b7cd..aebc613 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/models/AU_17_dyn.dat and b/matlab_version/AU_training/experiments/FERA2011/models/AU_17_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/models/AU_17_static.dat b/matlab_version/AU_training/experiments/FERA2011/models/AU_17_static.dat index ba82851..d76de88 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/models/AU_17_static.dat and b/matlab_version/AU_training/experiments/FERA2011/models/AU_17_static.dat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/models/AU_18_dyn.dat b/matlab_version/AU_training/experiments/FERA2011/models/AU_18_dyn.dat index 3de891a..231fb5b 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/models/AU_18_dyn.dat and b/matlab_version/AU_training/experiments/FERA2011/models/AU_18_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/models/AU_18_static.dat b/matlab_version/AU_training/experiments/FERA2011/models/AU_18_static.dat index 0032a44..568ef45 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/models/AU_18_static.dat and b/matlab_version/AU_training/experiments/FERA2011/models/AU_18_static.dat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/models/AU_1_dyn.dat b/matlab_version/AU_training/experiments/FERA2011/models/AU_1_dyn.dat index f686beb..1d2262d 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/models/AU_1_dyn.dat and b/matlab_version/AU_training/experiments/FERA2011/models/AU_1_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/models/AU_1_static.dat b/matlab_version/AU_training/experiments/FERA2011/models/AU_1_static.dat index a9e547b..19fea53 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/models/AU_1_static.dat and b/matlab_version/AU_training/experiments/FERA2011/models/AU_1_static.dat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/models/AU_25_dyn.dat b/matlab_version/AU_training/experiments/FERA2011/models/AU_25_dyn.dat index e1bd095..b5badf7 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/models/AU_25_dyn.dat and b/matlab_version/AU_training/experiments/FERA2011/models/AU_25_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/models/AU_25_static.dat b/matlab_version/AU_training/experiments/FERA2011/models/AU_25_static.dat index deb9d94..7139368 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/models/AU_25_static.dat and b/matlab_version/AU_training/experiments/FERA2011/models/AU_25_static.dat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/models/AU_26_dyn.dat b/matlab_version/AU_training/experiments/FERA2011/models/AU_26_dyn.dat index 60badc9..799c32b 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/models/AU_26_dyn.dat and b/matlab_version/AU_training/experiments/FERA2011/models/AU_26_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/models/AU_26_static.dat b/matlab_version/AU_training/experiments/FERA2011/models/AU_26_static.dat index b06d5c9..bcc95cb 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/models/AU_26_static.dat and b/matlab_version/AU_training/experiments/FERA2011/models/AU_26_static.dat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/models/AU_2_dyn.dat b/matlab_version/AU_training/experiments/FERA2011/models/AU_2_dyn.dat index 5987598..e03bd83 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/models/AU_2_dyn.dat and b/matlab_version/AU_training/experiments/FERA2011/models/AU_2_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/models/AU_2_static.dat b/matlab_version/AU_training/experiments/FERA2011/models/AU_2_static.dat index 56c26cb..5e27e16 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/models/AU_2_static.dat and b/matlab_version/AU_training/experiments/FERA2011/models/AU_2_static.dat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/models/AU_4_dyn.dat b/matlab_version/AU_training/experiments/FERA2011/models/AU_4_dyn.dat index e81b162..31724f2 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/models/AU_4_dyn.dat and b/matlab_version/AU_training/experiments/FERA2011/models/AU_4_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/models/AU_4_static.dat b/matlab_version/AU_training/experiments/FERA2011/models/AU_4_static.dat index a44a382..3c7b32c 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/models/AU_4_static.dat and b/matlab_version/AU_training/experiments/FERA2011/models/AU_4_static.dat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/models/AU_6_dyn.dat b/matlab_version/AU_training/experiments/FERA2011/models/AU_6_dyn.dat index 6f64468..2f7f716 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/models/AU_6_dyn.dat and b/matlab_version/AU_training/experiments/FERA2011/models/AU_6_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/models/AU_6_static.dat b/matlab_version/AU_training/experiments/FERA2011/models/AU_6_static.dat index ede5505..3ee4c14 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/models/AU_6_static.dat and b/matlab_version/AU_training/experiments/FERA2011/models/AU_6_static.dat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/models/AU_7_dyn.dat b/matlab_version/AU_training/experiments/FERA2011/models/AU_7_dyn.dat index 8d7c658..ea86f79 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/models/AU_7_dyn.dat and b/matlab_version/AU_training/experiments/FERA2011/models/AU_7_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/models/AU_7_static.dat b/matlab_version/AU_training/experiments/FERA2011/models/AU_7_static.dat index 83bf942..37b68cb 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/models/AU_7_static.dat and b/matlab_version/AU_training/experiments/FERA2011/models/AU_7_static.dat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_10_dyn.mat b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_10_dyn.mat index 6821450..76d0b4b 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_10_dyn.mat and b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_10_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_10_static.mat b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_10_static.mat index bb7f5a7..854d415 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_10_static.mat and b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_10_static.mat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_12_dyn.mat b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_12_dyn.mat index 3af13d4..a9b9022 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_12_dyn.mat and b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_12_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_12_static.mat b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_12_static.mat index e32103b..a677c70 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_12_static.mat and b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_12_static.mat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_15_dyn.mat b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_15_dyn.mat index 72e0168..da1f56a 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_15_dyn.mat and b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_15_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_15_static.mat b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_15_static.mat index 053128b..37e0cc7 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_15_static.mat and b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_15_static.mat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_17_dyn.mat b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_17_dyn.mat index ca16c54..e3769b9 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_17_dyn.mat and b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_17_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_17_static.mat b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_17_static.mat index 35b1033..b0161c6 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_17_static.mat and b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_17_static.mat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_18_dyn.mat b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_18_dyn.mat index 6bae36e..5e18330 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_18_dyn.mat and b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_18_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_18_static.mat b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_18_static.mat index 2b1aa53..3d0c085 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_18_static.mat and b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_18_static.mat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_1_dyn.mat b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_1_dyn.mat index 0b557cb..bd4c122 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_1_dyn.mat and b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_1_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_1_static.mat b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_1_static.mat index 5d5114e..ac87ef3 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_1_static.mat and b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_1_static.mat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_25_dyn.mat b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_25_dyn.mat index 50193ca..f70fb01 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_25_dyn.mat and b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_25_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_25_static.mat b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_25_static.mat index 3a369cd..0374ff2 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_25_static.mat and b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_25_static.mat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_26_dyn.mat b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_26_dyn.mat index e11f7e5..9a2b572 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_26_dyn.mat and b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_26_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_26_static.mat b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_26_static.mat index 96dd155..71f900e 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_26_static.mat and b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_26_static.mat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_2_dyn.mat b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_2_dyn.mat index f11c808..8ddf890 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_2_dyn.mat and b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_2_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_2_static.mat b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_2_static.mat index 5d5a246..cbec03a 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_2_static.mat and b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_2_static.mat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_4_dyn.mat b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_4_dyn.mat index f1954f3..5c2ea68 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_4_dyn.mat and b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_4_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_4_static.mat b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_4_static.mat index 2dff07a..d7cdad5 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_4_static.mat and b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_4_static.mat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_6_dyn.mat b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_6_dyn.mat index c7fe26d..01872c7 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_6_dyn.mat and b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_6_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_6_static.mat b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_6_static.mat index dd631ce..0bcd082 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_6_static.mat and b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_6_static.mat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_7_dyn.mat b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_7_dyn.mat index df7fa1a..61f07a1 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_7_dyn.mat and b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_7_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_7_static.mat b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_7_static.mat index 906e206..b4b9aaf 100644 Binary files a/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_7_static.mat and b/matlab_version/AU_training/experiments/FERA2011/results_FERA2011_devel/AU_7_static.mat differ diff --git a/matlab_version/AU_training/experiments/FERA2011/shared_defs.m b/matlab_version/AU_training/experiments/FERA2011/shared_defs.m index 33ae7e4..ee61d98 100644 --- a/matlab_version/AU_training/experiments/FERA2011/shared_defs.m +++ b/matlab_version/AU_training/experiments/FERA2011/shared_defs.m @@ -7,3 +7,5 @@ addpath('../../data extraction/'); find_FERA2011; +features_dir = 'E:\datasets\face_datasets_processed\fera2011'; + diff --git a/matlab_version/AU_training/experiments/SEMAINE/Prepare_HOG_AU_data_generic.m b/matlab_version/AU_training/experiments/SEMAINE/Prepare_HOG_AU_data_generic.m index bb1c674..4850297 100644 --- a/matlab_version/AU_training/experiments/SEMAINE/Prepare_HOG_AU_data_generic.m +++ b/matlab_version/AU_training/experiments/SEMAINE/Prepare_HOG_AU_data_generic.m @@ -1,5 +1,5 @@ function [data_train, labels_train, data_devel, labels_devel, raw_devel, PC, means_norm, stds_norm, vid_ids_devel_string] = ... - Prepare_HOG_AU_data_generic(train_users, devel_users, au_train, rest_aus, semaine_dir, hog_data_dir, pca_file) + Prepare_HOG_AU_data_generic(train_users, devel_users, au_train, rest_aus, semaine_dir, feature_dir) %% addpath(genpath('../data extraction/')); @@ -11,9 +11,9 @@ addpath(genpath('../data extraction/')); labels_other = cat(1, labels_other{:}); % Reading in the HOG data (of only relevant frames) -[train_appearance_data, valid_ids_train_hog, vid_ids_train_string] = Read_HOG_files(train_users, vid_ids_train, hog_data_dir); +[train_appearance_data, valid_ids_train_hog, vid_ids_train_string] = Read_HOG_files(train_users, vid_ids_train, feature_dir); -[train_geom_data] = Read_geom_files(train_users, vid_ids_train, hog_data_dir); +[train_geom_data] = Read_geom_files(train_users, vid_ids_train, feature_dir); % Subsample the data to make training quicker labels_train = cat(1, labels_train{:}); @@ -62,9 +62,9 @@ vid_ids_train_string = vid_ids_train_string(reduced_inds,:); [ labels_devel, valid_ids_devel, vid_ids_devel ] = extract_SEMAINE_labels(semaine_dir, devel_users, au_train); % Reading in the HOG data (of only relevant frames) -[devel_appearance_data, valid_ids_devel_hog, vid_ids_devel_string] = Read_HOG_files(devel_users, vid_ids_devel, hog_data_dir); +[devel_appearance_data, valid_ids_devel_hog, vid_ids_devel_string] = Read_HOG_files(devel_users, vid_ids_devel, feature_dir); -[devel_geom_data] = Read_geom_files(devel_users, vid_ids_devel, hog_data_dir); +[devel_geom_data] = Read_geom_files(devel_users, vid_ids_devel, feature_dir); labels_devel = cat(1, labels_devel{:}); diff --git a/matlab_version/AU_training/experiments/SEMAINE/Prepare_HOG_AU_data_generic_dynamic.m b/matlab_version/AU_training/experiments/SEMAINE/Prepare_HOG_AU_data_generic_dynamic.m index 4f90a63..fd963e3 100644 --- a/matlab_version/AU_training/experiments/SEMAINE/Prepare_HOG_AU_data_generic_dynamic.m +++ b/matlab_version/AU_training/experiments/SEMAINE/Prepare_HOG_AU_data_generic_dynamic.m @@ -1,5 +1,5 @@ function [data_train, labels_train, data_devel, labels_devel, raw_devel, PC, means_norm, stds_norm, vid_ids_devel_string] = ... - Prepare_HOG_AU_data_generic_dynamic(train_users, devel_users, au_train, rest_aus, semaine_dir, hog_data_dir, pca_file) + Prepare_HOG_AU_data_generic_dynamic(train_users, devel_users, au_train, rest_aus, semaine_dir, feature_dir) %% addpath(genpath('../data extraction/')); @@ -11,9 +11,9 @@ addpath(genpath('../data extraction/')); labels_other = cat(1, labels_other{:}); % Reading in the HOG data (of only relevant frames) -[train_appearance_data, valid_ids_train_hog, vid_ids_train_string] = Read_HOG_files_dynamic(train_users, vid_ids_train, hog_data_dir); +[train_appearance_data, valid_ids_train_hog, vid_ids_train_string] = Read_HOG_files_dynamic(train_users, vid_ids_train, feature_dir); -[train_geom_data] = Read_geom_files_dynamic(train_users, vid_ids_train, hog_data_dir); +[train_geom_data] = Read_geom_files_dynamic(train_users, vid_ids_train, feature_dir); % Subsample the data to make training quicker labels_train = cat(1, labels_train{:}); @@ -62,9 +62,9 @@ vid_ids_train_string = vid_ids_train_string(reduced_inds,:); [ labels_devel, valid_ids_devel, vid_ids_devel ] = extract_SEMAINE_labels(semaine_dir, devel_users, au_train); % Reading in the HOG data (of only relevant frames) -[devel_appearance_data, valid_ids_devel_hog, vid_ids_devel_string] = Read_HOG_files_dynamic(devel_users, vid_ids_devel, hog_data_dir); +[devel_appearance_data, valid_ids_devel_hog, vid_ids_devel_string] = Read_HOG_files_dynamic(devel_users, vid_ids_devel, feature_dir); -[devel_geom_data] = Read_geom_files_dynamic(devel_users, vid_ids_devel, hog_data_dir); +[devel_geom_data] = Read_geom_files_dynamic(devel_users, vid_ids_devel, feature_dir); labels_devel = cat(1, labels_devel{:}); diff --git a/matlab_version/AU_training/experiments/SEMAINE/Read_geom_files.m b/matlab_version/AU_training/experiments/SEMAINE/Read_geom_files.m index 1556e5e..1cb485c 100644 --- a/matlab_version/AU_training/experiments/SEMAINE/Read_geom_files.m +++ b/matlab_version/AU_training/experiments/SEMAINE/Read_geom_files.m @@ -7,23 +7,34 @@ function [geom_data, valid_ids] = Read_geom_files(users, vid_ids, hog_data_dir) for i=1:numel(users) - geom_file = [hog_data_dir, '/train/' users{i} '.params.txt']; + geom_file = [hog_data_dir, '/train/' users{i} '.csv']; m_file = [hog_data_dir, '/train/' users{i} '.params.mat']; if(~exist(geom_file, 'file')) - geom_file = [hog_data_dir, '/devel/' users{i} '.params.txt']; + geom_file = [hog_data_dir, '/devel/' users{i} '.csv']; m_file = [hog_data_dir, '/devel/' users{i} '.params.mat']; end if(~exist(m_file, 'file')) + if(~exist('shape_inds', 'var')) + tab = readtable(geom_file); + column_names = tab.Properties.VariableNames; + valid_ind = cellfun(@(x) ~isempty(x) && x==1, strfind(column_names, 'success')); + shape_inds = cellfun(@(x) ~isempty(x) && x==1, strfind(column_names, 'p_')); + end + res = dlmread(geom_file, ',', 1, 0); + + valid = res(:, valid_ind) > 0.7; + res = res(:, shape_inds); + + % Do not consider global parameters + res = res(:, 7:end); + res = res(vid_ids(i,1)+1:vid_ids(i,2),:); - save(m_file, 'res'); + save(m_file, 'res', 'valid'); else load(m_file); - end - - valid = res(:, 4); - res = res(:, 11:end); + end actual_locs = res * V'; res = cat(2, actual_locs, res); diff --git a/matlab_version/AU_training/experiments/SEMAINE/Read_geom_files_dynamic.m b/matlab_version/AU_training/experiments/SEMAINE/Read_geom_files_dynamic.m index dd6dd82..01465f3 100644 --- a/matlab_version/AU_training/experiments/SEMAINE/Read_geom_files_dynamic.m +++ b/matlab_version/AU_training/experiments/SEMAINE/Read_geom_files_dynamic.m @@ -7,24 +7,34 @@ function [geom_data, valid_ids] = Read_geom_files_dynamic(users, vid_ids, hog_da for i=1:numel(users) - geom_file = [hog_data_dir, '/train/' users{i} '.params.txt']; + geom_file = [hog_data_dir, '/train/' users{i} '.csv']; m_file = [hog_data_dir, '/train/' users{i} '.params.mat']; if(~exist(geom_file, 'file')) - geom_file = [hog_data_dir, '/devel/' users{i} '.params.txt']; + geom_file = [hog_data_dir, '/devel/' users{i} '.csv']; m_file = [hog_data_dir, '/devel/' users{i} '.params.mat']; end if(~exist(m_file, 'file')) + if(~exist('shape_inds', 'var')) + tab = readtable(geom_file); + column_names = tab.Properties.VariableNames; + valid_ind = cellfun(@(x) ~isempty(x) && x==1, strfind(column_names, 'success')); + shape_inds = cellfun(@(x) ~isempty(x) && x==1, strfind(column_names, 'p_')); + end + res = dlmread(geom_file, ',', 1, 0); + + valid = res(:, valid_ind) > 0.7; + res = res(:, shape_inds); + + % Do not consider global parameters + res = res(:, 7:end); + res = res(vid_ids(i,1)+1:vid_ids(i,2),:); - save(m_file, 'res'); + save(m_file, 'res', 'valid'); else load(m_file); - end - - valid = res(:, 4); - res = res(:, 11:end); - + end actual_locs = res * V'; res = cat(2, actual_locs, res); diff --git a/matlab_version/AU_training/experiments/SEMAINE/Script_HOG_SVM_train.m b/matlab_version/AU_training/experiments/SEMAINE/Script_HOG_SVM_train.m index 5da1419..6b0c20d 100644 --- a/matlab_version/AU_training/experiments/SEMAINE/Script_HOG_SVM_train.m +++ b/matlab_version/AU_training/experiments/SEMAINE/Script_HOG_SVM_train.m @@ -31,7 +31,7 @@ for a=1:numel(aus) rest_aus = setdiff(all_aus, au); % load the training and testing data for the current fold - [train_samples, train_labels, valid_samples, valid_labels, ~, PC, means, scaling] = Prepare_HOG_AU_data_generic(train_recs, devel_recs, au, rest_aus, SEMAINE_dir, hog_data_dir, pca_loc); + [train_samples, train_labels, valid_samples, valid_labels, ~, PC, means, scaling] = Prepare_HOG_AU_data_generic(train_recs, devel_recs, au, rest_aus, SEMAINE_dir, hog_data_dir); train_samples = sparse(train_samples); valid_samples = sparse(valid_samples); diff --git a/matlab_version/AU_training/experiments/SEMAINE/Script_HOG_SVM_train_dyn.m b/matlab_version/AU_training/experiments/SEMAINE/Script_HOG_SVM_train_dyn.m index 7fe9d5e..ce1af88 100644 --- a/matlab_version/AU_training/experiments/SEMAINE/Script_HOG_SVM_train_dyn.m +++ b/matlab_version/AU_training/experiments/SEMAINE/Script_HOG_SVM_train_dyn.m @@ -28,7 +28,7 @@ for a=1:numel(aus) rest_aus = setdiff(all_aus, au); % load the training and testing data for the current fold - [train_samples, train_labels, valid_samples, valid_labels, ~, PC, means, scaling] = Prepare_HOG_AU_data_generic_dynamic(train_recs, devel_recs, au, rest_aus, SEMAINE_dir, hog_data_dir, pca_loc); + [train_samples, train_labels, valid_samples, valid_labels, ~, PC, means, scaling] = Prepare_HOG_AU_data_generic_dynamic(train_recs, devel_recs, au, rest_aus, SEMAINE_dir, hog_data_dir); train_samples = sparse(train_samples); valid_samples = sparse(valid_samples); diff --git a/matlab_version/AU_training/experiments/SEMAINE/models/AU_12_dyn.dat b/matlab_version/AU_training/experiments/SEMAINE/models/AU_12_dyn.dat index bfaa989..d7486a8 100644 Binary files a/matlab_version/AU_training/experiments/SEMAINE/models/AU_12_dyn.dat and b/matlab_version/AU_training/experiments/SEMAINE/models/AU_12_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/SEMAINE/models/AU_12_static.dat b/matlab_version/AU_training/experiments/SEMAINE/models/AU_12_static.dat index 26235d6..d196d02 100644 Binary files a/matlab_version/AU_training/experiments/SEMAINE/models/AU_12_static.dat and b/matlab_version/AU_training/experiments/SEMAINE/models/AU_12_static.dat differ diff --git a/matlab_version/AU_training/experiments/SEMAINE/models/AU_17_dyn.dat b/matlab_version/AU_training/experiments/SEMAINE/models/AU_17_dyn.dat index 275df3c..4d4ae7f 100644 Binary files a/matlab_version/AU_training/experiments/SEMAINE/models/AU_17_dyn.dat and b/matlab_version/AU_training/experiments/SEMAINE/models/AU_17_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/SEMAINE/models/AU_17_static.dat b/matlab_version/AU_training/experiments/SEMAINE/models/AU_17_static.dat index 32ae98e..584286e 100644 Binary files a/matlab_version/AU_training/experiments/SEMAINE/models/AU_17_static.dat and b/matlab_version/AU_training/experiments/SEMAINE/models/AU_17_static.dat differ diff --git a/matlab_version/AU_training/experiments/SEMAINE/models/AU_25_dyn.dat b/matlab_version/AU_training/experiments/SEMAINE/models/AU_25_dyn.dat index 3dd8401..5f29ed8 100644 Binary files a/matlab_version/AU_training/experiments/SEMAINE/models/AU_25_dyn.dat and b/matlab_version/AU_training/experiments/SEMAINE/models/AU_25_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/SEMAINE/models/AU_25_static.dat b/matlab_version/AU_training/experiments/SEMAINE/models/AU_25_static.dat index 1977f94..35dea54 100644 Binary files a/matlab_version/AU_training/experiments/SEMAINE/models/AU_25_static.dat and b/matlab_version/AU_training/experiments/SEMAINE/models/AU_25_static.dat differ diff --git a/matlab_version/AU_training/experiments/SEMAINE/models/AU_28_dyn.dat b/matlab_version/AU_training/experiments/SEMAINE/models/AU_28_dyn.dat index d53c4c2..e03d753 100644 Binary files a/matlab_version/AU_training/experiments/SEMAINE/models/AU_28_dyn.dat and b/matlab_version/AU_training/experiments/SEMAINE/models/AU_28_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/SEMAINE/models/AU_28_static.dat b/matlab_version/AU_training/experiments/SEMAINE/models/AU_28_static.dat index 97fed7e..2e59766 100644 Binary files a/matlab_version/AU_training/experiments/SEMAINE/models/AU_28_static.dat and b/matlab_version/AU_training/experiments/SEMAINE/models/AU_28_static.dat differ diff --git a/matlab_version/AU_training/experiments/SEMAINE/models/AU_2_dyn.dat b/matlab_version/AU_training/experiments/SEMAINE/models/AU_2_dyn.dat index 827a220..e09e52e 100644 Binary files a/matlab_version/AU_training/experiments/SEMAINE/models/AU_2_dyn.dat and b/matlab_version/AU_training/experiments/SEMAINE/models/AU_2_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/SEMAINE/models/AU_2_static.dat b/matlab_version/AU_training/experiments/SEMAINE/models/AU_2_static.dat index f90ec88..3bcf21a 100644 Binary files a/matlab_version/AU_training/experiments/SEMAINE/models/AU_2_static.dat and b/matlab_version/AU_training/experiments/SEMAINE/models/AU_2_static.dat differ diff --git a/matlab_version/AU_training/experiments/SEMAINE/models/AU_45_dyn.dat b/matlab_version/AU_training/experiments/SEMAINE/models/AU_45_dyn.dat index 2e92ca2..4997cbc 100644 Binary files a/matlab_version/AU_training/experiments/SEMAINE/models/AU_45_dyn.dat and b/matlab_version/AU_training/experiments/SEMAINE/models/AU_45_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/SEMAINE/models/AU_45_static.dat b/matlab_version/AU_training/experiments/SEMAINE/models/AU_45_static.dat index dc01048..70bfbb7 100644 Binary files a/matlab_version/AU_training/experiments/SEMAINE/models/AU_45_static.dat and b/matlab_version/AU_training/experiments/SEMAINE/models/AU_45_static.dat differ diff --git a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_12_dyn.mat b/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_12_dyn.mat index 834ed4f..879f17f 100644 Binary files a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_12_dyn.mat and b/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_12_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_12_static.mat b/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_12_static.mat index a3139a1..d6e0bb1 100644 Binary files a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_12_static.mat and b/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_12_static.mat differ diff --git a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_17_dyn.mat b/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_17_dyn.mat index c943dcd..a88ab53 100644 Binary files a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_17_dyn.mat and b/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_17_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_17_static.mat b/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_17_static.mat index 92e4477..83ae914 100644 Binary files a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_17_static.mat and b/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_17_static.mat differ diff --git a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_25_dyn.mat b/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_25_dyn.mat index 4a1ee7a..1c4ad50 100644 Binary files a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_25_dyn.mat and b/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_25_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_25_static.mat b/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_25_static.mat index f83b4c5..25d170b 100644 Binary files a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_25_static.mat and b/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_25_static.mat differ diff --git a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_28_dyn.mat b/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_28_dyn.mat index 33a2e29..02651fe 100644 Binary files a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_28_dyn.mat and b/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_28_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_28_static.mat b/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_28_static.mat index 9b54ed6..c66aa22 100644 Binary files a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_28_static.mat and b/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_28_static.mat differ diff --git a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_2_dyn.mat b/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_2_dyn.mat index dbdec3e..efb1e6b 100644 Binary files a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_2_dyn.mat and b/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_2_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_2_static.mat b/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_2_static.mat index 6b76c41..43d0d81 100644 Binary files a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_2_static.mat and b/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_2_static.mat differ diff --git a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_45_dyn.mat b/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_45_dyn.mat index 2c60954..f2b2e82 100644 Binary files a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_45_dyn.mat and b/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_45_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_45_static.mat b/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_45_static.mat index f5dbd84..235c259 100644 Binary files a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_45_static.mat and b/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel/AU_45_static.mat differ diff --git a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel_back/AU_12_dyn.mat b/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel_back/AU_12_dyn.mat deleted file mode 100644 index a5dcc99..0000000 Binary files a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel_back/AU_12_dyn.mat and /dev/null differ diff --git a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel_back/AU_12_static.mat b/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel_back/AU_12_static.mat deleted file mode 100644 index 69b06c4..0000000 Binary files a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel_back/AU_12_static.mat and /dev/null differ diff --git a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel_back/AU_17_dyn.mat b/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel_back/AU_17_dyn.mat deleted file mode 100644 index ff99ac0..0000000 Binary files a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel_back/AU_17_dyn.mat and /dev/null differ diff --git a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel_back/AU_17_static.mat b/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel_back/AU_17_static.mat deleted file mode 100644 index ef347cb..0000000 Binary files a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel_back/AU_17_static.mat and /dev/null differ diff --git a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel_back/AU_25_dyn.mat b/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel_back/AU_25_dyn.mat deleted file mode 100644 index 51a7fce..0000000 Binary files a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel_back/AU_25_dyn.mat and /dev/null differ diff --git a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel_back/AU_25_static.mat b/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel_back/AU_25_static.mat deleted file mode 100644 index 01aa51f..0000000 Binary files a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel_back/AU_25_static.mat and /dev/null differ diff --git a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel_back/AU_28_dyn.mat b/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel_back/AU_28_dyn.mat deleted file mode 100644 index 1122954..0000000 Binary files a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel_back/AU_28_dyn.mat and /dev/null differ diff --git a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel_back/AU_28_static.mat b/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel_back/AU_28_static.mat deleted file mode 100644 index 42bbaa4..0000000 Binary files a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel_back/AU_28_static.mat and /dev/null differ diff --git a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel_back/AU_2_dyn.mat b/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel_back/AU_2_dyn.mat deleted file mode 100644 index 8fc81e7..0000000 Binary files a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel_back/AU_2_dyn.mat and /dev/null differ diff --git a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel_back/AU_2_static.mat b/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel_back/AU_2_static.mat deleted file mode 100644 index 33e3fec..0000000 Binary files a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel_back/AU_2_static.mat and /dev/null differ diff --git a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel_back/AU_45_dyn.mat b/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel_back/AU_45_dyn.mat deleted file mode 100644 index 1d88502..0000000 Binary files a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel_back/AU_45_dyn.mat and /dev/null differ diff --git a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel_back/AU_45_static.mat b/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel_back/AU_45_static.mat deleted file mode 100644 index a4867b3..0000000 Binary files a/matlab_version/AU_training/experiments/SEMAINE/results_SEMAINE_devel_back/AU_45_static.mat and /dev/null differ diff --git a/matlab_version/AU_training/experiments/UNBC/Prepare_HOG_AU_data.m b/matlab_version/AU_training/experiments/UNBC/Prepare_HOG_AU_data.m index 6ada175..87bce82 100644 --- a/matlab_version/AU_training/experiments/UNBC/Prepare_HOG_AU_data.m +++ b/matlab_version/AU_training/experiments/UNBC/Prepare_HOG_AU_data.m @@ -1,5 +1,5 @@ function [data_train, labels_train, data_devel, labels_devel, raw_devel, PC, means_norm, stds_norm, devel_ids, devel_success] = ... - Prepare_HOG_AU_data(train_users, devel_users, au_train, rest_aus, UNBC_dir, hog_data_dir) + Prepare_HOG_AU_data(train_users, devel_users, au_train, rest_aus, UNBC_dir, features_dir) %% addpath(genpath('../data extraction/')); @@ -11,10 +11,9 @@ addpath(genpath('../data extraction/')); labels_other = cat(1, labels_other{:}); % Reading in the HOG data (of only relevant frames) -[train_appearance_data, valid_ids_train_hog, vid_ids_train_string] = Read_HOG_files(train_users, hog_data_dir); +[train_appearance_data, valid_ids_train_hog, vid_ids_train_string] = Read_HOG_files(train_users, features_dir); -clm_data_dir = [hog_data_dir, '/../model_params']; -[train_geom_data] = Read_geom_files(train_users, clm_data_dir); +[train_geom_data] = Read_geom_files(train_users, features_dir); % Subsample the data to make training quicker labels_train = cat(1, labels_train{:}); @@ -64,11 +63,11 @@ end [ labels_devel, valid_ids_devel, vid_ids_devel ] = extract_UNBC_labels(UNBC_dir, devel_users, au_train); % Reading in the HOG data (of only relevant frames) -[devel_appearance_data, valid_ids_devel_hog, vid_ids_devel_string] = Read_HOG_files(devel_users, hog_data_dir); +[devel_appearance_data, valid_ids_devel_hog, vid_ids_devel_string] = Read_HOG_files(devel_users, features_dir); devel_success = valid_ids_devel_hog; devel_ids = vid_ids_devel_string; -[devel_geom_data] = Read_geom_files(devel_users, clm_data_dir); +[devel_geom_data] = Read_geom_files(devel_users, features_dir); labels_devel = cat(1, labels_devel{:}); diff --git a/matlab_version/AU_training/experiments/UNBC/Prepare_HOG_AU_data_dynamic.m b/matlab_version/AU_training/experiments/UNBC/Prepare_HOG_AU_data_dynamic.m index 1c5e231..f1ba2fa 100644 --- a/matlab_version/AU_training/experiments/UNBC/Prepare_HOG_AU_data_dynamic.m +++ b/matlab_version/AU_training/experiments/UNBC/Prepare_HOG_AU_data_dynamic.m @@ -1,5 +1,5 @@ function [data_train, labels_train, data_devel, labels_devel, raw_devel, PC, means_norm, stds_norm, devel_ids, devel_success] = ... - Prepare_HOG_AU_data_dynamic(train_users, devel_users, au_train, rest_aus, UNBC_dir, hog_data_dir) + Prepare_HOG_AU_data_dynamic(train_users, devel_users, au_train, rest_aus, UNBC_dir, features_dir) %% addpath(genpath('../data extraction/')); @@ -11,10 +11,9 @@ addpath(genpath('../data extraction/')); labels_other = cat(1, labels_other{:}); % Reading in the HOG data (of only relevant frames) -[train_appearance_data, valid_ids_train_hog, vid_ids_train_string] = Read_HOG_files_dynamic(train_users, hog_data_dir); +[train_appearance_data, valid_ids_train_hog, vid_ids_train_string] = Read_HOG_files_dynamic(train_users, features_dir); -clm_data_dir = [hog_data_dir, '/../model_params']; -[train_geom_data] = Read_geom_files_dynamic(train_users, clm_data_dir); +[train_geom_data] = Read_geom_files_dynamic(train_users, features_dir); % Subsample the data to make training quicker labels_train = cat(1, labels_train{:}); @@ -64,11 +63,11 @@ end [ labels_devel, valid_ids_devel, vid_ids_devel ] = extract_UNBC_labels(UNBC_dir, devel_users, au_train); % Reading in the HOG data (of only relevant frames) -[devel_appearance_data, valid_ids_devel_hog, vid_ids_devel_string] = Read_HOG_files_dynamic(devel_users, hog_data_dir); +[devel_appearance_data, valid_ids_devel_hog, vid_ids_devel_string] = Read_HOG_files_dynamic(devel_users, features_dir); devel_success = valid_ids_devel_hog; devel_ids = vid_ids_devel_string; -[devel_geom_data] = Read_geom_files_dynamic(devel_users, clm_data_dir); +[devel_geom_data] = Read_geom_files_dynamic(devel_users, features_dir); labels_devel = cat(1, labels_devel{:}); diff --git a/matlab_version/AU_training/experiments/UNBC/Read_geom_files.m b/matlab_version/AU_training/experiments/UNBC/Read_geom_files.m index 9d57c71..3d3d659 100644 --- a/matlab_version/AU_training/experiments/UNBC/Read_geom_files.m +++ b/matlab_version/AU_training/experiments/UNBC/Read_geom_files.m @@ -7,22 +7,34 @@ function [geom_data, valid_ids] = Read_geom_files(users, model_param_data_dir) for i=1:numel(users) - geom_files = dir([model_param_data_dir, '/' users{i} '*.txt']); + geom_files = dir([model_param_data_dir, '/' users{i} '*.csv']); for g=1:numel(geom_files) m_file = [model_param_data_dir, '/', geom_files(g).name, '.mat']; if(~exist(m_file, 'file')) - res = dlmread([model_param_data_dir, '/', geom_files(g).name], ',', 1, 0); - save(m_file, 'res'); + + if(~exist('shape_inds', 'var')) + tab = readtable([model_param_data_dir, '/', geom_files(g).name]); + column_names = tab.Properties.VariableNames; + valid_ind = cellfun(@(x) ~isempty(x) && x==1, strfind(column_names, 'success')); + shape_inds = cellfun(@(x) ~isempty(x) && x==1, strfind(column_names, 'p_')); + end + + res = dlmread([model_param_data_dir, '/', geom_files(g).name], ',', 1, 0); + + valid = res(:, valid_ind) > 0.7; + res = res(:, shape_inds); + + % Do not consider global parameters + res = res(:, 7:end); + + save(m_file, 'res', 'valid'); else load(m_file); end - valid = res(:, 4); - res = res(:, 11:end); - actual_locs = res * V'; res = cat(2, actual_locs, res); diff --git a/matlab_version/AU_training/experiments/UNBC/Read_geom_files_dynamic.m b/matlab_version/AU_training/experiments/UNBC/Read_geom_files_dynamic.m index 44cc3bf..4e971e2 100644 --- a/matlab_version/AU_training/experiments/UNBC/Read_geom_files_dynamic.m +++ b/matlab_version/AU_training/experiments/UNBC/Read_geom_files_dynamic.m @@ -7,7 +7,7 @@ function [geom_data, valid_ids] = Read_geom_files_dynamic(users, model_param_dat for i=1:numel(users) - geom_files = dir([model_param_data_dir, '/' users{i} '*.txt']); + geom_files = dir([model_param_data_dir, '/' users{i} '*.csv']); geom_data_curr_p = []; @@ -15,15 +15,27 @@ function [geom_data, valid_ids] = Read_geom_files_dynamic(users, model_param_dat m_file = [model_param_data_dir, '/', geom_files(g).name, '.mat']; if(~exist(m_file, 'file')) + + if(~exist('shape_inds', 'var')) + tab = readtable([model_param_data_dir, '/', geom_files(g).name]); + column_names = tab.Properties.VariableNames; + valid_ind = cellfun(@(x) ~isempty(x) && x==1, strfind(column_names, 'success')); + shape_inds = cellfun(@(x) ~isempty(x) && x==1, strfind(column_names, 'p_')); + end + res = dlmread([model_param_data_dir, '/', geom_files(g).name], ',', 1, 0); - save(m_file, 'res'); + + valid = res(:, valid_ind) > 0.7; + res = res(:, shape_inds); + + % Do not consider global parameters + res = res(:, 7:end); + + save(m_file, 'res', 'valid'); else load(m_file); end - valid = res(:, 4); - res = res(:, 11:end); - actual_locs = res * V'; res = cat(2, actual_locs, res); diff --git a/matlab_version/AU_training/experiments/UNBC/Script_HOG_SVM_train.m b/matlab_version/AU_training/experiments/UNBC/Script_HOG_SVM_train.m index 2875a92..d85e672 100644 --- a/matlab_version/AU_training/experiments/UNBC/Script_HOG_SVM_train.m +++ b/matlab_version/AU_training/experiments/UNBC/Script_HOG_SVM_train.m @@ -33,7 +33,7 @@ for a=1:numel(aus) [users_train, users_valid] = get_balanced_fold(UNBC_dir, all_recs, au, 1/3, 1); % load the training and testing data for the current fold - [train_samples, train_labels, valid_samples, valid_labels, ~, PC, means, scaling] = Prepare_HOG_AU_data(users_train, users_valid, au, rest_aus, UNBC_dir, hog_data_dir); + [train_samples, train_labels, valid_samples, valid_labels, ~, PC, means, scaling] = Prepare_HOG_AU_data(users_train, users_valid, au, rest_aus, UNBC_dir, features_dir); % Binarizing the data train_labels(train_labels > 1) = 1; diff --git a/matlab_version/AU_training/experiments/UNBC/Script_HOG_SVM_train_dyn.m b/matlab_version/AU_training/experiments/UNBC/Script_HOG_SVM_train_dyn.m index 00a9bd2..9049b38 100644 --- a/matlab_version/AU_training/experiments/UNBC/Script_HOG_SVM_train_dyn.m +++ b/matlab_version/AU_training/experiments/UNBC/Script_HOG_SVM_train_dyn.m @@ -33,7 +33,7 @@ for a=1:numel(aus) [users_train, users_valid] = get_balanced_fold(UNBC_dir, all_recs, au, 1/3, 1); % load the training and testing data for the current fold - [train_samples, train_labels, valid_samples, valid_labels, ~, PC, means, scaling] = Prepare_HOG_AU_data_dynamic(users_train, users_valid, au, rest_aus, UNBC_dir, hog_data_dir); + [train_samples, train_labels, valid_samples, valid_labels, ~, PC, means, scaling] = Prepare_HOG_AU_data_dynamic(users_train, users_valid, au, rest_aus, UNBC_dir, features_dir); train_samples = sparse(train_samples); valid_samples = sparse(valid_samples); diff --git a/matlab_version/AU_training/experiments/UNBC/Script_HOG_SVR_train.m b/matlab_version/AU_training/experiments/UNBC/Script_HOG_SVR_train.m index bc6e73e..1fac8ab 100644 --- a/matlab_version/AU_training/experiments/UNBC/Script_HOG_SVR_train.m +++ b/matlab_version/AU_training/experiments/UNBC/Script_HOG_SVR_train.m @@ -33,7 +33,7 @@ for a=1:numel(aus) [users_train, users_valid] = get_balanced_fold(UNBC_dir, all_recs, au, 1/3, 1); % load the training and testing data for the current fold - [train_samples, train_labels, valid_samples, valid_labels, ~, PC, means, scaling, valid_ids, valid_success] = Prepare_HOG_AU_data(users_train, users_valid, au, rest_aus, UNBC_dir, hog_data_dir); + [train_samples, train_labels, valid_samples, valid_labels, ~, PC, means, scaling, valid_ids, valid_success] = Prepare_HOG_AU_data(users_train, users_valid, au, rest_aus, UNBC_dir, features_dir); train_samples = sparse(train_samples); valid_samples = sparse(valid_samples); diff --git a/matlab_version/AU_training/experiments/UNBC/Script_HOG_SVR_train_dyn.m b/matlab_version/AU_training/experiments/UNBC/Script_HOG_SVR_train_dyn.m index a51a7dd..4bf740d 100644 --- a/matlab_version/AU_training/experiments/UNBC/Script_HOG_SVR_train_dyn.m +++ b/matlab_version/AU_training/experiments/UNBC/Script_HOG_SVR_train_dyn.m @@ -33,7 +33,7 @@ for a=1:numel(aus) [users_train, users_valid] = get_balanced_fold(UNBC_dir, all_recs, au, 1/3, 1); % load the training and testing data for the current fold - [train_samples, train_labels, valid_samples, valid_labels, ~, PC, means, scaling, valid_ids, valid_success] = Prepare_HOG_AU_data_dynamic(users_train, users_valid, au, rest_aus, UNBC_dir, hog_data_dir); + [train_samples, train_labels, valid_samples, valid_labels, ~, PC, means, scaling, valid_ids, valid_success] = Prepare_HOG_AU_data_dynamic(users_train, users_valid, au, rest_aus, UNBC_dir, features_dir); train_samples = sparse(train_samples); valid_samples = sparse(valid_samples); @@ -55,7 +55,7 @@ for a=1:numel(aus) name = sprintf('models/AU_%d_dyn_intensity.dat', au); - write_lin_dyn_svr(name, means, svs, b); + write_lin_dyn_svr(name, means, svs, b, 0); name = sprintf('results_UNBC_devel/AU_%d_dyn_intensity.mat', au); diff --git a/matlab_version/AU_training/experiments/UNBC/models/AU_10_dyn.dat b/matlab_version/AU_training/experiments/UNBC/models/AU_10_dyn.dat index 03fcbeb..681de71 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/models/AU_10_dyn.dat and b/matlab_version/AU_training/experiments/UNBC/models/AU_10_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/UNBC/models/AU_10_dyn_intensity.dat b/matlab_version/AU_training/experiments/UNBC/models/AU_10_dyn_intensity.dat index ce8a3d4..612d54c 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/models/AU_10_dyn_intensity.dat and b/matlab_version/AU_training/experiments/UNBC/models/AU_10_dyn_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/UNBC/models/AU_10_static.dat b/matlab_version/AU_training/experiments/UNBC/models/AU_10_static.dat index 5139668..21f1bb7 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/models/AU_10_static.dat and b/matlab_version/AU_training/experiments/UNBC/models/AU_10_static.dat differ diff --git a/matlab_version/AU_training/experiments/UNBC/models/AU_10_static_intensity.dat b/matlab_version/AU_training/experiments/UNBC/models/AU_10_static_intensity.dat index 6653c6d..05bf64d 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/models/AU_10_static_intensity.dat and b/matlab_version/AU_training/experiments/UNBC/models/AU_10_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/UNBC/models/AU_12_dyn.dat b/matlab_version/AU_training/experiments/UNBC/models/AU_12_dyn.dat index 8a7cc72..0e46e7b 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/models/AU_12_dyn.dat and b/matlab_version/AU_training/experiments/UNBC/models/AU_12_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/UNBC/models/AU_12_dyn_intensity.dat b/matlab_version/AU_training/experiments/UNBC/models/AU_12_dyn_intensity.dat index cf17174..5c79adb 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/models/AU_12_dyn_intensity.dat and b/matlab_version/AU_training/experiments/UNBC/models/AU_12_dyn_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/UNBC/models/AU_12_static.dat b/matlab_version/AU_training/experiments/UNBC/models/AU_12_static.dat index 25b7495..49263f2 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/models/AU_12_static.dat and b/matlab_version/AU_training/experiments/UNBC/models/AU_12_static.dat differ diff --git a/matlab_version/AU_training/experiments/UNBC/models/AU_12_static_intensity.dat b/matlab_version/AU_training/experiments/UNBC/models/AU_12_static_intensity.dat index afed975..3a9d935 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/models/AU_12_static_intensity.dat and b/matlab_version/AU_training/experiments/UNBC/models/AU_12_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/UNBC/models/AU_25_dyn.dat b/matlab_version/AU_training/experiments/UNBC/models/AU_25_dyn.dat index 3237f48..4317189 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/models/AU_25_dyn.dat and b/matlab_version/AU_training/experiments/UNBC/models/AU_25_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/UNBC/models/AU_25_dyn_intensity.dat b/matlab_version/AU_training/experiments/UNBC/models/AU_25_dyn_intensity.dat index 601c595..2920730 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/models/AU_25_dyn_intensity.dat and b/matlab_version/AU_training/experiments/UNBC/models/AU_25_dyn_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/UNBC/models/AU_25_static.dat b/matlab_version/AU_training/experiments/UNBC/models/AU_25_static.dat index 7491a0b..1354a56 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/models/AU_25_static.dat and b/matlab_version/AU_training/experiments/UNBC/models/AU_25_static.dat differ diff --git a/matlab_version/AU_training/experiments/UNBC/models/AU_25_static_intensity.dat b/matlab_version/AU_training/experiments/UNBC/models/AU_25_static_intensity.dat index 7dd79fa..45db145 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/models/AU_25_static_intensity.dat and b/matlab_version/AU_training/experiments/UNBC/models/AU_25_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/UNBC/models/AU_26_dyn.dat b/matlab_version/AU_training/experiments/UNBC/models/AU_26_dyn.dat index 88b92f0..f84df10 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/models/AU_26_dyn.dat and b/matlab_version/AU_training/experiments/UNBC/models/AU_26_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/UNBC/models/AU_26_dyn_intensity.dat b/matlab_version/AU_training/experiments/UNBC/models/AU_26_dyn_intensity.dat index a68e4f2..5b84a5f 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/models/AU_26_dyn_intensity.dat and b/matlab_version/AU_training/experiments/UNBC/models/AU_26_dyn_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/UNBC/models/AU_26_static.dat b/matlab_version/AU_training/experiments/UNBC/models/AU_26_static.dat index 2171137..59d5907 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/models/AU_26_static.dat and b/matlab_version/AU_training/experiments/UNBC/models/AU_26_static.dat differ diff --git a/matlab_version/AU_training/experiments/UNBC/models/AU_26_static_intensity.dat b/matlab_version/AU_training/experiments/UNBC/models/AU_26_static_intensity.dat index dfafbbf..947eb15 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/models/AU_26_static_intensity.dat and b/matlab_version/AU_training/experiments/UNBC/models/AU_26_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/UNBC/models/AU_6_dyn.dat b/matlab_version/AU_training/experiments/UNBC/models/AU_6_dyn.dat index 14e1323..af8604f 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/models/AU_6_dyn.dat and b/matlab_version/AU_training/experiments/UNBC/models/AU_6_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/UNBC/models/AU_6_dyn_intensity.dat b/matlab_version/AU_training/experiments/UNBC/models/AU_6_dyn_intensity.dat index 0695a0d..bef2f94 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/models/AU_6_dyn_intensity.dat and b/matlab_version/AU_training/experiments/UNBC/models/AU_6_dyn_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/UNBC/models/AU_6_static.dat b/matlab_version/AU_training/experiments/UNBC/models/AU_6_static.dat index 5ba6355..51d64e0 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/models/AU_6_static.dat and b/matlab_version/AU_training/experiments/UNBC/models/AU_6_static.dat differ diff --git a/matlab_version/AU_training/experiments/UNBC/models/AU_6_static_intensity.dat b/matlab_version/AU_training/experiments/UNBC/models/AU_6_static_intensity.dat index 77489d3..761a795 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/models/AU_6_static_intensity.dat and b/matlab_version/AU_training/experiments/UNBC/models/AU_6_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/UNBC/models/AU_7_dyn.dat b/matlab_version/AU_training/experiments/UNBC/models/AU_7_dyn.dat index 4f3b8f2..84d9557 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/models/AU_7_dyn.dat and b/matlab_version/AU_training/experiments/UNBC/models/AU_7_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/UNBC/models/AU_7_dyn_intensity.dat b/matlab_version/AU_training/experiments/UNBC/models/AU_7_dyn_intensity.dat index 62a4128..eaf20cd 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/models/AU_7_dyn_intensity.dat and b/matlab_version/AU_training/experiments/UNBC/models/AU_7_dyn_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/UNBC/models/AU_7_static.dat b/matlab_version/AU_training/experiments/UNBC/models/AU_7_static.dat index 47231d6..018132e 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/models/AU_7_static.dat and b/matlab_version/AU_training/experiments/UNBC/models/AU_7_static.dat differ diff --git a/matlab_version/AU_training/experiments/UNBC/models/AU_7_static_intensity.dat b/matlab_version/AU_training/experiments/UNBC/models/AU_7_static_intensity.dat index b7489f3..ad5dda2 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/models/AU_7_static_intensity.dat and b/matlab_version/AU_training/experiments/UNBC/models/AU_7_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/UNBC/models/AU_9_dyn.dat b/matlab_version/AU_training/experiments/UNBC/models/AU_9_dyn.dat index d0d4790..fb0fe92 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/models/AU_9_dyn.dat and b/matlab_version/AU_training/experiments/UNBC/models/AU_9_dyn.dat differ diff --git a/matlab_version/AU_training/experiments/UNBC/models/AU_9_dyn_intensity.dat b/matlab_version/AU_training/experiments/UNBC/models/AU_9_dyn_intensity.dat index 3da026d..09e3753 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/models/AU_9_dyn_intensity.dat and b/matlab_version/AU_training/experiments/UNBC/models/AU_9_dyn_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/UNBC/models/AU_9_static.dat b/matlab_version/AU_training/experiments/UNBC/models/AU_9_static.dat index 269c544..df4fc1a 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/models/AU_9_static.dat and b/matlab_version/AU_training/experiments/UNBC/models/AU_9_static.dat differ diff --git a/matlab_version/AU_training/experiments/UNBC/models/AU_9_static_intensity.dat b/matlab_version/AU_training/experiments/UNBC/models/AU_9_static_intensity.dat index 22e17cd..4ec9cbf 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/models/AU_9_static_intensity.dat and b/matlab_version/AU_training/experiments/UNBC/models/AU_9_static_intensity.dat differ diff --git a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_10_dyn.mat b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_10_dyn.mat index 9ccad00..245c1a6 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_10_dyn.mat and b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_10_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_10_dyn_intensity.mat b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_10_dyn_intensity.mat index f854cb9..aa6c862 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_10_dyn_intensity.mat and b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_10_dyn_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_10_static.mat b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_10_static.mat index cbcf202..1a24f76 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_10_static.mat and b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_10_static.mat differ diff --git a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_10_static_intensity.mat b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_10_static_intensity.mat index bc78d69..335a6c6 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_10_static_intensity.mat and b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_10_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_12_dyn.mat b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_12_dyn.mat index 162dc7f..c06563e 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_12_dyn.mat and b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_12_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_12_dyn_intensity.mat b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_12_dyn_intensity.mat index 2319e1e..9a6c5b6 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_12_dyn_intensity.mat and b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_12_dyn_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_12_static.mat b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_12_static.mat index 4d9f196..ce67416 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_12_static.mat and b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_12_static.mat differ diff --git a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_12_static_intensity.mat b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_12_static_intensity.mat index 8fa0a93..3cdd30b 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_12_static_intensity.mat and b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_12_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_25_dyn.mat b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_25_dyn.mat index af8c2f2..9d78ace 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_25_dyn.mat and b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_25_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_25_dyn_intensity.mat b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_25_dyn_intensity.mat index 4f90cb7..5c36bcb 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_25_dyn_intensity.mat and b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_25_dyn_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_25_static.mat b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_25_static.mat index 6d0e5a7..c7aede0 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_25_static.mat and b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_25_static.mat differ diff --git a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_25_static_intensity.mat b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_25_static_intensity.mat index 1082333..23a9aaf 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_25_static_intensity.mat and b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_25_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_26_dyn.mat b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_26_dyn.mat index bd2c0db..b523be7 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_26_dyn.mat and b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_26_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_26_dyn_intensity.mat b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_26_dyn_intensity.mat index e86585c..d6c11f8 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_26_dyn_intensity.mat and b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_26_dyn_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_26_static.mat b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_26_static.mat index e15633b..e463f68 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_26_static.mat and b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_26_static.mat differ diff --git a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_26_static_intensity.mat b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_26_static_intensity.mat index 6ee38bd..aa4fcad 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_26_static_intensity.mat and b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_26_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_6_dyn.mat b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_6_dyn.mat index cb241d3..771e49a 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_6_dyn.mat and b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_6_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_6_dyn_intensity.mat b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_6_dyn_intensity.mat index 646f75f..588701d 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_6_dyn_intensity.mat and b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_6_dyn_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_6_static.mat b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_6_static.mat index 0322f0d..b46707c 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_6_static.mat and b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_6_static.mat differ diff --git a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_6_static_intensity.mat b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_6_static_intensity.mat index 790830e..7d720c7 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_6_static_intensity.mat and b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_6_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_7_dyn.mat b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_7_dyn.mat index 65f636d..2e3d17a 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_7_dyn.mat and b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_7_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_7_dyn_intensity.mat b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_7_dyn_intensity.mat index 7412075..1302ef5 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_7_dyn_intensity.mat and b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_7_dyn_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_7_static.mat b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_7_static.mat index bc0a56c..6067ca4 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_7_static.mat and b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_7_static.mat differ diff --git a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_7_static_intensity.mat b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_7_static_intensity.mat index 63b92ae..dcbaeb2 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_7_static_intensity.mat and b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_7_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_9_dyn.mat b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_9_dyn.mat index b55a6a9..413e7d6 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_9_dyn.mat and b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_9_dyn.mat differ diff --git a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_9_dyn_intensity.mat b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_9_dyn_intensity.mat index d5e4cd7..38f87e3 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_9_dyn_intensity.mat and b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_9_dyn_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_9_static.mat b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_9_static.mat index 87d402b..acb8dce 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_9_static.mat and b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_9_static.mat differ diff --git a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_9_static_intensity.mat b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_9_static_intensity.mat index d05cc2f..a431089 100644 Binary files a/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_9_static_intensity.mat and b/matlab_version/AU_training/experiments/UNBC/results_UNBC_devel/AU_9_static_intensity.mat differ diff --git a/matlab_version/AU_training/experiments/UNBC/shared_defs.m b/matlab_version/AU_training/experiments/UNBC/shared_defs.m index a423e05..b545601 100644 --- a/matlab_version/AU_training/experiments/UNBC/shared_defs.m +++ b/matlab_version/AU_training/experiments/UNBC/shared_defs.m @@ -8,3 +8,4 @@ addpath('../../data extraction/'); find_UNBC; +features_dir = 'E:\datasets\face_datasets_processed\unbc'; \ No newline at end of file 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 169a5b8..93574ed 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 149fcf3..2421693 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 2f36f6f..bb6dec3 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 2b0c3ab..b7fb2cf 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 c31894a..24901fb 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 e067b63..993339f 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 886c0d1..4c45efc 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 4e8c136..5949a27 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 8764e93..be1bf45 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 4a44b6b..7d115bf 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 8da4738..c1066ae 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 4a93caf..4f8ee1a 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 3b2eb5a..d5778cf 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 64f27b3..6ee8fa6 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 8c8f7c8..46c0b01 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 12ec7fd..5e96940 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 ee7f6ee..660c097 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 c0a3226..8473378 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 2b04a5a..775fae1 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 fbc4132..2bf99d2 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 5f84b18..e03d753 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 a9af4fd..2e59766 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 8f9cb98..bf00352 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 288634e..8feb16b 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 b58b927..f0eae5d 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 830aee7..0f52afa 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 e56d1b2..0d18470 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 08e875a..58956f2 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 fc0beeb..867eb19 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 c6dd7e1..6851b01 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 e5dd446..f6b54e9 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 c53afee..4ef0344 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 55ea2ee..b685578 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 ec665e2..4d6f556 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 aa120df..7ae9ac9 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 0c46057..1c13b46 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/mat_models/AU_10_dynamic.mat b/matlab_version/AU_training/experiments/full_model_training/mat_models/AU_10_dynamic.mat index 45356d6..e4cd7d2 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 9af95db..1625767 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 2dd7841..65b4731 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 1140864..ba5028c 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 e31fe3c..f368494 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 0da73b6..14c319d 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 e32b877..1842f88 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 d689c48..e3e02bd 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 4a17759..8f60a06 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 2c2cd8f..616cd53 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 c3109e3..6b70a35 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 7ea294a..b77dab6 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 6852dfa..6dc3899 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 0c42700..88b1f33 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 6294fdf..2c71265 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 a465cd6..7af3d93 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 5293cb3..60f4557 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 ccdb469..0718778 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 91d3bcb..318308e 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 65c86e9..f2b4c71 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 a440185..1ba8e82 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 427e8ad..d1a8e73 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 77967b6..ae9a80a 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 22def91..4035279 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 f4303d8..54b0389 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 a4f1107..323c93a 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 56d9d61..f08a39d 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 3268166..3b848d3 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 e6d8838..cba5f86 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 0e0caec..e74cb1f 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 51cfa19..1b963cc 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 e73448b..e2a7913 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 eda562d..772fdd7 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 11d1137..ae1b538 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 f0d546f..f566527 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 de83425..97ffcbf 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 dd5bdb8..541508c 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 81bca50..173ead7 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 04bc411..224b616 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 8775c91..ec64c48 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 51bae91..f15560f 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 7faed42..f0d57fc 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 f69dda3..080c3aa 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 12209e3..8fdb464 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 733b360..bd3dd55 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 9eab964..56dfb4e 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 d524652..410b3fb 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 9bbd2d8..56be9fc 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 2e4ebdc..2de6303 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 cb4fd92..cb6fbcf 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 14c951a..39e978b 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 4bdaa90..602799b 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 a479a71..a5806e0 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 a575e0e..9baaa4e 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 9284bae..1c13b63 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 00f914b..1a97c3f 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 b6594e8..651fdcb 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 a41e835..af5f596 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 ad26984..9e29857 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 2c71351..26ba309 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 00e7ae3..b700321 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 526b29c..de7ce2e 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 89ca662..b54331a 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 23e2af9..d998df9 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 640dfdf..8056955 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 20960be..910cc6f 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 e9d35ba..c88db88 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 82bc298..2351d49 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 a0ed805..01a4b67 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 fbbfbf8..a311b85 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 1e86915..07413c6 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 1d2f390..36cb226 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 22f9a0a..afa10fd 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 ab755c6..e146882 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 68e2edd..2050581 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 b7f272d..24ce9e4 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 c21da05..598c29d 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 caf5644..9b7130a 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 1b2f4c4..1e0c30e 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 986fda5..10681ec 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 b86b300..39e912d 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 2a4b810..9a02c8e 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 f5331b3..34867d1 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 ee25eb8..c6e41fb 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 f282f27..6b112ce 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 dac6d3d..0dfc25f 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 d14f28a..46cc81c 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 20b734d..7807333 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 b8808ed..8f4de4f 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 677e284..01fabe3 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 ad2a20c..19b7052 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 0704ce2..c2628f7 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 021f572..9cccfcd 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 85d838e..0b3ec05 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 5247275..ab7b20c 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 b269571..0c3a18e 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 241f61e..0f66f03 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 fe9ce79..e775f4f 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 c388855..d947a91 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 624731e..693a324 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 ebb8053..e7de1ea 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 491f94d..dbd2b57 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 b74a655..0e2943f 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 406fd81..d6fee88 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 706d585..2018b27 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 83c864e..b55c1e4 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 42de54a..e3d0576 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 00f802c..c5260eb 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 472a768..c9c6008 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 3a22f41..dcac02c 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 649dec0..fb379c6 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 8e5c238..bbe11a5 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 362dd68..7d1c9c2 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 109c774..e627a50 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 67a80a5..865481b 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 db18375..b0d7aa3 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 065b1c5..c9df2fc 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 d85541b..5367535 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 554df8c..51fb7ac 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 eb78b66..b4354c6 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 2afaa3f..e8c124d 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 a6f437a..d727f08 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 335d7c7..0b1d21e 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 bd03fe2..99bc81e 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 a667964..3b7a402 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 f161ad8..cb6e5ab 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 411670d..a89629e 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 254f819..49e0bbb 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 a993999..1175a6f 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 c5b2597..df13ff3 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 39c61b9..af4d60a 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 3119305..444f20e 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 b384ad3..8085494 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 8939178..dbb45f2 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 eb9ae93..da2feb3 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 12f7ce8..cafc388 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 0da415b..ef2fa29 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 2f6c0b5..dbf29e8 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 fb3b9d3..8c3ca53 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 28bce9a..b30604a 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 67598c0..1d1e9cf 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 c5c8eda..0c533d7 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 7ee65b0..41529af 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 8204a87..1989c3f 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 14f43f5..5ce3630 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 5c3481b..bdbb41d 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 afbc267..5d6e27b 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 5872799..3e65140 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 5c33712..b43cdf8 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 69c3005..d96626a 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 221c6d2..a71a13d 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 f13ba04..51543a1 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 785ccc7..d172106 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 04b4a11..a4143bc 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 c809ddc..5be5d07 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 7cdfc5d..3fca4a5 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/experiments/full_model_training/train_dynamic_classifiers.m b/matlab_version/AU_training/experiments/full_model_training/train_dynamic_classifiers.m index 979717d..cfc44ad 100644 --- a/matlab_version/AU_training/experiments/full_model_training/train_dynamic_classifiers.m +++ b/matlab_version/AU_training/experiments/full_model_training/train_dynamic_classifiers.m @@ -76,7 +76,7 @@ for a=1:numel(all_dataset_aus) [users_train, users_valid_fera] = get_balanced_fold(FERA2011_dir, all_recs, au, 1/3, 1); % load the training and testing data for the current fold - [train_samples_f2011, train_labels_f2011, valid_samples_f2011, valid_labels_f2011, ~, PC, means, scaling] = Prepare_HOG_AU_data_generic_dynamic(users_train, users_valid_fera, au, rest_aus, FERA2011_dir, hog_data_dir); + [train_samples_f2011, train_labels_f2011, valid_samples_f2011, valid_labels_f2011, ~, PC, means, scaling] = Prepare_HOG_AU_data_generic_dynamic(users_train, users_valid_fera, au, rest_aus, FERA2011_dir, features_dir); train_samples = cat(1, train_samples, train_samples_f2011); valid_samples = cat(1, valid_samples, valid_samples_f2011); @@ -169,7 +169,7 @@ for a=1:numel(all_dataset_aus) [users_train, users_valid_disfa] = get_balanced_fold(DISFA_dir, users, au, 1/3, 1); % need to split the rest - [train_samples_disf, train_labels_disf, valid_samples_disf, valid_labels_disf, ~, PC, means, scaling, valid_ids, valid_success] = Prepare_HOG_AU_data_generic_dynamic(users_train, users_valid_disfa, au, rest_aus, hog_data_dir); + [train_samples_disf, train_labels_disf, valid_samples_disf, valid_labels_disf, ~, PC, means, scaling, valid_ids, valid_success] = Prepare_HOG_AU_data_generic_dynamic(users_train, users_valid_disfa, au, rest_aus, DISFA_dir, hog_data_dir); train_labels_disf(train_labels_disf > 1) = 1; valid_labels_disf(valid_labels_disf > 1) = 1; @@ -200,7 +200,7 @@ for a=1:numel(all_dataset_aus) [users_train, users_valid_unbc] = get_balanced_fold(UNBC_dir, all_recs, au, 1/3, 1); % load the training and testing data for the current fold - [train_samples_unbc, train_labels_unbc, valid_samples_unbc, valid_labels_unbc, ~, PC, means, scaling] = Prepare_HOG_AU_data_dynamic(users_train, users_valid_unbc, au, rest_aus, UNBC_dir, hog_data_dir); + [train_samples_unbc, train_labels_unbc, valid_samples_unbc, valid_labels_unbc, ~, PC, means, scaling] = Prepare_HOG_AU_data_dynamic(users_train, users_valid_unbc, au, rest_aus, UNBC_dir, features_dir); % Binarizing the data train_labels_unbc(train_labels_unbc > 1) = 1; diff --git a/matlab_version/AU_training/experiments/full_model_training/train_dynamic_regressors.m b/matlab_version/AU_training/experiments/full_model_training/train_dynamic_regressors.m index a69b453..42040ff 100644 --- a/matlab_version/AU_training/experiments/full_model_training/train_dynamic_regressors.m +++ b/matlab_version/AU_training/experiments/full_model_training/train_dynamic_regressors.m @@ -131,7 +131,7 @@ for a=1:numel(all_dataset_aus) [users_train, users_valid_disfa] = get_balanced_fold(DISFA_dir, users, au, 1/3, 1); % need to split the rest - [train_samples_disf, train_labels_disf, valid_samples_disf, valid_labels_disf, raw_disfa, PC, means, scaling, vid_ids_disfa, valid_success] = Prepare_HOG_AU_data_generic_dynamic(users_train, users_valid_disfa, au, rest_aus, hog_data_dir); + [train_samples_disf, train_labels_disf, valid_samples_disf, valid_labels_disf, raw_disfa, PC, means, scaling, vid_ids_disfa, valid_success] = Prepare_HOG_AU_data_generic_dynamic(users_train, users_valid_disfa, au, rest_aus, DISFA_dir, hog_data_dir); train_samples = cat(1, train_samples, train_samples_disf); valid_samples = cat(1, valid_samples, valid_samples_disf); @@ -163,7 +163,7 @@ for a=1:numel(all_dataset_aus) [users_train, users_valid_unbc] = get_balanced_fold(UNBC_dir, all_recs, au, 1/3, 1); % load the training and testing data for the current fold - [train_samples_unbc, train_labels_unbc, valid_samples_unbc, valid_labels_unbc, ~, PC, means, scaling, vid_ids_unbc, success_devel] = Prepare_HOG_AU_data_dynamic(users_train, users_valid_unbc, au, rest_aus, UNBC_dir, hog_data_dir); + [train_samples_unbc, train_labels_unbc, valid_samples_unbc, valid_labels_unbc, ~, PC, means, scaling, vid_ids_unbc, success_devel] = Prepare_HOG_AU_data_dynamic(users_train, users_valid_unbc, au, rest_aus, UNBC_dir, features_dir); train_samples = cat(1, train_samples, train_samples_unbc); valid_samples = cat(1, valid_samples, valid_samples_unbc); diff --git a/matlab_version/AU_training/experiments/full_model_training/train_dynamic_regressors_with_classifiers.m b/matlab_version/AU_training/experiments/full_model_training/train_dynamic_regressors_with_classifiers.m index ec996ea..cfeab7b 100644 --- a/matlab_version/AU_training/experiments/full_model_training/train_dynamic_regressors_with_classifiers.m +++ b/matlab_version/AU_training/experiments/full_model_training/train_dynamic_regressors_with_classifiers.m @@ -131,7 +131,7 @@ for a=1:numel(all_dataset_aus) [users_train, users_valid_disfa] = get_balanced_fold(DISFA_dir, users, au, 1/3, 1); % need to split the rest - [train_samples_disf, train_labels_disf, valid_samples_disf, valid_labels_disf, raw_disfa, PC, means, scaling, vid_ids_disfa, valid_success] = Prepare_HOG_AU_data_generic_dynamic(users_train, users_valid_disfa, au, rest_aus, hog_data_dir); + [train_samples_disf, train_labels_disf, valid_samples_disf, valid_labels_disf, raw_disfa, PC, means, scaling, vid_ids_disfa, valid_success] = Prepare_HOG_AU_data_generic_dynamic(users_train, users_valid_disfa, au, rest_aus, DISFA_dir, hog_data_dir); train_samples = cat(1, train_samples, train_samples_disf); valid_samples = cat(1, valid_samples, valid_samples_disf); @@ -163,7 +163,7 @@ for a=1:numel(all_dataset_aus) [users_train, users_valid_unbc] = get_balanced_fold(UNBC_dir, all_recs, au, 1/3, 1); % load the training and testing data for the current fold - [train_samples_unbc, train_labels_unbc, valid_samples_unbc, valid_labels_unbc, ~, PC, means, scaling, vid_ids_unbc, success_devel] = Prepare_HOG_AU_data_dynamic(users_train, users_valid_unbc, au, rest_aus, UNBC_dir, hog_data_dir); + [train_samples_unbc, train_labels_unbc, valid_samples_unbc, valid_labels_unbc, ~, PC, means, scaling, vid_ids_unbc, success_devel] = Prepare_HOG_AU_data_dynamic(users_train, users_valid_unbc, au, rest_aus, UNBC_dir, features_dir); train_samples = cat(1, train_samples, train_samples_unbc); valid_samples = cat(1, valid_samples, valid_samples_unbc); diff --git a/matlab_version/AU_training/experiments/full_model_training/train_static_classifiers.m b/matlab_version/AU_training/experiments/full_model_training/train_static_classifiers.m index fa8f9f2..129682a 100644 --- a/matlab_version/AU_training/experiments/full_model_training/train_static_classifiers.m +++ b/matlab_version/AU_training/experiments/full_model_training/train_static_classifiers.m @@ -76,7 +76,7 @@ for a=1:numel(all_dataset_aus) [users_train, users_valid_fera] = get_balanced_fold(FERA2011_dir, all_recs, au, 1/3, 1); % load the training and testing data for the current fold - [train_samples_f2011, train_labels_f2011, valid_samples_f2011, valid_labels_f2011, ~, PC, means, scaling] = Prepare_HOG_AU_data_generic(users_train, users_valid_fera, au, rest_aus, FERA2011_dir, hog_data_dir); + [train_samples_f2011, train_labels_f2011, valid_samples_f2011, valid_labels_f2011, ~, PC, means, scaling] = Prepare_HOG_AU_data_generic(users_train, users_valid_fera, au, rest_aus, FERA2011_dir, features_dir); train_samples = cat(1, train_samples, train_samples_f2011); valid_samples = cat(1, valid_samples, valid_samples_f2011); @@ -169,7 +169,7 @@ for a=1:numel(all_dataset_aus) [users_train, users_valid_disfa] = get_balanced_fold(DISFA_dir, users, au, 1/3, 1); % need to split the rest - [train_samples_disf, train_labels_disf, valid_samples_disf, valid_labels_disf, ~, PC, means, scaling, valid_ids, valid_success] = Prepare_HOG_AU_data_generic(users_train, users_valid_disfa, au, rest_aus, hog_data_dir); + [train_samples_disf, train_labels_disf, valid_samples_disf, valid_labels_disf, ~, PC, means, scaling, valid_ids, valid_success] = Prepare_HOG_AU_data_generic(users_train, users_valid_disfa, au, rest_aus, DISFA_dir, hog_data_dir); train_labels_disf(train_labels_disf > 1) = 1; valid_labels_disf(valid_labels_disf > 1) = 1; @@ -200,7 +200,7 @@ for a=1:numel(all_dataset_aus) [users_train, users_valid_unbc] = get_balanced_fold(UNBC_dir, all_recs, au, 1/3, 1); % load the training and testing data for the current fold - [train_samples_unbc, train_labels_unbc, valid_samples_unbc, valid_labels_unbc, ~, PC, means, scaling] = Prepare_HOG_AU_data(users_train, users_valid_unbc, au, rest_aus, UNBC_dir, hog_data_dir); + [train_samples_unbc, train_labels_unbc, valid_samples_unbc, valid_labels_unbc, ~, PC, means, scaling] = Prepare_HOG_AU_data(users_train, users_valid_unbc, au, rest_aus, UNBC_dir, features_dir); % Binarizing the data train_labels_unbc(train_labels_unbc > 1) = 1; diff --git a/matlab_version/AU_training/experiments/full_model_training/train_static_regressors.m b/matlab_version/AU_training/experiments/full_model_training/train_static_regressors.m index 83b67d9..e98e78c 100644 --- a/matlab_version/AU_training/experiments/full_model_training/train_static_regressors.m +++ b/matlab_version/AU_training/experiments/full_model_training/train_static_regressors.m @@ -125,7 +125,7 @@ for a=1:numel(all_dataset_aus) [users_train, users_valid_disfa] = get_balanced_fold(DISFA_dir, users, au, 1/3, 1); % need to split the rest - [train_samples_disf, train_labels_disf, valid_samples_disf, valid_labels_disf, raw_disfa, PC, means, scaling, vid_ids_disfa, valid_success] = Prepare_HOG_AU_data_generic(users_train, users_valid_disfa, au, rest_aus, hog_data_dir); + [train_samples_disf, train_labels_disf, valid_samples_disf, valid_labels_disf, raw_disfa, PC, means, scaling, vid_ids_disfa, valid_success] = Prepare_HOG_AU_data_generic(users_train, users_valid_disfa, au, rest_aus, DISFA_dir, hog_data_dir); train_samples = cat(1, train_samples, train_samples_disf); valid_samples = cat(1, valid_samples, valid_samples_disf); @@ -157,7 +157,7 @@ for a=1:numel(all_dataset_aus) [users_train, users_valid_unbc] = get_balanced_fold(UNBC_dir, all_recs, au, 1/3, 1); % load the training and testing data for the current fold - [train_samples_unbc, train_labels_unbc, valid_samples_unbc, valid_labels_unbc, ~, PC, means, scaling, vid_ids_unbc, success_devel] = Prepare_HOG_AU_data(users_train, users_valid_unbc, au, rest_aus, UNBC_dir, hog_data_dir); + [train_samples_unbc, train_labels_unbc, valid_samples_unbc, valid_labels_unbc, ~, PC, means, scaling, vid_ids_unbc, success_devel] = Prepare_HOG_AU_data(users_train, users_valid_unbc, au, rest_aus, UNBC_dir, features_dir); train_samples = cat(1, train_samples, train_samples_unbc); valid_samples = cat(1, valid_samples, valid_samples_unbc); diff --git a/matlab_version/AU_training/experiments/full_model_training/train_static_regressors_with_classifiers.m b/matlab_version/AU_training/experiments/full_model_training/train_static_regressors_with_classifiers.m index a852c68..8197177 100644 --- a/matlab_version/AU_training/experiments/full_model_training/train_static_regressors_with_classifiers.m +++ b/matlab_version/AU_training/experiments/full_model_training/train_static_regressors_with_classifiers.m @@ -125,7 +125,7 @@ for a=1:numel(all_dataset_aus) [users_train, users_valid_disfa] = get_balanced_fold(DISFA_dir, users, au, 1/3, 1); % need to split the rest - [train_samples_disf, train_labels_disf, valid_samples_disf, valid_labels_disf, raw_disfa, PC, means, scaling, vid_ids_disfa, valid_success] = Prepare_HOG_AU_data_generic(users_train, users_valid_disfa, au, rest_aus, hog_data_dir); + [train_samples_disf, train_labels_disf, valid_samples_disf, valid_labels_disf, raw_disfa, PC, means, scaling, vid_ids_disfa, valid_success] = Prepare_HOG_AU_data_generic(users_train, users_valid_disfa, au, rest_aus, DISFA_dir, hog_data_dir); train_samples = cat(1, train_samples, train_samples_disf); valid_samples = cat(1, valid_samples, valid_samples_disf); @@ -157,7 +157,7 @@ for a=1:numel(all_dataset_aus) [users_train, users_valid_unbc] = get_balanced_fold(UNBC_dir, all_recs, au, 1/3, 1); % load the training and testing data for the current fold - [train_samples_unbc, train_labels_unbc, valid_samples_unbc, valid_labels_unbc, ~, PC, means, scaling, vid_ids_unbc, success_devel] = Prepare_HOG_AU_data(users_train, users_valid_unbc, au, rest_aus, UNBC_dir, hog_data_dir); + [train_samples_unbc, train_labels_unbc, valid_samples_unbc, valid_labels_unbc, ~, PC, means, scaling, vid_ids_unbc, success_devel] = Prepare_HOG_AU_data(users_train, users_valid_unbc, au, rest_aus, UNBC_dir, features_dir); train_samples = cat(1, train_samples, train_samples_unbc); valid_samples = cat(1, valid_samples, valid_samples_unbc); 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 5b5cabf..d9b6449 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 2f17b5c..9f0b136 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 d0c77bf..a29208e 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