diff Agent.cpp @ 6:02d388f98c23

Introduce a number of new classes derived from the Java

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Agent.cpp	Tue Sep 27 18:37:01 2011 +0100
@@ -0,0 +1,79 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+  Vamp feature extraction plugin for the BeatRoot beat tracker.
+
+  Centre for Digital Music, Queen Mary, University of London.
+  This file copyright 2011 Simon Dixon, Chris Cannam and QMUL.
+    
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 2 of the
+  License, or (at your option) any later version.  See the file
+  COPYING included with this distribution for more information.
+*/
+
+#include "Agent.h"
+#include "BeatTracker.h"
+
+double Agent::POST_MARGIN_FACTOR = 0.3;
+double Agent::PRE_MARGIN_FACTOR = 0.15;
+const double Agent::INNER_MARGIN = 0.040;
+double Agent::MAX_CHANGE = 0.2;
+double Agent::CONF_FACTOR = 0.5;
+const double Agent::DEFAULT_CORRECTION_FACTOR = 50.0;
+const double Agent::DEFAULT_EXPIRY_TIME = 10.0;
+
+int Agent::idCounter = 0;
+
+double Agent::innerMargin = 0.0;
+double Agent::outerMargin = 0.0;
+double Agent::correctionFactor = 0.0;
+double Agent::expiryTime = 0.0;
+double Agent::decayFactor = 0.0;
+
+bool Agent::considerAsBeat(Event e, const AgentList &a) {
+    double err;
+    if (beatTime < 0) {	// first event
+	accept(e, 0, 1);
+	return true;
+    } else {			// subsequent events
+	if (e.keyDown - events.l.getLast().keyDown > expiryTime) {
+	    phaseScore = -1.0;	// flag agent to be deleted
+	    return false;
+	}
+	double beats = Math.round((e.keyDown - beatTime) / beatInterval);
+	err = e.keyDown - beatTime - beats * beatInterval;
+	if ((beats > 0) && (-preMargin <= err) && (err <= postMargin)) {
+	    if (Math.abs(err) > innerMargin)	// Create new agent that skips this
+		a.add(new Agent(this));	//  event (avoids large phase jump)
+	    accept(e, err, (int)beats);
+	    return true;
+	}
+    }
+    return false;
+} // considerAsBeat()
+
+
+void fillBeats(double start) {
+    double prevBeat = 0, nextBeat, currentInterval, beats;
+    EventList::iterator list = events.begin();
+    if (list != events.end()) {
+	++list;
+	prevBeat = list->time;
+	--list;
+    }
+    for ( ; list != events.end(); ++list) {
+	++list;
+	nextBeat = list->time;
+	--list;
+	beats = nearbyint((nextBeat - prevBeat) / beatInterval - 0.01); //prefer slow
+	currentInterval = (nextBeat - prevBeat) / beats;
+	for ( ; (nextBeat > start) && (beats > 1.5); beats--) {
+	    prevBeat += currentInterval;
+	    //!!! need to insert this event after current itr
+	    list.add(BeatTracker::newBeat(prevBeat, 0));	// more than once OK??
+	}
+	prevBeat = nextBeat;
+    }
+} // fillBeats()