generalized Convert

Josh Klontz
1 parent e964525c
Showing 7 changed files with 24 additions and 80 deletions
sdk/core/bee.cpp
sdk/core/bee.h
sdk/core/core.cpp
sdk/openbr.cpp
sdk/openbr.h
sdk/openbr_plugin.h
sdk/plugins/format.cpp
@@ -225,64 +225,6 @@ void BEE::writeMask(const Mat &amp;m, const QString &amp;mask, const QString &amp;targetSigs
     writeMatrix<Mask_t>(m, mask, targetSigset, querySigset);
 }
-template <typename T>
-void matrixToCSV(const QString &matrix, const QString &csv)
-{
-    qDebug("Converting %s to %s", qPrintable(matrix), qPrintable(csv));
-
-    QFile out(csv);
-    out.open(QFile::WriteOnly);
-
-    Mat m = readMatrix<T>(matrix);
-    for (int i=0; i<m.rows; i++) {
-        for (int j=0; j<m.cols; j++) {
-            out.write(qPrintable(QString::number(m.at<T>(i,j))));
-            out.write(",");
-        }
-        out.write("\n");
-    }
-}
-
-void BEE::simmatToCSV(const QString &simmat, const QString &csv)
-{
-    matrixToCSV<Simmat_t>(simmat, csv);
-}
-
-void BEE::maskToCSV(const QString &mask, const QString &csv)
-{
-    matrixToCSV<Mask_t>(mask, csv);
-}
-
-template <typename T>
-void CSVToMatrix(const QString &csv, const QString &matrix)
-{
-    qDebug("Converting %s to %s", qPrintable(csv), qPrintable(matrix));
-
-    QStringList lines = QtUtils::readLines(csv);
-    Mat m(lines.size(), lines.first().split(",", QString::SkipEmptyParts).size(), OpenCVType<T,1>::make());
-
-    for (int i=0; i<lines.size(); i++) {
-        const QStringList &words = lines[i].split(",", QString::SkipEmptyParts);
-        for (int j=0; j<words.size(); j++) {
-            bool ok;
-            m.at<T>(i, j) = words[j].toFloat(&ok);
-            if (!ok) qFatal("bee.cpp::CSVToMatrix failed to convert %s to floating point format.", qPrintable(words[j]));
-        }
-    }
-
-    writeMatrix<T>(m, matrix, "Unknown_Target", "Unknown_Query");
-}
-
-void BEE::CSVToSimmat(const QString &csv, const QString &simmat)
-{
-    CSVToMatrix<Simmat_t>(csv, simmat);
-}
-
-void BEE::CSVToMask(const QString &csv, const QString &mask)
-{
-    CSVToMatrix<Mask_t>(csv, mask);
-}
-
 void BEE::makeMask(const QString &targetInput, const QString &queryInput, const QString &mask)
 {
     qDebug("Making mask from %s and %s to %s", qPrintable(targetInput), qPrintable(queryInput), qPrintable(mask));
@@ -44,12 +44,6 @@ namespace BEE
     void writeSimmat(const cv::Mat &m, const QString &simmat, const QString &targetSigset = "Unknown_Target", const QString &querySigset = "Unknown_Query");
     void writeMask(const cv::Mat &m, const QString &mask, const QString &targetSigset = "Unknown_Target", const QString &querySigset = "Unknown_Query");
-    // CSV IO
-    void simmatToCSV(const QString &simmat, const QString &csv);
-    void maskToCSV(const QString &mask, const QString &csv);
-    void CSVToSimmat(const QString &csv, const QString &simmat);
-    void CSVToMask(const QString &csv, const QString &mask);
-
     // Write BEE files
     void makeMask(const QString &targetInput, const QString &queryInput, const QString &mask);
     void combineMasks(const QStringList &inputMasks, const QString &outputMask, const QString &method);
@@ -305,6 +305,13 @@ void br::Compare(const File &amp;targetGallery, const File &amp;queryGallery, const File
     AlgorithmManager::getAlgorithm(output.getString("algorithm"))->compare(targetGallery, queryGallery, output);
 }
+void br::Convert(const File &src, const File &dst)
+{
+    QScopedPointer<Format> before(Factory<Format>::make(src));
+    QScopedPointer<Format> after(Factory<Format>::make(dst));
+    after->write(before->read());
+}
+
 QSharedPointer<br::Transform> br::Transform::fromAlgorithm(const QString &algorithm)
 {
     return AlgorithmManager::getAlgorithm(algorithm)->transform;
@@ -51,17 +51,9 @@ void br_confusion(const char *file, float score, int *true_positives, int *false
     return Confusion(file, score, *true_positives, *false_positives, *true_negatives, *false_negatives);
 }
-void br_convert(const char *input_matrix, const char *output_matrix)
-{
-    QString inputSuffix = QFileInfo(input_matrix).suffix();
-    QString outputSuffix = QFileInfo(output_matrix).suffix();
-    if (inputSuffix == "csv") {
-        if (outputSuffix == "mtx") BEE::CSVToSimmat(input_matrix, output_matrix);
-        else                       BEE::CSVToMask(input_matrix, output_matrix);
-    } else {
-        if (inputSuffix == "mtx") BEE::simmatToCSV(input_matrix, output_matrix);
-        else                      BEE::maskToCSV(input_matrix, output_matrix);
-    }
+void br_convert(const char *input, const char *output)
+{
+    Convert(File(input), File(output));
 }
 void br_enroll(const char *input, const char *gallery)
@@ -123,11 +123,9 @@ BR_EXPORT void br_confusion(const char *file, float score,
                             int *true_positives, int *false_positives, int *true_negatives, int *false_negatives);
 /*!
- * \brief Converts a <i>.csv</i> file to/from a \ref simmat or \ref mask.
- * \param input_matrix The input matrix.
- * \param output_matrix The output matrix.
+ * \brief Wraps br::Convert()
  */
-BR_EXPORT void br_convert(const char *input_matrix, const char *output_matrix);
+BR_EXPORT void br_convert(const char *input, const char *output);
 /*!
  * \brief Constructs template(s) from an input.
@@ -1080,6 +1080,13 @@ BR_EXPORT FileList Enroll(const File &amp;input, const File &amp;gallery = File());
  */
 BR_EXPORT void Compare(const File &targetGallery, const File &queryGallery, const File &output);
+/*!
+ * \brief To convert between matrix/template formats.
+ * \param input The input matrix or template.
+ * \param output The output matrix or template.
+ */
+BR_EXPORT void Convert(const File &input, const File &output);
+
 /*! @}*/
 } // namespace br
@@ -46,12 +46,15 @@ class csvFormat : public Format
         QStringList lines(QString(f.readAll()).split('\n'));
         f.close();
+        bool isUChar = true;
         QList< QList<float> > valsList;
         foreach (const QString &line, lines) {
             QList<float> vals;
             foreach (const QString &word, line.split(QRegExp(" *, *"))) {
                 bool ok;
-                vals.append(word.toFloat(&ok)); assert(ok);
+                const float val = word.toFloat(&ok);
+                vals.append(val);
+                isUChar = isUChar && (val == float(uchar(val)));
             }
             valsList.append(vals);
         }
@@ -65,6 +68,7 @@ class csvFormat : public Format
             }
         }
+        if (isUChar) m.convertTo(m, CV_8U);
         return Template(m);
     }