From fee099703932f77f3ffd9668cc681406857fa98d Mon Sep 17 00:00:00 2001 From: Stephen Rawls Date: Thu, 22 Jan 2015 10:26:10 -0800 Subject: [PATCH] Fixing indentation / code style issues for pull request --- openbr/core/eval.cpp | 36 +++++++++++++++++++++++------------- openbr/core/plot.cpp | 4 +--- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/openbr/core/eval.cpp b/openbr/core/eval.cpp index 5876538..2f0ae67 100755 --- a/openbr/core/eval.cpp +++ b/openbr/core/eval.cpp @@ -81,7 +81,7 @@ static OperatingPoint getOperatingPointGivenTAR(const QList &ope while (operatingPoints[index].TAR < TAR) { index++; if (index == operatingPoints.size()) - return OperatingPoint(operatingPoints.last().score, operatingPoints.last().FAR, TAR); + return OperatingPoint(operatingPoints.last().score, operatingPoints.last().FAR, TAR); } @@ -316,20 +316,30 @@ float Evaluate(const Mat &simmat, const Mat &mask, const QString &csv, const QSt } // Write TAR@FAR Table (FT) - lines.append(qPrintable(QString("FT,0.000001,%1").arg(QString::number(getOperatingPointGivenFAR(operatingPoints, 0.000001).TAR, 'f', 3)))); - lines.append(qPrintable(QString("FT,0.00001,%1").arg(QString::number(getOperatingPointGivenFAR(operatingPoints, 0.00001).TAR, 'f', 3)))); - lines.append(qPrintable(QString("FT,0.0001,%1").arg(QString::number(getOperatingPointGivenFAR(operatingPoints, 0.0001).TAR, 'f', 3)))); - lines.append(qPrintable(QString("FT,0.001,%1").arg(QString::number(getOperatingPointGivenFAR(operatingPoints, 0.001).TAR, 'f', 3)))); - lines.append(qPrintable(QString("FT,0.01,%1").arg(QString::number(getOperatingPointGivenFAR(operatingPoints, 0.01).TAR, 'f', 3)))); - lines.append(qPrintable(QString("FT,0.1,%1").arg(QString::number(getOperatingPointGivenFAR(operatingPoints, 0.1).TAR, 'f', 3)))); + foreach (float far, QList() << 1e-6 << 1e-5 << 1e-4 << 1e-3 << 1e-2 << 1e-1) + lines.append(qPrintable(QString("FT,%1,%2").arg( + QString::number(far, 'f'), + QString::number(getOperatingPointGivenFAR(operatingPoints, far).TAR, 'f', 3)))); + +// lines.append(qPrintable(QString("FT,0.000001,%1").arg(QString::number(getOperatingPointGivenFAR(operatingPoints, 0.000001).TAR, 'f', 3)))); +// lines.append(qPrintable(QString("FT,0.00001,%1").arg(QString::number(getOperatingPointGivenFAR(operatingPoints, 0.00001).TAR, 'f', 3)))); +// lines.append(qPrintable(QString("FT,0.0001,%1").arg(QString::number(getOperatingPointGivenFAR(operatingPoints, 0.0001).TAR, 'f', 3)))); +// lines.append(qPrintable(QString("FT,0.001,%1").arg(QString::number(getOperatingPointGivenFAR(operatingPoints, 0.001).TAR, 'f', 3)))); +// lines.append(qPrintable(QString("FT,0.01,%1").arg(QString::number(getOperatingPointGivenFAR(operatingPoints, 0.01).TAR, 'f', 3)))); +// lines.append(qPrintable(QString("FT,0.1,%1").arg(QString::number(getOperatingPointGivenFAR(operatingPoints, 0.1).TAR, 'f', 3)))); // Write FAR@TAR Table (FatT) - lines.append(qPrintable(QString("FatT,0.95,%1").arg(QString::number(getOperatingPointGivenTAR(operatingPoints, 0.95).FAR, 'f', 3)))); - lines.append(qPrintable(QString("FatT,0.85,%1").arg(QString::number(getOperatingPointGivenTAR(operatingPoints, 0.85).FAR, 'f', 3)))); - lines.append(qPrintable(QString("FatT,0.75,%1").arg(QString::number(getOperatingPointGivenTAR(operatingPoints, 0.75).FAR, 'f', 3)))); - lines.append(qPrintable(QString("FatT,0.65,%1").arg(QString::number(getOperatingPointGivenTAR(operatingPoints, 0.65).FAR, 'f', 3)))); - lines.append(qPrintable(QString("FatT,0.50,%1").arg(QString::number(getOperatingPointGivenTAR(operatingPoints, 0.50).FAR, 'f', 3)))); - lines.append(qPrintable(QString("FatT,0.40,%1").arg(QString::number(getOperatingPointGivenTAR(operatingPoints, 0.40).FAR, 'f', 3)))); + foreach (float tar, QList() << 0.95 << 0.85 << 0.75 << 0.65 << 0.5 << 0.4) + lines.append(qPrintable(QString("FatT,%1,%2").arg( + QString::number(tar, 'f', 2), + QString::number(getOperatingPointGivenTAR(operatingPoints, tar).FAR, 'f', 3)))); + +// lines.append(qPrintable(QString("FatT,0.95,%1").arg(QString::number(getOperatingPointGivenTAR(operatingPoints, 0.95).FAR, 'f', 3)))); +// lines.append(qPrintable(QString("FatT,0.85,%1").arg(QString::number(getOperatingPointGivenTAR(operatingPoints, 0.85).FAR, 'f', 3)))); +// lines.append(qPrintable(QString("FatT,0.75,%1").arg(QString::number(getOperatingPointGivenTAR(operatingPoints, 0.75).FAR, 'f', 3)))); +// lines.append(qPrintable(QString("FatT,0.65,%1").arg(QString::number(getOperatingPointGivenTAR(operatingPoints, 0.65).FAR, 'f', 3)))); +// lines.append(qPrintable(QString("FatT,0.50,%1").arg(QString::number(getOperatingPointGivenTAR(operatingPoints, 0.50).FAR, 'f', 3)))); +// lines.append(qPrintable(QString("FatT,0.40,%1").arg(QString::number(getOperatingPointGivenTAR(operatingPoints, 0.40).FAR, 'f', 3)))); //Write CMC Table (CT) lines.append(qPrintable(QString("CT,1,%1").arg(QString::number(getCMC(firstGenuineReturns, 1), 'f', 3)))); diff --git a/openbr/core/plot.cpp b/openbr/core/plot.cpp index aead994..288382d 100644 --- a/openbr/core/plot.cpp +++ b/openbr/core/plot.cpp @@ -215,8 +215,6 @@ struct RPlot "rownames(mat) <- c(\"TAR = 0.95\", \"TAR = 0.85\", \"TAR = 0.75\", \"TAR = 0.65\", \"TAR = 0.50\", \"TAR = 0.40\")\n" "F_at_Ttable <- as.table(mat)\n" "\n" - - "\n" "# Code to format CMC Table\n" "mat <- matrix(%4,nrow=6,ncol=length(algs),byrow=FALSE)\n" "colnames(mat) <- algs \n" @@ -261,7 +259,7 @@ struct RPlot "plot.new()\n" "print(textplot(FTtable))\n" "print(title(\"Table of True Accept Rates at various False Accept Rates\"))\n" - "print(textplot(F_at_Ttable))\n" + "print(textplot(F_at_Ttable))\n" "print(title(\"Table of False Accept Rates at various True Accept Rates\"))\n" "print(textplot(CMCtable))\n" "print(title(\"Table of retrieval rate at various ranks\"))\n" -- libgit2 0.21.4