TemplateList::fromInput() updated to TemplateList::fromGallery() to reflect the …

…fact that the Input class was generalized into the Gallery class a while ago.

TemplateList::fromInput() updated to TemplateList::fromGallery() to reflect the …
…fact that the Input class was generalized into the Gallery class a while ago.
Josh Klontz
1 parent 56148599
Showing 8 changed files with 19 additions and 18 deletions
sdk/core/bee.cpp
sdk/core/classify.cpp
sdk/core/cluster.cpp
sdk/core/core.cpp
sdk/openbr.cpp
sdk/openbr_plugin.cpp
sdk/openbr_plugin.h
sdk/plugins/youtube.cpp
@@ -227,8 +227,8 @@ void BEE::makeMask(const QString &amp;targetInput, const QString &amp;queryInput, const 
 {
     qDebug("Making mask from %s and %s to %s", qPrintable(targetInput), qPrintable(queryInput), qPrintable(mask));
-    FileList targetFiles = TemplateList::fromInput(targetInput).files();
-    FileList queryFiles = TemplateList::fromInput(queryInput).files();
+    FileList targetFiles = TemplateList::fromGallery(targetInput).files();
+    FileList queryFiles = TemplateList::fromGallery(queryInput).files();
     QList<float> targetLabels = targetFiles.labels();
     QList<float> queryLabels = queryFiles.labels();
     QList<int> targetPartitions = targetFiles.crossValidationPartitions();
@@ -37,8 +37,8 @@ void br::EvalClassification(const QString &amp;predictedInput, const QString &amp;truthI
 {
     qDebug("Evaluating classification of %s against %s", qPrintable(predictedInput), qPrintable(truthInput));
-    TemplateList predicted(TemplateList::fromInput(predictedInput));
-    TemplateList truth(TemplateList::fromInput(truthInput));
+    TemplateList predicted(TemplateList::fromGallery(predictedInput));
+    TemplateList truth(TemplateList::fromGallery(truthInput));
     if (predicted.size() != truth.size()) qFatal("Input size mismatch.");
     QHash<int, Counter> counters;
@@ -83,8 +83,8 @@ void br::EvalRegression(const QString &amp;predictedInput, const QString &amp;truthInput
 {
     qDebug("Evaluating regression of %s against %s", qPrintable(predictedInput), qPrintable(truthInput));
-    const TemplateList predicted(TemplateList::fromInput(predictedInput));
-    const TemplateList truth(TemplateList::fromInput(truthInput));
+    const TemplateList predicted(TemplateList::fromGallery(predictedInput));
+    const TemplateList truth(TemplateList::fromGallery(truthInput));
     if (predicted.size() != truth.size()) qFatal("Input size mismatch.");
     float rmsError = 0;
@@ -278,7 +278,7 @@ void br::EvalClustering(const QString &amp;csv, const QString &amp;input)
 {
     qDebug("Evaluating %s against %s", qPrintable(csv), qPrintable(input));
-    QList<float> labels = TemplateList::fromInput(input).files().labels();
+    QList<float> labels = TemplateList::fromGallery(input).files().labels();
     QHash<int, int> labelToIndex;
     int nClusters = 0;
@@ -40,7 +40,7 @@ struct AlgorithmCore
     void train(const File &input, const QString &model)
     {
-        TemplateList data(TemplateList::fromInput(input));
+        TemplateList data(TemplateList::fromGallery(input));
         if (transform.isNull()) qFatal("Null transform.");
         qDebug("%d training files", data.size());
@@ -118,7 +118,7 @@ struct AlgorithmCore
         if (!fileList.isEmpty() && gallery.contains("cache"))
             return fileList;
-        const TemplateList i(TemplateList::fromInput(input));
+        const TemplateList i(TemplateList::fromGallery(input));
         if (i.isEmpty()) return fileList; // Nothing to enroll
         if (transform.isNull()) qFatal("Null transform.");
@@ -204,7 +204,7 @@ void br_read_line(int *argc, const char ***argv)
 void br_reformat(const char *target_input, const char *query_input, const char *simmat, const char *output)
 {
-    Output::reformat(TemplateList::fromInput(target_input).files(), TemplateList::fromInput(query_input).files(), simmat, output);
+    Output::reformat(TemplateList::fromGallery(target_input).files(), TemplateList::fromGallery(query_input).files(), simmat, output);
 }
 const char *br_scratch_path()
@@ -445,14 +445,14 @@ QDataStream &amp;br::operator&gt;&gt;(QDataStream &amp;stream, Template &amp;t)
 }
 /* TemplateList - public methods */
-TemplateList TemplateList::fromInput(const br::File &input)
+TemplateList TemplateList::fromGallery(const br::File &gallery)
 {
     TemplateList templates;
-    foreach (const br::File &file, input.split()) {
+    foreach (const br::File &file, gallery.split()) {
         QScopedPointer<Gallery> i(Gallery::make(file));
         TemplateList newTemplates = i->read();
-        const int crossValidate = input.getInt("crossValidate");
+        const int crossValidate = gallery.getInt("crossValidate");
         if (crossValidate > 0) srand(0);
         // If file is a Format not a Gallery
@@ -461,13 +461,13 @@ TemplateList TemplateList::fromInput(const br::File &amp;input)
         // Propogate metadata
         for (int i=0; i<newTemplates.size(); i++) {
-            newTemplates[i].file.append(input.localMetadata());
+            newTemplates[i].file.append(gallery.localMetadata());
             newTemplates[i].file.append(file.localMetadata());
             newTemplates[i].file.insert("Input_Index", i+templates.size());
             if (crossValidate > 0) newTemplates[i].file.insert("Cross_Validation_Partition", rand()%crossValidate);
         }
-        if (!templates.isEmpty() && input.getBool("merge")) {
+        if (!templates.isEmpty() && gallery.getBool("merge")) {
             if (newTemplates.size() != templates.size())
                 qFatal("Inputs must be the same size in order to merge.");
             for (int i=0; i<templates.size(); i++)
@@ -332,8 +332,9 @@ struct TemplateList : public QList&lt;Template&gt;
     TemplateList() : uniform(false) {}
     TemplateList(const QList<Template> &templates) : uniform(false) { append(templates); } /*!< \brief Initialize the template list from another template list. */
     TemplateList(const QList<File> &files) : uniform(false) { foreach (const File &file, files) append(file); } /*!< \brief Initialize the template list from a file list. */
-    BR_EXPORT static TemplateList fromInput(const File &input); /*!< \brief Create a template list from a br::Input. */
+    BR_EXPORT static TemplateList fromGallery(const File &gallery); /*!< \brief Create a template list from a br::Gallery. */
     BR_EXPORT static TemplateList relabel(const TemplateList &tl); /*!< \brief Ensure labels are in the range [0,numClasses-1]. */
+
     /*!
      * \brief Returns the total number of bytes in all the templates.
      */
@@ -33,10 +33,10 @@ class YouTubeFacesDBTransform : public UntrainableMetaTransform
         const QStringList words = src.file.name.split(", ");
         dst.file.name = words[0] + "_" + words[1] + "_" + words[4] + ".mtx";
-        TemplateList queryTemplates = TemplateList::fromInput(File(words[2]).resolved());
+        TemplateList queryTemplates = TemplateList::fromGallery(File(words[2]).resolved());
         queryTemplates >> *transform;
-        TemplateList targetTemplates = TemplateList::fromInput(File(words[3]).resolved());
+        TemplateList targetTemplates = TemplateList::fromGallery(File(words[3]).resolved());
         targetTemplates >> *transform;
         QScopedPointer<MatrixOutput> memoryOutput(MatrixOutput::make(targetTemplates.files(), queryTemplates.files()));