comparison Agent.h @ 8:f04f87b5e643

Add agent list class, and continue plodding through

 #ifndef _AGENT_H_
 #define _AGENT_H_
 
 #include "Event.h"
 
+class AgentList;
+
 /** Agent is the central class for beat tracking.
  *  Each Agent object has a tempo hypothesis, a history of tracked beats, and
  *  a score evaluating the continuity, regularity and salience of its beat track.
  */
 class Agent
 {
 public:
-
-    typedef std::vector<Agent> AgentList;
-
     /** The maximum amount by which a beat can be later than the predicted beat time,
      *  expressed as a fraction of the beat period. */
     static double POST_MARGIN_FACTOR;
 
     /** The maximum amount by which a beat can be earlier than the predicted beat time,

 	if (value > max)
 	    return max;
 	return value;
     }
 
+public:
     /** Accept a new Event as a beat time, and update the state of the Agent accordingly.
      *  @param e The Event which is accepted as being on the beat.
      *  @param err The difference between the predicted and actual beat times.
      *  @param beats The number of beats since the last beat that matched an Event.
      */

      *  5) The Event is ignored because it is outside the windows around the Agent's predicted beat time.
      * @param e The Event to be tested
      * @param a The list of all agents, which is updated if a new agent is created.
      * @return Indicate whether the given Event was accepted as a beat by this Agent.
      */
-    bool considerAsBeat(Event e, const AgentList &a);
+    bool considerAsBeat(Event e, AgentList &a);
 
     /** Interpolates missing beats in the Agent's beat track, starting from the beginning of the piece. */
     void fillBeats() {
 	fillBeats(-1.0);
     } // fillBeats()/0

     /** Interpolates missing beats in the Agent's beat track.
      *  @param start Ignore beats earlier than this start time 
      */
     void fillBeats(double start);
 
+    // for sorting AgentList
+    bool operator<(const Agent &a) const {
+        return beatInterval < a.beatInterval;
+    }
+
 }; // class Agent
 
-typedef Agent::AgentList AgentList;
-
 #endif