diff --git a/.gitignore b/.gitignore index e99e33cd..a3898fa0 100644 --- a/.gitignore +++ b/.gitignore @@ -95,3 +95,5 @@ matlab_version/experiments_300VW/CLNF_res_2/ matlab_version/experiments_300VW/CECLM_res_menpo/ matlab_version/experiments_300VW/CLNF_res_general/ matlab_version/experiments_300VW/CECLM_res_general/ +matlab_version/experiments_300VW/CECLM_res_general_mtcnn/ +matlab_version/experiments_300VW/CLNF_res_general_mtcnn/ diff --git a/matlab_version/experiments_300VW/CECLM_300VW_general.m b/matlab_version/experiments_300VW/CECLM_300VW_general.m index 86e1e901..465cd851 100644 --- a/matlab_version/experiments_300VW/CECLM_300VW_general.m +++ b/matlab_version/experiments_300VW/CECLM_300VW_general.m @@ -3,9 +3,13 @@ addpath(genpath('../')); output_dir = './CECLM_res_general/'; +if(~exist(output_dir, 'dir')) + mkdir(output_dir) +end + %% select database and load bb initializations db_root = 'D:\Datasets\300VW_Dataset_2015_12_14\300VW_Dataset_2015_12_14/'; -bb_root = '../..//matlab_runners/Feature Point Experiments/300VW_face_dets/'; +bb_root = './300VW_dets_mtcnn/'; extra_dir = 'D:\Datasets\300VW_Dataset_2015_12_14\extra'; [ vid_locs, bboxes, gts_all, invalid_frames ] = CollectTestData(db_root, bb_root, extra_dir); diff --git a/matlab_version/experiments_300VW/CECLM_300VW_menpo.m b/matlab_version/experiments_300VW/CECLM_300VW_menpo.m index 900ed15c..8cd45b05 100644 --- a/matlab_version/experiments_300VW/CECLM_300VW_menpo.m +++ b/matlab_version/experiments_300VW/CECLM_300VW_menpo.m @@ -5,7 +5,7 @@ output_dir = './CECLM_res_menpo/'; %% select database and load bb initializations db_root = 'D:\Datasets\300VW_Dataset_2015_12_14\300VW_Dataset_2015_12_14/'; -bb_root = '../..//matlab_runners/Feature Point Experiments/300VW_face_dets/'; +bb_root = './300VW_dets_mtcnn/'; extra_dir = 'D:\Datasets\300VW_Dataset_2015_12_14\extra'; [ vid_locs, bboxes, gts_all, invalid_frames ] = CollectTestData(db_root, bb_root, extra_dir); diff --git a/matlab_version/experiments_300VW/CLM_300VW.m b/matlab_version/experiments_300VW/CLM_300VW.m index 3846c06a..6e7fcdde 100644 --- a/matlab_version/experiments_300VW/CLM_300VW.m +++ b/matlab_version/experiments_300VW/CLM_300VW.m @@ -5,7 +5,7 @@ output_dir = './CLM_res/'; %% select database and load bb initializations db_root = 'D:\Datasets\300VW_Dataset_2015_12_14\300VW_Dataset_2015_12_14/'; -bb_root = '../..//matlab_runners/Feature Point Experiments/300VW_face_dets/'; +bb_root = './300VW_dets_mtcnn/'; extra_dir = 'D:\Datasets\300VW_Dataset_2015_12_14\extra'; [ vid_locs, bboxes, gts_all, invalid_frames ] = CollectTestData(db_root, bb_root, extra_dir); diff --git a/matlab_version/experiments_300VW/CLNF_300VW_general.m b/matlab_version/experiments_300VW/CLNF_300VW_general.m index c18a7a4f..f88d3aed 100644 --- a/matlab_version/experiments_300VW/CLNF_300VW_general.m +++ b/matlab_version/experiments_300VW/CLNF_300VW_general.m @@ -3,9 +3,13 @@ addpath(genpath('../')); output_dir = './CLNF_res_general/'; +if(~exist(output_dir, 'dir')) + mkdir(output_dir) +end + %% select database and load bb initializations db_root = 'D:\Datasets\300VW_Dataset_2015_12_14\300VW_Dataset_2015_12_14/'; -bb_root = '../..//matlab_runners/Feature Point Experiments/300VW_face_dets/'; +bb_root = './300VW_dets_mtcnn/'; extra_dir = 'D:\Datasets\300VW_Dataset_2015_12_14\extra'; [ vid_locs, bboxes, gts_all, invalid_frames ] = CollectTestData(db_root, bb_root, extra_dir); diff --git a/matlab_version/experiments_300VW/Construct_error_table.m b/matlab_version/experiments_300VW/Construct_error_table.m index ab35a357..72e65a2a 100644 --- a/matlab_version/experiments_300VW/Construct_error_table.m +++ b/matlab_version/experiments_300VW/Construct_error_table.m @@ -4,6 +4,7 @@ file_out = fopen('results/300VW_66.txt', 'w'); load('results/ceclm_errors.mat'); load('results/cfss_errors.mat'); load('results/clnf_errors.mat'); +load('results/cfan_errors.mat'); load('results/drmf_errors.mat'); load('results/iccr_errors.mat'); load('results/pocr_errors.mat'); @@ -14,6 +15,7 @@ fprintf(file_out, 'Method\tcat 1\tcat 2\tcat3\n'); fprintf(file_out, 'CLNF\t%.2f\t%.2f\t%.2f\n', median(clnf_error_66_cat_1)*100, median(clnf_error_66_cat_2)*100, median(clnf_error_66_cat_3)*100); fprintf(file_out, 'CFSS\t%.2f\t%.2f\t%.2f\n', median(cfss_error_66_cat_1)*100, median(cfss_error_66_cat_2)*100, median(cfss_error_66_cat_3)*100); fprintf(file_out, 'ICCR\t%.2f\t%.2f\t%.2f\n', median(iccr_error_66_cat_1)*100, median(iccr_error_66_cat_2)*100, median(iccr_error_66_cat_3)*100); +fprintf(file_out, 'CFAN\t%.2f\t%.2f\t%.2f\n', median(cfan_error_66_cat_1)*100, median(cfan_error_66_cat_2)*100, median(cfan_error_66_cat_3)*100); fprintf(file_out, '------------------------------\n'); fprintf(file_out, 'CE-CLM\t%.2f\t%.2f\t%.2f\n', median(ceclm_error_66_cat_1)*100, median(ceclm_error_66_cat_2)*100, median(ceclm_error_66_cat_3)*100); fclose(file_out); @@ -28,6 +30,7 @@ fprintf(file_out, 'CFSS\t%.2f\t%.2f\t%.2f\n', median(cfss_error_49_cat_1)*100, m fprintf(file_out, 'ICCR\t%.2f\t%.2f\t%.2f\n', median(iccr_error_49_cat_1)*100, median(iccr_error_49_cat_2)*100, median(iccr_error_49_cat_3)*100); fprintf(file_out, 'DRMF\t%.2f\t%.2f\t%.2f\n', median(drmf_error_49_cat_1)*100, median(drmf_error_49_cat_2)*100, median(drmf_error_49_cat_3)*100); fprintf(file_out, 'PO-CR\t%.2f\t%.2f\t%.2f\n', median(pocr_error_49_cat_1)*100, median(pocr_error_49_cat_2)*100, median(pocr_error_49_cat_3)*100); +fprintf(file_out, 'CFAN\t%.2f\t%.2f\t%.2f\n', median(cfan_error_49_cat_1)*100, median(cfan_error_49_cat_2)*100, median(cfan_error_49_cat_3)*100); fprintf(file_out, '------------------------------\n'); fprintf(file_out, 'CE-CLM\t%.2f\t%.2f\t%.2f\n', median(ceclm_error_49_cat_1)*100, median(ceclm_error_49_cat_2)*100, median(ceclm_error_49_cat_3)*100); fclose(file_out); \ No newline at end of file diff --git a/matlab_version/experiments_300VW/Display_300VW_results_49.m b/matlab_version/experiments_300VW/Display_300VW_results_49.m index bff40941..518a5ba5 100644 --- a/matlab_version/experiments_300VW/Display_300VW_results_49.m +++ b/matlab_version/experiments_300VW/Display_300VW_results_49.m @@ -25,6 +25,10 @@ load('results/clnf_errors.mat'); [error_x, error_y] = cummErrorCurve(clnf_error_49_cat_1); plot(error_x, error_y, 'DisplayName', 'CLNF', 'LineWidth',line_width); +load('results/cfan_errors.mat'); +[error_x, error_y] = cummErrorCurve(cfan_error_49_cat_1); +plot(error_x, error_y, 'DisplayName', 'CFAN', 'LineWidth',line_width); + load('results/iccr_errors.mat'); [error_x, error_y] = cummErrorCurve(iccr_error_49_cat_1); plot(error_x, error_y, 'DisplayName', 'iCCR', 'LineWidth',line_width); @@ -80,6 +84,10 @@ load('results/clnf_errors.mat'); [error_x, error_y] = cummErrorCurve(clnf_error_49_cat_2); plot(error_x, error_y, 'DisplayName', 'CLNF', 'LineWidth',line_width); +load('results/cfan_errors.mat'); +[error_x, error_y] = cummErrorCurve(cfan_error_49_cat_2); +plot(error_x, error_y, 'DisplayName', 'CFAN', 'LineWidth',line_width); + load('results/iccr_errors.mat'); [error_x, error_y] = cummErrorCurve(iccr_error_49_cat_2); plot(error_x, error_y, 'DisplayName', 'iCCR', 'LineWidth',line_width); @@ -135,6 +143,10 @@ load('results/clnf_errors.mat'); [error_x, error_y] = cummErrorCurve(clnf_error_49_cat_3); plot(error_x, error_y, 'DisplayName', 'CLNF', 'LineWidth',line_width); +load('results/cfan_errors.mat'); +[error_x, error_y] = cummErrorCurve(cfan_error_49_cat_3); +plot(error_x, error_y, 'DisplayName', 'CFAN', 'LineWidth',line_width); + load('results/iccr_errors.mat'); [error_x, error_y] = cummErrorCurve(iccr_error_49_cat_3); plot(error_x, error_y, 'DisplayName', 'iCCR', 'LineWidth',line_width); diff --git a/matlab_version/experiments_300VW/Display_300VW_results_66.m b/matlab_version/experiments_300VW/Display_300VW_results_66.m index 8e3cc79d..aa246d56 100644 --- a/matlab_version/experiments_300VW/Display_300VW_results_66.m +++ b/matlab_version/experiments_300VW/Display_300VW_results_66.m @@ -25,6 +25,10 @@ load('results/clnf_errors.mat'); [error_x, error_y] = cummErrorCurve(clnf_error_66_cat_1); plot(error_x, error_y, 'DisplayName', 'CLNF', 'LineWidth',line_width); +load('results/cfan_errors.mat'); +[error_x, error_y] = cummErrorCurve(cfan_error_66_cat_1); +plot(error_x, error_y, 'DisplayName', 'CFAN', 'LineWidth',line_width); + load('results/iccr_errors.mat'); [error_x, error_y] = cummErrorCurve(iccr_error_66_cat_1); plot(error_x, error_y, 'DisplayName', 'iCCR', 'LineWidth',line_width); @@ -72,6 +76,10 @@ load('results/clnf_errors.mat'); [error_x, error_y] = cummErrorCurve(clnf_error_66_cat_2); plot(error_x, error_y, 'DisplayName', 'CLNF', 'LineWidth',line_width); +load('results/cfan_errors.mat'); +[error_x, error_y] = cummErrorCurve(cfan_error_66_cat_2); +plot(error_x, error_y, 'DisplayName', 'CFAN', 'LineWidth',line_width); + load('results/iccr_errors.mat'); [error_x, error_y] = cummErrorCurve(iccr_error_66_cat_2); plot(error_x, error_y, 'DisplayName', 'iCCR', 'LineWidth',line_width); @@ -119,6 +127,10 @@ load('results/clnf_errors.mat'); [error_x, error_y] = cummErrorCurve(clnf_error_66_cat_3); plot(error_x, error_y, 'DisplayName', 'CLNF', 'LineWidth',line_width); +load('results/cfan_errors.mat'); +[error_x, error_y] = cummErrorCurve(cfan_error_66_cat_3); +plot(error_x, error_y, 'DisplayName', 'CFAN', 'LineWidth',line_width); + load('results/iccr_errors.mat'); [error_x, error_y] = cummErrorCurve(iccr_error_66_cat_3); plot(error_x, error_y, 'DisplayName', 'iCCR', 'LineWidth',line_width); diff --git a/matlab_version/experiments_300VW/Generate_baseline_results.m b/matlab_version/experiments_300VW/Generate_baseline_results.m index 425781ba..bc5399c6 100644 --- a/matlab_version/experiments_300VW/Generate_baseline_results.m +++ b/matlab_version/experiments_300VW/Generate_baseline_results.m @@ -1,10 +1,12 @@ clear -pocr_dir = 'D:\Dropbox\Dropbox\AAM\3rd party models\PO-CR\300VW/'; +pocr_dir = 'D:\Dropbox\Dropbox\AAM\3rd party models\PO-CR\300VW_mtcnn/'; cfss_dir = 'C:\Users\tbaltrus\Documents\300W-CFSS/'; +% cfss_dir = 'D:\Dropbox\Dropbox\AAM\3rd party models\CVPR15-CFSS-master\CVPR15-CFSS-master\300VW_mtcnn/'; iccr_dir = 'D:\demo_iccr\iCCR\iCCR\out_300VW/'; -chehra_dir = 'D:\Datasets\300VW_Dataset_2015_12_14\chehra_out/'; -sdm_dir = 'D:\Datasets\300VW_Dataset_2015_12_14\sdm_out/'; +chehra_dir = 'D:\Datasets\300VW_Dataset_2015_12_14\chehra_out_mtcnn/'; +sdm_dir = 'D:\Datasets\300VW_Dataset_2015_12_14\sdm_out_mtcnn/'; +cfan_dir = 'D:\Datasets\300VW_Dataset_2015_12_14\CFAN_mtcnn/'; %% Gather predictions and ground truth cat_1 = [ 114, 124, 125, 126, 150, 158, 401, 402, 505, 506, 507, 508, 509, 510, 511, 514, 515, 518, 519, 520, 521, 522, 524, 525, 537, 538, 540, 541, 546, 547, 548]; @@ -16,6 +18,7 @@ cat_3 = [410, 411, 516, 517, 526, 528, 529, 530, 531, 533, 557, 558, 559, 562]; cfss_preds = zeros(68,2,0); iccr_preds = zeros(66,2,0); clnf_preds = zeros(68,2,0); +cfan_preds = zeros(68,2,0); sdm_preds = zeros(49,2,0); drmf_preds = zeros(49,2,0); pocr_preds = zeros(49,2,0); @@ -31,6 +34,9 @@ for i=cat_1 load([cfss_dir, num2str(i)]); cfss_preds = cat(3, cfss_preds, preds); + load([cfan_dir, num2str(i)]); + cfan_preds = cat(3, cfan_preds, preds); + load([iccr_dir, num2str(i)]); iccr_preds = cat(3, iccr_preds, pred_landmarks); @@ -45,20 +51,24 @@ end labels = labels([1:60,62:64,66:end],:,:); clnf_preds = clnf_preds([1:60,62:64,66:end],:,:); cfss_preds = cfss_preds([1:60,62:64,66:end],:,:); +cfan_preds = cfan_preds([1:60,62:64,66:end],:,:); clnf_error_66_cat_1 = compute_error(labels, clnf_preds); cfss_error_66_cat_1 = compute_error(labels, cfss_preds - 0.5); +cfan_error_66_cat_1 = compute_error(labels, cfan_preds - 1.0); iccr_error_66_cat_1 = compute_error(labels, iccr_preds); % Do the 49 point version labels = labels(18:end,:,:); clnf_preds = clnf_preds(18:end,:,:); +cfan_preds = cfan_preds(18:end,:,:); cfss_preds = cfss_preds(18:end,:,:); iccr_preds = iccr_preds(18:end,:,:); clnf_error_49_cat_1 = compute_error(labels, clnf_preds); cfss_error_49_cat_1 = compute_error(labels, cfss_preds - 0.5); +cfan_error_49_cat_1 = compute_error(labels, cfan_preds - 1.0); iccr_error_49_cat_1 = compute_error(labels, iccr_preds); drmf_error_49_cat_1 = compute_error(labels, drmf_preds-0.5); pocr_error_49_cat_1 = compute_error(labels, pocr_preds); @@ -68,6 +78,8 @@ pocr_error_49_cat_1 = compute_error(labels, pocr_preds); cfss_preds = zeros(68,2,0); iccr_preds = zeros(66,2,0); clnf_preds = zeros(68,2,0); +cfan_preds = zeros(68,2,0); +sdm_preds = zeros(49,2,0); drmf_preds = zeros(49,2,0); pocr_preds = zeros(49,2,0); @@ -82,12 +94,15 @@ for i=cat_2 load([cfss_dir, num2str(i)]); cfss_preds = cat(3, cfss_preds, preds); + load([cfan_dir, num2str(i)]); + cfan_preds = cat(3, cfan_preds, preds); + load([iccr_dir, num2str(i)]); iccr_preds = cat(3, iccr_preds, pred_landmarks); - + load([chehra_dir, num2str(i)]); - drmf_preds = cat(3, drmf_preds, preds); - + drmf_preds = cat(3, drmf_preds, preds); + load([pocr_dir, num2str(i)]); pocr_preds = cat(3, pocr_preds, preds); end @@ -96,20 +111,24 @@ end labels = labels([1:60,62:64,66:end],:,:); clnf_preds = clnf_preds([1:60,62:64,66:end],:,:); cfss_preds = cfss_preds([1:60,62:64,66:end],:,:); +cfan_preds = cfan_preds([1:60,62:64,66:end],:,:); clnf_error_66_cat_2 = compute_error(labels, clnf_preds); cfss_error_66_cat_2 = compute_error(labels, cfss_preds - 0.5); +cfan_error_66_cat_2 = compute_error(labels, cfan_preds - 1.0); iccr_error_66_cat_2 = compute_error(labels, iccr_preds); % Do the 49 point version labels = labels(18:end,:,:); clnf_preds = clnf_preds(18:end,:,:); +cfan_preds = cfan_preds(18:end,:,:); cfss_preds = cfss_preds(18:end,:,:); iccr_preds = iccr_preds(18:end,:,:); clnf_error_49_cat_2 = compute_error(labels, clnf_preds); cfss_error_49_cat_2 = compute_error(labels, cfss_preds - 0.5); +cfan_error_49_cat_2 = compute_error(labels, cfan_preds - 1.0); iccr_error_49_cat_2 = compute_error(labels, iccr_preds); drmf_error_49_cat_2 = compute_error(labels, drmf_preds-0.5); pocr_error_49_cat_2 = compute_error(labels, pocr_preds); @@ -118,6 +137,8 @@ pocr_error_49_cat_2 = compute_error(labels, pocr_preds); cfss_preds = zeros(68,2,0); iccr_preds = zeros(66,2,0); clnf_preds = zeros(68,2,0); +cfan_preds = zeros(68,2,0); +sdm_preds = zeros(49,2,0); drmf_preds = zeros(49,2,0); pocr_preds = zeros(49,2,0); @@ -132,34 +153,41 @@ for i=cat_3 load([cfss_dir, num2str(i)]); cfss_preds = cat(3, cfss_preds, preds); + load([cfan_dir, num2str(i)]); + cfan_preds = cat(3, cfan_preds, preds); + load([iccr_dir, num2str(i)]); - iccr_preds = cat(3, iccr_preds, pred_landmarks); - + iccr_preds = cat(3, iccr_preds, pred_landmarks); + load([chehra_dir, num2str(i)]); - drmf_preds = cat(3, drmf_preds, preds); + drmf_preds = cat(3, drmf_preds, preds); load([pocr_dir, num2str(i)]); - pocr_preds = cat(3, pocr_preds, preds); + pocr_preds = cat(3, pocr_preds, preds); end % As ICCR uses only 66 landmarks adapt all the others to the same format labels = labels([1:60,62:64,66:end],:,:); clnf_preds = clnf_preds([1:60,62:64,66:end],:,:); cfss_preds = cfss_preds([1:60,62:64,66:end],:,:); +cfan_preds = cfan_preds([1:60,62:64,66:end],:,:); clnf_error_66_cat_3 = compute_error(labels, clnf_preds); cfss_error_66_cat_3 = compute_error(labels, cfss_preds - 0.5); +cfan_error_66_cat_3 = compute_error(labels, cfan_preds - 1.0); iccr_error_66_cat_3 = compute_error(labels, iccr_preds); % Do the 49 point version labels = labels(18:end,:,:); clnf_preds = clnf_preds(18:end,:,:); +cfan_preds = cfan_preds(18:end,:,:); cfss_preds = cfss_preds(18:end,:,:); iccr_preds = iccr_preds(18:end,:,:); clnf_error_49_cat_3 = compute_error(labels, clnf_preds); cfss_error_49_cat_3 = compute_error(labels, cfss_preds - 0.5); +cfan_error_49_cat_3 = compute_error(labels, cfan_preds - 1.0); iccr_error_49_cat_3 = compute_error(labels, iccr_preds); drmf_error_49_cat_3 = compute_error(labels, drmf_preds-0.5); pocr_error_49_cat_3 = compute_error(labels, pocr_preds); @@ -171,6 +199,8 @@ save('results/cfss_errors', 'cfss_error_66_cat_1', 'cfss_error_66_cat_2', 'cfss_ 'cfss_error_49_cat_1', 'cfss_error_49_cat_2', 'cfss_error_49_cat_3'); save('results/iccr_errors', 'iccr_error_66_cat_1', 'iccr_error_66_cat_2', 'iccr_error_66_cat_3',... 'iccr_error_49_cat_1', 'iccr_error_49_cat_2', 'iccr_error_49_cat_3'); +save('results/cfan_errors', 'cfan_error_66_cat_1', 'cfan_error_66_cat_2', 'cfan_error_66_cat_3',... + 'cfan_error_49_cat_1', 'cfan_error_49_cat_2', 'cfan_error_49_cat_3'); save('results/drmf_errors', 'drmf_error_49_cat_1', 'drmf_error_49_cat_2', 'drmf_error_49_cat_3'); save('results/pocr_errors', 'pocr_error_49_cat_1', 'pocr_error_49_cat_2', 'pocr_error_49_cat_3'); \ No newline at end of file diff --git a/matlab_version/experiments_300VW/results/300VW_49.txt b/matlab_version/experiments_300VW/results/300VW_49.txt index f1ddc920..bcb59e65 100644 --- a/matlab_version/experiments_300VW/results/300VW_49.txt +++ b/matlab_version/experiments_300VW/results/300VW_49.txt @@ -1,10 +1,11 @@ Errors without outline (49 points) ------------------------------ Method cat 1 cat 2 cat3 -CLNF 3.01 3.40 4.06 +CLNF 3.02 3.34 4.05 CFSS 2.82 3.09 3.36 ICCR 2.68 2.94 3.49 -DRMF 3.33 3.57 5.44 -PO-CR 2.95 3.10 3.69 +DRMF 3.33 3.55 5.27 +PO-CR 2.95 3.08 3.68 +CFAN 3.17 3.72 4.94 ------------------------------ -CE-CLM 2.43 2.75 3.18 +CE-CLM 2.44 2.70 3.19 diff --git a/matlab_version/experiments_300VW/results/300VW_66.txt b/matlab_version/experiments_300VW/results/300VW_66.txt index 7199f807..faf7c16d 100644 --- a/matlab_version/experiments_300VW/results/300VW_66.txt +++ b/matlab_version/experiments_300VW/results/300VW_66.txt @@ -1,8 +1,9 @@ Errors with outline (66 points) ------------------------------ Method cat 1 cat 2 cat3 -CLNF 4.19 4.15 5.06 +CLNF 4.21 4.08 5.05 CFSS 3.42 3.66 4.22 ICCR 3.37 3.45 4.46 +CFAN 3.93 4.43 6.39 ------------------------------ -CE-CLM 3.36 3.49 4.22 +CE-CLM 3.37 3.45 4.24 diff --git a/matlab_version/experiments_300VW/results/300VWres_49_cat1.pdf b/matlab_version/experiments_300VW/results/300VWres_49_cat1.pdf index fb219821..9d8589bc 100644 Binary files a/matlab_version/experiments_300VW/results/300VWres_49_cat1.pdf and b/matlab_version/experiments_300VW/results/300VWres_49_cat1.pdf differ diff --git a/matlab_version/experiments_300VW/results/300VWres_49_cat2.pdf b/matlab_version/experiments_300VW/results/300VWres_49_cat2.pdf index b810df65..62c47f56 100644 Binary files a/matlab_version/experiments_300VW/results/300VWres_49_cat2.pdf and b/matlab_version/experiments_300VW/results/300VWres_49_cat2.pdf differ diff --git a/matlab_version/experiments_300VW/results/300VWres_49_cat3.pdf b/matlab_version/experiments_300VW/results/300VWres_49_cat3.pdf index 9ac27b60..725c5a1e 100644 Binary files a/matlab_version/experiments_300VW/results/300VWres_49_cat3.pdf and b/matlab_version/experiments_300VW/results/300VWres_49_cat3.pdf differ diff --git a/matlab_version/experiments_300VW/results/300VWres_66_cat1.pdf b/matlab_version/experiments_300VW/results/300VWres_66_cat1.pdf index 1553b25e..39cc0c21 100644 Binary files a/matlab_version/experiments_300VW/results/300VWres_66_cat1.pdf and b/matlab_version/experiments_300VW/results/300VWres_66_cat1.pdf differ diff --git a/matlab_version/experiments_300VW/results/300VWres_66_cat2.pdf b/matlab_version/experiments_300VW/results/300VWres_66_cat2.pdf index 90773bdb..d53edeb2 100644 Binary files a/matlab_version/experiments_300VW/results/300VWres_66_cat2.pdf and b/matlab_version/experiments_300VW/results/300VWres_66_cat2.pdf differ diff --git a/matlab_version/experiments_300VW/results/300VWres_66_cat3.pdf b/matlab_version/experiments_300VW/results/300VWres_66_cat3.pdf index 5eef01a1..d34cb5f5 100644 Binary files a/matlab_version/experiments_300VW/results/300VWres_66_cat3.pdf and b/matlab_version/experiments_300VW/results/300VWres_66_cat3.pdf differ diff --git a/matlab_version/experiments_300VW/results/ceclm_errors.mat b/matlab_version/experiments_300VW/results/ceclm_errors.mat index e00d8849..585849e1 100644 Binary files a/matlab_version/experiments_300VW/results/ceclm_errors.mat and b/matlab_version/experiments_300VW/results/ceclm_errors.mat differ diff --git a/matlab_version/experiments_300VW/results/cfan_errors.mat b/matlab_version/experiments_300VW/results/cfan_errors.mat new file mode 100644 index 00000000..8cb8323d Binary files /dev/null and b/matlab_version/experiments_300VW/results/cfan_errors.mat differ diff --git a/matlab_version/experiments_300VW/results/cfss_errors.mat b/matlab_version/experiments_300VW/results/cfss_errors.mat index 21633fd2..622de1a5 100644 Binary files a/matlab_version/experiments_300VW/results/cfss_errors.mat and b/matlab_version/experiments_300VW/results/cfss_errors.mat differ diff --git a/matlab_version/experiments_300VW/results/clnf_errors.mat b/matlab_version/experiments_300VW/results/clnf_errors.mat index 95178929..41892c18 100644 Binary files a/matlab_version/experiments_300VW/results/clnf_errors.mat and b/matlab_version/experiments_300VW/results/clnf_errors.mat differ diff --git a/matlab_version/experiments_300VW/results/drmf_errors.mat b/matlab_version/experiments_300VW/results/drmf_errors.mat index 8826ea2c..5f36a6d0 100644 Binary files a/matlab_version/experiments_300VW/results/drmf_errors.mat and b/matlab_version/experiments_300VW/results/drmf_errors.mat differ diff --git a/matlab_version/experiments_300VW/results/iccr_errors.mat b/matlab_version/experiments_300VW/results/iccr_errors.mat index b7fa57f1..3b5c0fa1 100644 Binary files a/matlab_version/experiments_300VW/results/iccr_errors.mat and b/matlab_version/experiments_300VW/results/iccr_errors.mat differ diff --git a/matlab_version/experiments_300VW/results/pocr_errors.mat b/matlab_version/experiments_300VW/results/pocr_errors.mat index 3921a95e..f74b1b0f 100644 Binary files a/matlab_version/experiments_300VW/results/pocr_errors.mat and b/matlab_version/experiments_300VW/results/pocr_errors.mat differ diff --git a/matlab_version/experiments_JANUS/results/Janus-full.pdf b/matlab_version/experiments_JANUS/results/Janus-full.pdf index b082d350..a724d0bb 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 a5be32ef..909d61e5 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_menpo/results/menpo-frontal_49.pdf b/matlab_version/experiments_menpo/results/menpo-frontal_49.pdf index 55a9687f..db524b6f 100644 Binary files a/matlab_version/experiments_menpo/results/menpo-frontal_49.pdf and b/matlab_version/experiments_menpo/results/menpo-frontal_49.pdf differ diff --git a/matlab_version/experiments_menpo/results/menpo-frontal_49.png b/matlab_version/experiments_menpo/results/menpo-frontal_49.png index cf75b8cc..6c16d046 100644 Binary files a/matlab_version/experiments_menpo/results/menpo-frontal_49.png and b/matlab_version/experiments_menpo/results/menpo-frontal_49.png differ diff --git a/matlab_version/experiments_menpo/results/menpo-frontal_68.pdf b/matlab_version/experiments_menpo/results/menpo-frontal_68.pdf index bd4dac6c..f6ff3c31 100644 Binary files a/matlab_version/experiments_menpo/results/menpo-frontal_68.pdf and b/matlab_version/experiments_menpo/results/menpo-frontal_68.pdf differ diff --git a/matlab_version/experiments_menpo/results/menpo-frontal_68.png b/matlab_version/experiments_menpo/results/menpo-frontal_68.png index f48a63f1..c144437d 100644 Binary files a/matlab_version/experiments_menpo/results/menpo-frontal_68.png and b/matlab_version/experiments_menpo/results/menpo-frontal_68.png differ diff --git a/matlab_version/experiments_menpo/results/menpo-profile_49.pdf b/matlab_version/experiments_menpo/results/menpo-profile_49.pdf index 8f201849..85dc2bd3 100644 Binary files a/matlab_version/experiments_menpo/results/menpo-profile_49.pdf and b/matlab_version/experiments_menpo/results/menpo-profile_49.pdf differ diff --git a/matlab_version/experiments_menpo/results/menpo-profile_49.png b/matlab_version/experiments_menpo/results/menpo-profile_49.png index aaa0c5cc..0068d208 100644 Binary files a/matlab_version/experiments_menpo/results/menpo-profile_49.png and b/matlab_version/experiments_menpo/results/menpo-profile_49.png differ diff --git a/matlab_version/experiments_menpo/results/menpo-profile_68.pdf b/matlab_version/experiments_menpo/results/menpo-profile_68.pdf index 53a784cd..d8ea016a 100644 Binary files a/matlab_version/experiments_menpo/results/menpo-profile_68.pdf and b/matlab_version/experiments_menpo/results/menpo-profile_68.pdf differ diff --git a/matlab_version/experiments_menpo/results/menpo-profile_68.png b/matlab_version/experiments_menpo/results/menpo-profile_68.png index 52e6fd5a..cdb248cf 100644 Binary files a/matlab_version/experiments_menpo/results/menpo-profile_68.png and b/matlab_version/experiments_menpo/results/menpo-profile_68.png differ diff --git a/matlab_version/experiments_menpo/results/results_ceclm_cross-data.mat b/matlab_version/experiments_menpo/results/results_ceclm_cross-data.mat index bb60d1e2..c98ae0f5 100644 Binary files a/matlab_version/experiments_menpo/results/results_ceclm_cross-data.mat and b/matlab_version/experiments_menpo/results/results_ceclm_cross-data.mat differ diff --git a/matlab_version/experiments_menpo/results/results_ceclm_menpo_valid.mat b/matlab_version/experiments_menpo/results/results_ceclm_menpo_valid.mat index 380c479a..3969acc4 100644 Binary files a/matlab_version/experiments_menpo/results/results_ceclm_menpo_valid.mat and b/matlab_version/experiments_menpo/results/results_ceclm_menpo_valid.mat differ