X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=tracker.cc;h=c66c89de179e41aedba54ebafe37b1b01903da0e;hb=9bbc3775491edae5bb92679ecca0f525877371f5;hp=5a0647b682a73630744b0247204056d678e39bca;hpb=6afe91234d7807ce82b96a071087decb2f7aead3;p=mtp.git diff --git a/tracker.cc b/tracker.cc index 5a0647b..c66c89d 100644 --- a/tracker.cc +++ b/tracker.cc @@ -60,7 +60,7 @@ Tracker::~Tracker() { } void Tracker::build_graph() { - // Delete existing graph if there was one + // Delete the existing graph if there was one delete[] _edge_lengths; delete _graph; @@ -81,11 +81,10 @@ void Tracker::build_graph() { // frame to the sink _nb_locations * 2 + // The edges from the source to the entrances and from the exists - // to the sink (in every time frames but the first for the source, - // and last for the exits) + // to the sink (in every time frames but the first for the + // entrances, and last for the exits) (_nb_time_steps - 1) * (nb_exits + nb_entrances) + - // The edges for the motions, between every pair of successive - // frames + // The edges for the motions, between every successive frames (_nb_time_steps - 1) * nb_motions + // The edges inside the duplicated nodes _nb_locations * _nb_time_steps; @@ -211,6 +210,6 @@ int Tracker::trajectory_duration(int k) { return (_graph->paths[k]->nb_nodes - 2) / 2; } -int Tracker::trajectory_location(int k, int time) { - return (_graph->paths[k]->nodes[2 * time + 1] - 1) % _nb_locations; +int Tracker::trajectory_location(int k, int time_from_entry) { + return (_graph->paths[k]->nodes[2 * time_from_entry + 1] - 1) % _nb_locations; }