diff --git a/exe/FaceLandmarkImg/FaceLandmarkImg.vcxproj b/exe/FaceLandmarkImg/FaceLandmarkImg.vcxproj index 0053edb1..4b061646 100644 --- a/exe/FaceLandmarkImg/FaceLandmarkImg.vcxproj +++ b/exe/FaceLandmarkImg/FaceLandmarkImg.vcxproj @@ -147,7 +147,7 @@ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)\lib\local\LandmarkDetector\include;$(SolutionDir)\lib\local\FaceAnalyser\include;$(SolutionDir)\lib\local\GazeAnalyser\include;$(SolutionDir)\lib\local\Utilities\include;%(AdditionalIncludeDirectories) false - AdvancedVectorExtensions2 + AdvancedVectorExtensions true Speed @@ -169,7 +169,7 @@ WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)\lib\local\LandmarkDetector\include;$(SolutionDir)\lib\local\FaceAnalyser\include;$(SolutionDir)\lib\local\GazeAnalyser\include;$(SolutionDir)\lib\local\Utilities\include;%(AdditionalIncludeDirectories) false - AdvancedVectorExtensions2 + AdvancedVectorExtensions true Speed diff --git a/exe/FaceLandmarkVid/FaceLandmarkVid.vcxproj b/exe/FaceLandmarkVid/FaceLandmarkVid.vcxproj index 1921f04f..7bdab285 100644 --- a/exe/FaceLandmarkVid/FaceLandmarkVid.vcxproj +++ b/exe/FaceLandmarkVid/FaceLandmarkVid.vcxproj @@ -150,7 +150,7 @@ $(SolutionDir)\lib\local\LandmarkDetector\include;$(SolutionDir)\lib\local\FaceAnalyser\include;$(SolutionDir)\lib\local\GazeAnalyser\include;$(SolutionDir)\lib\local\Utilities\include;%(AdditionalIncludeDirectories) false Speed - AdvancedVectorExtensions2 + AdvancedVectorExtensions true @@ -172,7 +172,7 @@ $(SolutionDir)\lib\local\LandmarkDetector\include;$(SolutionDir)\lib\local\FaceAnalyser\include;$(SolutionDir)\lib\local\GazeAnalyser\include;$(SolutionDir)\lib\local\Utilities\include;%(AdditionalIncludeDirectories) false Speed - AdvancedVectorExtensions2 + AdvancedVectorExtensions true diff --git a/exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.vcxproj b/exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.vcxproj index 39951394..91dfa480 100644 --- a/exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.vcxproj +++ b/exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.vcxproj @@ -133,7 +133,7 @@ true $(SolutionDir)\lib\local\LandmarkDetector\include;$(SolutionDir)\lib\local\Utilities\include;$(SolutionDir)\lib\local\FaceAnalyser\include;$(SolutionDir)\lib\local\GazeAnalyser\include;%(AdditionalIncludeDirectories) - AdvancedVectorExtensions2 + AdvancedVectorExtensions MultiThreadedDLL true Speed @@ -152,7 +152,7 @@ true $(SolutionDir)\lib\local\LandmarkDetector\include;$(SolutionDir)\lib\local\Utilities\include;$(SolutionDir)\lib\local\FaceAnalyser\include;$(SolutionDir)\lib\local\GazeAnalyser\include;%(AdditionalIncludeDirectories) - AdvancedVectorExtensions2 + AdvancedVectorExtensions MultiThreadedDLL true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) diff --git a/exe/FeatureExtraction/FeatureExtraction.vcxproj b/exe/FeatureExtraction/FeatureExtraction.vcxproj index 330a234a..78f95ce1 100644 --- a/exe/FeatureExtraction/FeatureExtraction.vcxproj +++ b/exe/FeatureExtraction/FeatureExtraction.vcxproj @@ -149,7 +149,7 @@ $(SolutionDir)\lib\local\FaceAnalyser\include;$(SolutionDir)\lib\local\LandmarkDetector\include;$(SolutionDir)\lib\local\GazeAnalyser\include;$(SolutionDir)\lib\local\Utilities\include;%(AdditionalIncludeDirectories) false Speed - AdvancedVectorExtensions2 + AdvancedVectorExtensions MultiThreadedDLL true @@ -172,7 +172,7 @@ $(SolutionDir)\lib\local\FaceAnalyser\include;$(SolutionDir)\lib\local\LandmarkDetector\include;$(SolutionDir)\lib\local\GazeAnalyser\include;$(SolutionDir)\lib\local\Utilities\include;%(AdditionalIncludeDirectories) false Speed - AdvancedVectorExtensions2 + AdvancedVectorExtensions MultiThreadedDLL true diff --git a/lib/3rdParty/CameraEnumerator/CameraEnumerator.vcxproj b/lib/3rdParty/CameraEnumerator/CameraEnumerator.vcxproj index 6e14e6eb..72134410 100644 --- a/lib/3rdParty/CameraEnumerator/CameraEnumerator.vcxproj +++ b/lib/3rdParty/CameraEnumerator/CameraEnumerator.vcxproj @@ -104,7 +104,7 @@ true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) Speed - AdvancedVectorExtensions2 + AdvancedVectorExtensions Windows @@ -122,7 +122,7 @@ true NDEBUG;_LIB;%(PreprocessorDefinitions) Speed - AdvancedVectorExtensions2 + AdvancedVectorExtensions Windows diff --git a/lib/3rdParty/dlib/dlib.vcxproj b/lib/3rdParty/dlib/dlib.vcxproj index 5de0d19a..0f263123 100644 --- a/lib/3rdParty/dlib/dlib.vcxproj +++ b/lib/3rdParty/dlib/dlib.vcxproj @@ -141,7 +141,7 @@ $(SolutionDir)dlib/include/dlib/..;%(AdditionalIncludeDirectories) CompileAsCpp - AdvancedVectorExtensions2 + AdvancedVectorExtensions Sync AnySuitable Full @@ -178,7 +178,7 @@ $(SolutionDir)dlib/include/dlib/..;%(AdditionalIncludeDirectories) CompileAsCpp - AdvancedVectorExtensions2 + AdvancedVectorExtensions Sync AnySuitable Full diff --git a/lib/local/CppInerop/CppInerop.vcxproj b/lib/local/CppInerop/CppInerop.vcxproj index d7667979..d35e77b2 100644 --- a/lib/local/CppInerop/CppInerop.vcxproj +++ b/lib/local/CppInerop/CppInerop.vcxproj @@ -145,7 +145,7 @@ WIN32;NDEBUG;_WINDOWS;_USRDLL;CPPINEROP_EXPORTS;%(PreprocessorDefinitions) ./;$(SolutionDir)lib\local\LandmarkDetector\include;$(SolutionDir)lib\local\FaceAnalyser\include;$(SolutionDir)lib\local\GazeAnalyser\include;$(SolutionDir)lib\local\Utilities\include;$(SolutionDir)lib\3rdParty\CameraEnumerator;%(AdditionalIncludeDirectories) Speed - AdvancedVectorExtensions2 + AdvancedVectorExtensions Windows @@ -166,7 +166,7 @@ NDEBUG;_WINDOWS;_USRDLL;CPPINEROP_EXPORTS;%(PreprocessorDefinitions) ./;$(SolutionDir)lib\local\LandmarkDetector\include;$(SolutionDir)lib\local\FaceAnalyser\include;$(SolutionDir)lib\local\GazeAnalyser\include;$(SolutionDir)lib\local\Utilities\include;$(SolutionDir)lib\3rdParty\CameraEnumerator;%(AdditionalIncludeDirectories) Speed - AdvancedVectorExtensions2 + AdvancedVectorExtensions Windows diff --git a/lib/local/FaceAnalyser/AU_predictors/AU_DISFA_best.txt b/lib/local/FaceAnalyser/AU_predictors/AU_DISFA_best.txt new file mode 100644 index 00000000..d779971f --- /dev/null +++ b/lib/local/FaceAnalyser/AU_predictors/AU_DISFA_best.txt @@ -0,0 +1,24 @@ +svm_disfa/AU_1_dynamic.dat AU01 +svm_disfa/AU_2_dynamic.dat AU02 +svm_disfa/AU_4_static.dat AU04 +svm_disfa/AU_5_dynamic.dat AU05 +svm_disfa/AU_6_static.dat AU06 +svm_disfa/AU_9_dynamic.dat AU09 +svm_disfa/AU_12_dynamic.dat AU12 +svm_disfa/AU_15_dynamic.dat AU15 +svm_disfa/AU_17_dynamic.dat AU17 +svm_disfa/AU_20_dynamic.dat AU20 +svm_disfa/AU_25_dynamic.dat AU25 +svm_disfa/AU_26_dynamic.dat AU26 +svr_disfa/AU_1_dynamic_intensity.dat AU01 +svr_disfa/AU_2_dynamic_intensity.dat AU02 +svr_disfa/AU_4_dynamic_intensity_comb.dat AU04 +svr_disfa/AU_5_dynamic_intensity.dat AU05 +svr_disfa/AU_6_dynamic_intensity_comb.dat AU06 +svr_disfa/AU_9_dynamic_intensity.dat AU09 +svr_disfa/AU_12_dynamic_intensity_comb.dat AU12 +svr_disfa/AU_15_dynamic_intensity_comb.dat AU15 +svr_disfa/AU_17_dynamic_intensity_comb.dat AU17 +svr_disfa/AU_20_dynamic_intensity.dat AU20 +svr_disfa/AU_25_dynamic_intensity_comb.dat AU25 +svr_disfa/AU_26_dynamic_intensity_comb.dat AU26 diff --git a/lib/local/FaceAnalyser/AU_predictors/AU_DISFA_static.txt b/lib/local/FaceAnalyser/AU_predictors/AU_DISFA_static.txt new file mode 100644 index 00000000..3624a7fe --- /dev/null +++ b/lib/local/FaceAnalyser/AU_predictors/AU_DISFA_static.txt @@ -0,0 +1,24 @@ +svm_disfa/AU_1_static.dat AU01 +svm_disfa/AU_2_static.dat AU02 +svm_disfa/AU_4_static.dat AU04 +svm_disfa/AU_5_static.dat AU05 +svm_disfa/AU_6_static.dat AU06 +svm_disfa/AU_9_static.dat AU09 +svm_disfa/AU_12_static.dat AU12 +svm_disfa/AU_15_static.dat AU15 +svm_disfa/AU_17_static.dat AU17 +svm_disfa/AU_20_static.dat AU20 +svm_disfa/AU_25_static.dat AU25 +svm_disfa/AU_26_static.dat AU26 +svr_disfa/AU_1_static_intensity.dat AU01 +svr_disfa/AU_2_static_intensity.dat AU02 +svr_disfa/AU_4_static_intensity.dat AU04 +svr_disfa/AU_5_static_intensity.dat AU05 +svr_disfa/AU_6_static_intensity.dat AU06 +svr_disfa/AU_9_static_intensity.dat AU09 +svr_disfa/AU_12_static_intensity.dat AU12 +svr_disfa/AU_15_static_intensity.dat AU15 +svr_disfa/AU_17_static_intensity.dat AU17 +svr_disfa/AU_20_static_intensity.dat AU20 +svr_disfa/AU_25_static_intensity.dat AU25 +svr_disfa/AU_26_static_intensity.dat AU26 diff --git a/lib/local/FaceAnalyser/AU_predictors/DISFA_dynamic_svms.txt b/lib/local/FaceAnalyser/AU_predictors/DISFA_dynamic_svms.txt new file mode 100644 index 00000000..716ea4b4 --- /dev/null +++ b/lib/local/FaceAnalyser/AU_predictors/DISFA_dynamic_svms.txt @@ -0,0 +1,3 @@ +AUPredictor AU_DISFA_best.txt +PDM In-the-wild_aligned_PDM_68.txt +Triangulation tris_68_full.txt \ No newline at end of file diff --git a/lib/local/FaceAnalyser/AU_predictors/DISFA_static_svms.txt b/lib/local/FaceAnalyser/AU_predictors/DISFA_static_svms.txt new file mode 100644 index 00000000..5e438967 --- /dev/null +++ b/lib/local/FaceAnalyser/AU_predictors/DISFA_static_svms.txt @@ -0,0 +1,3 @@ +AUPredictor AU_DISFA_static.txt +PDM In-the-wild_aligned_PDM_68.txt +Triangulation tris_68_full.txt \ No newline at end of file diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_12_dyn.dat b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_12_dyn.dat new file mode 100644 index 00000000..ff9967d4 Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_12_dyn.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_12_stat.dat b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_12_stat.dat new file mode 100644 index 00000000..0430186f Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_12_stat.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_15_dyn.dat b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_15_dyn.dat new file mode 100644 index 00000000..668d0372 Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_15_dyn.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_15_stat.dat b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_15_stat.dat new file mode 100644 index 00000000..72a623a7 Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_15_stat.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_17_dyn.dat b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_17_dyn.dat new file mode 100644 index 00000000..23a5d03b Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_17_dyn.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_17_stat.dat b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_17_stat.dat new file mode 100644 index 00000000..82855c59 Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_17_stat.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_1_dyn.dat b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_1_dyn.dat new file mode 100644 index 00000000..6fcc4eb5 Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_1_dyn.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_1_stat.dat b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_1_stat.dat new file mode 100644 index 00000000..0b11cca3 Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_1_stat.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_20_dyn.dat b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_20_dyn.dat new file mode 100644 index 00000000..336ad930 Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_20_dyn.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_20_stat.dat b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_20_stat.dat new file mode 100644 index 00000000..0f45361c Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_20_stat.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_25_dyn.dat b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_25_dyn.dat new file mode 100644 index 00000000..acf6b527 Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_25_dyn.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_25_stat.dat b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_25_stat.dat new file mode 100644 index 00000000..2c25e6ec Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_25_stat.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_26_dyn.dat b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_26_dyn.dat new file mode 100644 index 00000000..3a0c9d24 Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_26_dyn.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_26_stat.dat b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_26_stat.dat new file mode 100644 index 00000000..08a12053 Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_26_stat.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_2_dyn.dat b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_2_dyn.dat new file mode 100644 index 00000000..c2129881 Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_2_dyn.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_2_stat.dat b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_2_stat.dat new file mode 100644 index 00000000..bbbc37f9 Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_2_stat.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_4_dyn.dat b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_4_dyn.dat new file mode 100644 index 00000000..65e7003d Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_4_dyn.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_4_stat.dat b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_4_stat.dat new file mode 100644 index 00000000..5f814c38 Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_4_stat.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_5_dyn.dat b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_5_dyn.dat new file mode 100644 index 00000000..eac4611a Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_5_dyn.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_5_stat.dat b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_5_stat.dat new file mode 100644 index 00000000..f6e021a9 Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_5_stat.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_6_dyn.dat b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_6_dyn.dat new file mode 100644 index 00000000..90ec79de Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_6_dyn.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_6_stat.dat b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_6_stat.dat new file mode 100644 index 00000000..80155f08 Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_6_stat.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_9_dyn.dat b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_9_dyn.dat new file mode 100644 index 00000000..56ea3170 Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_9_dyn.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_9_stat.dat b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_9_stat.dat new file mode 100644 index 00000000..7ce9c9be Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svm_disfa/AU_9_stat.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_12_dynamic_intensity.dat b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_12_dynamic_intensity.dat new file mode 100644 index 00000000..45788697 Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_12_dynamic_intensity.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_12_static_intensity.dat b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_12_static_intensity.dat new file mode 100644 index 00000000..338f7f87 Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_12_static_intensity.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_15_dynamic_intensity.dat b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_15_dynamic_intensity.dat new file mode 100644 index 00000000..b8f36594 Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_15_dynamic_intensity.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_15_static_intensity.dat b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_15_static_intensity.dat new file mode 100644 index 00000000..6412f64f Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_15_static_intensity.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_17_dynamic_intensity.dat b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_17_dynamic_intensity.dat new file mode 100644 index 00000000..e07d026d Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_17_dynamic_intensity.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_17_static_intensity.dat b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_17_static_intensity.dat new file mode 100644 index 00000000..274e95dc Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_17_static_intensity.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_1_dynamic_intensity.dat b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_1_dynamic_intensity.dat new file mode 100644 index 00000000..2c2d49e1 Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_1_dynamic_intensity.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_1_static_intensity.dat b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_1_static_intensity.dat new file mode 100644 index 00000000..f4f59d3e Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_1_static_intensity.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_20_dynamic_intensity.dat b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_20_dynamic_intensity.dat new file mode 100644 index 00000000..3e735792 Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_20_dynamic_intensity.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_20_static_intensity.dat b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_20_static_intensity.dat new file mode 100644 index 00000000..97ef033f Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_20_static_intensity.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_25_dynamic_intensity.dat b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_25_dynamic_intensity.dat new file mode 100644 index 00000000..c0ed1b37 Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_25_dynamic_intensity.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_25_static_intensity.dat b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_25_static_intensity.dat new file mode 100644 index 00000000..46dc3f3f Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_25_static_intensity.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_26_dynamic_intensity.dat b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_26_dynamic_intensity.dat new file mode 100644 index 00000000..204a316f Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_26_dynamic_intensity.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_26_static_intensity.dat b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_26_static_intensity.dat new file mode 100644 index 00000000..18a8a924 Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_26_static_intensity.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_2_dynamic_intensity.dat b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_2_dynamic_intensity.dat new file mode 100644 index 00000000..9609c989 Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_2_dynamic_intensity.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_2_static_intensity.dat b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_2_static_intensity.dat new file mode 100644 index 00000000..7d547196 Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_2_static_intensity.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_4_dynamic_intensity.dat b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_4_dynamic_intensity.dat new file mode 100644 index 00000000..19517e6a Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_4_dynamic_intensity.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_4_static_intensity.dat b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_4_static_intensity.dat new file mode 100644 index 00000000..e1e39495 Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_4_static_intensity.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_5_dynamic_intensity.dat b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_5_dynamic_intensity.dat new file mode 100644 index 00000000..715b9d84 Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_5_dynamic_intensity.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_5_static_intensity.dat b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_5_static_intensity.dat new file mode 100644 index 00000000..598f802b Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_5_static_intensity.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_6_dynamic_intensity.dat b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_6_dynamic_intensity.dat new file mode 100644 index 00000000..4ad4c87d Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_6_dynamic_intensity.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_6_static_intensity.dat b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_6_static_intensity.dat new file mode 100644 index 00000000..1bbc8e44 Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_6_static_intensity.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_9_dynamic_intensity.dat b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_9_dynamic_intensity.dat new file mode 100644 index 00000000..bab119c9 Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_9_dynamic_intensity.dat differ diff --git a/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_9_static_intensity.dat b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_9_static_intensity.dat new file mode 100644 index 00000000..794f414e Binary files /dev/null and b/lib/local/FaceAnalyser/AU_predictors/svr_disfa/AU_9_static_intensity.dat differ diff --git a/lib/local/FaceAnalyser/FaceAnalyser.vcxproj b/lib/local/FaceAnalyser/FaceAnalyser.vcxproj index 67b27417..8b6c7929 100644 --- a/lib/local/FaceAnalyser/FaceAnalyser.vcxproj +++ b/lib/local/FaceAnalyser/FaceAnalyser.vcxproj @@ -141,7 +141,7 @@ ./include;$(SolutionDir)lib/local/Utilities/include;$(SolutionDir)lib/local/LandmarkDetector/include;%(AdditionalIncludeDirectories) - AdvancedVectorExtensions2 + AdvancedVectorExtensions true Speed @@ -167,7 +167,7 @@ ./include;$(SolutionDir)lib/local/Utilities/include;$(SolutionDir)lib/local/LandmarkDetector/include;%(AdditionalIncludeDirectories) - AdvancedVectorExtensions2 + AdvancedVectorExtensions true WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions) Speed diff --git a/lib/local/GazeAnalyser/GazeAnalyser.vcxproj b/lib/local/GazeAnalyser/GazeAnalyser.vcxproj index 319f27fe..2336ae3e 100644 --- a/lib/local/GazeAnalyser/GazeAnalyser.vcxproj +++ b/lib/local/GazeAnalyser/GazeAnalyser.vcxproj @@ -116,7 +116,7 @@ ./include;../LandmarkDetector/include;../Utilities/include;%(AdditionalIncludeDirectories) true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - AdvancedVectorExtensions2 + AdvancedVectorExtensions Speed @@ -135,7 +135,7 @@ ./include;../LandmarkDetector/include;../Utilities/include;%(AdditionalIncludeDirectories) true WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions) - AdvancedVectorExtensions2 + AdvancedVectorExtensions Speed diff --git a/lib/local/LandmarkDetector/LandmarkDetector.vcxproj b/lib/local/LandmarkDetector/LandmarkDetector.vcxproj index b2ab44b2..fb1444df 100644 --- a/lib/local/LandmarkDetector/LandmarkDetector.vcxproj +++ b/lib/local/LandmarkDetector/LandmarkDetector.vcxproj @@ -148,7 +148,7 @@ xcopy /I /E /Y /D "$(SolutionDir)lib\3rdParty\OpenCV3.4\classifiers" "$(OutDir)c Use Level3 ProgramDatabase - AdvancedVectorExtensions2 + AdvancedVectorExtensions Speed false /Zm300 %(AdditionalOptions) @@ -173,7 +173,7 @@ xcopy /I /E /Y /D "$(SolutionDir)lib\3rdParty\OpenCV3.4\classifiers" "$(OutDir)c Use Level3 ProgramDatabase - AdvancedVectorExtensions2 + AdvancedVectorExtensions Speed false /Zm300 %(AdditionalOptions) diff --git a/lib/local/LandmarkDetector/include/CEN_patch_expert.h b/lib/local/LandmarkDetector/include/CEN_patch_expert.h index e56012c1..887dd461 100644 --- a/lib/local/LandmarkDetector/include/CEN_patch_expert.h +++ b/lib/local/LandmarkDetector/include/CEN_patch_expert.h @@ -53,8 +53,8 @@ namespace LandmarkDetector public: // Width and height of the patch expert support area - int width; - int height; + int width_support; + int height_support; // Neural weights std::vector> biases; diff --git a/lib/local/LandmarkDetector/src/CCNF_patch_expert.cpp b/lib/local/LandmarkDetector/src/CCNF_patch_expert.cpp index e0da3d44..cc90dbce 100644 --- a/lib/local/LandmarkDetector/src/CCNF_patch_expert.cpp +++ b/lib/local/LandmarkDetector/src/CCNF_patch_expert.cpp @@ -455,8 +455,7 @@ void CCNF_patch_expert::ResponseOpenBlas(const cv::Mat_ &area_of_interest // Perform matrix multiplication in OpenBLAS (fortran call) float alpha1 = 1.0; float beta1 = 0.0; - char *nT = "N"; - sgemm_(nT, nT, &normalized_input.cols, &weight_matrix.rows, &weight_matrix.cols, &alpha1, (float*)normalized_input.data, &normalized_input.cols, (float*)weight_matrix.data, &weight_matrix.cols, &beta1, (float*)neuron_resp_full.data, &normalized_input.cols); + sgemm_("N", "N", &normalized_input.cols, &weight_matrix.rows, &weight_matrix.cols, &alpha1, (float*)normalized_input.data, &normalized_input.cols, (float*)weight_matrix.data, &weight_matrix.cols, &beta1, (float*)neuron_resp_full.data, &normalized_input.cols); // Above is a faster version of this //cv::Mat_ neuron_resp_full = this->weight_matrix * normalized_input; @@ -500,8 +499,7 @@ void CCNF_patch_expert::ResponseOpenBlas(const cv::Mat_ &area_of_interest // Perform matrix multiplication in OpenBLAS (fortran call) alpha1 = 1.0; beta1 = 0.0; - nT = "N"; - sgemm_(nT, nT, &resp_vec_f.cols, &Sigmas[s_to_use].rows, &Sigmas[s_to_use].cols, &alpha1, (float*)resp_vec_f.data, &resp_vec_f.cols, (float*)Sigmas[s_to_use].data, &Sigmas[s_to_use].cols, &beta1, (float*)out.data, &resp_vec_f.cols); + sgemm_("N", "N", &resp_vec_f.cols, &Sigmas[s_to_use].rows, &Sigmas[s_to_use].cols, &alpha1, (float*)resp_vec_f.data, &resp_vec_f.cols, (float*)Sigmas[s_to_use].data, &Sigmas[s_to_use].cols, &beta1, (float*)out.data, &resp_vec_f.cols); // Above is a faster version of this //cv::Mat out = Sigmas[s_to_use] * resp_vec_f; diff --git a/lib/local/LandmarkDetector/src/CEN_patch_expert.cpp b/lib/local/LandmarkDetector/src/CEN_patch_expert.cpp index 2d0db37f..3171fd9c 100644 --- a/lib/local/LandmarkDetector/src/CEN_patch_expert.cpp +++ b/lib/local/LandmarkDetector/src/CEN_patch_expert.cpp @@ -77,7 +77,7 @@ using namespace LandmarkDetector; // Copy constructor -CEN_patch_expert::CEN_patch_expert(const CEN_patch_expert& other) : confidence(other.confidence), width(other.width), height(other.height) +CEN_patch_expert::CEN_patch_expert(const CEN_patch_expert& other) : confidence(other.confidence), width_support(other.width_support), height_support(other.height_support) { // Copy the layer weights in a deep way @@ -106,8 +106,8 @@ void CEN_patch_expert::Read(ifstream &stream) // the number of neurons for this patch int num_layers; - stream.read((char*)&width, 4); - stream.read((char*)&height, 4); + stream.read((char*)&width_support, 4); + stream.read((char*)&height_support, 4); stream.read((char*)&num_layers, 4); if (num_layers == 0) @@ -221,11 +221,11 @@ void im2colBias(const cv::Mat_& input, int width, int height, cv::Mat_ &area_of_interest, cv::Mat_ &response) { - int response_height = area_of_interest.rows - height + 1; - int response_width = area_of_interest.cols - width + 1; + int response_height = area_of_interest.rows - height_support + 1; + int response_width = area_of_interest.cols - width_support + 1; cv::Mat_ input_col; - im2colBias(area_of_interest, width, height, input_col); + im2colBias(area_of_interest, width_support, height_support, input_col); // Mean and standard deviation normalization contrastNorm(input_col, response); @@ -246,8 +246,7 @@ void CEN_patch_expert::Response(const cv::Mat_ &area_of_interest, cv::Mat // Perform matrix multiplication in OpenBLAS (fortran call) float alpha1 = 1.0; float beta1 = 0.0; - char *nT = "N"; - sgemm_(nT, nT, &resp.cols, &weight.rows, &weight.cols, &alpha1, m1, &resp.cols, m2, &weight.cols, &beta1, m3, &resp.cols); + sgemm_("N", "N", &resp.cols, &weight.rows, &weight.cols, &alpha1, m1, &resp.cols, m2, &weight.cols, &beta1, m3, &resp.cols); // The above is a faster version of this, by calling the fortran version directly //cblas_sgemm(CblasColMajor, CblasNoTrans, CblasNoTrans, resp.cols, weight.rows, weight.cols, 1, m1, resp.cols, m2, weight.cols, 0.0, m3, resp.cols); @@ -507,11 +506,11 @@ void LandmarkDetector::interpolationMatrix(cv::Mat_& mapMatrix, int respo void CEN_patch_expert::ResponseSparse(const cv::Mat_ &area_of_interest, cv::Mat_ &response, cv::Mat_& mapMatrix, cv::Mat_& im2col_prealloc) { - int response_height = area_of_interest.rows - height + 1; - int response_width = area_of_interest.cols - width + 1; + int response_height = area_of_interest.rows - height_support + 1; + int response_width = area_of_interest.cols - width_support + 1; // Extract im2col but in a sparse way and contrast normalize - im2colBiasSparseContrastNorm(area_of_interest, width, height, im2col_prealloc); + im2colBiasSparseContrastNorm(area_of_interest, width_support, height_support, im2col_prealloc); response = im2col_prealloc.t(); for (size_t layer = 0; layer < activation_function.size(); ++layer) @@ -529,8 +528,7 @@ void CEN_patch_expert::ResponseSparse(const cv::Mat_ &area_of_interest, c // Perform matrix multiplication in OpenBLAS (fortran call) float alpha1 = 1.0; float beta1 = 0.0; - char *nT = "N"; - sgemm_(nT, nT, &resp.cols, &weight.rows, &weight.cols, &alpha1, m1, &resp.cols, m2, &weight.cols, &beta1, m3, &resp.cols); + sgemm_("N", "N", &resp.cols, &weight.rows, &weight.cols, &alpha1, m1, &resp.cols, m2, &weight.cols, &beta1, m3, &resp.cols); // The above is a faster version of this, by calling the fortran version directly //cblas_sgemm(CblasColMajor, CblasNoTrans, CblasNoTrans, resp.cols, weight.rows, weight.cols, 1, m1, resp.cols, m2, weight.cols, 0.0, m3, resp.cols); @@ -585,13 +583,13 @@ void CEN_patch_expert::ResponseSparse(const cv::Mat_ &area_of_interest, c void CEN_patch_expert::ResponseSparse_mirror(const cv::Mat_ &area_of_interest, cv::Mat_ &response, cv::Mat_& mapMatrix, cv::Mat_& im2col_prealloc) { - int response_height = area_of_interest.rows - height + 1; - int response_width = area_of_interest.cols - width + 1; + int response_height = area_of_interest.rows - height_support + 1; + int response_width = area_of_interest.cols - width_support + 1; cv::flip(area_of_interest, area_of_interest, 1); // Extract im2col but in a sparse way and contrast normalize - im2colBiasSparseContrastNorm(area_of_interest, width, height, im2col_prealloc); + im2colBiasSparseContrastNorm(area_of_interest, width_support, height_support, im2col_prealloc); response = im2col_prealloc.t(); @@ -610,8 +608,7 @@ void CEN_patch_expert::ResponseSparse_mirror(const cv::Mat_ &area_of_inte // Perform matrix multiplication in OpenBLAS (fortran call) float alpha1 = 1.0; float beta1 = 0.0; - char *nT = "N"; - sgemm_(nT, nT, &resp.cols, &weight.rows, &weight.cols, &alpha1, m1, &resp.cols, m2, &weight.cols, &beta1, m3, &resp.cols); + sgemm_("N", "N", &resp.cols, &weight.rows, &weight.cols, &alpha1, m1, &resp.cols, m2, &weight.cols, &beta1, m3, &resp.cols); // The above is a faster version of this, by calling the fortran version directly //cblas_sgemm(CblasColMajor, CblasNoTrans, CblasNoTrans, resp.cols, weight.rows, weight.cols, 1, m1, resp.cols, m2, weight.cols, 0.0, m3, resp.cols); @@ -665,14 +662,14 @@ void CEN_patch_expert::ResponseSparse_mirror(const cv::Mat_ &area_of_inte void CEN_patch_expert::ResponseSparse_mirror_joint(const cv::Mat_ &area_of_interest_left, const cv::Mat_ &area_of_interest_right, cv::Mat_ &response_left, cv::Mat_ &response_right, cv::Mat_& mapMatrix, cv::Mat_& im2col_prealloc_left, cv::Mat_& im2col_prealloc_right) { - int response_height = area_of_interest_left.rows - height + 1; - int response_width = area_of_interest_left.cols - width + 1; + int response_height = area_of_interest_left.rows - height_support + 1; + int response_width = area_of_interest_left.cols - width_support + 1; cv::flip(area_of_interest_right, area_of_interest_right, 1); // Extract im2col but in a sparse way and contrast normalize - im2colBiasSparseContrastNorm(area_of_interest_left, width, height, im2col_prealloc_left); - im2colBiasSparseContrastNorm(area_of_interest_right, width, height, im2col_prealloc_right); + im2colBiasSparseContrastNorm(area_of_interest_left, width_support, height_support, im2col_prealloc_left); + im2colBiasSparseContrastNorm(area_of_interest_right, width_support, height_support, im2col_prealloc_right); cv::Mat_ response; cv::vconcat(im2col_prealloc_left, im2col_prealloc_right, response); @@ -695,8 +692,7 @@ void CEN_patch_expert::ResponseSparse_mirror_joint(const cv::Mat_ &area_o // Perform matrix multiplication in OpenBLAS (fortran call) float alpha1 = 1.0; float beta1 = 0.0; - char *nT = "N"; - sgemm_(nT, nT, &resp.cols, &weight.rows, &weight.cols, &alpha1, m1, &resp.cols, m2, &weight.cols, &beta1, m3, &resp.cols); + sgemm_("N", "N", &resp.cols, &weight.rows, &weight.cols, &alpha1, m1, &resp.cols, m2, &weight.cols, &beta1, m3, &resp.cols); // The above is a faster version of this, by calling the fortran version directly //cblas_sgemm(CblasColMajor, CblasNoTrans, CblasNoTrans, resp.cols, weight.rows, weight.cols, 1, m1, resp.cols, m2, weight.cols, 0.0, m3, resp.cols); diff --git a/lib/local/LandmarkDetector/src/CNN_utils.cpp b/lib/local/LandmarkDetector/src/CNN_utils.cpp index 0d841a28..343b0ef4 100644 --- a/lib/local/LandmarkDetector/src/CNN_utils.cpp +++ b/lib/local/LandmarkDetector/src/CNN_utils.cpp @@ -563,8 +563,7 @@ namespace LandmarkDetector float alpha = 1.0f; float beta = 0.0f; // Call fortran directly (faster) - char *nT = "N"; - sgemm_(nT, nT, &m2_cols, &num_rows, &pre_alloc_im2col.cols, &alpha, m2, &m2_cols, m1, &pre_alloc_im2col.cols, &beta, m3, &m2_cols); + sgemm_("N", "N", &m2_cols, &num_rows, &pre_alloc_im2col.cols, &alpha, m2, &m2_cols, m1, &pre_alloc_im2col.cols, &beta, m3, &m2_cols); // Above is equivalent to out = pre_alloc_im2col * weight_matrix; diff --git a/lib/local/LandmarkDetector/src/FaceDetectorMTCNN.cpp b/lib/local/LandmarkDetector/src/FaceDetectorMTCNN.cpp index 0e395cf6..5a6d5b6b 100644 --- a/lib/local/LandmarkDetector/src/FaceDetectorMTCNN.cpp +++ b/lib/local/LandmarkDetector/src/FaceDetectorMTCNN.cpp @@ -762,7 +762,8 @@ bool FaceDetectorMTCNN::DetectFaces(vector >& o_regions, const rectify(proposal_boxes_all); // Creating proposal images from previous step detections - vector above_thresh(proposal_boxes_all.size()); + vector above_thresh; + above_thresh.resize(proposal_boxes_all.size(), false); //tbb::parallel_for(0, (int)proposal_boxes_all.size(), [&](int k) { for (size_t k = 0; k < proposal_boxes_all.size(); ++k) { diff --git a/lib/local/LandmarkDetector/src/LandmarkDetectorModel.cpp b/lib/local/LandmarkDetector/src/LandmarkDetectorModel.cpp index 148214b5..42ae2131 100644 --- a/lib/local/LandmarkDetector/src/LandmarkDetectorModel.cpp +++ b/lib/local/LandmarkDetector/src/LandmarkDetectorModel.cpp @@ -1115,8 +1115,7 @@ float CLNF::NU_RLMS(cv::Vec6f& final_global, cv::Mat_& final_local, const // Perform matrix multiplication in OpenBLAS (fortran call) float alpha1 = 1.0; float beta1 = 1.0; - char *nT = "N"; - sgemm_(nT, nT, &J.cols, &J_w_t.rows, &J_w_t.cols, &alpha1, (float*)J.data, &J.cols, (float*)J_w_t.data, &J_w_t.cols, &beta1, (float*)Hessian.data, &J.cols); + sgemm_("N", "N", &J.cols, &J_w_t.rows, &J_w_t.cols, &alpha1, (float*)J.data, &J.cols, (float*)J_w_t.data, &J_w_t.cols, &beta1, (float*)Hessian.data, &J.cols); // Above is a fast (but ugly) version of // cv::Mat_ Hessian = J_w_t * J + regTerm; diff --git a/lib/local/LandmarkDetector/src/LandmarkDetectorUtils.cpp b/lib/local/LandmarkDetector/src/LandmarkDetectorUtils.cpp index e316fa16..1cc8ac66 100644 --- a/lib/local/LandmarkDetector/src/LandmarkDetectorUtils.cpp +++ b/lib/local/LandmarkDetector/src/LandmarkDetectorUtils.cpp @@ -429,8 +429,7 @@ namespace LandmarkDetector // Get the rotation cv::Matx22f R = AlignShapesKabsch2D_f(src_mean_normed, dst_mean_normed); - cv::Matx22f A; - cv::Mat(s * R).copyTo(A); + cv::Matx22f A = s * R; cv::Mat_ aligned = (cv::Mat(cv::Mat(A) * src.t())).t(); cv::Mat_ offset = dst - aligned; diff --git a/lib/local/LandmarkDetector/src/PDM.cpp b/lib/local/LandmarkDetector/src/PDM.cpp index 188f6598..1ada6052 100644 --- a/lib/local/LandmarkDetector/src/PDM.cpp +++ b/lib/local/LandmarkDetector/src/PDM.cpp @@ -150,8 +150,7 @@ void PDM::CalcShape3D(cv::Mat_& out_shape, const cv::Mat_& p_local int p_local_cols = p_local.cols; int princ_comp_rows = princ_comp.rows; int princ_comp_cols = princ_comp.cols; - char *nT = "N"; - sgemm_(nT, nT, &p_local_cols, &princ_comp_rows, &princ_comp_cols, &alpha1, (float*)p_local.data, &p_local_cols, (float*)princ_comp.data, &princ_comp_cols, &beta1, (float*)out_shape.data, &p_local_cols); + sgemm_("N", "N", &p_local_cols, &princ_comp_rows, &princ_comp_cols, &alpha1, (float*)p_local.data, &p_local_cols, (float*)princ_comp.data, &princ_comp_cols, &beta1, (float*)out_shape.data, &p_local_cols); // Above is a fast (but ugly) version of // out_shape = mean_shape + princ_comp * p_local; @@ -639,8 +638,7 @@ void PDM::CalcParams(cv::Vec6f& out_params_global, cv::Mat_& out_params_l // Perform matrix multiplication in OpenBLAS (fortran call) float alpha1 = 1.0; float beta1 = 1.0; - char *nT = "N"; - sgemm_(nT, nT, &J.cols, &J_w_t.rows, &J_w_t.cols, &alpha1, (float*)J.data, &J.cols, (float*)J_w_t.data, &J_w_t.cols, &beta1, (float*)Hessian.data, &J.cols); + sgemm_("N", "N", &J.cols, &J_w_t.rows, &J_w_t.cols, &alpha1, (float*)J.data, &J.cols, (float*)J_w_t.data, &J_w_t.cols, &beta1, (float*)Hessian.data, &J.cols); // Above is a fast (but ugly) version of // cv::Mat_ Hessian2 = J_w_t * J + regularisations; diff --git a/lib/local/LandmarkDetector/src/Patch_experts.cpp b/lib/local/LandmarkDetector/src/Patch_experts.cpp index c219d5af..ad9553e2 100644 --- a/lib/local/LandmarkDetector/src/Patch_experts.cpp +++ b/lib/local/LandmarkDetector/src/Patch_experts.cpp @@ -162,10 +162,13 @@ void Patch_experts::Response(vector >& patch_expert_responses, c sim_img_to_ref = AlignShapesWithScale_f(image_shape_2D, reference_shape_2D); sim_ref_to_img = sim_img_to_ref.inv(cv::DECOMP_LU); - + float a1 = sim_ref_to_img(0, 0); float b1 = -sim_ref_to_img(0, 1); + cv::Mat_ gray_image_flt; + grayscale_image.convertTo(gray_image_flt, CV_32F); + bool use_ccnf = !this->ccnf_expert_intensity.empty(); bool use_cen = !this->cen_expert_intensity.empty(); @@ -230,8 +233,8 @@ void Patch_experts::Response(vector >& patch_expert_responses, c if (use_cen) { - area_of_interest_width = window_size + cen_expert_intensity[scale][view_id][ind].width - 1; - area_of_interest_height = window_size + cen_expert_intensity[scale][view_id][ind].height - 1; + area_of_interest_width = window_size + cen_expert_intensity[scale][view_id][ind].width_support - 1; + area_of_interest_height = window_size + cen_expert_intensity[scale][view_id][ind].height_support - 1; } else if (use_ccnf) { @@ -245,17 +248,13 @@ void Patch_experts::Response(vector >& patch_expert_responses, c } // scale and rotate to mean shape to reference frame - cv::Mat sim = (cv::Mat_(2, 3) << a1, -b1, landmark_locations.at(ind, 0), b1, a1, landmark_locations.at(ind + n, 0)); + cv::Mat sim = (cv::Mat_(2, 3) << a1, -b1, landmark_locations.at(ind, 0) - a1 * (area_of_interest_width - 1.0f) / 2.0f + b1 * (area_of_interest_width - 1.0f) / 2.0f, b1, a1, landmark_locations.at(ind + n, 0) - a1 * (area_of_interest_width - 1.0f) / 2.0f - b1 * (area_of_interest_width - 1.0f) / 2.0f); // Extract the region of interest around the current landmark location - cv::Mat_ area_of_interest(area_of_interest_height, area_of_interest_width); - - // Using C style openCV as it does what we need - CvMat area_of_interest_o = area_of_interest; - CvMat sim_o = sim; - IplImage im_o = grayscale_image; - cvGetQuadrangleSubPix(&im_o, &area_of_interest_o, &sim_o); + cv::Mat_ area_of_interest(area_of_interest_height, area_of_interest_width, 0.0f); + cv::warpAffine(gray_image_flt, area_of_interest, sim, area_of_interest.size(), cv::WARP_INVERSE_MAP + CV_INTER_LINEAR); + // Get intensity response either from the SVR, CCNF, or CEN patch experts (prefer CEN as they are the most accurate so far) if (!cen_expert_intensity.empty()) @@ -281,15 +280,14 @@ void Patch_experts::Response(vector >& patch_expert_responses, c { // Grab mirrored area of interest - cv::Mat sim_r = (cv::Mat_(2, 3) << a1, -b1, landmark_locations.at(mirror_id, 0), b1, a1, landmark_locations.at(mirror_id + n, 0)); + + // scale and rotate to mean shape to reference frame + cv::Mat sim_r = (cv::Mat_(2, 3) << a1, -b1, landmark_locations.at(mirror_id, 0) - a1 * (area_of_interest_width - 1.0f) / 2.0f + b1 * (area_of_interest_width - 1.0f) / 2.0f, b1, a1, landmark_locations.at(mirror_id + n, 0) - a1 * (area_of_interest_width - 1.0f) / 2.0f - b1 * (area_of_interest_width - 1.0f) / 2.0f); // Extract the region of interest around the current landmark location - cv::Mat_ area_of_interest_r(area_of_interest_height, area_of_interest_width); - // Using C style openCV as it does what we need - CvMat area_of_interest_o_r = area_of_interest_r; - CvMat sim_o_r = sim_r; - IplImage im_o_r = grayscale_image; - cvGetQuadrangleSubPix(&im_o_r, &area_of_interest_o_r, &sim_o_r); + cv::Mat_ area_of_interest_r(area_of_interest_height, area_of_interest_width, 0.0f); + + cv::warpAffine(gray_image_flt, area_of_interest_r, sim_r, area_of_interest_r.size(), cv::WARP_INVERSE_MAP + CV_INTER_LINEAR); cv::Mat_ prealloc_mat_right = preallocated_im2col[mirror_id][im2col_size]; diff --git a/lib/local/Utilities/Utilities.vcxproj b/lib/local/Utilities/Utilities.vcxproj index 79b5fe87..ddd9a160 100644 --- a/lib/local/Utilities/Utilities.vcxproj +++ b/lib/local/Utilities/Utilities.vcxproj @@ -126,7 +126,7 @@ ./include;%(AdditionalIncludeDirectories) AnySuitable Speed - AdvancedVectorExtensions2 + AdvancedVectorExtensions Windows @@ -147,7 +147,7 @@ ./include;%(AdditionalIncludeDirectories) Speed AnySuitable - AdvancedVectorExtensions2 + AdvancedVectorExtensions Windows diff --git a/matlab_runners/Feature Point Experiments/results/fps_yt.txt b/matlab_runners/Feature Point Experiments/results/fps_yt.txt index 15533a85..d78365ed 100644 --- a/matlab_runners/Feature Point Experiments/results/fps_yt.txt +++ b/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.0515 -CLM: 0.0635, 0.0588 +OpenFace (CLNF): 0.0553, 0.0516 +CLM: 0.0644, 0.0592 diff --git a/matlab_runners/Feature Point Experiments/results/landmark_detections.txt b/matlab_runners/Feature Point Experiments/results/landmark_detections.txt index fd739f19..4a827aec 100644 --- a/matlab_runners/Feature Point Experiments/results/landmark_detections.txt +++ b/matlab_runners/Feature Point Experiments/results/landmark_detections.txt @@ -1,4 +1,4 @@ Type, mean, median -err ce-clm: 0.042605, 0.034724 -err clnf: 0.055018, 0.038367 -err svr: 0.069573, 0.049737 +err ce-clm: 0.043346, 0.034804 +err clnf: 0.055347, 0.038637 +err svr: 0.070061, 0.049981 diff --git a/matlab_runners/Head Pose Experiments/run_head_pose_tests_OpenFace.m b/matlab_runners/Head Pose Experiments/run_head_pose_tests_OpenFace.m deleted file mode 100644 index bc12275e..00000000 --- a/matlab_runners/Head Pose Experiments/run_head_pose_tests_OpenFace.m +++ /dev/null @@ -1,56 +0,0 @@ -clear; - -% fitting parameters more suitable for clnf - -%% -% Run the BU test with clnf -if exist('D:/Datasets/HeadPose', 'file') - database_root = 'D:/Datasets/HeadPose/'; -elseif(exist([getenv('USERPROFILE') '/Dropbox/AAM/test data/'], 'file')) - database_root = [getenv('USERPROFILE') '/Dropbox/AAM/test data/']; -elseif(exist([getenv('USERPROFILE') 'F:/Dropbox/Dropbox/AAM/test data/'], 'file')) - database_root = 'F:/Dropbox/Dropbox/AAM/test data/'; -elseif(exist('F:/Dropbox/AAM/test data/', 'file')) - database_root = 'F:/Dropbox/AAM/test data/'; -elseif(exist('/multicomp/datasets/head_pose_dbs', 'file')) - database_root = '/multicomp/datasets/head_pose_dbs/'; -elseif(exist('/media/tadas/5E08AE0D08ADE3ED/Dropbox/AAM/test data', 'file')) - database_root = '/media/tadas/5E08AE0D08ADE3ED/Dropbox/AAM/test data'; -end - -buDir = [database_root, '/bu/uniform-light/']; - -% The fast and accurate clnf -%% -[resFolderBU_OF] = run_bu_experiment(buDir, false, 'model', 'model/main_clnf_general.txt'); -[bu_error_OF, pred_hp_bu, gt_hp_bu, all_errors_bu_OF, rels_bu] = calcBUerror(resFolderBU_OF, buDir); - -%% -% Run the Biwi test -biwi_dir = '/biwi pose/'; - -[res_folder_biwi_OF] = run_biwi_experiment(database_root, biwi_dir, false, 'model', 'model/main_clnf_general.txt'); -% Calculate the resulting errors -[biwi_error_OF, pred_hp_biwi, gt_hp_biwi, ~, all_errors_biwi_OF, rels_biwi] = calcBiwiError(res_folder_biwi_OF, [database_root biwi_dir]); - -%% Run the ICT test -ict_dir = ['/ict/']; - -% Intensity -[res_folder_ict_OF] = run_ict_experiment(database_root, ict_dir, false, 'model', 'model/main_clnf_general.txt'); -% Calculate the resulting errors -[ict_error_OF, pred_hp_ict, gt_hp_ict, ~, all_errors_ict_OF, rel_ict] = calcIctError(res_folder_ict_OF, [database_root ict_dir]); - -%% Save the results -filename = 'results/Pose_OF'; -save(filename); - -% Also save them in a reasonable .txt format for easy comparison -f = fopen('results/Pose_OF.txt', 'w'); -fprintf(f, 'Dataset and model, pitch, yaw, roll, mean, median\n'); -fprintf(f, 'biwi error: %.3f, %.3f, %.3f, %.3f, %.3f\n', biwi_error_OF, mean(all_errors_biwi_OF(:)), median(all_errors_biwi_OF(:))); -fprintf(f, 'bu error: %.3f, %.3f, %.3f, %.3f, %.3f\n', bu_error_OF, mean(all_errors_bu_OF(:)), median(all_errors_bu_OF(:))); -fprintf(f, 'ict error: %.3f, %.3f, %.3f, %.3f, %.3f\n', ict_error_OF, mean(all_errors_ict_OF(:)), median(all_errors_ict_OF(:))); - -fclose(f); -clear 'f' \ No newline at end of file diff --git a/matlab_version/experiments_300VW/Script_CECLM_300VW_general.m b/matlab_version/experiments_300VW/Script_CECLM_300VW_general.m index b34b1090..b343cf71 100644 --- a/matlab_version/experiments_300VW/Script_CECLM_300VW_general.m +++ b/matlab_version/experiments_300VW/Script_CECLM_300VW_general.m @@ -8,9 +8,9 @@ if(~exist(output_dir, 'dir')) end %% select database and load bb initializations -db_root = 'D:\Datasets\300VW_Dataset_2015_12_14\300VW_Dataset_2015_12_14/'; +db_root = 'E:\datasets\300VW\300VW_Dataset_2015_12_14/'; bb_root = './300VW_dets_mtcnn/'; -extra_dir = 'D:\Datasets\300VW_Dataset_2015_12_14\extra'; +extra_dir = 'E:\datasets\300VW\300VW_Dataset_2015_12_14\extra'; [ vid_locs, bboxes, gts_all, invalid_frames ] = CollectTestData(db_root, bb_root, extra_dir); %% loading the patch experts and the PDM diff --git a/matlab_version/experiments_300VW/Script_CECLM_300VW_menpo.m b/matlab_version/experiments_300VW/Script_CECLM_300VW_menpo.m index abd48fb6..1b3a67f7 100644 --- a/matlab_version/experiments_300VW/Script_CECLM_300VW_menpo.m +++ b/matlab_version/experiments_300VW/Script_CECLM_300VW_menpo.m @@ -2,11 +2,13 @@ clear; addpath(genpath('../')); output_dir = './CECLM_res_menpo/'; - +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/'; +db_root = 'E:\datasets\300VW\300VW_Dataset_2015_12_14/'; bb_root = './300VW_dets_mtcnn/'; -extra_dir = 'D:\Datasets\300VW_Dataset_2015_12_14\extra'; +extra_dir = 'E:\datasets\300VW\300VW_Dataset_2015_12_14\extra'; [ vid_locs, bboxes, gts_all, invalid_frames ] = CollectTestData(db_root, bb_root, extra_dir); %% loading the patch experts and the PDM diff --git a/matlab_version/experiments_300VW/Script_CLM_300VW.m b/matlab_version/experiments_300VW/Script_CLM_300VW.m index 9ccd4fed..041f7942 100644 --- a/matlab_version/experiments_300VW/Script_CLM_300VW.m +++ b/matlab_version/experiments_300VW/Script_CLM_300VW.m @@ -2,27 +2,25 @@ clear; addpath(genpath('../')); output_dir = './CLM_res/'; - +if(~exist(output_dir, 'dir')) + mkdir(output_dir) +end %% select database and load bb initializations -db_root = 'C:\datasets\300VW_Dataset_2015_12_14/'; +db_root = 'E:\datasets\300VW\300VW_Dataset_2015_12_14/'; bb_root = './300VW_dets_mtcnn/'; -extra_dir = 'C:\datasets\300VW_Dataset_2015_12_14\extra'; +extra_dir = 'E:\datasets\300VW\300VW_Dataset_2015_12_14\extra'; [ vid_locs, bboxes, gts_all, invalid_frames ] = CollectTestData(db_root, bb_root, extra_dir); %% loading the patch experts and the PDM -[ patches, pdm, clmParams ] = Load_CLM_general(); +[ patches, pdm, clmParams ] = Load_CLM_wild(); -% Adapt the parameters for video -clmParams.window_size = [25,25; 23,23; 21,21; 19,19; 17,17;]; -clmParams.numPatchIters = size(clmParams.window_size,1); -clmParams.regFactor = [35, 27, 20, 20]; -clmParams.sigmaMeanShift = [1.25, 1.375, 1.5, 1.5]; -clmParams.tikhonov_factor = [0,0,0, 0]; -clmParams.numPatchIters = 4; +% Defining the view orientations that will be evaluated +%views = [0,0,0]; +views = [0,0,0; 0,-30,0; 0,30,0; 0,-55,0; 0,55,0; 0,0,30; 0,0,-30]; +views = views * pi/180; num_points = numel(pdm.M) / 3; -multi_view = true; verbose = true; %% Select video @@ -57,34 +55,12 @@ for i=1:numel(vid_locs) % have a multi-view version for initialization, otherwise use % previous shape - if(reset && multi_view) + if(reset) clmParams.window_size = [25,25; 23,23; 21,21; 21,21]; clmParams.numPatchIters = 4; - clmParams.startScale = 1; - - % The number of hyps is different in CLM from CE-CLM as too - % many actually harm it - views = [0,0,0; 0,-30,0; 0,30,0; 0,-55,0; 0,55,0; 0,0,30; 0,0,-30]; - views = views * pi/180; + clmParams.startScale = 1; - 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)); - g_params = cell(size(views,1),1); - l_params = cell(size(views,1),1); - - % Find the best orientation - for v = 1:size(views,1) - [shapes(:,:,v),g_params{v},l_params{v},ls(v),lmark_lhoods(:,v),views_used(v)] = Fitting_from_bb(input_image, [], bb, pdm, patches, clmParams, 'orientation', views(v,:)); - end - - [lhood, v_ind] = max(ls); - lmark_lhood = lmark_lhoods(:,v_ind); - g_param = g_params{v_ind}; - l_param = l_params{v_ind}; - shape = shapes(:,:,v_ind); - view_used = views_used(v); + [shape,g_param,l_param,lhood,lmark_lhood,view_used] = Fitting_from_bb_multi_hyp(input_image, [], bb, pdm, patches, clmParams, views); else clmParams.window_size = [23,23; 21,21; 19,19; 17,17]; diff --git a/matlab_version/experiments_300VW/Script_CLNF_300VW_general.m b/matlab_version/experiments_300VW/Script_CLNF_300VW_general.m index f88d3aed..bd256c37 100644 --- a/matlab_version/experiments_300VW/Script_CLNF_300VW_general.m +++ b/matlab_version/experiments_300VW/Script_CLNF_300VW_general.m @@ -8,40 +8,19 @@ if(~exist(output_dir, 'dir')) end %% select database and load bb initializations -db_root = 'D:\Datasets\300VW_Dataset_2015_12_14\300VW_Dataset_2015_12_14/'; +db_root = 'E:\datasets\300VW\300VW_Dataset_2015_12_14/'; bb_root = './300VW_dets_mtcnn/'; -extra_dir = 'D:\Datasets\300VW_Dataset_2015_12_14\extra'; +extra_dir = 'E:\datasets\300VW\300VW_Dataset_2015_12_14\extra'; [ vid_locs, bboxes, gts_all, invalid_frames ] = CollectTestData(db_root, bb_root, extra_dir); %% loading the patch experts and the PDM -clmParams = struct; -clmParams.window_size = [25,25; 23,23; 21,21; 19,19; 17,17;]; -clmParams.numPatchIters = size(clmParams.window_size,1); +[ patches, pdm, clmParams ] = Load_CLNF_general(); +views = [0,0,0; 0,-30,0; 0,30,0; 0,-55,0; 0,55,0; 0,0,30; 0,0,-30; 0,-90,0; 0,90,0; 0,-70,40; 0,70,-40]; +views = views * pi/180; -[patches] = Load_Patch_Experts( '../models/general/', 'ccnf_patches_*_general.mat', [], [], clmParams); - -% the default PDM to use -pdmLoc = ['../models/pdm/pdm_68_aligned_wild.mat']; - -load(pdmLoc); - -pdm = struct; pdm.M = double(M); pdm.E = double(E); pdm.V = double(V); num_points = numel(pdm.M) / 3; -clmParams.regFactor = [35, 27, 20, 20]; -clmParams.sigmaMeanShift = [1.25, 1.375, 1.5, 1.5]; -clmParams.tikhonov_factor = [0,0,0,0]; - -clmParams.startScale = 1; -clmParams.num_RLMS_iter = 10; -clmParams.fTol = 0.01; -clmParams.useMultiScale = true; -clmParams.use_multi_modal = 1; -clmParams.multi_modal_types = patches(1).multi_modal_types; -clmParams.numPatchIters = 4; - -multi_view = true; verbose = true; %% Select video @@ -76,32 +55,12 @@ for i=1:numel(vid_locs) % have a multi-view version for initialization, otherwise use % previous shape - if(reset && multi_view) + if(reset) clmParams.window_size = [25,25; 23,23; 21,21; 21,21]; clmParams.numPatchIters = 4; clmParams.startScale = 1; - views = [0,0,0; 0,-30,0; 0,30,0; 0,-55,0; 0,55,0; 0,0,30; 0,0,-30; 0,-90,0; 0,90,0; 0,-70,40; 0,70,-40]; - views = views * pi/180; - - 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)); - g_params = cell(size(views,1),1); - l_params = cell(size(views,1),1); - - % Find the best orientation - for v = 1:size(views,1) - [shapes(:,:,v),g_params{v},l_params{v},ls(v),lmark_lhoods(:,v),views_used(v)] = Fitting_from_bb(input_image, [], bb, pdm, patches, clmParams, 'orientation', views(v,:)); - end - - [lhood, v_ind] = max(ls); - lmark_lhood = lmark_lhoods(:,v_ind); - g_param = g_params{v_ind}; - l_param = l_params{v_ind}; - shape = shapes(:,:,v_ind); - view_used = views_used(v); + [shape,g_param,l_param,lhood,lmark_lhood,view_used] = Fitting_from_bb_multi_hyp(input_image, [], bb, pdm, patches, clmParams, views); else clmParams.window_size = [23,23; 21,21; 19,19; 17,17]; diff --git a/matlab_version/experiments_300VW/results/300VWres_49_cat1.pdf b/matlab_version/experiments_300VW/results/300VWres_49_cat1.pdf index 0f2f9b3b..29dd5b50 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 2ff336a4..0c2cc201 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 9fcf865e..acba3fe6 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/ceclm_errors.mat b/matlab_version/experiments_300VW/results/ceclm_errors.mat index 30d18b57..502f7868 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_menpo/results/results_ceclm_cross-data.mat b/matlab_version/experiments_menpo/results/results_ceclm_cross-data.mat index 77287b5c..7b5fb593 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 7612cde7..2a887340 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 diff --git a/matlab_version/experiments_menpo/results/results_clnf_cross-data_general.mat b/matlab_version/experiments_menpo/results/results_clnf_cross-data_general.mat index d02b964f..2b34f0ef 100644 Binary files a/matlab_version/experiments_menpo/results/results_clnf_cross-data_general.mat and b/matlab_version/experiments_menpo/results/results_clnf_cross-data_general.mat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_12_dyn.dat b/model_training/AU_training/experiments/DISFA/classifiers/AU_12_dyn.dat new file mode 100644 index 00000000..ff9967d4 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/classifiers/AU_12_dyn.dat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_12_dyn.mat b/model_training/AU_training/experiments/DISFA/classifiers/AU_12_dyn.mat index 84eba1e0..d9bead11 100644 Binary files a/model_training/AU_training/experiments/DISFA/classifiers/AU_12_dyn.mat and b/model_training/AU_training/experiments/DISFA/classifiers/AU_12_dyn.mat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_12_stat.dat b/model_training/AU_training/experiments/DISFA/classifiers/AU_12_stat.dat new file mode 100644 index 00000000..0430186f Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/classifiers/AU_12_stat.dat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_12_stat.mat b/model_training/AU_training/experiments/DISFA/classifiers/AU_12_stat.mat index 41fd362d..0f938980 100644 Binary files a/model_training/AU_training/experiments/DISFA/classifiers/AU_12_stat.mat and b/model_training/AU_training/experiments/DISFA/classifiers/AU_12_stat.mat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_15_dyn.dat b/model_training/AU_training/experiments/DISFA/classifiers/AU_15_dyn.dat new file mode 100644 index 00000000..668d0372 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/classifiers/AU_15_dyn.dat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_15_dyn.mat b/model_training/AU_training/experiments/DISFA/classifiers/AU_15_dyn.mat index 78c25433..83116e4f 100644 Binary files a/model_training/AU_training/experiments/DISFA/classifiers/AU_15_dyn.mat and b/model_training/AU_training/experiments/DISFA/classifiers/AU_15_dyn.mat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_15_stat.dat b/model_training/AU_training/experiments/DISFA/classifiers/AU_15_stat.dat new file mode 100644 index 00000000..72a623a7 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/classifiers/AU_15_stat.dat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_15_stat.mat b/model_training/AU_training/experiments/DISFA/classifiers/AU_15_stat.mat index 1fe9bd57..86b4681e 100644 Binary files a/model_training/AU_training/experiments/DISFA/classifiers/AU_15_stat.mat and b/model_training/AU_training/experiments/DISFA/classifiers/AU_15_stat.mat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_17_dyn.dat b/model_training/AU_training/experiments/DISFA/classifiers/AU_17_dyn.dat new file mode 100644 index 00000000..23a5d03b Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/classifiers/AU_17_dyn.dat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_17_dyn.mat b/model_training/AU_training/experiments/DISFA/classifiers/AU_17_dyn.mat index 7a705ac0..aef545fe 100644 Binary files a/model_training/AU_training/experiments/DISFA/classifiers/AU_17_dyn.mat and b/model_training/AU_training/experiments/DISFA/classifiers/AU_17_dyn.mat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_17_stat.dat b/model_training/AU_training/experiments/DISFA/classifiers/AU_17_stat.dat new file mode 100644 index 00000000..82855c59 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/classifiers/AU_17_stat.dat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_17_stat.mat b/model_training/AU_training/experiments/DISFA/classifiers/AU_17_stat.mat index 9fe50e9f..7725c425 100644 Binary files a/model_training/AU_training/experiments/DISFA/classifiers/AU_17_stat.mat and b/model_training/AU_training/experiments/DISFA/classifiers/AU_17_stat.mat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_1_dyn.dat b/model_training/AU_training/experiments/DISFA/classifiers/AU_1_dyn.dat new file mode 100644 index 00000000..6fcc4eb5 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/classifiers/AU_1_dyn.dat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_1_dyn.mat b/model_training/AU_training/experiments/DISFA/classifiers/AU_1_dyn.mat index 5db9f4f0..524e4614 100644 Binary files a/model_training/AU_training/experiments/DISFA/classifiers/AU_1_dyn.mat and b/model_training/AU_training/experiments/DISFA/classifiers/AU_1_dyn.mat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_1_stat.dat b/model_training/AU_training/experiments/DISFA/classifiers/AU_1_stat.dat new file mode 100644 index 00000000..0b11cca3 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/classifiers/AU_1_stat.dat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_1_stat.mat b/model_training/AU_training/experiments/DISFA/classifiers/AU_1_stat.mat index 6b03f1c0..2a83326d 100644 Binary files a/model_training/AU_training/experiments/DISFA/classifiers/AU_1_stat.mat and b/model_training/AU_training/experiments/DISFA/classifiers/AU_1_stat.mat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_20_dyn.dat b/model_training/AU_training/experiments/DISFA/classifiers/AU_20_dyn.dat new file mode 100644 index 00000000..336ad930 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/classifiers/AU_20_dyn.dat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_20_dyn.mat b/model_training/AU_training/experiments/DISFA/classifiers/AU_20_dyn.mat index a35c818b..d2bd9c80 100644 Binary files a/model_training/AU_training/experiments/DISFA/classifiers/AU_20_dyn.mat and b/model_training/AU_training/experiments/DISFA/classifiers/AU_20_dyn.mat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_20_stat.dat b/model_training/AU_training/experiments/DISFA/classifiers/AU_20_stat.dat new file mode 100644 index 00000000..0f45361c Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/classifiers/AU_20_stat.dat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_20_stat.mat b/model_training/AU_training/experiments/DISFA/classifiers/AU_20_stat.mat index b7fb4a4b..cc76678d 100644 Binary files a/model_training/AU_training/experiments/DISFA/classifiers/AU_20_stat.mat and b/model_training/AU_training/experiments/DISFA/classifiers/AU_20_stat.mat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_25_dyn.dat b/model_training/AU_training/experiments/DISFA/classifiers/AU_25_dyn.dat new file mode 100644 index 00000000..acf6b527 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/classifiers/AU_25_dyn.dat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_25_dyn.mat b/model_training/AU_training/experiments/DISFA/classifiers/AU_25_dyn.mat index 10547b50..efb71ae9 100644 Binary files a/model_training/AU_training/experiments/DISFA/classifiers/AU_25_dyn.mat and b/model_training/AU_training/experiments/DISFA/classifiers/AU_25_dyn.mat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_25_stat.dat b/model_training/AU_training/experiments/DISFA/classifiers/AU_25_stat.dat new file mode 100644 index 00000000..2c25e6ec Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/classifiers/AU_25_stat.dat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_25_stat.mat b/model_training/AU_training/experiments/DISFA/classifiers/AU_25_stat.mat index cea4d5a6..4afe4c95 100644 Binary files a/model_training/AU_training/experiments/DISFA/classifiers/AU_25_stat.mat and b/model_training/AU_training/experiments/DISFA/classifiers/AU_25_stat.mat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_26_dyn.dat b/model_training/AU_training/experiments/DISFA/classifiers/AU_26_dyn.dat new file mode 100644 index 00000000..3a0c9d24 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/classifiers/AU_26_dyn.dat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_26_dyn.mat b/model_training/AU_training/experiments/DISFA/classifiers/AU_26_dyn.mat index 27c77d10..1d849be8 100644 Binary files a/model_training/AU_training/experiments/DISFA/classifiers/AU_26_dyn.mat and b/model_training/AU_training/experiments/DISFA/classifiers/AU_26_dyn.mat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_26_stat.dat b/model_training/AU_training/experiments/DISFA/classifiers/AU_26_stat.dat new file mode 100644 index 00000000..08a12053 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/classifiers/AU_26_stat.dat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_26_stat.mat b/model_training/AU_training/experiments/DISFA/classifiers/AU_26_stat.mat index e91f6f55..74374a82 100644 Binary files a/model_training/AU_training/experiments/DISFA/classifiers/AU_26_stat.mat and b/model_training/AU_training/experiments/DISFA/classifiers/AU_26_stat.mat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_2_dyn.dat b/model_training/AU_training/experiments/DISFA/classifiers/AU_2_dyn.dat new file mode 100644 index 00000000..c2129881 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/classifiers/AU_2_dyn.dat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_2_dyn.mat b/model_training/AU_training/experiments/DISFA/classifiers/AU_2_dyn.mat index 742020bc..3b7ebfb4 100644 Binary files a/model_training/AU_training/experiments/DISFA/classifiers/AU_2_dyn.mat and b/model_training/AU_training/experiments/DISFA/classifiers/AU_2_dyn.mat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_2_stat.dat b/model_training/AU_training/experiments/DISFA/classifiers/AU_2_stat.dat new file mode 100644 index 00000000..bbbc37f9 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/classifiers/AU_2_stat.dat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_2_stat.mat b/model_training/AU_training/experiments/DISFA/classifiers/AU_2_stat.mat index 30f14b8a..cf988fd0 100644 Binary files a/model_training/AU_training/experiments/DISFA/classifiers/AU_2_stat.mat and b/model_training/AU_training/experiments/DISFA/classifiers/AU_2_stat.mat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_4_dyn.dat b/model_training/AU_training/experiments/DISFA/classifiers/AU_4_dyn.dat new file mode 100644 index 00000000..65e7003d Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/classifiers/AU_4_dyn.dat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_4_dyn.mat b/model_training/AU_training/experiments/DISFA/classifiers/AU_4_dyn.mat index f81e3931..94162d10 100644 Binary files a/model_training/AU_training/experiments/DISFA/classifiers/AU_4_dyn.mat and b/model_training/AU_training/experiments/DISFA/classifiers/AU_4_dyn.mat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_4_stat.dat b/model_training/AU_training/experiments/DISFA/classifiers/AU_4_stat.dat new file mode 100644 index 00000000..5f814c38 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/classifiers/AU_4_stat.dat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_4_stat.mat b/model_training/AU_training/experiments/DISFA/classifiers/AU_4_stat.mat index 76215e02..1bbef54b 100644 Binary files a/model_training/AU_training/experiments/DISFA/classifiers/AU_4_stat.mat and b/model_training/AU_training/experiments/DISFA/classifiers/AU_4_stat.mat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_5_dyn.dat b/model_training/AU_training/experiments/DISFA/classifiers/AU_5_dyn.dat new file mode 100644 index 00000000..eac4611a Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/classifiers/AU_5_dyn.dat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_5_dyn.mat b/model_training/AU_training/experiments/DISFA/classifiers/AU_5_dyn.mat index f69b0632..7862d444 100644 Binary files a/model_training/AU_training/experiments/DISFA/classifiers/AU_5_dyn.mat and b/model_training/AU_training/experiments/DISFA/classifiers/AU_5_dyn.mat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_5_stat.dat b/model_training/AU_training/experiments/DISFA/classifiers/AU_5_stat.dat new file mode 100644 index 00000000..f6e021a9 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/classifiers/AU_5_stat.dat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_5_stat.mat b/model_training/AU_training/experiments/DISFA/classifiers/AU_5_stat.mat index e6214c60..bbc7d2f7 100644 Binary files a/model_training/AU_training/experiments/DISFA/classifiers/AU_5_stat.mat and b/model_training/AU_training/experiments/DISFA/classifiers/AU_5_stat.mat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_6_dyn.dat b/model_training/AU_training/experiments/DISFA/classifiers/AU_6_dyn.dat new file mode 100644 index 00000000..90ec79de Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/classifiers/AU_6_dyn.dat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_6_dyn.mat b/model_training/AU_training/experiments/DISFA/classifiers/AU_6_dyn.mat index 629047a3..dd38674c 100644 Binary files a/model_training/AU_training/experiments/DISFA/classifiers/AU_6_dyn.mat and b/model_training/AU_training/experiments/DISFA/classifiers/AU_6_dyn.mat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_6_stat.dat b/model_training/AU_training/experiments/DISFA/classifiers/AU_6_stat.dat new file mode 100644 index 00000000..80155f08 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/classifiers/AU_6_stat.dat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_6_stat.mat b/model_training/AU_training/experiments/DISFA/classifiers/AU_6_stat.mat index 81ae18d3..5c650454 100644 Binary files a/model_training/AU_training/experiments/DISFA/classifiers/AU_6_stat.mat and b/model_training/AU_training/experiments/DISFA/classifiers/AU_6_stat.mat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_9_dyn.dat b/model_training/AU_training/experiments/DISFA/classifiers/AU_9_dyn.dat new file mode 100644 index 00000000..56ea3170 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/classifiers/AU_9_dyn.dat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_9_dyn.mat b/model_training/AU_training/experiments/DISFA/classifiers/AU_9_dyn.mat index 76f1046c..01a4329f 100644 Binary files a/model_training/AU_training/experiments/DISFA/classifiers/AU_9_dyn.mat and b/model_training/AU_training/experiments/DISFA/classifiers/AU_9_dyn.mat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_9_stat.dat b/model_training/AU_training/experiments/DISFA/classifiers/AU_9_stat.dat new file mode 100644 index 00000000..7ce9c9be Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/classifiers/AU_9_stat.dat differ diff --git a/model_training/AU_training/experiments/DISFA/classifiers/AU_9_stat.mat b/model_training/AU_training/experiments/DISFA/classifiers/AU_9_stat.mat index f436d981..9d5d19f4 100644 Binary files a/model_training/AU_training/experiments/DISFA/classifiers/AU_9_stat.mat and b/model_training/AU_training/experiments/DISFA/classifiers/AU_9_stat.mat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_12_dyn_intensity.mat b/model_training/AU_training/experiments/DISFA/regressors/AU_12_dyn_intensity.mat new file mode 100644 index 00000000..6b329739 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_12_dyn_intensity.mat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_12_dynamic_intensity.dat b/model_training/AU_training/experiments/DISFA/regressors/AU_12_dynamic_intensity.dat new file mode 100644 index 00000000..45788697 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_12_dynamic_intensity.dat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_12_static_intensity.dat b/model_training/AU_training/experiments/DISFA/regressors/AU_12_static_intensity.dat new file mode 100644 index 00000000..338f7f87 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_12_static_intensity.dat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_12_static_intensity.mat b/model_training/AU_training/experiments/DISFA/regressors/AU_12_static_intensity.mat new file mode 100644 index 00000000..8bc030c6 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_12_static_intensity.mat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_15_dyn_intensity.mat b/model_training/AU_training/experiments/DISFA/regressors/AU_15_dyn_intensity.mat new file mode 100644 index 00000000..05fd8bc0 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_15_dyn_intensity.mat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_15_dynamic_intensity.dat b/model_training/AU_training/experiments/DISFA/regressors/AU_15_dynamic_intensity.dat new file mode 100644 index 00000000..b8f36594 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_15_dynamic_intensity.dat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_15_static_intensity.dat b/model_training/AU_training/experiments/DISFA/regressors/AU_15_static_intensity.dat new file mode 100644 index 00000000..6412f64f Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_15_static_intensity.dat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_15_static_intensity.mat b/model_training/AU_training/experiments/DISFA/regressors/AU_15_static_intensity.mat new file mode 100644 index 00000000..34bfc5c4 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_15_static_intensity.mat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_17_dyn_intensity.mat b/model_training/AU_training/experiments/DISFA/regressors/AU_17_dyn_intensity.mat new file mode 100644 index 00000000..1249e5cb Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_17_dyn_intensity.mat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_17_dynamic_intensity.dat b/model_training/AU_training/experiments/DISFA/regressors/AU_17_dynamic_intensity.dat new file mode 100644 index 00000000..e07d026d Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_17_dynamic_intensity.dat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_17_static_intensity.dat b/model_training/AU_training/experiments/DISFA/regressors/AU_17_static_intensity.dat new file mode 100644 index 00000000..274e95dc Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_17_static_intensity.dat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_17_static_intensity.mat b/model_training/AU_training/experiments/DISFA/regressors/AU_17_static_intensity.mat new file mode 100644 index 00000000..1163faf7 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_17_static_intensity.mat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_1_dyn_intensity.mat b/model_training/AU_training/experiments/DISFA/regressors/AU_1_dyn_intensity.mat new file mode 100644 index 00000000..b8ff6d55 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_1_dyn_intensity.mat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_1_dynamic_intensity.dat b/model_training/AU_training/experiments/DISFA/regressors/AU_1_dynamic_intensity.dat new file mode 100644 index 00000000..2c2d49e1 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_1_dynamic_intensity.dat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_1_static_intensity.dat b/model_training/AU_training/experiments/DISFA/regressors/AU_1_static_intensity.dat new file mode 100644 index 00000000..f4f59d3e Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_1_static_intensity.dat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_1_static_intensity.mat b/model_training/AU_training/experiments/DISFA/regressors/AU_1_static_intensity.mat new file mode 100644 index 00000000..339ccf11 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_1_static_intensity.mat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_20_dyn_intensity.mat b/model_training/AU_training/experiments/DISFA/regressors/AU_20_dyn_intensity.mat new file mode 100644 index 00000000..4b1553d5 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_20_dyn_intensity.mat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_20_dynamic_intensity.dat b/model_training/AU_training/experiments/DISFA/regressors/AU_20_dynamic_intensity.dat new file mode 100644 index 00000000..3e735792 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_20_dynamic_intensity.dat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_20_static_intensity.dat b/model_training/AU_training/experiments/DISFA/regressors/AU_20_static_intensity.dat new file mode 100644 index 00000000..97ef033f Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_20_static_intensity.dat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_20_static_intensity.mat b/model_training/AU_training/experiments/DISFA/regressors/AU_20_static_intensity.mat new file mode 100644 index 00000000..385e3133 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_20_static_intensity.mat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_25_dyn_intensity.mat b/model_training/AU_training/experiments/DISFA/regressors/AU_25_dyn_intensity.mat new file mode 100644 index 00000000..a3b7b14e Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_25_dyn_intensity.mat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_25_dynamic_intensity.dat b/model_training/AU_training/experiments/DISFA/regressors/AU_25_dynamic_intensity.dat new file mode 100644 index 00000000..c0ed1b37 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_25_dynamic_intensity.dat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_25_static_intensity.dat b/model_training/AU_training/experiments/DISFA/regressors/AU_25_static_intensity.dat new file mode 100644 index 00000000..46dc3f3f Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_25_static_intensity.dat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_25_static_intensity.mat b/model_training/AU_training/experiments/DISFA/regressors/AU_25_static_intensity.mat new file mode 100644 index 00000000..cfb9c470 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_25_static_intensity.mat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_26_dyn_intensity.mat b/model_training/AU_training/experiments/DISFA/regressors/AU_26_dyn_intensity.mat new file mode 100644 index 00000000..71543e0e Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_26_dyn_intensity.mat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_26_dynamic_intensity.dat b/model_training/AU_training/experiments/DISFA/regressors/AU_26_dynamic_intensity.dat new file mode 100644 index 00000000..204a316f Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_26_dynamic_intensity.dat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_26_static_intensity.dat b/model_training/AU_training/experiments/DISFA/regressors/AU_26_static_intensity.dat new file mode 100644 index 00000000..18a8a924 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_26_static_intensity.dat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_26_static_intensity.mat b/model_training/AU_training/experiments/DISFA/regressors/AU_26_static_intensity.mat new file mode 100644 index 00000000..7f005a19 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_26_static_intensity.mat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_2_dyn_intensity.mat b/model_training/AU_training/experiments/DISFA/regressors/AU_2_dyn_intensity.mat new file mode 100644 index 00000000..75e3b035 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_2_dyn_intensity.mat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_2_dynamic_intensity.dat b/model_training/AU_training/experiments/DISFA/regressors/AU_2_dynamic_intensity.dat new file mode 100644 index 00000000..9609c989 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_2_dynamic_intensity.dat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_2_static_intensity.dat b/model_training/AU_training/experiments/DISFA/regressors/AU_2_static_intensity.dat new file mode 100644 index 00000000..7d547196 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_2_static_intensity.dat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_2_static_intensity.mat b/model_training/AU_training/experiments/DISFA/regressors/AU_2_static_intensity.mat new file mode 100644 index 00000000..3903f1af Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_2_static_intensity.mat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_4_dyn_intensity.mat b/model_training/AU_training/experiments/DISFA/regressors/AU_4_dyn_intensity.mat new file mode 100644 index 00000000..315c4214 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_4_dyn_intensity.mat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_4_dynamic_intensity.dat b/model_training/AU_training/experiments/DISFA/regressors/AU_4_dynamic_intensity.dat new file mode 100644 index 00000000..19517e6a Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_4_dynamic_intensity.dat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_4_static_intensity.dat b/model_training/AU_training/experiments/DISFA/regressors/AU_4_static_intensity.dat new file mode 100644 index 00000000..e1e39495 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_4_static_intensity.dat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_4_static_intensity.mat b/model_training/AU_training/experiments/DISFA/regressors/AU_4_static_intensity.mat new file mode 100644 index 00000000..ac2882b0 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_4_static_intensity.mat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_5_dyn_intensity.mat b/model_training/AU_training/experiments/DISFA/regressors/AU_5_dyn_intensity.mat new file mode 100644 index 00000000..aaaa2031 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_5_dyn_intensity.mat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_5_dynamic_intensity.dat b/model_training/AU_training/experiments/DISFA/regressors/AU_5_dynamic_intensity.dat new file mode 100644 index 00000000..715b9d84 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_5_dynamic_intensity.dat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_5_static_intensity.dat b/model_training/AU_training/experiments/DISFA/regressors/AU_5_static_intensity.dat new file mode 100644 index 00000000..598f802b Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_5_static_intensity.dat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_5_static_intensity.mat b/model_training/AU_training/experiments/DISFA/regressors/AU_5_static_intensity.mat new file mode 100644 index 00000000..cc92f9b2 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_5_static_intensity.mat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_6_dyn_intensity.mat b/model_training/AU_training/experiments/DISFA/regressors/AU_6_dyn_intensity.mat new file mode 100644 index 00000000..1a977dda Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_6_dyn_intensity.mat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_6_dynamic_intensity.dat b/model_training/AU_training/experiments/DISFA/regressors/AU_6_dynamic_intensity.dat new file mode 100644 index 00000000..4ad4c87d Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_6_dynamic_intensity.dat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_6_static_intensity.dat b/model_training/AU_training/experiments/DISFA/regressors/AU_6_static_intensity.dat new file mode 100644 index 00000000..1bbc8e44 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_6_static_intensity.dat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_6_static_intensity.mat b/model_training/AU_training/experiments/DISFA/regressors/AU_6_static_intensity.mat new file mode 100644 index 00000000..5911d69f Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_6_static_intensity.mat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_9_dyn_intensity.mat b/model_training/AU_training/experiments/DISFA/regressors/AU_9_dyn_intensity.mat new file mode 100644 index 00000000..540040e7 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_9_dyn_intensity.mat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_9_dynamic_intensity.dat b/model_training/AU_training/experiments/DISFA/regressors/AU_9_dynamic_intensity.dat new file mode 100644 index 00000000..bab119c9 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_9_dynamic_intensity.dat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_9_static_intensity.dat b/model_training/AU_training/experiments/DISFA/regressors/AU_9_static_intensity.dat new file mode 100644 index 00000000..794f414e Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_9_static_intensity.dat differ diff --git a/model_training/AU_training/experiments/DISFA/regressors/AU_9_static_intensity.mat b/model_training/AU_training/experiments/DISFA/regressors/AU_9_static_intensity.mat new file mode 100644 index 00000000..1c4f16d3 Binary files /dev/null and b/model_training/AU_training/experiments/DISFA/regressors/AU_9_static_intensity.mat differ