implemented gallery concatenation. fixed #4

Josh Klontz
1 parent 7873c508
Showing 6 changed files with 40 additions and 3 deletions
app/br/br.cpp
sdk/core/core.cpp
sdk/openbr.cpp
sdk/openbr.h
sdk/openbr_plugin.h
sdk/plugins/regions.cpp
@@ -51,7 +51,8 @@ static void help()
            "-cluster <simmat> ... <simmat> <aggressiveness> {csv}\n"
            "-makeMask <target_gallery> <query_gallery> {mask}\n"
            "-combineMasks <mask> ... <mask> {mask} (And|Or)\n"
-           "-convert <(csv,simmat,mask)> {(csv,simmat,mask)}\n"
+           "-cat <gallery> ... <gallery> {gallery}\n"
+           "-convert <template> {template}\n"
            "-reformat <target_sigset> <query_sigset> <simmat> {output}\n"
            "-evalClassification <predicted_gallery> <truth_gallery>\n"
            "-evalRegression <predicted_gallery> <truth_gallery>\n"
@@ -141,6 +142,9 @@ int main(int argc, char *argv[])
         } else if (!strcmp(fun, "combineMasks")) {
             check(parc >= 4, "Insufficient parameter count for 'combineMasks'.");
             br_combine_masks(parc-2, parv, parv[parc-2], parv[parc-1]);
+        } else if (!strcmp(fun, "cat")) {
+            check(parc >= 2, "Insufficient parameter count for 'cat'.");
+            br_cat(parc-1, parv, parv[parc-1]);
         } else if (!strcmp(fun, "convert")) {
             check(parc == 2, "Incorrect parameter count for 'convert'.");
             br_convert(parv[0], parv[1]);
@@ -315,11 +315,26 @@ void br::Compare(const File &amp;targetGallery, const File &amp;queryGallery, const File
 void br::Convert(const File &src, const File &dst)
 {
+    qDebug("Converting %s to %s", qPrintable(src.flat()), qPrintable(dst.flat()));
     QScopedPointer<Format> before(Factory<Format>::make(src));
     QScopedPointer<Format> after(Factory<Format>::make(dst));
     after->write(before->read());
 }
+void br::Cat(const QStringList &inputGalleries, const QString &outputGallery)
+{
+    qDebug("Concatenating %d galleries to %s", inputGalleries.size(), qPrintable(outputGallery));
+    foreach (const QString &inputGallery, inputGalleries)
+        if (inputGallery == outputGallery)
+            qFatal("br::Cat outputGallery must not be in inputGalleries.");
+    QScopedPointer<Gallery> og(Gallery::make(outputGallery));
+    foreach (const QString &inputGallery, inputGalleries) {
+        QScopedPointer<Gallery> ig(Gallery::make(inputGallery));
+        bool done = false;
+        while (!done) og->writeBlock(ig->readBlock(&done));
+    }
+}
+
 QSharedPointer<br::Transform> br::Transform::fromAlgorithm(const QString &algorithm)
 {
     return AlgorithmManager::getAlgorithm(algorithm)->transform;
@@ -31,6 +31,11 @@ const char *br_about()
     return about.data();
 }
+void br_cat(int num_input_galleries, const char *input_galleries[], const char *output_gallery)
+{
+    Cat(QtUtils::toStringList(num_input_galleries, input_galleries), output_gallery);
+}
+
 void br_cluster(int num_simmats, const char *simmats[], float aggressiveness, const char *csv)
 {
     ClusterGallery(QtUtils::toStringList(num_simmats, simmats), aggressiveness, csv);
@@ -73,6 +73,11 @@ extern &quot;C&quot; {
 BR_EXPORT const char *br_about();
 /*!
+ * \brief Wraps br::Cat()
+ */
+BR_EXPORT void br_cat(int num_input_galleries, const char *input_galleries[], const char *output_gallery);
+
+/*!
  * \brief Clusters one or more similarity matrices into a list of subjects.
  *
  * A similarity matrix is a type of br::Output. The current clustering algorithm is a simplified implementation of \cite zhu11.
@@ -1098,6 +1098,14 @@ BR_EXPORT void Compare(const File &amp;targetGallery, const File &amp;queryGallery, cons
  */
 BR_EXPORT void Convert(const File &input, const File &output);
+/*!
+ * \brief Concatenate several galleries into one.
+ * \param inputGalleries List of galleries to concatenate.
+ * \param outputGallery Gallery to store the concatenated result.
+ * \note outputGallery must not be in inputGalleries.
+ */
+BR_EXPORT void Cat(const QStringList &inputGalleries, const QString &outputGallery);
+
 /*! @}*/
 } // namespace br
@@ -76,7 +76,7 @@ BR_REGISTER(Transform, ByRow)
  * No requirements are placed on input matrices size and type.
  * \author Josh Klontz \cite jklontz
  */
-class Cat : public UntrainableMetaTransform
+class CatTransform : public UntrainableMetaTransform
 {
     Q_OBJECT
     Q_PROPERTY(int partitions READ get_partitions WRITE set_partitions RESET reset_partitions)
@@ -105,7 +105,7 @@ class Cat : public UntrainableMetaTransform
     }
 };
-BR_REGISTER(Transform, Cat)
+BR_REGISTER(Transform, CatTransform)
 /*!
  * \ingroup transforms