Revert "added some additional functionality to turkGallery"

This reverts commit f63a47d95f731d95bc8694ba802e84ffbf9f3d1d.

Revert "added some additional functionality to turkGallery"
This reverts commit f63a47d95f731d95bc8694ba802e84ffbf9f3d1d.
Josh Klontz
1 parent d022425a
Showing 2 changed files with 7 additions and 46 deletions
openbr/core/common.h
openbr/plugins/turk.cpp
@@ -116,24 +116,15 @@ T Max(const QList&lt;T&gt; &amp;vals)
 }
 /*!
- * \brief Returns the sum of a vector of values.
- */
-template <template<class> class V, typename T>
-double Sum(const V<T> &vals)
-{
-    double sum = 0;
-    foreach (T val, vals) sum += val;
-    return sum;
-}
-
-/*!
  * \brief Returns the mean and standard deviation of a vector of values.
  */
 template <template<class> class V, typename T>
 double Mean(const V<T> &vals)
 {
     if (vals.isEmpty()) return 0;
-    return Sum(vals) / vals.size();
+    double sum = 0;
+    foreach (T val, vals) sum += val;
+    return sum / vals.size();
 }
 /*!
 #include "openbr_internal.h"
-#include "openbr/core/common.h"
 #include "openbr/core/qtutils.h"
 namespace br
@@ -13,10 +12,6 @@ namespace br
 class turkGallery : public Gallery
 {
     Q_OBJECT
-    Q_PROPERTY(bool flat READ get_flat WRITE set_flat RESET reset_flat STORED false)
-    Q_PROPERTY(bool normalize READ get_normalize WRITE set_normalize RESET reset_normalize STORED false)
-    BR_PROPERTY(bool, flat, false)
-    BR_PROPERTY(bool, normalize, false)
     struct Attribute : public QStringList
     {
@@ -28,23 +23,6 @@ class turkGallery : public Gallery
             if (i != -1)
                 append(str.mid(i+1, str.length()-i-2).split(","));
         }
-
-        Attribute normalized() const
-        {
-            bool ok;
-            QList<float> values;
-            foreach (const QString &value, *this) {
-                values.append(value.toFloat(&ok));
-                if (!ok)
-                    qFatal("Can't normalize non-numeric vector!");
-            }
-
-            Attribute normal(name);
-            const float sum = Common::Sum(values);
-            for (int i=0; i<values.size(); i++)
-                normal.append(QString::number(values[i] / sum));
-            return normal;
-        }
     };
     TemplateList readBlock(bool *done)
@@ -70,18 +48,10 @@ class turkGallery : public Gallery
                 if (type.size() != rating.size())
                     qFatal(".turk Gallery incorrect ratings count.");
-                if (normalize)
-                    rating = rating.normalized();
-
-                if (flat) {
-                    for (int j=0; j<type.size(); j++)
-                        f.set(type.name + "_" + type[j], rating[j]);
-                } else {
-                    QMap<QString,QVariant> categoryMap;
-                    for (int j=0; j<type.size(); j++)
-                        categoryMap.insert(type[j], rating[j]);
-                    f.set(type.name, categoryMap);
-                }
+                QMap<QString,QVariant> categoryMap;
+                for (int j=0; j<type.size(); j++)
+                    categoryMap.insert(type[j], rating[j]);
+                f.set(type.name, categoryMap);
             }
             templates.append(f);
         }