diff --git a/matlab_version/experiments_JANUS/Display_ceclm_results_49.m b/matlab_version/experiments_JANUS/Display_ceclm_results_49.m index 37b214bb..e82768ea 100644 --- a/matlab_version/experiments_JANUS/Display_ceclm_results_49.m +++ b/matlab_version/experiments_JANUS/Display_ceclm_results_49.m @@ -16,10 +16,10 @@ line_width = 6; hold on; [error_x, error_y] = cummErrorCurve(ceclm_error); -plot(error_x, error_y, 'r','DisplayName', 'CE-CLM', 'LineWidth',line_width); +plot(error_x, error_y, 'r','DisplayName', 'OpenFace 2.0', 'LineWidth',line_width); [error_x, error_y] = cummErrorCurve(clnf_error); -plot(error_x, error_y, 'DisplayName', 'CLNF', 'LineWidth',line_width); +plot(error_x, error_y, 'DisplayName', 'OpenFace', 'LineWidth',line_width); [error_x, error_y] = cummErrorCurve(cfss_error); plot(error_x, error_y, 'DisplayName', 'CFSS', 'LineWidth',line_width); @@ -47,7 +47,7 @@ grid on % title('Fitting in the wild without outline','FontSize',60,'FontName','Helvetica'); leg = legend('show', 'Location', 'SouthEast'); -set(leg,'FontSize',30) +set(leg,'FontSize',40) print -dpdf results/Janus-no-outline.pdf print -dpng results/Janus-no-outline.png \ No newline at end of file diff --git a/matlab_version/experiments_JANUS/Display_ceclm_results_68.m b/matlab_version/experiments_JANUS/Display_ceclm_results_68.m index 13e187d9..4c17d6a4 100644 --- a/matlab_version/experiments_JANUS/Display_ceclm_results_68.m +++ b/matlab_version/experiments_JANUS/Display_ceclm_results_68.m @@ -16,10 +16,10 @@ line_width = 6; hold on; [error_x, error_y] = cummErrorCurve(ceclm_error); -plot(error_x, error_y, 'r','DisplayName', 'CE-CLM', 'LineWidth',line_width); +plot(error_x, error_y, 'r','DisplayName', 'OpenFace 2.0', 'LineWidth',line_width); [error_x, error_y] = cummErrorCurve(clnf_error); -plot(error_x, error_y, 'DisplayName', 'CLNF', 'LineWidth',line_width); +plot(error_x, error_y, 'DisplayName', 'OpenFace', 'LineWidth',line_width); [error_x, error_y] = cummErrorCurve(cfss_error); plot(error_x, error_y, 'DisplayName', 'CFSS', 'LineWidth',line_width); @@ -41,7 +41,7 @@ grid on % title('Fitting in the wild without outline','FontSize',60,'FontName','Helvetica'); leg = legend('show', 'Location', 'SouthEast'); -set(leg,'FontSize',30) +set(leg,'FontSize',40) print -dpdf results/Janus-full.pdf print -dpng results/Janus-full.png \ No newline at end of file diff --git a/matlab_version/experiments_JANUS/Script_CECLM_general.m b/matlab_version/experiments_JANUS/Script_CECLM_general.m index e2de5843..3aec86c7 100644 --- a/matlab_version/experiments_JANUS/Script_CECLM_general.m +++ b/matlab_version/experiments_JANUS/Script_CECLM_general.m @@ -3,7 +3,7 @@ function Script_CECLM_general() addpath(genpath('../')); % Replace this with the location of the IJB-FL data location -root_test_data = 'C:\Users\Tadas Baltrusaitis\Dropbox\janus_labeled'; +root_test_data = 'F:\Dropbox\janus_labeled'; [images, detections, labels] = Collect_JANUS_imgs(root_test_data); %% loading the CE-CLM model and parameters diff --git a/matlab_version/experiments_JANUS/Script_CECLM_menpo.m b/matlab_version/experiments_JANUS/Script_CECLM_menpo.m index 25b95211..60b09cf9 100644 --- a/matlab_version/experiments_JANUS/Script_CECLM_menpo.m +++ b/matlab_version/experiments_JANUS/Script_CECLM_menpo.m @@ -3,7 +3,7 @@ function Script_CECLM_menpo() addpath(genpath('../')); % Replace this with the location of the IJB-FL data location -root_test_data = 'D:/Datasets/janus_labeled'; +root_test_data = 'F:\Dropbox\janus_labeled'; [images, detections, labels] = Collect_JANUS_imgs(root_test_data); %% loading the CE-CLM model and parameters diff --git a/matlab_version/experiments_JANUS/Script_CLNF_general.m b/matlab_version/experiments_JANUS/Script_CLNF_general.m index 10b9c2b3..de3c916b 100644 --- a/matlab_version/experiments_JANUS/Script_CLNF_general.m +++ b/matlab_version/experiments_JANUS/Script_CLNF_general.m @@ -3,7 +3,7 @@ function Script_CLNF_general() addpath(genpath('../')); % Replace this with the location of the IJB-FL data location -root_test_data = 'D:/Datasets/janus_labeled'; +root_test_data = 'F:\Dropbox\janus_labeled'; [images, detections, labels] = Collect_JANUS_imgs(root_test_data); %% loading the patch experts @@ -12,6 +12,8 @@ root_test_data = 'D:/Datasets/janus_labeled'; views = [0,0,0; 0,-30,0; 0,30,0; 0,-55,0; 0,55,0; 0,0,30; 0,0,-30; 0,-90,0; 0,90,0; 0,-70,40; 0,70,-40]; views = views * pi/180; +[ patches_51, pdm_51, clmParams_51, inds_full, inds_inner ] = Load_CLNF_inner(); + shapes_all = zeros(size(labels,2),size(labels,3), size(labels,1)); labels_all = zeros(size(labels,2),size(labels,3), size(labels,1)); lhoods = zeros(numel(images),1); @@ -33,6 +35,9 @@ for i=1:numel(images) bbox = detections(i,:); [shape,~,~,lhood,lmark_lhood,view_used] = Fitting_from_bb_multi_hyp(image, [], bbox, pdm, patches, clmParams, views); + + % Perform inner landmark fitting now + [shape, shape_inner] = Fitting_from_bb_hierarch(image, pdm, pdm_51, patches_51, clmParams_51, shape, inds_full, inds_inner); shapes_all(:,:,i) = shape; diff --git a/matlab_version/experiments_JANUS/Script_CLNF_wild.m b/matlab_version/experiments_JANUS/Script_CLNF_wild.m index ab1d4d7e..f07be186 100644 --- a/matlab_version/experiments_JANUS/Script_CLNF_wild.m +++ b/matlab_version/experiments_JANUS/Script_CLNF_wild.m @@ -3,7 +3,7 @@ function Script_CLNF_wild() addpath(genpath('../')); % Replace this with the location of the IJB-FL data location -root_test_data = 'D:/Datasets/janus_labeled'; +root_test_data = 'F:\Dropbox\janus_labeled'; [images, detections, labels] = Collect_JANUS_imgs(root_test_data); %% loading the patch experts diff --git a/matlab_version/experiments_JANUS/results/Janus-full.pdf b/matlab_version/experiments_JANUS/results/Janus-full.pdf index 33b2478f..7aeceb31 100644 Binary files a/matlab_version/experiments_JANUS/results/Janus-full.pdf and b/matlab_version/experiments_JANUS/results/Janus-full.pdf differ diff --git a/matlab_version/experiments_JANUS/results/Janus-full.png b/matlab_version/experiments_JANUS/results/Janus-full.png index 14199177..3e190fa1 100644 Binary files a/matlab_version/experiments_JANUS/results/Janus-full.png and b/matlab_version/experiments_JANUS/results/Janus-full.png differ diff --git a/matlab_version/experiments_JANUS/results/Janus-no-outline.pdf b/matlab_version/experiments_JANUS/results/Janus-no-outline.pdf index 0c6df39f..c2e5a052 100644 Binary files a/matlab_version/experiments_JANUS/results/Janus-no-outline.pdf and b/matlab_version/experiments_JANUS/results/Janus-no-outline.pdf differ diff --git a/matlab_version/experiments_JANUS/results/Janus-no-outline.png b/matlab_version/experiments_JANUS/results/Janus-no-outline.png index 97c8fd53..605a55cf 100644 Binary files a/matlab_version/experiments_JANUS/results/Janus-no-outline.png and b/matlab_version/experiments_JANUS/results/Janus-no-outline.png differ diff --git a/matlab_version/experiments_JANUS/results/results_ceclm_general.mat b/matlab_version/experiments_JANUS/results/results_ceclm_general.mat index 037a0152..6b5f643e 100644 Binary files a/matlab_version/experiments_JANUS/results/results_ceclm_general.mat and b/matlab_version/experiments_JANUS/results/results_ceclm_general.mat differ diff --git a/matlab_version/experiments_JANUS/results/results_ceclm_menpo.mat b/matlab_version/experiments_JANUS/results/results_ceclm_menpo.mat index 6c8b9d61..3cfa85e6 100644 Binary files a/matlab_version/experiments_JANUS/results/results_ceclm_menpo.mat and b/matlab_version/experiments_JANUS/results/results_ceclm_menpo.mat differ diff --git a/matlab_version/experiments_JANUS/results/results_clnf_general.mat b/matlab_version/experiments_JANUS/results/results_clnf_general.mat index a22175c9..cf5f92b4 100644 Binary files a/matlab_version/experiments_JANUS/results/results_clnf_general.mat and b/matlab_version/experiments_JANUS/results/results_clnf_general.mat differ diff --git a/matlab_version/experiments_JANUS/results/results_clnf_wild.mat b/matlab_version/experiments_JANUS/results/results_clnf_wild.mat index ea76c468..00b9e7cb 100644 Binary files a/matlab_version/experiments_JANUS/results/results_clnf_wild.mat and b/matlab_version/experiments_JANUS/results/results_clnf_wild.mat differ