diff --git a/exe/FaceLandmarkImg/FaceLandmarkImg.cpp b/exe/FaceLandmarkImg/FaceLandmarkImg.cpp index 502ddbb..3980c93 100644 --- a/exe/FaceLandmarkImg/FaceLandmarkImg.cpp +++ b/exe/FaceLandmarkImg/FaceLandmarkImg.cpp @@ -171,7 +171,7 @@ int main (int argc, char **argv) cv::Point3f gaze_direction1(0, 0, -1); cv::Vec2d gaze_angle(0, 0); - if (success && face_model.eye_model) + if (face_model.eye_model) { GazeAnalysis::EstimateGaze(face_model, gaze_direction0, image_reader.fx, image_reader.fy, image_reader.cx, image_reader.cy, true); GazeAnalysis::EstimateGaze(face_model, gaze_direction1, image_reader.fx, image_reader.fy, image_reader.cx, image_reader.cy, false); diff --git a/lib/local/Utilities/src/RecorderCSV.cpp b/lib/local/Utilities/src/RecorderCSV.cpp index a8a90ad..3754261 100644 --- a/lib/local/Utilities/src/RecorderCSV.cpp +++ b/lib/local/Utilities/src/RecorderCSV.cpp @@ -208,11 +208,12 @@ void RecorderCSV::WriteLine(int observation_count, double time_stamp, bool landm // Output the estimated gaze if (output_gaze) { - output_file << std::setprecision(3); + output_file << std::setprecision(6); output_file << ", " << gazeDirection0.x << ", " << gazeDirection0.y << ", " << gazeDirection0.z << ", " << gazeDirection1.x << ", " << gazeDirection1.y << ", " << gazeDirection1.z; // Output gaze angle (same format as head pose angle) + output_file << std::setprecision(3); output_file << ", " << gaze_angle[0] << ", " << gaze_angle[1]; // Output the 2D eye landmarks diff --git a/lib/local/Utilities/src/Visualizer.cpp b/lib/local/Utilities/src/Visualizer.cpp index 5fbbd12..75877f9 100644 --- a/lib/local/Utilities/src/Visualizer.cpp +++ b/lib/local/Utilities/src/Visualizer.cpp @@ -90,7 +90,6 @@ void Visualizer::SetImage(const cv::Mat& canvas, float fx, float fy, float cx, f { // Convert the image to 8 bit RGB captured_image = canvas.clone(); - ConvertToRGB_8bit(captured_image); this->fx = fx; this->fy = fy; diff --git a/matlab_runners/Action Unit Experiments/results/Bosphorus_res_int.txt b/matlab_runners/Action Unit Experiments/results/Bosphorus_res_int.txt index 8ac0ee9..c066a02 100644 --- a/matlab_runners/Action Unit Experiments/results/Bosphorus_res_int.txt +++ b/matlab_runners/Action Unit Experiments/results/Bosphorus_res_int.txt @@ -10,7 +10,7 @@ AU12 intensity, Corr - 0.804, RMS - 0.715, CCC - 0.766 AU14 intensity, Corr - 0.357, RMS - 0.931, CCC - 0.277 AU15 intensity, Corr - 0.516, RMS - 0.565, CCC - 0.431 AU17 intensity, Corr - 0.554, RMS - 0.893, CCC - 0.477 -AU20 intensity, Corr - 0.411, RMS - 0.900, CCC - 0.277 +AU20 intensity, Corr - 0.411, RMS - 0.901, CCC - 0.277 AU23 intensity, Corr - 0.351, RMS - 0.736, CCC - 0.274 AU25 intensity, Corr - 0.846, RMS - 0.809, CCC - 0.822 AU26 intensity, Corr - 0.516, RMS - 0.995, CCC - 0.453 diff --git a/matlab_runners/Action Unit Experiments/results/DISFA_valid_res.txt b/matlab_runners/Action Unit Experiments/results/DISFA_valid_res.txt index 90dd105..884b143 100644 --- a/matlab_runners/Action Unit Experiments/results/DISFA_valid_res.txt +++ b/matlab_runners/Action Unit Experiments/results/DISFA_valid_res.txt @@ -9,4 +9,4 @@ AU15 results - corr 0.745, rms 0.269, ccc - 0.712 AU17 results - corr 0.642, rms 0.517, ccc - 0.574 AU20 results - corr 0.619, rms 0.311, ccc - 0.581 AU25 results - corr 0.926, rms 0.500, ccc - 0.920 -AU26 results - corr 0.803, rms 0.449, ccc - 0.762 +AU26 results - corr 0.802, rms 0.449, ccc - 0.762 diff --git a/matlab_runners/Feature Point Experiments/results/fps_yt.mat b/matlab_runners/Feature Point Experiments/results/fps_yt.mat index dea34e8..ceaf6ea 100644 Binary files a/matlab_runners/Feature Point Experiments/results/fps_yt.mat and b/matlab_runners/Feature Point Experiments/results/fps_yt.mat differ diff --git a/matlab_runners/Feature Point Experiments/results/in-the-wild-res-no-outline.pdf b/matlab_runners/Feature Point Experiments/results/in-the-wild-res-no-outline.pdf index 7e88056..0c91fca 100644 Binary files a/matlab_runners/Feature Point Experiments/results/in-the-wild-res-no-outline.pdf and b/matlab_runners/Feature Point Experiments/results/in-the-wild-res-no-outline.pdf differ diff --git a/matlab_runners/Feature Point Experiments/results/landmark_detections.mat b/matlab_runners/Feature Point Experiments/results/landmark_detections.mat index 826d2ce..5007570 100644 Binary files a/matlab_runners/Feature Point Experiments/results/landmark_detections.mat and b/matlab_runners/Feature Point Experiments/results/landmark_detections.mat differ diff --git a/matlab_runners/Feature Point Experiments/results/landmark_detections.txt b/matlab_runners/Feature Point Experiments/results/landmark_detections.txt index 892917a..ac697cb 100644 --- a/matlab_runners/Feature Point Experiments/results/landmark_detections.txt +++ b/matlab_runners/Feature Point Experiments/results/landmark_detections.txt @@ -1,9 +1,9 @@ Type, mean, median -err clnf: 0.054470, 0.039988 -err clnf wild: 0.053170, 0.038478 +err clnf: 0.054473, 0.040001 +err clnf wild: 0.053173, 0.038511 err svr: 0.070548, 0.050640 -err svr wild: 0.067535, 0.048706 -err clnf no out: 0.043237, 0.030025 -err clnf wild no out: 0.041457, 0.027522 -err svr no out: 0.058768, 0.038836 -err svr wild no out: 0.054166, 0.036251 +err svr wild: 0.067535, 0.048691 +err clnf no out: 0.043240, 0.030040 +err clnf wild no out: 0.041460, 0.027516 +err svr no out: 0.058769, 0.038858 +err svr wild no out: 0.054168, 0.036253 diff --git a/matlab_runners/Full_test_suite.m b/matlab_runners/Full_test_suite.m index 761124f..5bc54f5 100644 --- a/matlab_runners/Full_test_suite.m +++ b/matlab_runners/Full_test_suite.m @@ -43,7 +43,7 @@ cd('../'); %% Gaze cd('Gaze Experiments'); extract_mpii_gaze_test -assert(mean_error < 9.7) +assert(mean_error < 9.6) assert(median_error < 9.0) cd('../'); diff --git a/matlab_runners/Gaze Experiments/mpii_1500_errs.mat b/matlab_runners/Gaze Experiments/mpii_1500_errs.mat index 8fa2d5d..65ba937 100644 Binary files a/matlab_runners/Gaze Experiments/mpii_1500_errs.mat and b/matlab_runners/Gaze Experiments/mpii_1500_errs.mat differ diff --git a/matlab_runners/Gaze Experiments/mpii_1500_errs.txt b/matlab_runners/Gaze Experiments/mpii_1500_errs.txt index 99b3432..4a203b7 100644 --- a/matlab_runners/Gaze Experiments/mpii_1500_errs.txt +++ b/matlab_runners/Gaze Experiments/mpii_1500_errs.txt @@ -1,2 +1,2 @@ Mean error, median error -9.428, 8.611 +9.438, 8.611 diff --git a/matlab_runners/Head Pose Experiments/results/Pose_OF.mat b/matlab_runners/Head Pose Experiments/results/Pose_OF.mat index 53bbc58..850f291 100644 Binary files a/matlab_runners/Head Pose Experiments/results/Pose_OF.mat and b/matlab_runners/Head Pose Experiments/results/Pose_OF.mat differ diff --git a/matlab_runners/Head Pose Experiments/results/Pose_OF.txt b/matlab_runners/Head Pose Experiments/results/Pose_OF.txt index 3d11618..3eafc97 100644 --- a/matlab_runners/Head Pose Experiments/results/Pose_OF.txt +++ b/matlab_runners/Head Pose Experiments/results/Pose_OF.txt @@ -1,4 +1,4 @@ Dataset and model, pitch, yaw, roll, mean, median -biwi error: 7.779, 6.302, 4.440, 6.174, 2.779 -bu error: 2.739, 3.348, 2.458, 2.848, 1.975 -ict error: 3.501, 3.988, 3.298, 3.596, 1.968 +biwi error: 7.778, 6.302, 4.441, 6.174, 2.777 +bu error: 2.739, 3.349, 2.459, 2.849, 1.974 +ict error: 3.498, 3.986, 3.298, 3.594, 1.966