comparison AgentList.h @ 20:03927f6acee2

Use a proper comparator for AgentList. The naive operator< wasn't being used
because AgentList stores pointers, not values, so it was comparing by address.
This was a pretty serious bug

     typedef std::vector<Agent *> Container;
     typedef Container::iterator iterator;
 
 protected:
     Container list;
+
+    static bool agentComparator(const Agent *a, const Agent *b) {
+        if (a->beatInterval == b->beatInterval) {
+            return a->idNumber < b->idNumber; // ensure stable ordering
+        } else {
+            return a->beatInterval < b->beatInterval;
+        }
+    }
 
 public:
     // expose some vector methods
     //!!! can we remove these again once the rest of AgentList is implemented?
     bool empty() const { return list.empty(); }

 	if (sort) this->sort();
     } // add()/2
 
     /** Sorts the AgentList by increasing beatInterval. */
     void sort() {
-	std::sort(list.begin(), list.end());
+#ifdef DEBUG_BEATROOT
+        std::cerr << "sort: before: ";
+        for (iterator i = list.begin(); i != list.end(); ++i) {
+            std::cerr << (*i)->idNumber << " ";
+        }
+        std::cerr << std::endl;
+#endif
+	std::sort(list.begin(), list.end(), agentComparator);
+#ifdef DEBUG_BEATROOT
+        std::cerr << "sort: after: ";
+        for (iterator i = list.begin(); i != list.end(); ++i) {
+            std::cerr << (*i)->idNumber << " ";
+        }
+        std::cerr << std::endl;
+#endif
     } // sort()
 
     /** Removes the given item from the list.
      *  @param ptr Points to the Agent which is removed from the list
      */