X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=mtp.cc;h=2f9e7a98f593227e1d4d84be31d012a2865f235a;hb=8f7e0196dd3c89cb4e68732d6812a13d43bdfbc7;hp=bd6d2965fde899744d708c1ce651513e5be31950;hpb=455e5736828233445ac8aea8f15b3bde7e16e9bf;p=mtp.git

diff --git a/mtp.cc b/mtp.cc
index bd6d296..2f9e7a9 100644
--- a/mtp.cc
+++ b/mtp.cc
@@ -18,107 +18,44 @@
 
 // Multi-Tracked Path
 
-// Takes the graph description file as input and produces a dot file.
-
-// EXAMPLE: ./mtp ./graph2.txt  | dot -T pdf -o- | xpdf -
-
-#define VERBOSE
-
 #include <iostream>
 #include <fstream>
-#include <cmath>
-#include <stdio.h>
-#include <stdlib.h>
-#include <float.h>
 
 using namespace std;
 
-#include "mtp_graph.h"
 #include "tracker.h"
 
-//////////////////////////////////////////////////////////////////////
-
-void find_best_paths(int nb_vertices,
-                     int nb_edges, int *ea, int *eb, scalar_t *el,
-                     int source, int sink,
-                     int *result_edge_occupation) {
-  MTPGraph graph(nb_vertices, nb_edges, ea, eb, source, sink);
-  graph.find_best_paths(el, result_edge_occupation);
-}
-
-//////////////////////////////////////////////////////////////////////
-
 int main(int argc, char **argv) {
-  int nb_locations = 3;
-  int nb_time_steps = 4;
-
-  Tracker tracker(nb_time_steps, nb_locations);
-
-  for(int l = 0; l < nb_locations; l++) {
-    for(int k = 0; k < nb_locations; k++) {
-      if(abs(l - k) <= 1) tracker.set_allowed_motion(l, k);
-    }
-  }
-
-  for(int t = 0; t < nb_time_steps; t++) {
-    for(int l = 0; l < nb_locations; l++) {
-      tracker.set_detection_score(t, l, -1.0);
-    }
-    tracker.set_detection_score(t, 0, 1.0);
-  }
-
-  tracker.track();
-
-  exit(0);
 
   if(argc < 2) {
-    cerr << argv[0] << " <graph file>" << endl;
+    cerr << argv[0] << " <tracker file>" << endl;
     exit(EXIT_FAILURE);
   }
 
-  ifstream *file = new ifstream(argv[1]);
+  Tracker tracker;
 
-  int nb_edges, nb_vertices;
-  int source, sink;
+  ifstream in_tracker(argv[1]);
 
-  if(file->good()) {
+  if(in_tracker.good()) {
 
-    (*file) >> nb_vertices >> nb_edges;
-    (*file) >> source >> sink;
+    tracker.read(&in_tracker);
+    tracker.build_graph();
+    tracker.track();
 
-    scalar_t *edge_lengths = new scalar_t[nb_edges];
-    int *vertex_from = new int[nb_edges];
-    int *vertex_to = new int[nb_edges];
-    int *result_edge_occupation = new int[nb_edges];
+    ofstream out_traj("result.trj");
+    tracker.write_trajectories(&out_traj);
+    cout << "Wrote result.trj" << endl;
 
-    for(int e = 0; e < nb_edges; e++) {
-      (*file) >> vertex_from[e] >> vertex_to[e] >> edge_lengths[e];
-    }
-
-    find_best_paths(nb_vertices, nb_edges,
-                    vertex_from, vertex_to, edge_lengths,
-                    source, sink,
-                    result_edge_occupation);
-
-    dot_print(nb_vertices, nb_edges,
-              vertex_from, vertex_to, edge_lengths,
-              source, sink,
-              result_edge_occupation);
-
-    delete[] result_edge_occupation;
-    delete[] edge_lengths;
-    delete[] vertex_from;
-    delete[] vertex_to;
+    ofstream out_dot("graph.dot");
+    tracker.print_graph_dot(&out_dot);
+    cout << "Wrote graph.dot" << endl;
 
   } else {
 
     cerr << "Can not open " << argv[1] << endl;
-
-    delete file;
     exit(EXIT_FAILURE);
 
   }
 
-  delete file;
   exit(EXIT_SUCCESS);
 }