Fixed conflicts

sklum
1 parent 95911ac6
Showing 3 changed files with 49 additions and 5 deletions
openbr/plugins/independent.cpp
openbr/plugins/template.cpp
openbr/plugins/validate.cpp
@@ -11,17 +11,21 @@ namespace br
 static TemplateList Downsample(const TemplateList &templates, int classes, int instances, float fraction, const QString & inputVariable, const QStringList &gallery)
 {
+    QString keepKey = "baggy";
+
     // Return early when no downsampling is required
     if ((classes == std::numeric_limits<int>::max()) &&
             (instances == std::numeric_limits<int>::max()) &&
             (fraction >= 1) &&
-            (gallery.isEmpty()))
+            (gallery.isEmpty()) &&
+            (keepKey.isEmpty()))
         return templates;
     const bool atLeast = instances < 0;
     instances = abs(instances);
     QList<QString> allLabels = File::get<QString>(templates, inputVariable);
+
     QList<QString> uniqueLabels = allLabels.toSet().toList();
     qSort(uniqueLabels);
@@ -103,9 +103,13 @@ class MTurkTransform : public UntrainableTransform
     Q_OBJECT
     Q_PROPERTY(QString inputVariable READ get_inputVariable WRITE set_inputVariable RESET reset_inputVariable STORED false)
     Q_PROPERTY(float maxVotes READ get_maxVotes WRITE set_maxVotes RESET reset_maxVotes STORED false)
+    Q_PROPERTY(bool classify READ get_classify WRITE set_classify RESET reset_classify STORED false)
+    Q_PROPERTY(bool consensusOnly READ get_consensusOnly WRITE set_consensusOnly RESET reset_consensusOnly STORED false)
     BR_PROPERTY(QString, inputVariable, QString())
     BR_PROPERTY(float, maxVotes, 1.)
-;
+    BR_PROPERTY(bool, classify, false)
+    BR_PROPERTY(bool, consensusOnly, false)
+
     void project(const Template &src, Template &dst) const
     {
         dst = src;
@@ -117,8 +121,11 @@ class MTurkTransform : public UntrainableTransform
         QMapIterator<QString, QVariant> i(map);
         while (i.hasNext()) {
             i.next();
-            float value = i.value().toFloat(&ok)/maxVotes;
-            dst.file.set(i.key(), value);
+            // Normalize to [-1,1]
+            float value = i.value().toFloat(&ok)/maxVotes;//* 2./maxVotes - 1;
+            if (classify) (value > 0) ? value = 1 : value = -1;
+            else if (consensusOnly && (value != 1 && value != -1)) continue;
+            dst.file.set(i.key(),value);
         }
     }
 };
@@ -142,9 +142,42 @@ BR_REGISTER(Transform, CrossValidateTransform)
 class CrossValidateDistance : public Distance
 {
     Q_OBJECT
-
+;
     float compare(const Template &a, const Template &b) const
     {
+        QStringList filters;
+        //filters << "Age" << "GENDER" << "RACE";
+        foreach (const QString &key, filters) {
+            QString aValue = a.file.get<QString>(key, QString());
+            QString bValue = b.file.get<QString>(key, QString());
+
+            // The query value may be a range. Let's check.
+            if (bValue.isEmpty()) bValue = QtUtils::toString(b.file.get<QPointF>(key, QPointF()));
+
+            if (aValue.isEmpty() || bValue.isEmpty()) continue;
+
+            bool keep = false;
+            bool ok;
+
+            QPointF range = QtUtils::toPoint(bValue,&ok);
+
+            if (ok) /* Range */ {
+                int value = range.x();
+                int upperBound = range.y();
+
+                while (value <= upperBound) {
+                    if (aValue == QString::number(value)) {
+                        keep = true;
+                        break;
+                    }
+                    value++;
+                }
+            }
+            else if (aValue == bValue) keep = true;
+
+            if (!keep) return -std::numeric_limits<float>::max();
+        }
+
         static const QString key("Partition"); // More efficient to preallocate this
         const int partitionA = a.file.get<int>(key, 0);
         const int partitionB = b.file.get<int>(key, 0);