Peter M. Groen / openbr

Commit 284a46fd7622ce630e2b71b72f868bb99b6949b9

Authored by Ben Klein
Committed by GitHub
2 parents 2f1f63c2 0739a0c5

Merge pull request #564 from biometrics/eval_landmarking_fix 

Fixed some edge cases in eval landmarking
Inline Side-by-side
Showing 2 changed files with 3 additions and 1 deletions
openbr/core/eval.cpp
  View file @284a46f
@@ -892,6 +892,8 @@ float EvalLandmarking(const QString &predictedGallery, const QString &truthGalle @@ -892,6 +892,8 @@ float EvalLandmarking(const QString &predictedGallery, const QString &truthGalle
892 // Or the ground truth seems to be for another object in the image 892 // Or the ground truth seems to be for another object in the image
893 || (QtUtils::euclideanLength(predictedPoints[normalizationIndexA] - truthPoints[normalizationIndexA]) / normalizedLength >= 0.5) 893 || (QtUtils::euclideanLength(predictedPoints[normalizationIndexA] - truthPoints[normalizationIndexA]) / normalizedLength >= 0.5)
894 || (QtUtils::euclideanLength(predictedPoints[normalizationIndexB] - truthPoints[normalizationIndexB]) / normalizedLength >= 0.5) 894 || (QtUtils::euclideanLength(predictedPoints[normalizationIndexB] - truthPoints[normalizationIndexB]) / normalizedLength >= 0.5)
  895 + // Or the predicted image FTE'd
  896 + || predicted[i].file.fte || predicted[i].file.getBool("FTE")
895 ) { 897 ) {
896 predicted.removeAt(i); 898 predicted.removeAt(i);
897 predictedNames.removeAt(i); 899 predictedNames.removeAt(i);
share/openbr/plotting/plot_utils.R
  View file @284a46f
@@ -313,7 +313,7 @@ plotEERSamples <- function(imData=NULL, gmData=NULL) { @@ -313,7 +313,7 @@ plotEERSamples <- function(imData=NULL, gmData=NULL) {
313 313
314 plotLandmarkSamples <- function(displaySample=NULL, expData=NULL, extData=NULL) { 314 plotLandmarkSamples <- function(displaySample=NULL, expData=NULL, extData=NULL) {
315 print(plotImage(displaySample[[1]], "Sample Landmarks", sprintf("Total Landmarks: %s", displaySample[[1]]$value))) 315 print(plotImage(displaySample[[1]], "Sample Landmarks", sprintf("Total Landmarks: %s", displaySample[[1]]$value)))
316 - column <- if(majorSize > 1) majorHeader else "File" 316 + column <- if(majorSize > 1) majorHeader else minorHeader
317 if (nrow(EXT) != 0 && nrow(EXP)) { 317 if (nrow(EXT) != 0 && nrow(EXP)) {
318 for (j in 1:length(algs)) { 318 for (j in 1:length(algs)) {
319 truthSample <- readImageData(EXT[EXT[,column] == algs[[j]],]) 319 truthSample <- readImageData(EXT[EXT[,column] == algs[[j]],])