comparison AgentList.h @ 16:33d0b18b2509

Allocate Agents separately on the heap and make AgentList contain pointers only (much quicker)

 /** Class for maintaining the set of all Agents involved in beat tracking a piece of music.
  */
 class AgentList
 {
 public:
-    typedef std::vector<Agent> Container;
+    typedef std::vector<Agent *> Container;
     typedef Container::iterator iterator;
 
 protected:
     Container list;
 

     //!!! can we remove these again once the rest of AgentList is implemented?
     bool empty() const { return list.empty(); }
     Container::iterator begin() { return list.begin(); }
     Container::iterator end() { return list.end(); }
     size_t size() { return list.size(); }
-    void push_back(const Agent &a) {
+    void push_back(Agent *a) {
         list.push_back(a);
 #ifdef DEBUG_BEATROOT
-        std::cerr << "  Added Ag#" << a.idNumber << ", have " << list.size() << " agent(s)" << std::endl;
+        std::cerr << "  Added Ag#" << a->idNumber << ", have " << list.size() << " agent(s)" << std::endl;
 #endif
     }
 
     /** Flag for choice between sum and average beat salience values for Agent scores.
      *  The use of summed saliences favours faster tempi or lower metrical levels. */

 	
     /** For the purpose of removing duplicate agents, the default JND of phase */
     static const double DEFAULT_BT;
 
     /** Inserts newAgent into the list in ascending order of beatInterval */
-    void add(Agent a) {
+    void add(Agent *a) {
 	add(a, true);
     } // add()/1
 
     /** Appends newAgent to list (sort==false), or inserts newAgent into the list
      *  in ascending order of beatInterval
      *  @param newAgent The agent to be added to the list
      *  @param sort Flag indicating whether the list is sorted or not
      */
-    void add(Agent newAgent, bool sort){
+    void add(Agent *newAgent, bool sort){
         push_back(newAgent);
 	if (sort) this->sort();
     } // add()/2
 
     /** Sorts the AgentList by increasing beatInterval. */