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

diff --git a/mtp.cc b/mtp.cc
index 118e521..2f9e7a9 100644
--- a/mtp.cc
+++ b/mtp.cc
@@ -18,101 +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"
-
-//////////////////////////////////////////////////////////////////////
-
-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);
-}
-
-void dot_print(int nb_vertices,
-               int nb_edges, int *ea, int *eb, scalar_t *el,
-               int source, int sink,
-               int *edge_occupation) {
-  cout << "digraph {" << endl;
-  cout << "  node[shape=circle];" << endl;
-  for(int e = 0; e < nb_edges; e++) {
-    if(edge_occupation[e]) {
-      cout << "  " << ea[e] << " -> " << eb[e] << " [style=bold,color=black,label=\"" << el[e] << "\"];" << endl;
-    } else {
-      cout << "  " << ea[e] << " -> " << eb[e] << " [color=gray,label=\"" << el[e] << "\"];" << endl;
-    }
-  }
-  cout << "}" << endl;
-}
-
-//////////////////////////////////////////////////////////////////////
+#include "tracker.h"
 
 int main(int argc, char **argv) {
 
   if(argc < 2) {
-    cerr << argv[0] << " <graph file>" << endl;
+    cerr << argv[0] << " <tracker file>" << endl;
     exit(EXIT_FAILURE);
   }
 
-  ifstream *file = new ifstream(argv[1]);
-
-  int nb_edges, nb_vertices;
-  int source, sink;
+  Tracker tracker;
 
-  if(file->good()) {
+  ifstream in_tracker(argv[1]);
 
-    (*file) >> nb_vertices >> nb_edges;
-    (*file) >> source >> sink;
+  if(in_tracker.good()) {
 
-    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];
+    tracker.read(&in_tracker);
+    tracker.build_graph();
+    tracker.track();
 
-    for(int e = 0; e < nb_edges; e++) {
-      (*file) >> vertex_from[e] >> vertex_to[e] >> edge_lengths[e];
-    }
+    ofstream out_traj("result.trj");
+    tracker.write_trajectories(&out_traj);
+    cout << "Wrote result.trj" << endl;
 
-    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);
 }