Schedule performance improvement

Author: Nico-Duduf

src/ramobjectmodels/ramabstractdatamodel.cpp

@@ -12,32 +12,18 @@ RamObject *RamAbstractDataModel::get(const QModelIndex &index)
     return reinterpret_cast<RamObject*>( iptr );
 }
 
-QSet<RamObject *> RamAbstractDataModel::multiLookUp(const QStringList &lookUpKeys, const QStringList &lookUpValues) const
+QSet<RamObject *> &RamAbstractDataModel::intersectLookUp(QString lookUpKey, QString lookUpValue, QSet<RamObject *> &objList) const
 {
-    Q_ASSERT(!lookUpKeys.isEmpty());
-    Q_ASSERT(lookUpKeys.count() == lookUpValues.count());
-
-    QSet<RamObject *> objs = lookUp(
-        lookUpKeys.first(),
-        lookUpValues.first()
-        );
-
-    if (lookUpKeys.count() <= 1)
-        return objs;
-
-    for (int i = 1; i < lookUpKeys.count(); ++i) {
-        objs.intersect(
-            lookUp(
-                lookUpKeys.at(i),
-                lookUpValues.at(i)
-                )
-            );
+    // Don't use another lookup and QSet::intersect,
+    // as it would be slower
+    // but actually iterate throught the existing set
+    QMutableSetIterator<RamObject*> i(objList);
+    while(i.hasNext()) {
+        i.next();
+        RamObject *obj = i.value();
+        if (obj->getData(lookUpKey).toString() != lookUpValue)
+            objList.remove(obj);
     }
 
-    return objs;
-}
-
-QSet<RamObject *> RamAbstractDataModel::intersectLookUp(QString lookUpKey, QString lookUpValue, QSet<RamObject *> objList) const
-{
-    return objList.intersect( lookUp(lookUpKey, lookUpValue) );
+    return objList;
 }

src/ramobjectmodels/ramabstractdatamodel.h

@@ -24,8 +24,8 @@ class RamAbstractDataModel
     virtual RamObject *search(QString searchString) const = 0;
     // Objects by their lookup key
     virtual QSet<RamObject *> lookUp(QString lookUpKey, QString lookUpValue) const = 0;
-    virtual QSet<RamObject *> multiLookUp(const QStringList &lookUpKeys, const QStringList &lookUpValues) const;
-    virtual QSet<RamObject *> intersectLookUp(QString lookUpKey, QString lookUpValue, QSet<RamObject *> objList) const;
+    // Modifies the list and returns a reference to it
+    virtual QSet<RamObject *> &intersectLookUp(QString lookUpKey, QString lookUpValue, QSet<RamObject *> &objList) const;
 
     // All the uuids
     virtual QVector<QString> toVector() const = 0;

src/ramobjectmodels/ramscheduletablemodel.cpp

@@ -84,10 +84,8 @@ QVariant RamScheduleTableModel::data(const QModelIndex &index, int role) const
         return date;
 
     // Get the entrie(s)
-    const QSet<RamObject*> entriesSet = m_entries->multiLookUp(
-        QStringList( { "date", "row" } ),
-        QStringList( { date.toString( DATE_DATA_FORMAT ), m_rows->getUuid(row) } )
-        );
+    QSet<RamObject*> entriesSet = m_entries->lookUp("date", date.toString( DATE_DATA_FORMAT ));
+    m_entries->intersectLookUp("row",  m_rows->getUuid(row), entriesSet);
 
     // Empty cell
     if (entriesSet.isEmpty())
@@ -97,24 +95,33 @@ QVariant RamScheduleTableModel::data(const QModelIndex &index, int role) const
     if (role == RamAbstractObject::Type)
         return RamObject::ScheduleEntry;
 
-    // Sort the entries by step order, then title
+    // Make sure the steps are always returned in the same order
     QList<RamObject*> entries = entriesSet.values();
     std::sort( entries.begin(), entries.end(), [] (RamObject *a, RamObject *b) {
         auto entryA = RamScheduleEntry::c(a);
         auto entryB = RamScheduleEntry::c(b);
+
+        // Don't actually get the RamStep
+        // To improve performance just use the uuid
+        return entryA->getData("step").toString() < entryB->getData("step").toString();
+
+        // ======= Disabled better sorting
         auto stepA = entryA->step();
         auto stepB = entryB->step();
 
         if (stepA && stepB)
             return stepA->order() < stepB->order();
+
         if (!stepA && stepB)
             return false;
         if (stepA && !stepB)
             return true;
 
         return entryA->shortName() < entryB->shortName();
+        // ==========
     });
 
+
     // Pointer list for Multiple entries,
     // The delegate should get the list of pointers
     // to do something with it...
@@ -140,7 +147,10 @@ QVariant RamScheduleTableModel::data(const QModelIndex &index, int role) const
         return entries.first()->roleData(role);
     }
 
+
+    //*/
     return QVariant();
+
 }
 
 bool RamScheduleTableModel::moveRows(const QModelIndex &sourceParent, int sourceRow, int count, const QModelIndex &destinationParent, int destinationChild)