diff --git a/matlab_version/experiments_300W/Script_CLNF_general.m b/matlab_version/experiments_300W/Script_CLNF_general.m index ba0f85ff..08cf6d1b 100644 --- a/matlab_version/experiments_300W/Script_CLNF_general.m +++ b/matlab_version/experiments_300W/Script_CLNF_general.m @@ -70,8 +70,6 @@ num_points = numel(M)/3; 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); -all_lmark_lhoods = zeros(num_points, numel(images)); -all_views_used = zeros(numel(images),1); % Use the multi-hypothesis model, as bounding box tells nothing about % orientation @@ -99,22 +97,17 @@ for i=1:numel(images) shapes = zeros(num_points, 2, size(views,1)); ls = zeros(size(views,1),1); - lmark_lhoods = zeros(num_points,size(views,1)); - views_used = zeros(num_points,size(views,1)); % Find the best orientation for v = 1:size(views,1) - [shapes(:,:,v),~,~,ls(v),lmark_lhoods(:,v),views_used(v)] = Fitting_from_bb(image, [], bbox, pdm, patches, clmParams, 'orientation', views(v,:)); + [shapes(:,:,v),~,~,ls(v)] = Fitting_from_bb(image, [], bbox, pdm, patches, clmParams, 'orientation', views(v,:)); end [lhood, v_ind] = max(ls); - lmark_lhood = lmark_lhoods(:,v_ind); - shape = shapes(:,:,v_ind); - view_used = views_used(v); else - [shape,~,~,lhood,lmark_lhood,view_used] = Fitting_from_bb(image, [], bbox, pdm, patches, clmParams); + [shape,~,~,lhood] = Fitting_from_bb(image, [], bbox, pdm, patches, clmParams); end % Perform inner face fitting @@ -135,9 +128,6 @@ for i=1:numel(images) [ ~, ~, ~, ~, ~, ~, shape_fit] = fit_PDM_ortho_proj_to_2D_no_reg(pdm.M, pdm.E, pdm.V, shape); - all_lmark_lhoods(:,i) = lmark_lhood; - all_views_used(i) = view_used; - shapes_all(:,:,i) = shape_fit; else shapes_all(:,:,i) = shape; @@ -150,7 +140,6 @@ for i=1:numel(images) lhoods(i) = lhood; - if(output_img) v_points = sum(squeeze(labels(i,:,:)),2) > 0; DrawFaceOnImg(image_orig, shape, sprintf('%s/%s%d.jpg', output_root, 'fit', i), bbox, v_points); @@ -168,8 +157,6 @@ experiment.errors_normed = compute_error(labels_all, shapes_all + 1.0); experiment.lhoods = lhoods; experiment.shapes = shapes_all; experiment.labels = labels_all; -experiment.all_lmark_lhoods = all_lmark_lhoods; -experiment.all_views_used = all_views_used; fprintf('Done: mean normed error %.3f median normed error %.4f\n', ... mean(experiment.errors_normed), median(experiment.errors_normed)); diff --git a/matlab_version/experiments_300W/Script_CLNF_wild.m b/matlab_version/experiments_300W/Script_CLNF_wild.m index 671f4872..184cc140 100644 --- a/matlab_version/experiments_300W/Script_CLNF_wild.m +++ b/matlab_version/experiments_300W/Script_CLNF_wild.m @@ -63,8 +63,6 @@ num_points = numel(M)/3; 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); -all_lmark_lhoods = zeros(num_points, numel(images)); -all_views_used = zeros(numel(images),1); % Use the multi-hypothesis model, as bounding box tells nothing about % orientation @@ -92,22 +90,17 @@ for i=1:numel(images) shapes = zeros(num_points, 2, size(views,1)); ls = zeros(size(views,1),1); - lmark_lhoods = zeros(num_points,size(views,1)); - views_used = zeros(num_points,size(views,1)); % Find the best orientation for v = 1:size(views,1) - [shapes(:,:,v),~,~,ls(v),lmark_lhoods(:,v),views_used(v)] = Fitting_from_bb(image, [], bbox, pdm, patches, clmParams, 'orientation', views(v,:)); + [shapes(:,:,v),~,~,ls(v)] = Fitting_from_bb(image, [], bbox, pdm, patches, clmParams, 'orientation', views(v,:)); end [lhood, v_ind] = max(ls); - lmark_lhood = lmark_lhoods(:,v_ind); - shape = shapes(:,:,v_ind); - view_used = views_used(v); else - [shape,~,~,lhood,lmark_lhood,view_used] = Fitting_from_bb(image, [], bbox, pdm, patches, clmParams); + [shape,~,~,lhood] = Fitting_from_bb(image, [], bbox, pdm, patches, clmParams); end shapes_all(:,:,i) = shape; @@ -138,8 +131,6 @@ experiment.errors_normed = compute_error(labels_all, shapes_all + 1.0); experiment.lhoods = lhoods; experiment.shapes = shapes_all; experiment.labels = labels_all; -experiment.all_lmark_lhoods = all_lmark_lhoods; -experiment.all_views_used = all_views_used; fprintf('Done: mean normed error %.3f median normed error %.4f\n', ... mean(experiment.errors_normed), median(experiment.errors_normed)); diff --git a/matlab_version/experiments_JANUS/Script_CLNF_general.m b/matlab_version/experiments_JANUS/Script_CLNF_general.m index 96562a6d..fd49124a 100644 --- a/matlab_version/experiments_JANUS/Script_CLNF_general.m +++ b/matlab_version/experiments_JANUS/Script_CLNF_general.m @@ -53,8 +53,6 @@ num_points = numel(M)/3; 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); -all_lmark_lhoods = zeros(num_points, numel(images)); -all_views_used = zeros(numel(images),1); % Use the multi-hypothesis model, as bounding box tells nothing about % orientation @@ -81,22 +79,18 @@ for i=1:numel(images) shapes = zeros(num_points, 2, size(views,1)); ls = zeros(size(views,1),1); - lmark_lhoods = zeros(num_points,size(views,1)); - views_used = zeros(num_points,size(views,1)); % Find the best orientation for v = 1:size(views,1) - [shapes(:,:,v),~,~,ls(v),lmark_lhoods(:,v),views_used(v)] = Fitting_from_bb(image, [], bbox, pdm, patches, clmParams, 'orientation', views(v,:)); + [shapes(:,:,v),~,~,ls(v)] = Fitting_from_bb(image, [], bbox, pdm, patches, clmParams, 'orientation', views(v,:)); end [lhood, v_ind] = max(ls); - lmark_lhood = lmark_lhoods(:,v_ind); shape = shapes(:,:,v_ind); - view_used = views_used(v); else - [shape,~,~,lhood,lmark_lhood,view_used] = Fitting_from_bb(image, [], bbox, pdm, patches, clmParams); + [shape,~,~,lhood] = Fitting_from_bb(image, [], bbox, pdm, patches, clmParams); end % Perform inner face fitting @@ -117,9 +111,6 @@ for i=1:numel(images) [ ~, ~, ~, ~, ~, ~, shape_fit] = fit_PDM_ortho_proj_to_2D_no_reg(pdm.M, pdm.E, pdm.V, shape); - all_lmark_lhoods(:,i) = lmark_lhood; - all_views_used(i) = view_used; - shapes_all(:,:,i) = shape_fit; else shapes_all(:,:,i) = shape; @@ -144,8 +135,6 @@ experiment.errors_normed = compute_error(labels_all, shapes_all - 1.0); experiment.lhoods = lhoods; experiment.shapes = shapes_all; experiment.labels = labels_all; -experiment.all_lmark_lhoods = all_lmark_lhoods; -experiment.all_views_used = all_views_used; fprintf('Done: mean normed error %.3f median normed error %.4f\n', ... mean(experiment.errors_normed), median(experiment.errors_normed)); diff --git a/matlab_version/experiments_JANUS/Script_CLNF_wild.m b/matlab_version/experiments_JANUS/Script_CLNF_wild.m index dd145e25..e6e9ea19 100644 --- a/matlab_version/experiments_JANUS/Script_CLNF_wild.m +++ b/matlab_version/experiments_JANUS/Script_CLNF_wild.m @@ -46,8 +46,6 @@ num_points = numel(M)/3; 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); -all_lmark_lhoods = zeros(num_points, numel(images)); -all_views_used = zeros(numel(images),1); % Use the multi-hypothesis model, as bounding box tells nothing about % orientation @@ -74,22 +72,17 @@ for i=1:numel(images) shapes = zeros(num_points, 2, size(views,1)); ls = zeros(size(views,1),1); - lmark_lhoods = zeros(num_points,size(views,1)); - views_used = zeros(num_points,size(views,1)); % Find the best orientation for v = 1:size(views,1) - [shapes(:,:,v),~,~,ls(v),lmark_lhoods(:,v),views_used(v)] = Fitting_from_bb(image, [], bbox, pdm, patches, clmParams, 'orientation', views(v,:)); + [shapes(:,:,v),~,~,ls(v)] = Fitting_from_bb(image, [], bbox, pdm, patches, clmParams, 'orientation', views(v,:)); end [lhood, v_ind] = max(ls); - lmark_lhood = lmark_lhoods(:,v_ind); - shape = shapes(:,:,v_ind); - view_used = views_used(v); else - [shape,~,~,lhood,lmark_lhood,view_used] = Fitting_from_bb(image, [], bbox, pdm, patches, clmParams); + [shape,~,~,lhood] = Fitting_from_bb(image, [], bbox, pdm, patches, clmParams); end shapes_all(:,:,i) = shape; labels_all(:,:,i) = labels(i,:,:); @@ -112,8 +105,6 @@ experiment.errors_normed = compute_error(labels_all, shapes_all - 1.0); experiment.lhoods = lhoods; experiment.shapes = shapes_all; experiment.labels = labels_all; -experiment.all_lmark_lhoods = all_lmark_lhoods; -experiment.all_views_used = all_views_used; fprintf('Done: mean normed error %.3f median normed error %.4f\n', ... mean(experiment.errors_normed), median(experiment.errors_normed)); diff --git a/matlab_version/experiments_JANUS/results/Janus-full.pdf b/matlab_version/experiments_JANUS/results/Janus-full.pdf index ea4c028a..d7a968a8 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 86c7372f..c6d03384 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 303818bc..d3c7de6e 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 5a7eef16..4467c226 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_clnf_general.mat b/matlab_version/experiments_JANUS/results/results_clnf_general.mat index f673280f..a22175c9 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 d599ff34..ea76c468 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