diff --git a/matlab_runners/Feature Point Experiments/results/fps_yt.mat b/matlab_runners/Feature Point Experiments/results/fps_yt.mat index a4f6035..340269d 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 f48a216..8fd3bfc 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.0631, 0.0587 +CLM: 0.0630, 0.0586 diff --git a/matlab_runners/Feature Point Experiments/run_yt_dataset.m b/matlab_runners/Feature Point Experiments/run_yt_dataset.m index 1630faf..65bde95 100644 --- a/matlab_runners/Feature Point Experiments/run_yt_dataset.m +++ b/matlab_runners/Feature Point Experiments/run_yt_dataset.m @@ -75,20 +75,30 @@ preds_all_clm = []; gts_all = []; for i = 1:numel(files_yt) [~, name, ~] = fileparts(files_yt(i).name); - pred_landmarks = dlmread([d_loc, files_yt(i).name], ',', 1, 0); - pred_landmarks = pred_landmarks(:,5:end); + + fname = [d_loc, files_yt(i).name]; + if(i == 1) + % First read in the column names + tab = readtable(fname); + column_names = tab.Properties.VariableNames; + + confidence_id = cellfun(@(x) ~isempty(x) && x==1, strfind(column_names, 'confidence')); + x_ids = cellfun(@(x) ~isempty(x) && x==1, strfind(column_names, 'x_')); + y_ids = cellfun(@(x) ~isempty(x) && x==1, strfind(column_names, 'y_')); + end + + all_params = dlmread(fname, ',', 1, 0); - xs = pred_landmarks(:, 1:end/2); - ys = pred_landmarks(:, end/2+1:end); + xs = all_params(:, x_ids); + ys = all_params(:, y_ids); pred_landmarks = zeros([size(xs,2), 2, size(xs,1)]); pred_landmarks(:,1,:) = xs'; pred_landmarks(:,2,:) = ys'; - pred_landmarks_clm = dlmread([d_loc_clm, files_yt(i).name], ',', 1, 0); - pred_landmarks_clm = pred_landmarks_clm(:,5:end); + all_params = dlmread([d_loc_clm, files_yt(i).name], ',', 1, 0); - xs = pred_landmarks_clm(:, 1:end/2); - ys = pred_landmarks_clm(:, end/2+1:end); + xs = all_params(:, x_ids); + ys = all_params(:, y_ids); pred_landmarks_clm = zeros([size(xs,2), 2, size(xs,1)]); pred_landmarks_clm(:,1,:) = xs'; pred_landmarks_clm(:,2,:) = ys'; diff --git a/matlab_runners/Gaze Experiments/mpii_1500_errs.mat b/matlab_runners/Gaze Experiments/mpii_1500_errs.mat index 2f6b97e..65d3b63 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 99b3432..9cd6e06 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.428, 8.611 +9.431, 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 72ddab2..5e8179b 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