Peter M. Groen / openbr

Commit fee099703932f77f3ffd9668cc681406857fa98d

Authored by Stephen Rawls
1 parent cbdb48ca

Fixing indentation / code style issues for pull request

Inline Side-by-side
Showing 2 changed files with 24 additions and 16 deletions
openbr/core/eval.cpp
  View file @fee0997
@@ -81,7 +81,7 @@ static OperatingPoint getOperatingPointGivenTAR(const QList<OperatingPoint> &ope @@ -81,7 +81,7 @@ static OperatingPoint getOperatingPointGivenTAR(const QList<OperatingPoint> &ope
81 while (operatingPoints[index].TAR < TAR) { 81 while (operatingPoints[index].TAR < TAR) {
82 index++; 82 index++;
83 if (index == operatingPoints.size()) 83 if (index == operatingPoints.size())
84 - return OperatingPoint(operatingPoints.last().score, operatingPoints.last().FAR, TAR); 84 + return OperatingPoint(operatingPoints.last().score, operatingPoints.last().FAR, TAR);
85 } 85 }
86 86
87 87
@@ -316,20 +316,30 @@ float Evaluate(const Mat &amp;simmat, const Mat &amp;mask, const QString &amp;csv, const QSt @@ -316,20 +316,30 @@ float Evaluate(const Mat &amp;simmat, const Mat &amp;mask, const QString &amp;csv, const QSt
316 } 316 }
317 317
318 // Write TAR@FAR Table (FT) 318 // Write TAR@FAR Table (FT)
319 - lines.append(qPrintable(QString("FT,0.000001,%1").arg(QString::number(getOperatingPointGivenFAR(operatingPoints, 0.000001).TAR, 'f', 3))));  
320 - lines.append(qPrintable(QString("FT,0.00001,%1").arg(QString::number(getOperatingPointGivenFAR(operatingPoints, 0.00001).TAR, 'f', 3))));  
321 - lines.append(qPrintable(QString("FT,0.0001,%1").arg(QString::number(getOperatingPointGivenFAR(operatingPoints, 0.0001).TAR, 'f', 3))));  
322 - lines.append(qPrintable(QString("FT,0.001,%1").arg(QString::number(getOperatingPointGivenFAR(operatingPoints, 0.001).TAR, 'f', 3))));  
323 - lines.append(qPrintable(QString("FT,0.01,%1").arg(QString::number(getOperatingPointGivenFAR(operatingPoints, 0.01).TAR, 'f', 3))));  
324 - lines.append(qPrintable(QString("FT,0.1,%1").arg(QString::number(getOperatingPointGivenFAR(operatingPoints, 0.1).TAR, 'f', 3)))); 319 + foreach (float far, QList<float>() << 1e-6 << 1e-5 << 1e-4 << 1e-3 << 1e-2 << 1e-1)
  320 + lines.append(qPrintable(QString("FT,%1,%2").arg(
  321 + QString::number(far, 'f'),
  322 + QString::number(getOperatingPointGivenFAR(operatingPoints, far).TAR, 'f', 3))));
  323 +
  324 +// lines.append(qPrintable(QString("FT,0.000001,%1").arg(QString::number(getOperatingPointGivenFAR(operatingPoints, 0.000001).TAR, 'f', 3))));
  325 +// lines.append(qPrintable(QString("FT,0.00001,%1").arg(QString::number(getOperatingPointGivenFAR(operatingPoints, 0.00001).TAR, 'f', 3))));
  326 +// lines.append(qPrintable(QString("FT,0.0001,%1").arg(QString::number(getOperatingPointGivenFAR(operatingPoints, 0.0001).TAR, 'f', 3))));
  327 +// lines.append(qPrintable(QString("FT,0.001,%1").arg(QString::number(getOperatingPointGivenFAR(operatingPoints, 0.001).TAR, 'f', 3))));
  328 +// lines.append(qPrintable(QString("FT,0.01,%1").arg(QString::number(getOperatingPointGivenFAR(operatingPoints, 0.01).TAR, 'f', 3))));
  329 +// lines.append(qPrintable(QString("FT,0.1,%1").arg(QString::number(getOperatingPointGivenFAR(operatingPoints, 0.1).TAR, 'f', 3))));
325 330
326 // Write FAR@TAR Table (FatT) 331 // Write FAR@TAR Table (FatT)
327 - lines.append(qPrintable(QString("FatT,0.95,%1").arg(QString::number(getOperatingPointGivenTAR(operatingPoints, 0.95).FAR, 'f', 3))));  
328 - lines.append(qPrintable(QString("FatT,0.85,%1").arg(QString::number(getOperatingPointGivenTAR(operatingPoints, 0.85).FAR, 'f', 3))));  
329 - lines.append(qPrintable(QString("FatT,0.75,%1").arg(QString::number(getOperatingPointGivenTAR(operatingPoints, 0.75).FAR, 'f', 3))));  
330 - lines.append(qPrintable(QString("FatT,0.65,%1").arg(QString::number(getOperatingPointGivenTAR(operatingPoints, 0.65).FAR, 'f', 3))));  
331 - lines.append(qPrintable(QString("FatT,0.50,%1").arg(QString::number(getOperatingPointGivenTAR(operatingPoints, 0.50).FAR, 'f', 3))));  
332 - lines.append(qPrintable(QString("FatT,0.40,%1").arg(QString::number(getOperatingPointGivenTAR(operatingPoints, 0.40).FAR, 'f', 3)))); 332 + foreach (float tar, QList<float>() << 0.95 << 0.85 << 0.75 << 0.65 << 0.5 << 0.4)
  333 + lines.append(qPrintable(QString("FatT,%1,%2").arg(
  334 + QString::number(tar, 'f', 2),
  335 + QString::number(getOperatingPointGivenTAR(operatingPoints, tar).FAR, 'f', 3))));
  336 +
  337 +// lines.append(qPrintable(QString("FatT,0.95,%1").arg(QString::number(getOperatingPointGivenTAR(operatingPoints, 0.95).FAR, 'f', 3))));
  338 +// lines.append(qPrintable(QString("FatT,0.85,%1").arg(QString::number(getOperatingPointGivenTAR(operatingPoints, 0.85).FAR, 'f', 3))));
  339 +// lines.append(qPrintable(QString("FatT,0.75,%1").arg(QString::number(getOperatingPointGivenTAR(operatingPoints, 0.75).FAR, 'f', 3))));
  340 +// lines.append(qPrintable(QString("FatT,0.65,%1").arg(QString::number(getOperatingPointGivenTAR(operatingPoints, 0.65).FAR, 'f', 3))));
  341 +// lines.append(qPrintable(QString("FatT,0.50,%1").arg(QString::number(getOperatingPointGivenTAR(operatingPoints, 0.50).FAR, 'f', 3))));
  342 +// lines.append(qPrintable(QString("FatT,0.40,%1").arg(QString::number(getOperatingPointGivenTAR(operatingPoints, 0.40).FAR, 'f', 3))));
333 343
334 //Write CMC Table (CT) 344 //Write CMC Table (CT)
335 lines.append(qPrintable(QString("CT,1,%1").arg(QString::number(getCMC(firstGenuineReturns, 1), 'f', 3)))); 345 lines.append(qPrintable(QString("CT,1,%1").arg(QString::number(getCMC(firstGenuineReturns, 1), 'f', 3))));
openbr/core/plot.cpp
  View file @fee0997
@@ -215,8 +215,6 @@ struct RPlot @@ -215,8 +215,6 @@ struct RPlot
215 "rownames(mat) <- c(\"TAR = 0.95\", \"TAR = 0.85\", \"TAR = 0.75\", \"TAR = 0.65\", \"TAR = 0.50\", \"TAR = 0.40\")\n" 215 "rownames(mat) <- c(\"TAR = 0.95\", \"TAR = 0.85\", \"TAR = 0.75\", \"TAR = 0.65\", \"TAR = 0.50\", \"TAR = 0.40\")\n"
216 "F_at_Ttable <- as.table(mat)\n" 216 "F_at_Ttable <- as.table(mat)\n"
217 "\n" 217 "\n"
218 -  
219 - "\n"  
220 "# Code to format CMC Table\n" 218 "# Code to format CMC Table\n"
221 "mat <- matrix(%4,nrow=6,ncol=length(algs),byrow=FALSE)\n" 219 "mat <- matrix(%4,nrow=6,ncol=length(algs),byrow=FALSE)\n"
222 "colnames(mat) <- algs \n" 220 "colnames(mat) <- algs \n"
@@ -261,7 +259,7 @@ struct RPlot @@ -261,7 +259,7 @@ struct RPlot
261 "plot.new()\n" 259 "plot.new()\n"
262 "print(textplot(FTtable))\n" 260 "print(textplot(FTtable))\n"
263 "print(title(\"Table of True Accept Rates at various False Accept Rates\"))\n" 261 "print(title(\"Table of True Accept Rates at various False Accept Rates\"))\n"
264 - "print(textplot(F_at_Ttable))\n" 262 + "print(textplot(F_at_Ttable))\n"
265 "print(title(\"Table of False Accept Rates at various True Accept Rates\"))\n" 263 "print(title(\"Table of False Accept Rates at various True Accept Rates\"))\n"
266 "print(textplot(CMCtable))\n" 264 "print(textplot(CMCtable))\n"
267 "print(title(\"Table of retrieval rate at various ranks\"))\n" 265 "print(title(\"Table of retrieval rate at various ranks\"))\n"