diff --git a/app/br/br.cpp b/app/br/br.cpp index e135b93..5daed53 100644 --- a/app/br/br.cpp +++ b/app/br/br.cpp @@ -163,8 +163,8 @@ public: check((parc >= 2) && (parc <= 6), "Incorrect parameter count for 'evalDetection'."); br_eval_detection(parv[0], parv[1], parc >= 3 ? parv[2] : "", parc >= 4 ? atoi(parv[3]) : 0, parc >= 5 ? atoi(parv[4]) : 0, parc == 6 ? atoi(parv[5]) : 0); } else if (!strcmp(fun, "evalLandmarking")) { - check((parc >= 2) && (parc <= 6), "Incorrect parameter count for 'evalLandmarking'."); - br_eval_landmarking(parv[0], parv[1], parc >= 3 ? parv[2] : "", parc >= 4 ? atoi(parv[3]) : 0, parc >= 5 ? atoi(parv[4]) : 1, parc >= 6 ? atoi(parv[5]) : 0); + check((parc >= 2) && (parc <= 7), "Incorrect parameter count for 'evalLandmarking'."); + br_eval_landmarking(parv[0], parv[1], parc >= 3 ? parv[2] : "", parc >= 4 ? atoi(parv[3]) : 0, parc >= 5 ? atoi(parv[4]) : 1, parc >= 6 ? atoi(parv[5]) : 0, parc >= 7 ? atoi(parv[6]) : 5); } else if (!strcmp(fun, "evalRegression")) { check(parc >= 2 && parc <= 4, "Incorrect parameter count for 'evalRegression'."); br_eval_regression(parv[0], parv[1], parc >= 3 ? parv[2] : "", parc >= 4 ? parv[3] : ""); diff --git a/openbr/core/eval.cpp b/openbr/core/eval.cpp index 2e79cca..853fc51 100755 --- a/openbr/core/eval.cpp +++ b/openbr/core/eval.cpp @@ -1040,7 +1040,7 @@ static void projectAndWrite(Transform *t, const Template &src, const QString &fi OpenCVUtils::saveImage(dst.m(),filePath); } -float EvalLandmarking(const QString &predictedGallery, const QString &truthGallery, const QString &csv, int normalizationIndexA, int normalizationIndexB, int sampleIndex) +float EvalLandmarking(const QString &predictedGallery, const QString &truthGallery, const QString &csv, int normalizationIndexA, int normalizationIndexB, int sampleIndex, int totalExamples) { qDebug("Evaluating landmarking of %s against %s", qPrintable(predictedGallery), qPrintable(truthGallery)); TemplateList predicted(TemplateList::fromGallery(predictedGallery)); @@ -1109,7 +1109,6 @@ float EvalLandmarking(const QString &predictedGallery, const QString &truthGalle QScopedPointer t(Transform::make("Open+Draw(rects=false)",NULL)); - const int totalExamples = 10; for (int i=0; i 1 ? p.major.header : (p.minor.header.isEmpty() ? p.major.header : p.minor.header)))); diff --git a/openbr/openbr.cpp b/openbr/openbr.cpp index 96ec913..3162371 100644 --- a/openbr/openbr.cpp +++ b/openbr/openbr.cpp @@ -134,9 +134,9 @@ float br_eval_detection(const char *predicted_gallery, const char *truth_gallery return EvalDetection(predicted_gallery, truth_gallery, csv, normalize, minSize, maxSize); } -float br_eval_landmarking(const char *predicted_gallery, const char *truth_gallery, const char *csv, int normalization_index_a, int normalization_index_b, int sample_index) +float br_eval_landmarking(const char *predicted_gallery, const char *truth_gallery, const char *csv, int normalization_index_a, int normalization_index_b, int sample_index, int total_examples) { - return EvalLandmarking(predicted_gallery, truth_gallery, csv, normalization_index_a, normalization_index_b, sample_index); + return EvalLandmarking(predicted_gallery, truth_gallery, csv, normalization_index_a, normalization_index_b, sample_index, total_examples); } void br_eval_regression(const char *predicted_gallery, const char *truth_gallery, const char *predicted_property, const char *truth_property) diff --git a/openbr/openbr.h b/openbr/openbr.h index 6dcf3e5..4f32e86 100644 --- a/openbr/openbr.h +++ b/openbr/openbr.h @@ -215,8 +215,9 @@ BR_EXPORT float br_eval_detection(const char *predicted_gallery, const char *tru * \param normalization_index_a Optional first index in the list of points to use for normalization. * \param normalization_index_b Optional second index in the list of points to use for normalization. * \param sample_index Optional index for sample landmark image in ground truth gallery. + * \param total_examples Optional number of accurate and inaccurate examples to display. */ -BR_EXPORT float br_eval_landmarking(const char *predicted_gallery, const char *truth_gallery, const char *csv = "", int normalization_index_a = 0, int normalization_index_b = 1, int sample_index = 0); +BR_EXPORT float br_eval_landmarking(const char *predicted_gallery, const char *truth_gallery, const char *csv = "", int normalization_index_a = 0, int normalization_index_b = 1, int sample_index = 0, int total_examples = 5); /*! * \brief Evaluates regression accuracy to disk.