diff --git a/matlab_runners/Demos/feature_extraction_demo_img_seq.m b/matlab_runners/Demos/feature_extraction_demo_img_seq.m index aff1b73..cead4ab 100644 --- a/matlab_runners/Demos/feature_extraction_demo_img_seq.m +++ b/matlab_runners/Demos/feature_extraction_demo_img_seq.m @@ -124,7 +124,7 @@ title('Pose (rotation and translation)'); xlabel('Time (s)'); %% Output HOG files -[hog_data, valid_inds, vid_id] = Read_HOG_files({name}, output); +[hog_data, valid_inds] = Read_HOG_file([output, '/', name, '.hog']); %% Output aligned images img_files = dir([outputDir_aligned, '/*.png']); 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 c937405..90df65c 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/run_clm_feature_point_tests_wild.m b/matlab_runners/Feature Point Experiments/run_clm_feature_point_tests_wild.m index 0587666..fa83b1e 100644 --- a/matlab_runners/Feature Point Experiments/run_clm_feature_point_tests_wild.m +++ b/matlab_runners/Feature Point Experiments/run_clm_feature_point_tests_wild.m @@ -149,7 +149,7 @@ hold on; % Make it look nice and print to a pdf set(gca,'xtick',[0:0.05:0.15]) xlim([0,0.15]); -xlabel('Size normalised shape RMS error','FontName','Helvetica'); +xlabel('Size normalised shape error','FontName','Helvetica'); ylabel('Proportion of images','FontName','Helvetica'); grid on legend('show', 'Location', 'SouthEast'); diff --git a/matlab_runners/Feature Point Experiments/run_yt_dataset.m b/matlab_runners/Feature Point Experiments/run_yt_dataset.m index aeca5b8..71c7400 100644 --- a/matlab_runners/Feature Point Experiments/run_yt_dataset.m +++ b/matlab_runners/Feature Point Experiments/run_yt_dataset.m @@ -14,7 +14,7 @@ else database_root = 'D:/Dropbox/Dropbox/AAM/test data/'; end -database_root = [database_root, '/ytceleb_annotations_CVPR2014/']; +database_root = [database_root, '/ytceleb/']; in_vids = dir([database_root '/*.avi']); diff --git a/matlab_version/experiments_iccv_300w/Display_clnf_results.m b/matlab_version/experiments_iccv_300w/Display_clnf_results.m index 66597cd..dacdfca 100644 --- a/matlab_version/experiments_iccv_300w/Display_clnf_results.m +++ b/matlab_version/experiments_iccv_300w/Display_clnf_results.m @@ -96,7 +96,7 @@ plot(error_x, error_y, '-.k','DisplayName', 'DRMF (CVPR 13)', 'LineWidth',line_w set(gca,'xtick',[0:0.05:0.15]) xlim([0,0.15]); -xlabel('Size normalised shape RMS error','FontName','Helvetica'); +xlabel('IOD normalised shape error','FontName','Helvetica'); ylabel('Proportion of images','FontName','Helvetica'); grid on % title('Fitting in the wild without outline','FontSize',60,'FontName','Helvetica'); @@ -171,7 +171,7 @@ plot(error_x, error_y, '-.k','DisplayName', 'DRMF', 'LineWidth',line_width); set(gca,'xtick',[0:0.05:0.15]) xlim([0,0.15]); -xlabel('Size normalised shape RMS error','FontName','Helvetica'); +xlabel('IOD normalised shape error','FontName','Helvetica'); ylabel('Proportion of images','FontName','Helvetica'); grid on %title('Fitting in the wild','FontSize',60,'FontName','Helvetica'); diff --git a/matlab_version/experiments_iccv_300w/Display_clnf_results_per_db.m b/matlab_version/experiments_iccv_300w/Display_clnf_results_per_db.m index c400c60..f08cbd5 100644 --- a/matlab_version/experiments_iccv_300w/Display_clnf_results_per_db.m +++ b/matlab_version/experiments_iccv_300w/Display_clnf_results_per_db.m @@ -72,7 +72,7 @@ plot(error_x, error_y, '-.k','DisplayName', 'DRMF [27]', 'LineWidth',line_width) set(gca,'xtick',[0:0.05:0.15]) xlim([0,0.15]); -xlabel('Size normalised shape RMS error','FontName','Helvetica'); +xlabel('IOD normalised shape error','FontName','Helvetica'); ylabel('Proportion of images','FontName','Helvetica'); grid on % title('Fitting in the wild without outline','FontSize',60,'FontName','Helvetica'); @@ -154,7 +154,7 @@ plot(error_x, error_y, '-.k','DisplayName', 'DRMF [27]', 'LineWidth',line_width) set(gca,'xtick',[0:0.05:0.15]) xlim([0,0.15]); -xlabel('Size normalised shape RMS error','FontName','Helvetica'); +xlabel('IOD normalised shape error','FontName','Helvetica'); ylabel('Proportion of images','FontName','Helvetica'); grid on % title('Fitting in the wild without outline','FontSize',60,'FontName','Helvetica'); @@ -236,7 +236,7 @@ plot(error_x, error_y, '-.k','DisplayName', 'DRMF [27]', 'LineWidth',line_width) set(gca,'xtick',[0:0.05:0.15]) xlim([0,0.15]); -xlabel('Size normalised shape RMS error','FontName','Helvetica'); +xlabel('IOD normalised shape error','FontName','Helvetica'); ylabel('Proportion of images','FontName','Helvetica'); grid on % title('Fitting in the wild without outline','FontSize',60,'FontName','Helvetica'); diff --git a/matlab_version/experiments_iccv_300w/results/in-the-wild-clnf-no-outline.pdf b/matlab_version/experiments_iccv_300w/results/in-the-wild-clnf-no-outline.pdf index 1700bcb..27dc17e 100644 Binary files a/matlab_version/experiments_iccv_300w/results/in-the-wild-clnf-no-outline.pdf and b/matlab_version/experiments_iccv_300w/results/in-the-wild-clnf-no-outline.pdf differ diff --git a/matlab_version/experiments_iccv_300w/results/in-the-wild-clnf-no-outline_afw.pdf b/matlab_version/experiments_iccv_300w/results/in-the-wild-clnf-no-outline_afw.pdf index 5a52f55..1be7a07 100644 Binary files a/matlab_version/experiments_iccv_300w/results/in-the-wild-clnf-no-outline_afw.pdf and b/matlab_version/experiments_iccv_300w/results/in-the-wild-clnf-no-outline_afw.pdf differ diff --git a/matlab_version/experiments_iccv_300w/results/in-the-wild-clnf-no-outline_ibug.pdf b/matlab_version/experiments_iccv_300w/results/in-the-wild-clnf-no-outline_ibug.pdf index 85ab25b..f634b63 100644 Binary files a/matlab_version/experiments_iccv_300w/results/in-the-wild-clnf-no-outline_ibug.pdf and b/matlab_version/experiments_iccv_300w/results/in-the-wild-clnf-no-outline_ibug.pdf differ diff --git a/matlab_version/experiments_iccv_300w/results/in-the-wild-clnf-no-outline_lfpw_helen.pdf b/matlab_version/experiments_iccv_300w/results/in-the-wild-clnf-no-outline_lfpw_helen.pdf index aaf35a4..835d3e0 100644 Binary files a/matlab_version/experiments_iccv_300w/results/in-the-wild-clnf-no-outline_lfpw_helen.pdf and b/matlab_version/experiments_iccv_300w/results/in-the-wild-clnf-no-outline_lfpw_helen.pdf differ diff --git a/matlab_version/experiments_iccv_300w/results/in-the-wild-comparison.pdf b/matlab_version/experiments_iccv_300w/results/in-the-wild-comparison.pdf index e144d7d..32f5ecf 100644 Binary files a/matlab_version/experiments_iccv_300w/results/in-the-wild-comparison.pdf and b/matlab_version/experiments_iccv_300w/results/in-the-wild-comparison.pdf differ diff --git a/matlab_version/experiments_in_the_wild/Display_clnf_results_general.m b/matlab_version/experiments_in_the_wild/Display_clnf_results_general.m index fb41ee9..d3197f6 100644 --- a/matlab_version/experiments_in_the_wild/Display_clnf_results_general.m +++ b/matlab_version/experiments_in_the_wild/Display_clnf_results_general.m @@ -54,7 +54,7 @@ plot(error_x, error_y, 'r','DisplayName', 'OpenFace', 'LineWidth',line_width); set(gca,'xtick',[0:0.02:0.06]) xlim([0,0.08]); -xlabel('Size normalised shape RMS error','FontName','Helvetica'); +xlabel('IOD normalised shape error','FontName','Helvetica'); ylabel('Proportion of images','FontName','Helvetica'); grid on % title('Fitting in the wild without outline','FontSize',60,'FontName','Helvetica'); @@ -108,7 +108,7 @@ plot(error_x, error_y, 'r','DisplayName', 'CLNF hierarch', 'LineWidth',line_widt set(gca,'xtick',[0:0.02:0.08]) xlim([0,0.08]); -xlabel('Size normalised shape RMS error','FontName','Times New Roman'); +xlabel('IOD normalised shape error','FontName','Times New Roman'); ylabel('Proportion of images','FontName','Times New Roman'); grid on title('Fitting in the wild with outline','FontSize',60,'FontName','Times New Roman');