Work on image experiments using the new interface.
This commit is contained in:
parent
01368270be
commit
681e6b9b58
2 changed files with 10 additions and 18 deletions
|
@ -49,7 +49,7 @@ command = sprintf("%s -mloc %s -multi_view %s -2Dfp -tracked ", executable, mode
|
||||||
% TODO just landmarks + BBoxes
|
% TODO just landmarks + BBoxes
|
||||||
|
|
||||||
tic
|
tic
|
||||||
for i=1:numel(dataset_dirs)
|
parfor i=1:numel(dataset_dirs)
|
||||||
|
|
||||||
command_c = sprintf('%s -fdir "%s" -bboxdir "%s" -out_dir "%s" -wild ',...
|
command_c = sprintf('%s -fdir "%s" -bboxdir "%s" -out_dir "%s" -wild ',...
|
||||||
command, dataset_dirs{i}, dataset_dirs{i}, output_loc);
|
command, dataset_dirs{i}, dataset_dirs{i}, output_loc);
|
||||||
|
@ -83,6 +83,12 @@ shapes = zeros(68,2,num_imgs);
|
||||||
|
|
||||||
curr = 0;
|
curr = 0;
|
||||||
|
|
||||||
|
% work out which columns in the csv file are relevant
|
||||||
|
tab = readtable([landmark_det_dir, landmark_dets(1).name]);
|
||||||
|
column_names = tab.Properties.VariableNames;
|
||||||
|
landmark_inds_x = cellfun(@(x) ~isempty(x) && x==1, strfind(column_names, 'x_'));
|
||||||
|
landmark_inds_y = cellfun(@(x) ~isempty(x) && x==1, strfind(column_names, 'y_'));
|
||||||
|
|
||||||
for i=1:numel(dirs)
|
for i=1:numel(dirs)
|
||||||
|
|
||||||
|
|
||||||
|
@ -94,7 +100,9 @@ for i=1:numel(dirs)
|
||||||
gt_landmarks = dlmread([dirs{i}, gt_labels(g).name], ' ', 'A4..B71');
|
gt_landmarks = dlmread([dirs{i}, gt_labels(g).name], ' ', 'A4..B71');
|
||||||
|
|
||||||
% find the corresponding detection
|
% find the corresponding detection
|
||||||
landmark_det = dlmread([landmark_det_dir, gt_labels(g).name], ' ', 'A4..B71');
|
all_params = dlmread([landmark_det_dir, landmark_dets(g).name], ',', 1, 0);
|
||||||
|
|
||||||
|
landmark_det = [all_params(landmark_inds_x); all_params(landmark_inds_y)]';
|
||||||
|
|
||||||
labels(:,:,curr) = gt_landmarks;
|
labels(:,:,curr) = gt_landmarks;
|
||||||
|
|
||||||
|
|
|
@ -15,34 +15,18 @@ end
|
||||||
|
|
||||||
%% Run using CLNF in the wild model
|
%% Run using CLNF in the wild model
|
||||||
out_clnf = [curr_dir '/out_wild_clnf_wild/'];
|
out_clnf = [curr_dir '/out_wild_clnf_wild/'];
|
||||||
if(~exist(out_clnf, 'file'))
|
|
||||||
mkdir(out_clnf);
|
|
||||||
end
|
|
||||||
|
|
||||||
[err_clnf_wild, err_no_out_clnf_wild] = Run_OF_on_images(out_clnf, database_root, 'use_afw', 'use_lfpw', 'use_ibug', 'use_helen', 'verbose', 'model', 'model/main_clnf_wild.txt', 'multi_view', 1);
|
[err_clnf_wild, err_no_out_clnf_wild] = Run_OF_on_images(out_clnf, database_root, 'use_afw', 'use_lfpw', 'use_ibug', 'use_helen', 'verbose', 'model', 'model/main_clnf_wild.txt', 'multi_view', 1);
|
||||||
|
|
||||||
%% Run using SVR model
|
%% Run using SVR model
|
||||||
out_svr = [curr_dir '/out_wild_svr_wild/'];
|
out_svr = [curr_dir '/out_wild_svr_wild/'];
|
||||||
if(~exist(out_svr, 'file'))
|
|
||||||
mkdir(out_svr);
|
|
||||||
end
|
|
||||||
|
|
||||||
[err_svr_wild, err_no_out_svr_wild] = Run_OF_on_images(out_svr, database_root, 'use_afw', 'use_lfpw', 'use_ibug', 'use_helen', 'verbose', 'model', 'model/main_clm_wild.txt', 'multi_view', 1);
|
[err_svr_wild, err_no_out_svr_wild] = Run_OF_on_images(out_svr, database_root, 'use_afw', 'use_lfpw', 'use_ibug', 'use_helen', 'verbose', 'model', 'model/main_clm_wild.txt', 'multi_view', 1);
|
||||||
|
|
||||||
%% Run using general CLNF model
|
%% Run using general CLNF model
|
||||||
out_clnf = [curr_dir '/out_wild_clnf/'];
|
out_clnf = [curr_dir '/out_wild_clnf/'];
|
||||||
if(~exist(out_clnf, 'file'))
|
|
||||||
mkdir(out_clnf);
|
|
||||||
end
|
|
||||||
|
|
||||||
[err_clnf, err_no_out_clnf] = Run_OF_on_images(out_clnf, database_root, 'use_afw', 'use_lfpw', 'use_ibug', 'use_helen', 'verbose', 'model', 'model/main_clnf_general.txt', 'multi_view', 1);
|
[err_clnf, err_no_out_clnf] = Run_OF_on_images(out_clnf, database_root, 'use_afw', 'use_lfpw', 'use_ibug', 'use_helen', 'verbose', 'model', 'model/main_clnf_general.txt', 'multi_view', 1);
|
||||||
|
|
||||||
%% Run using SVR model
|
%% Run using SVR model
|
||||||
out_svr = [curr_dir '/out_wild_svr/'];
|
out_svr = [curr_dir '/out_wild_svr/'];
|
||||||
if(~exist(out_svr, 'file'))
|
|
||||||
mkdir(out_svr);
|
|
||||||
end
|
|
||||||
|
|
||||||
[err_svr, err_no_out_svr] = Run_OF_on_images(out_svr, database_root, 'use_afw', 'use_lfpw', 'use_ibug', 'use_helen', 'verbose', 'model', 'model/main_clm_general.txt', 'multi_view', 1);
|
[err_svr, err_no_out_svr] = Run_OF_on_images(out_svr, database_root, 'use_afw', 'use_lfpw', 'use_ibug', 'use_helen', 'verbose', 'model', 'model/main_clm_general.txt', 'multi_view', 1);
|
||||||
|
|
||||||
%%
|
%%
|
||||||
|
|
Loading…
Reference in a new issue