diff --git a/matlab_version/AU_training/experiments/BP4D/Read_geom_files.m b/matlab_version/AU_training/experiments/BP4D/Read_geom_files.m index 0a18698..2226a87 100644 --- a/matlab_version/AU_training/experiments/BP4D/Read_geom_files.m +++ b/matlab_version/AU_training/experiments/BP4D/Read_geom_files.m @@ -23,7 +23,7 @@ function [geom_data, valid_ids] = Read_geom_files(users, hog_data_dir) if(i == 1) tab = readtable(geom_file); column_names = tab.Properties.VariableNames; - valid_ind = cellfun(@(x) ~isempty(x) && x==1, strfind(column_names, 'valid')); + 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 diff --git a/matlab_version/AU_training/experiments/BP4D/Read_geom_files_dynamic.m b/matlab_version/AU_training/experiments/BP4D/Read_geom_files_dynamic.m index 195260b..c85b8a2 100644 --- a/matlab_version/AU_training/experiments/BP4D/Read_geom_files_dynamic.m +++ b/matlab_version/AU_training/experiments/BP4D/Read_geom_files_dynamic.m @@ -25,7 +25,7 @@ function [geom_data, valid_ids] = Read_geom_files_dynamic(users, hog_data_dir) if(i == 1) tab = readtable(geom_file); column_names = tab.Properties.VariableNames; - valid_ind = cellfun(@(x) ~isempty(x) && x==1, strfind(column_names, 'valid')); + 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 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 cbe7aea..fab4765 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 6528cd7..60bb8d3 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 65d56b3..c809514 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 4b9a5b7..fd4e053 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 be89c18..95983d4 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 b4fd6e0..a6a064b 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 f70c191..15a1345 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 b3e0f92..630410b 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 4341e1d..c7a6124 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 c1c69dd..f553998 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 cdd6762..bfef00c 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 4dfd27a..7c7b749 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/Prepare_HOG_AU_data_generic.m b/matlab_version/AU_training/experiments/DISFA/Prepare_HOG_AU_data_generic.m index cc1213b..0432bba 100644 --- a/matlab_version/AU_training/experiments/DISFA/Prepare_HOG_AU_data_generic.m +++ b/matlab_version/AU_training/experiments/DISFA/Prepare_HOG_AU_data_generic.m @@ -1,13 +1,11 @@ function [data_train, labels_train, data_test, labels_test, raw_test, PC, means_norm, stds_norm, vid_ids_test, success_test] = ... - Prepare_HOG_AU_data_generic(train_users, test_users, au_train, rest_aus, hog_data_dir) + Prepare_HOG_AU_data_generic(train_users, test_users, au_train, rest_aus, root, features_dir) %% This should be a separate function? input_train_label_files = cell(numel(train_users),1); input_test_label_files = cell(numel(test_users),1); -root = [hog_data_dir, '/../']; - % This is for loading the labels for i=1:numel(train_users) input_train_label_files{i} = [root, '/ActionUnit_Labels/', train_users{i}, '/', train_users{i}]; @@ -19,12 +17,12 @@ for i=1:numel(test_users) end % First extracting the labels -[train_geom_data] = Read_geom_files(train_users, hog_data_dir); -[test_geom_data] = Read_geom_files(test_users, hog_data_dir); +[train_geom_data] = Read_geom_files(train_users, features_dir); +[test_geom_data] = Read_geom_files(test_users, features_dir); % Reading in the HOG data -[train_data, tracked_inds_hog, vid_ids_train] = Read_HOG_files(train_users, hog_data_dir); -[test_data, success_test, vid_ids_test] = Read_HOG_files(test_users, hog_data_dir); +[train_data, tracked_inds_hog, vid_ids_train] = Read_HOG_files(train_users, features_dir); +[test_data, success_test, vid_ids_test] = Read_HOG_files(test_users, features_dir); train_data = cat(2, train_data, train_geom_data); raw_test = cat(2, test_data, test_geom_data); diff --git a/matlab_version/AU_training/experiments/DISFA/Prepare_HOG_AU_data_generic_dynamic.m b/matlab_version/AU_training/experiments/DISFA/Prepare_HOG_AU_data_generic_dynamic.m index 39e655b..d9d0de8 100644 --- a/matlab_version/AU_training/experiments/DISFA/Prepare_HOG_AU_data_generic_dynamic.m +++ b/matlab_version/AU_training/experiments/DISFA/Prepare_HOG_AU_data_generic_dynamic.m @@ -1,13 +1,11 @@ function [data_train, labels_train, data_test, labels_test, raw_test, PC, means_norm, stds_norm, vid_ids_test, success_test] = ... - Prepare_HOG_AU_data_generic_dynamic(train_users, test_users, au_train, rest_aus, hog_data_dir) + Prepare_HOG_AU_data_generic_dynamic(train_users, test_users, au_train, rest_aus, root, features_dir) %% This should be a separate function? input_train_label_files = cell(numel(train_users),1); input_test_label_files = cell(numel(test_users),1); -root = [hog_data_dir, '/../']; - % This is for loading the labels for i=1:numel(train_users) input_train_label_files{i} = [root, '/ActionUnit_Labels/', train_users{i}, '/', train_users{i}]; @@ -19,12 +17,12 @@ for i=1:numel(test_users) end % First extracting the labels -[train_geom_data] = Read_geom_files_dynamic(train_users, hog_data_dir); -[test_geom_data] = Read_geom_files_dynamic(test_users, hog_data_dir); +[train_geom_data] = Read_geom_files_dynamic(train_users, features_dir); +[test_geom_data] = Read_geom_files_dynamic(test_users, features_dir); % Reading in the HOG data -[train_data, tracked_inds_hog, vid_ids_train] = Read_HOG_files_dynamic(train_users, hog_data_dir); -[test_data, success_test, vid_ids_test] = Read_HOG_files_dynamic(test_users, hog_data_dir); +[train_data, tracked_inds_hog, vid_ids_train] = Read_HOG_files_dynamic(train_users, features_dir); +[test_data, success_test, vid_ids_test] = Read_HOG_files_dynamic(test_users, features_dir); train_data = cat(2, train_data, train_geom_data); raw_test = cat(2, test_data, test_geom_data); diff --git a/matlab_version/AU_training/experiments/DISFA/Read_geom_files.m b/matlab_version/AU_training/experiments/DISFA/Read_geom_files.m index 12c3d55..2fd81dc 100644 --- a/matlab_version/AU_training/experiments/DISFA/Read_geom_files.m +++ b/matlab_version/AU_training/experiments/DISFA/Read_geom_files.m @@ -6,14 +6,23 @@ function [geom_data] = Read_geom_files(users, hog_data_dir) for i=1:numel(users) - geom_file = [hog_data_dir, '/../model_params/LeftVideo' users{i} '_comp.txt']; + geom_file = [hog_data_dir, 'LeftVideo' users{i} '_comp.csv']; - res = dlmread(geom_file, ',', 1, 0); - valid = logical(res(:,4)); - - %res_rot = res(:,6:8); - - 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/DISFA/Read_geom_files_dynamic.m b/matlab_version/AU_training/experiments/DISFA/Read_geom_files_dynamic.m index 6689f41..c702e8e 100644 --- a/matlab_version/AU_training/experiments/DISFA/Read_geom_files_dynamic.m +++ b/matlab_version/AU_training/experiments/DISFA/Read_geom_files_dynamic.m @@ -6,15 +6,24 @@ function [geom_data] = Read_geom_files_dynamic(users, hog_data_dir) for i=1:numel(users) - geom_file = [hog_data_dir, '/../model_params/LeftVideo' users{i} '_comp.txt']; - - res = dlmread(geom_file, ',', 1, 0); - valid = logical(res(:,4)); - - %res_rot = res(:,6:8); - - res = res(:,11:end); + geom_file = [hog_data_dir, 'LeftVideo' users{i} '_comp.csv']; + 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/DISFA/Script_HOG_SVM_train_dyn.m b/matlab_version/AU_training/experiments/DISFA/Script_HOG_SVM_train_dyn.m index 60887f9..2b1e4e1 100644 --- a/matlab_version/AU_training/experiments/DISFA/Script_HOG_SVM_train_dyn.m +++ b/matlab_version/AU_training/experiments/DISFA/Script_HOG_SVM_train_dyn.m @@ -30,7 +30,7 @@ for a=1:numel(aus) [users_train, users_valid] = get_balanced_fold(DISFA_dir, users, au, 1/3, 1); % need to split the rest - [train_samples, train_labels, valid_samples, valid_labels, ~, PC, means, scaling, valid_ids, valid_success] = Prepare_HOG_AU_data_generic_dynamic(users_train, users_valid, au, rest_aus, hog_data_dir); + [train_samples, train_labels, valid_samples, valid_labels, ~, PC, means, scaling, valid_ids, valid_success] = Prepare_HOG_AU_data_generic_dynamic(users_train, users_valid, au, rest_aus, DISFA_dir, hog_data_dir); train_labels(train_labels > 1) = 1; valid_labels(valid_labels > 1) = 1; diff --git a/matlab_version/AU_training/experiments/DISFA/Script_HOG_SVM_train_stat.m b/matlab_version/AU_training/experiments/DISFA/Script_HOG_SVM_train_stat.m index 638c6d3..c946caa 100644 --- a/matlab_version/AU_training/experiments/DISFA/Script_HOG_SVM_train_stat.m +++ b/matlab_version/AU_training/experiments/DISFA/Script_HOG_SVM_train_stat.m @@ -30,7 +30,7 @@ for a=1:numel(aus) [users_train, users_valid] = get_balanced_fold(DISFA_dir, users, au, 1/3, 1); % need to split the rest - [train_samples, train_labels, valid_samples, valid_labels, ~, PC, means, scaling, valid_ids, valid_success] = Prepare_HOG_AU_data_generic(users_train, users_valid, au, rest_aus, hog_data_dir); + [train_samples, train_labels, valid_samples, valid_labels, ~, PC, means, scaling, valid_ids, valid_success] = Prepare_HOG_AU_data_generic(users_train, users_valid, au, rest_aus, DISFA_dir, hog_data_dir); train_labels(train_labels > 1) = 1; valid_labels(valid_labels > 1) = 1; diff --git a/matlab_version/AU_training/experiments/DISFA/Script_HOG_SVR_train_dyn_5_fold_shift.m b/matlab_version/AU_training/experiments/DISFA/Script_HOG_SVR_train_dyn_5_fold_shift.m index 6a3603d..9c405e8 100644 --- a/matlab_version/AU_training/experiments/DISFA/Script_HOG_SVR_train_dyn_5_fold_shift.m +++ b/matlab_version/AU_training/experiments/DISFA/Script_HOG_SVR_train_dyn_5_fold_shift.m @@ -36,7 +36,7 @@ for a=1:numel(aus) rest_aus = setdiff(all_aus, au); % load the training and testing data for the current fold - [~, ~, test_samples, test_labels, ~, ~, ~, ~, test_ids, test_success] = Prepare_HOG_AU_data_generic_dynamic({}, test_folds{t}, au, rest_aus, hog_data_dir); + [~, ~, test_samples, test_labels, ~, ~, ~, ~, test_ids, test_success] = Prepare_HOG_AU_data_generic_dynamic({}, test_folds{t}, au, rest_aus, DISFA_dir, hog_data_dir); % create the training and validation data users_train = setdiff(users, unique(test_ids)); @@ -44,7 +44,7 @@ for a=1:numel(aus) [users_train, users_valid] = get_balanced_fold(DISFA_dir, users_train, au, 1/4, 1); % need to split the rest - [train_samples, train_labels, valid_samples, valid_labels, ~, PC, means, scaling, valid_ids, valid_success] = Prepare_HOG_AU_data_generic_dynamic(users_train, users_valid, au, rest_aus, hog_data_dir); + [train_samples, train_labels, valid_samples, valid_labels, ~, PC, means, scaling, valid_ids, valid_success] = Prepare_HOG_AU_data_generic_dynamic(users_train, users_valid, au, rest_aus, DISFA_dir, hog_data_dir); train_samples = sparse(train_samples); valid_samples = sparse(valid_samples); 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 84eba1e..8a06655 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 41fd362..d9f839f 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 78c2543..cf247e9 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 1fe9bd5..5d77809 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 7a705ac..e4fb027 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 9fe50e9..f7b9b12 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 5db9f4f..e0991ae 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 6b03f1c..60239d8 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 a35c818..36ee0d5 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 b7fb4a4..5f69280 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 10547b5..2948bd6 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 cea4d5a..f22875e 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 27c77d1..94d23b3 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 e91f6f5..c52d30f 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 742020b..1050a52 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 30f14b8..552dc5d 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 f81e393..11196ff 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 76215e0..2538bb0 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 f69b063..d3bc683 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 e6214c6..b6d53eb 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 629047a..e440ee6 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 81ae18d..88b6e20 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 76f1046..5eb6418 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 f436d98..2a07b8d 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/DISFA/shared_defs.m b/matlab_version/AU_training/experiments/DISFA/shared_defs.m index 5580dd8..0f617bc 100644 --- a/matlab_version/AU_training/experiments/DISFA/shared_defs.m +++ b/matlab_version/AU_training/experiments/DISFA/shared_defs.m @@ -24,7 +24,7 @@ else fprintf('DISFA location not found (or not defined)\n'); end -hog_data_dir = [DISFA_dir, '/hog_aligned_rigid/']; +hog_data_dir = 'E:\datasets\face_datasets_processed\disfa/'; users = {'SN001'; 'SN002';