More updates for procrustes and delaunay

Scott Klum
1 parent 9e3e99a4
Showing 5 changed files with 60 additions and 30 deletions
openbr/core/core.cpp
openbr/core/plot.cpp
openbr/plugins/format.cpp
openbr/plugins/landmarks.cpp
openbr/plugins/stasm4.cpp
@@ -167,7 +167,6 @@ struct AlgorithmCore
             }
             const float speed = 1000 * Globals->totalSteps / Globals->startTime.elapsed() / std::max(1, abs(Globals->parallelism));
-            qDebug() << Globals->startTime.elapsed();
             if (!Globals->quiet && (Globals->totalSteps > 1))
                 fprintf(stderr, "\rSPEED=%.1e  SIZE=%.4g  FAILURES=%d/%d  \n",
                         speed, totalBytes/totalCount, failureCount, totalCount);
@@ -247,8 +247,8 @@ float Evaluate(const Mat &amp;simmat, const Mat &amp;mask, const QString &amp;csv)
     }
     // Write FAR/TAR Bar Chart (BC)
-    lines.append(qPrintable(QString("BC,0.001,%1").arg(QString::number(result = getTAR(operatingPoints, 0.001), 'f', 3))));
-    lines.append(qPrintable(QString("BC,0.01,%1").arg(QString::number(getTAR(operatingPoints, 0.01), 'f', 3))));
+    lines.append(qPrintable(QString("BC,0.001,%1").arg(QString::number(getTAR(operatingPoints, 0.001), 'f', 3))));
+    lines.append(qPrintable(QString("BC,0.01,%1").arg(QString::number(result = getTAR(operatingPoints, 0.01), 'f', 3))));
     // Write SD & KDE
     points = qMin(qMin(Max_Points, genuines.size()), impostors.size());
@@ -287,7 +287,7 @@ float Evaluate(const Mat &amp;simmat, const Mat &amp;mask, const QString &amp;csv)
     }
     if (!csv.isEmpty()) QtUtils::writeFile(csv, lines);
-    qDebug("TAR @ FAR = 0.001: %.3f\nRetrieval Rate @ Rank = %d: %.3f", result, Report_Retrieval, reportRetrievalRate);
+    qDebug("TAR @ FAR = 0.01: %.3f\nRetrieval Rate @ Rank = %d: %.3f", result, Report_Retrieval, reportRetrievalRate);
     return result;
 }
@@ -659,8 +659,8 @@ class xmlFormat : public Format
         QDomDocument doc(fileName);
         QFile f(fileName);
-        if (!f.open(QIODevice::ReadOnly)) qFatal("Unable to open %s for reading.", qPrintable(file.flat()));
-        if (!doc.setContent(&f))          qFatal("Unable to parse %s.", qPrintable(file.flat()));
+        if (!f.open(QIODevice::ReadOnly)) qWarning("Unable to open %s for reading.", qPrintable(file.flat()));
+        if (!doc.setContent(&f))          qWarning("Unable to parse %s.", qPrintable(file.flat()));
         f.close();
         QDomElement docElem = doc.documentElement();
@@ -81,6 +81,12 @@ class ProcrustesTransform : public Transform
         QList<QPointF> points = src.file.points();
         QList<QRectF> rects = src.file.rects();
+        if (points.empty() || rects.empty()) {
+            dst = src;
+            qWarning("Points/rects are empty.");
+            return;
+        }
+
         if (rects.size() > 1) qWarning("More than one rect in training data templates.");
         points.append(rects[0].topLeft());
@@ -95,8 +101,8 @@ class ProcrustesTransform : public Transform
         Eigen::MatrixXf srcPoints(points.size(), 2);
         for (int i = 0; i < points.size(); i++) {
-            srcPoints(i,0) = points[i].x()/(norm/150.)+50;
-            srcPoints(i,1) = points[i].y()/(norm/150.)+50;
+            srcPoints(i,0) = points[i].x()/(norm/100.)+50;
+            srcPoints(i,1) = points[i].y()/(norm/100.)+50;
         }
         Eigen::JacobiSVD<Eigen::MatrixXf> svd(srcPoints.transpose()*meanShape, Eigen::ComputeThinU | Eigen::ComputeThinV);
@@ -140,11 +146,18 @@ class DelaunayTransform : public UntrainableTransform
     void project(const Template &src, Template &dst) const
     {
+
         Subdiv2D subdiv(Rect(0,0,src.m().cols,src.m().rows));
         QList<cv::Point2f> points = OpenCVUtils::toPoints(src.file.points());
         QList<QRectF> rects = src.file.rects();
+        if (points.empty() || rects.empty()) {
+            dst = src;
+            qWarning("Points/rects are empty.");
+            return;
+        }
+
         if (rects.size() > 1) qWarning("More than one rect in training data templates.");
         points.append(OpenCVUtils::toPoint(rects[0].topLeft()));
@@ -176,7 +189,6 @@ class DelaunayTransform : public UntrainableTransform
             if (inside) {
                 count++;
-                qDebug() << count << pt[0] << pt[1] << pt[2] << "Area" << contourArea(pt);
                 QList<Point> triangleBuffer;
@@ -209,38 +221,36 @@ class DelaunayTransform : public UntrainableTransform
             mean[0] = src.file.get<float>("Procrustes_mean_0");
             mean[1] = src.file.get<float>("Procrustes_mean_1");
-            qDebug() << mean[0] << mean[1];
-
             float norm = src.file.get<float>("Procrustes_norm");
-            qDebug() << norm;
-
             dst.m() = Mat::zeros(src.m().rows,src.m().cols,src.m().type());
-            foreach(const QList<Point> &triangle, validTriangles) {
-                Eigen::MatrixXf srcPoints(triangle.size(), 2);
+            QList<Point2f> mappedPoints;
-                for (int j = 0; j < triangle.size(); j++) {
-                    srcPoints(j,0) = (triangle[j].x-mean[0])/(norm/150.)+50;
-                    srcPoints(j,1) = (triangle[j].y-mean[1])/(norm/150.)+50;
+            for (int i = 0; i < validTriangles.size(); i++) {
+                Eigen::MatrixXf srcMat(validTriangles[i].size(), 2);
+
+                for (int j = 0; j < validTriangles[i].size(); j++) {
+                    srcMat(j,0) = (validTriangles[i][j].x-mean[0])/(norm/100.)+50;
+                    srcMat(j,1) = (validTriangles[i][j].y-mean[1])/(norm/100.)+50;
                 }
-                Eigen::MatrixXf dstMat = srcPoints*R;
+                Eigen::MatrixXf dstMat = srcMat*R;
+
+                Point2f srcPoints[3];
+                for (int j = 0; j < 3; j++) srcPoints[j] = validTriangles[i][j];
-                Point2f test[3];
-                test[0] = triangle[0];
-                test[1] = triangle[1];
-                test[2] = triangle[2];
                 Point2f dstPoints[3];
-                dstPoints[0] = Point2f(dstMat(0,0),dstMat(0,1));
-                dstPoints[1] = Point2f(dstMat(1,0),dstMat(1,1));
-                dstPoints[2] = Point2f(dstMat(2,0),dstMat(2,1));
+                for (int j = 0; j < 3; j++) {
+                    dstPoints[j] = Point2f(dstMat(j,0),dstMat(j,1));
+                    mappedPoints.append(dstPoints[j]);
+                }
                 Mat buffer(src.m().rows,src.m().cols,src.m().type());
-                warpAffine(src.m(), buffer, getAffineTransform(test, dstPoints), Size(src.m().cols,src.m().rows));
+                warpAffine(src.m(), buffer, getAffineTransform(srcPoints, dstPoints), Size(src.m().cols,src.m().rows));
-                Mat mask = Mat::zeros(src.m().rows, src.m().cols, CV_8U);
+                Mat mask = Mat::zeros(src.m().rows, src.m().cols, CV_8UC1);
                 Point maskPoints[1][3];
                 maskPoints[0][0] = dstPoints[0];
                 maskPoints[0][1] = dstPoints[1];
@@ -251,10 +261,31 @@ class DelaunayTransform : public UntrainableTransform
                 Mat output(src.m().rows,src.m().cols,src.m().type());
+                // Optimize
+                if (i > 0) {
+                    Mat overlap;
+                    bitwise_and(dst.m(),mask,overlap);
+                    for (int j = 0; j < overlap.rows; j++) {
+                        for (int k = 0; k < overlap.cols; k++) {
+                            if (overlap.at<uchar>(k,j) != 0) {
+                                mask.at<uchar>(k,j) = 0;
+                            }
+                        }
+                    }
+                }
+
                 bitwise_and(buffer,mask,output);
-                dst.m() += output;
+                dst.m() += output; // Need to xor stuff out
             }
+
+            Rect boundingBox = boundingRect(mappedPoints.toVector().toStdVector());
+            boundingBox.x += boundingBox.width * .025;
+            boundingBox.y += boundingBox.height * .025; // 0.025 for nose, .05 for mouth, .10 for brow
+            boundingBox.width *= .975;
+            boundingBox.height *= .975; // .975 for nose, .95 for mouth, .925 for brow
+
+            dst.m() = Mat(dst.m(), boundingBox);
         }
     }
@@ -39,7 +39,7 @@ class StasmInitializer : public Initializer
         Globals->abbreviations.insert("RectFromStasmEyes","RectFromPoints([29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47],0.125,6.0)+Resize(44,164)");
         Globals->abbreviations.insert("RectFromStasmBrow","RectFromPoints([17, 18, 19, 20, 21, 22, 23, 24],0.15,6)+Resize(28,132)");
         Globals->abbreviations.insert("RectFromStasmNose","RectFromPoints([48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58],0.15,1.25)");
-        Globals->abbreviations.insert("RectFromStasmMouth","RectFromPoints([59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76],0.3,3.0)+Resize(28,68)");
+        Globals->abbreviations.insert("RectFromStasmMouth","RectFromPoints([59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76],0.3,2.5)");
     }
 };