ZF/OpenFace
1
0
Fork 0
mirror of https://gitcode.com/gh_mirrors/ope/OpenFace.git synced 2026-08-27 11:17:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplifying the code a bit with moving to floats instead of doubles for likelihoods

Browse Source
This commit is contained in:
Tadas Baltrusaitis
2017-09-30 21:11:37 +01:00
parent 918651efdc
commit cedc430ef0
5 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/local/LandmarkDetector/src/LandmarkDetectorModel.cpp
View File

@@ -938,8 +938,8 @@ void CLNF::GetWeightMatrix(cv::Mat_<float>& WeightMatrix, int scale, int view_id
}
//=============================================================================
double CLNF::NU_RLMS(cv::Vec6d& final_global, cv::Mat_<double>& final_local, const vector<cv::Mat_<float> >& patch_expert_responses, const cv::Vec6d& initial_global, const cv::Mat_<double>& initial_local,
const cv::Mat_<double>& base_shape, const cv::Matx22d& sim_img_to_ref, const cv::Matx22f& sim_ref_to_img, int resp_size, int view_id, bool rigid, int scale, cv::Mat_<double>& landmark_lhoods,
float CLNF::NU_RLMS(cv::Vec6d& final_global, cv::Mat_<double>& final_local, const vector<cv::Mat_<float> >& patch_expert_responses, const cv::Vec6d& initial_global, const cv::Mat_<double>& initial_local,
const cv::Mat_<double>& base_shape, const cv::Matx22d& sim_img_to_ref, const cv::Matx22f& sim_ref_to_img, int resp_size, int view_id, bool rigid, int scale, cv::Mat_<float>& landmark_lhoods,
const FaceModelParameters& parameters, bool compute_lhood)
{
@@ -1088,11 +1088,11 @@ double CLNF::NU_RLMS(cv::Vec6d& final_global, cv::Mat_<double>& final_local, con
}
// compute the log likelihood
double loglhood = 0;
float loglhood = 0;
if(compute_lhood)
{
landmark_lhoods = cv::Mat_<double>(n, 1, -1e8);
landmark_lhoods = cv::Mat_<float>(n, 1, -1e8);
for(int i = 0; i < n; i++)
{
@@ -1126,7 +1126,7 @@ double CLNF::NU_RLMS(cv::Vec6d& final_global, cv::Mat_<double>& final_local, con
sum += v;
}
}
landmark_lhoods.at<double>(i,0) = (double)sum;
landmark_lhoods.at<float>(i,0) = sum;
// the offset is there for numerical stability
loglhood += log(sum + 1e-8);