diff --git a/matlab_runners/Feature Point Experiments/Run_OF_on_images.m b/matlab_runners/Feature Point Experiments/Run_OF_on_images.m index 0a6ed5d..51338d0 100644 --- a/matlab_runners/Feature Point Experiments/Run_OF_on_images.m +++ b/matlab_runners/Feature Point Experiments/Run_OF_on_images.m @@ -98,7 +98,7 @@ for i=1:numel(dirs) curr = curr+1; gt_landmarks = dlmread([dirs{i}, gt_labels(g).name], ' ', 'A4..B71'); - [~, name, ~] = gt_labels(g).name; + [~, name, ~] = fileparts(gt_labels(g).name); % find the corresponding detection all_params = dlmread([landmark_det_dir, name, '.csv'], ',', 1, 0); @@ -125,8 +125,8 @@ if(size(shapes,2) == 66 && size(labels,2) == 68) shapes = shapes(inds_66,:,:); end -% Center the pixel -labels = labels - 0.5; +% Center the pixel, and convert to OCV format +labels = labels - 1.5; err_outline = compute_error(labels, shapes); diff --git a/matlab_runners/Feature Point Experiments/results/landmark_detections.txt b/matlab_runners/Feature Point Experiments/results/landmark_detections.txt index 8e69a0d..892917a 100644 --- a/matlab_runners/Feature Point Experiments/results/landmark_detections.txt +++ b/matlab_runners/Feature Point Experiments/results/landmark_detections.txt @@ -1,9 +1,9 @@ Type, mean, median -err clnf: 0.054348, 0.040034 -err clnf wild: 0.053107, 0.038525 -err svr: 0.070552, 0.050640 -err svr wild: 0.067452, 0.048706 -err clnf no out: 0.043081, 0.029782 -err clnf wild no out: 0.041386, 0.027463 -err svr no out: 0.058766, 0.038836 -err svr wild no out: 0.054020, 0.036252 +err clnf: 0.054470, 0.039988 +err clnf wild: 0.053170, 0.038478 +err svr: 0.070548, 0.050640 +err svr wild: 0.067535, 0.048706 +err clnf no out: 0.043237, 0.030025 +err clnf wild no out: 0.041457, 0.027522 +err svr no out: 0.058768, 0.038836 +err svr wild no out: 0.054166, 0.036251 diff --git a/matlab_runners/Feature Point Experiments/run_OpenFace_feature_point_tests_300W.m b/matlab_runners/Feature Point Experiments/run_OpenFace_feature_point_tests_300W.m index 5a36baa..740aa88 100644 --- a/matlab_runners/Feature Point Experiments/run_OpenFace_feature_point_tests_300W.m +++ b/matlab_runners/Feature Point Experiments/run_OpenFace_feature_point_tests_300W.m @@ -77,7 +77,7 @@ load('landmark_det_baselines/zhu_wild.mat'); load('out_wild_clnf_wild/res.mat'); for i=1:size(labels,3) - diffs = squeeze(sum(sum(bsxfun(@plus, labels_all(18:end,:,:)-0.5, - labels([18:60,62:64,66:end],:,i)),1),2)); + diffs = squeeze(sum(sum(bsxfun(@plus, labels_all(18:end,:,:)-1.5, - labels([18:60,62:64,66:end],:,i)),1),2)); inds_in_cpp = cat(1, inds_in_cpp, find(diffs == 0)); end