Removing non-DISFA AU models and MTCNN models.

.gitignore

@@ -90,3 +90,4 @@ lib/3rdParty/CameraEnumerator/Release/
 lib/local/CppInerop/Release/
 lib/local/Utilities/Release/
 matlab_runners/Demos/processed/
+exe/releases/OpenFace_*

lib/local/FaceAnalyser/AU_predictors/AU_all_best.txt

@@ -1,35 +0,0 @@
-svm_combined/AU_1_dynamic.dat AU01
-svm_combined/AU_2_dynamic.dat AU02
-svm_combined/AU_4_static.dat AU04
-svm_combined/AU_5_static.dat AU05
-svm_combined/AU_6_static.dat AU06
-svm_combined/AU_7_static.dat AU07
-svm_combined/AU_9_dynamic.dat AU09
-svm_combined/AU_10_static.dat AU10
-svm_combined/AU_12_static.dat AU12
-svm_combined/AU_14_static.dat AU14
-svm_combined/AU_15_dynamic.dat AU15
-svm_combined/AU_17_dynamic.dat AU17
-svm_combined/AU_20_dynamic.dat AU20
-svm_combined/AU_23_static.dat AU23
-svm_combined/AU_25_dynamic.dat AU25
-svm_combined/AU_26_dynamic.dat AU26
-svm_combined/AU_28_dynamic.dat AU28
-svm_combined/AU_45_dynamic.dat AU45
-svr_combined/AU_1_dynamic_intensity_comb.dat AU01
-svr_combined/AU_2_dynamic_intensity_comb.dat AU02
-svr_combined/AU_4_static_intensity_comb.dat AU04
-svr_combined/AU_5_dynamic_intensity.dat AU05
-svr_combined/AU_6_static_intensity_comb.dat AU06
-svr_combined/AU_7_static_intensity_comb.dat AU07
-svr_combined/AU_9_dynamic_intensity.dat AU09
-svr_combined/AU_10_static_intensity_comb.dat AU10
-svr_combined/AU_12_static_intensity_comb.dat AU12
-svr_combined/AU_14_static_intensity.dat AU14
-svr_combined/AU_15_dynamic_intensity_comb.dat AU15
-svr_combined/AU_17_dynamic_intensity_comb.dat AU17
-svr_combined/AU_20_dynamic_intensity.dat AU20
-svr_combined/AU_23_dynamic_intensity_comb.dat AU23
-svr_combined/AU_25_dynamic_intensity_comb.dat AU25
-svr_combined/AU_26_dynamic_intensity_comb.dat AU26
-svr_combined/AU_45_dynamic_intensity_comb.dat AU45

lib/local/FaceAnalyser/AU_predictors/AU_all_static.txt

@@ -1,35 +0,0 @@
-svm_combined/AU_1_static.dat AU01
-svm_combined/AU_2_static.dat AU02
-svm_combined/AU_4_static.dat AU04
-svm_combined/AU_5_static.dat AU05
-svm_combined/AU_6_static.dat AU06
-svm_combined/AU_7_static.dat AU07
-svm_combined/AU_9_static.dat AU09
-svm_combined/AU_10_static.dat AU10
-svm_combined/AU_12_static.dat AU12
-svm_combined/AU_14_static.dat AU14
-svm_combined/AU_15_static.dat AU15
-svm_combined/AU_17_static.dat AU17
-svm_combined/AU_20_static.dat AU20
-svm_combined/AU_23_static.dat AU23
-svm_combined/AU_25_static.dat AU25
-svm_combined/AU_26_static.dat AU26
-svm_combined/AU_28_static.dat AU28
-svm_combined/AU_45_static.dat AU45
-svr_combined/AU_1_static_intensity_comb.dat AU01
-svr_combined/AU_2_static_intensity_comb.dat AU02
-svr_combined/AU_4_static_intensity_comb.dat AU04
-svr_combined/AU_5_static_intensity.dat AU05
-svr_combined/AU_6_static_intensity_comb.dat AU06
-svr_combined/AU_7_static_intensity_comb.dat AU07
-svr_combined/AU_9_static_intensity.dat AU09
-svr_combined/AU_10_static_intensity_comb.dat AU10
-svr_combined/AU_12_static_intensity_comb.dat AU12
-svr_combined/AU_14_static_intensity.dat AU14
-svr_combined/AU_15_static_intensity_comb.dat AU15
-svr_combined/AU_17_static_intensity_comb.dat AU17
-svr_combined/AU_20_static_intensity.dat AU20
-svr_combined/AU_23_static_intensity_comb.dat AU23
-svr_combined/AU_25_static_intensity.dat AU25
-svr_combined/AU_26_static_intensity_comb.dat AU26
-svr_combined/AU_45_static_intensity_comb.dat AU45

lib/local/FaceAnalyser/AU_predictors/main_dynamic_svms.txt

@@ -1,3 +0,0 @@
-AUPredictor AU_all_best.txt
-PDM In-the-wild_aligned_PDM_68.txt
-Triangulation tris_68_full.txt

lib/local/FaceAnalyser/AU_predictors/main_static_svms.txt

@@ -1,3 +0,0 @@
-AUPredictor AU_all_static.txt
-PDM In-the-wild_aligned_PDM_68.txt
-Triangulation tris_68_full.txt

lib/local/FaceAnalyser/src/FaceAnalyserParameters.cpp

@@ -121,11 +121,11 @@ FaceAnalyserParameters::FaceAnalyserParameters(vector<string> &arguments):root()
 
 	if (dynamic)
 	{
-		this->model_location = "AU_predictors/main_dynamic_svms.txt";
+		this->model_location = "AU_predictors/DISFA_dynamic_svms.txt";
 	}
 	else
 	{
-		this->model_location = "AU_predictors/main_static_svms.txt";
+		this->model_location = "AU_predictors/DISFA_static_svms.txt";
 	}
 
 	// If we set the size but not the scale, adapt the scale to the right size
@@ -162,7 +162,7 @@ void FaceAnalyserParameters::init()
 	this->sim_size_out = 112;
 	this->sim_align_face_mask = true;
 
-	this->model_location = "AU_predictors/main_dynamic_svms.txt";
+	this->model_location = "AU_predictors/DISFA_dynamic_svms.txt";
 
 	// Make sure model_location is valid
 	// First check working directory, then the executable's directory, then the config path set by the build process.
@@ -212,7 +212,7 @@ void FaceAnalyserParameters::OptimizeForVideos()
 	// Set the post-processing to true and load a dynamic model
 	dynamic = true;
 
-	this->model_location = "AU_predictors/main_dynamic_svms.txt";
+	this->model_location = "AU_predictors/DISFA_dynamic_svms.txt";
 
 	// Make sure model_location is valid
 	// First check working directory, then the executable's directory, then the config path set by the build process.
@@ -242,7 +242,7 @@ void FaceAnalyserParameters::OptimizeForImages()
 	// Set the post-processing to true and load a dynamic model
 	dynamic = false;
 
-	this->model_location = "AU_predictors/main_static_svms.txt";
+	this->model_location = "AU_predictors/DISFA_static_svms.txt";
 
 	// Make sure model_location is valid
 	// First check working directory, then the executable's directory, then the config path set by the build process.

lib/local/LandmarkDetector/model/mtcnn_detector/MTCNN_detector.txt

@@ -1,3 +0,0 @@
-PNet PNet.dat
-RNet RNet.dat
-ONet ONet.dat

matlab_runners/Action Unit Experiments/results/DISFA_valid_res.txt

@@ -1,12 +1,12 @@
-AU1 results - corr 0.846, rms 0.386, ccc - 0.824
-AU2 results - corr 0.766, rms 0.441, ccc - 0.668
-AU4 results - corr 0.870, rms 0.573, ccc - 0.843
-AU5 results - corr 0.767, rms 0.174, ccc - 0.731
-AU6 results - corr 0.725, rms 0.580, ccc - 0.685
-AU9 results - corr 0.737, rms 0.391, ccc - 0.653
-AU12 results - corr 0.866, rms 0.504, ccc - 0.852
-AU15 results - corr 0.753, rms 0.268, ccc - 0.721
-AU17 results - corr 0.613, rms 0.568, ccc - 0.529
-AU20 results - corr 0.588, rms 0.326, ccc - 0.559
-AU25 results - corr 0.929, rms 0.495, ccc - 0.919
-AU26 results - corr 0.814, rms 0.440, ccc - 0.785
+AU1 results - corr 0.817, rms 0.419, ccc - 0.782
+AU2 results - corr 0.825, rms 0.399, ccc - 0.731
+AU4 results - corr 0.886, rms 0.547, ccc - 0.861
+AU5 results - corr 0.755, rms 0.179, ccc - 0.703
+AU6 results - corr 0.819, rms 0.440, ccc - 0.786
+AU9 results - corr 0.778, rms 0.365, ccc - 0.707
+AU12 results - corr 0.906, rms 0.415, ccc - 0.895
+AU15 results - corr 0.734, rms 0.273, ccc - 0.668
+AU17 results - corr 0.752, rms 0.380, ccc - 0.681
+AU20 results - corr 0.677, rms 0.291, ccc - 0.638
+AU25 results - corr 0.937, rms 0.467, ccc - 0.929
+AU26 results - corr 0.832, rms 0.427, ccc - 0.793

matlab_runners/Feature Point Experiments/results/300VW_49.txt

@@ -7,5 +7,5 @@ DRMF	3.33	3.55	5.27
 PO-CR	2.95	3.08	3.68
 CFAN	3.17	3.72	4.94
 ------------------------------
-OpenFace CLNF	2.83	3.38	3.82
-OpenFace CE-CLM	2.41	2.67	3.21
+OpenFace CLNF	2.84	3.41	3.84
+OpenFace CE-CLM	2.41	2.69	3.20

matlab_runners/Feature Point Experiments/results/300VW_66.txt

@@ -5,5 +5,5 @@ CFSS	3.40	3.61	4.20
 ICCR	3.37	3.45	4.46
 CFAN	3.93	4.43	6.39
 ------------------------------
-OpenFace CLNF	3.79	4.23	4.78
-OpenFace CE-CLM	3.15	3.55	4.19
+OpenFace CLNF	3.80	4.25	4.81
+OpenFace CE-CLM	3.15	3.57	4.18

matlab_runners/Feature Point Experiments/results/fps_yt.txt

@@ -1,4 +1,4 @@
 Model, mean,  median
-OpenFace (CE-CLM):  0.0499,   0.0474
-OpenFace (CLNF):  0.0553,   0.0516
-CLM:   0.0644,   0.0592
+OpenFace (CE-CLM):  0.0500,   0.0473
+OpenFace (CLNF):  0.0564,   0.0516
+CLM:   0.0648,   0.0591

matlab_runners/Full_test_suite.m

@@ -41,30 +41,17 @@ cd('../');
 
 %% AUs
 cd('Action Unit Experiments');
-run_AU_prediction_Bosphorus
-assert(mean(cccs_reg) > 0.56);
-assert(mean(f1s_class) > 0.48);
-
-run_AU_prediction_BP4D
-assert(mean(ints_cccs) > 0.65);
-assert(mean(f1s_class) > 0.61);
 
 run_AU_prediction_DISFA
 assert(mean(au_res) > 0.73);
 
-run_AU_prediction_SEMAINE
-assert(mean(f1s) > 0.43);
-
-run_AU_prediction_FERA2011
-assert(mean(au_res) > 0.51);
-
 cd('../');
 
 %% Gaze
 cd('Gaze Experiments');
 extract_mpii_gaze_test
-assert(mean_error < 9.15)
-assert(median_error < 8.5)
+assert(mean_error < 9.2)
+assert(median_error < 8.6)
 cd('../');
 
 %% Demos

matlab_runners/Gaze Experiments/mpii_1500_errs.txt

@@ -1,2 +1,2 @@
 Mean error, median error
-9.100, 8.468
+9.123, 8.530

matlab_runners/Head Pose Experiments/results/Pose_OF_CECLM.txt

@@ -1,4 +1,4 @@
 Dataset and model,        pitch,  yaw,  roll,  mean,  median
-biwi error:  6.089,   5.086, 3.713,  4.963,  2.414
-bu error:    2.397,   3.248, 2.408,  2.684,  1.838
-ict error:   3.136,   3.512, 3.136,  3.261,  1.867
+biwi error:  6.064,   5.395, 3.498,  4.986,  2.435
+bu error:    2.410,   3.251, 2.404,  2.688,  1.849
+ict error:   3.139,   3.512, 3.135,  3.262,  1.871

matlab_runners/Head Pose Experiments/results/Pose_OF_CLNF.txt

@@ -1,4 +1,4 @@
 Dataset and model,        pitch,  yaw,  roll,  mean,  median
-biwi error:  7.500,   5.094, 4.610,  5.735,  2.550
-bu error:    2.775,   3.348, 2.448,  2.857,  1.990
-ict error:   3.813,   3.711, 3.528,  3.684,  1.931
+biwi error:  7.475,   5.066, 4.638,  5.726,  2.588
+bu error:    2.740,   3.349, 2.456,  2.848,  1.974
+ict error:   3.832,   3.740, 3.636,  3.736,  1.949