X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=tracker.h;h=b56ac61898465358c30c1b3ab3f4f77e17c22ee6;hb=a0f008effb41b45dd5ae2d51ec98a59cce81c7c3;hp=2ca731ad0199eab007397eee1a8215eb0e6a4761;hpb=fda29b3422f4850d77e4b8f4916251509789d3ac;p=mtp.git

diff --git a/tracker.h b/tracker.h
index 2ca731a..b56ac61 100644
--- a/tracker.h
+++ b/tracker.h
@@ -33,26 +33,46 @@ class Tracker {
   int *_entrances, *_exits;
 
   MTPGraph *_graph;
-  int *_edge_occupation;
   scalar_t *_edge_lengths;
+
+  int early_pair_node(int t, int l);
+  int late_pair_node(int t, int l);
+
 public:
-  Tracker(int nb_time_steps, int nb_locations);
+
+  // The spatial structure
+  int **allowed_motion;
+  int *entrances, *exits;
+
+  // The detection scores at each node
+  scalar_t **detection_scores;
+
+  Tracker();
   ~Tracker();
 
-  void set_allowed_motion(int from_location, int to_location, int v);
-  void set_as_entrance(int location, int v);
-  void set_as_exit(int location, int v);
+  void allocate(int nb_time_steps, int nb_locations);
+  void free();
+
+  void write(ostream *os);
+  void read(istream *is);
+  void write_trajectories(ostream *os);
+
+  // Build or print the graph needed for the tracking per se
 
   void build_graph();
-  void print_dot_graph(ostream *os);
+  void print_graph_dot(ostream *os);
 
-  void set_detection_score(int time, int location, scalar_t score);
+  // Compute the optimal set of trajectories
 
   void track();
 
+  // Read-out of the optimal trajectories
+
   int nb_trajectories();
+  scalar_t trajectory_score(int k);
+  int trajectory_entrance_time(int k);
   int trajectory_duration(int k);
-  int trajectory_location(int k, int time);
+  int trajectory_location(int k, int time_from_entry);
 };
 
 #endif