X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=tracker.h;h=d8cb811c40a1d51e4aeb651896684e585f1b0be6;hb=79a4a9ab164a667ecb551078e1cd773e2140e3c2;hp=d37e46adfebfa2b9f5880fe3a05549e2b4ea89eb;hpb=0f54e5005de0f05d4bc400f23181301eb40f469e;p=mtp.git

diff --git a/tracker.h b/tracker.h
index d37e46a..d8cb811 100644
--- a/tracker.h
+++ b/tracker.h
@@ -24,24 +24,27 @@
 
 class Tracker {
   int _nb_locations, _nb_time_steps;
-  MTPGraph *_graph;
   scalar_t **_detection_score;
   int **_allowed_motion;
 
+  MTPGraph *_graph;
+  int *_edge_occupation;
+  scalar_t *_edge_lengths;
 public:
-  Tracker(int nb_locations, int nb_time_steps);
+  Tracker(int nb_time_steps, int nb_locations);
   ~Tracker();
 
-  void set_allowed_motion(int from_location, int to_location);
-  void set_detection_score(int location, int time, scalar_t score);
-  void make_graph();
+  void set_allowed_motion(int from_location, int to_location, int v);
+  void build_graph();
+
+  void set_detection_score(int time, int location, scalar_t score);
 
   void track();
 
-  int nb_trajectories();
-  int trajectory_start_time(int k);
-  int trajectory_end_time(int k);
-  int trajectory_location(int k, int time);
+  // int nb_trajectories();
+  // int trajectory_start_time(int k);
+  // int trajectory_end_time(int k);
+  // int trajectory_location(int k, int time);
 };
 
 #endif