X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=mtp.git;a=blobdiff_plain;f=mtp.cc;h=61dcc21692df4a0e69b9e315e8abc66998697683;hp=f2db0c65a3cdc15587e1211920df203c31b31ce3;hb=14e3b33cbe1e0d7deb0b4aa697f6c8b5d43e2963;hpb=9490c76beeea6435b0d51dc2dc1c4c11f4054a2c

diff --git a/mtp.cc b/mtp.cc
index f2db0c6..61dcc21 100644
--- a/mtp.cc
+++ b/mtp.cc
@@ -1,56 +1,80 @@
 
-///////////////////////////////////////////////////////////////////////////
-// This program is free software: you can redistribute it and/or modify  //
-// it under the terms of the version 3 of the GNU General Public License //
-// as published by the Free Software Foundation.                         //
-//                                                                       //
-// This program is distributed in the hope that it will be useful, but   //
-// WITHOUT ANY WARRANTY; without even the implied warranty of            //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      //
-// General Public License for more details.                              //
-//                                                                       //
-// You should have received a copy of the GNU General Public License     //
-// along with this program. If not, see <http://www.gnu.org/licenses/>.  //
-//                                                                       //
-// Written by and Copyright (C) Francois Fleuret                         //
-// Contact <francois.fleuret@idiap.ch> for comments & bug reports        //
-///////////////////////////////////////////////////////////////////////////
-
-// Multi-Tracked Path
+/*
+ *  mtp is the ``Multi Tracked Paths'', an implementation of the
+ *  k-shortest paths algorithm for multi-target tracking.
+ *
+ *  Copyright (c) 2012 Idiap Research Institute, http://www.idiap.ch/
+ *  Written by Francois Fleuret <francois.fleuret@idiap.ch>
+ *
+ *  This file is part of mtp.
+ *
+ *  mtp is free software: you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
+ *
+ *  mtp is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *  or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+ *  License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with selector.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
 
 #include <iostream>
 #include <fstream>
+#include <sys/time.h>
 
 using namespace std;
 
-#include "tracker.h"
+#include "mtp_tracker.h"
+
+scalar_t diff_in_second(struct timeval *start, struct timeval *end) {
+  return
+    scalar_t(end->tv_sec - start->tv_sec) +
+    scalar_t(end->tv_usec - start->tv_usec)/1000000;
+}
 
 int main(int argc, char **argv) {
+  timeval start_time, end_time;
 
   if(argc < 2) {
     cerr << argv[0] << " <tracker file>" << endl;
     exit(EXIT_FAILURE);
   }
 
-  Tracker tracker;
+  ifstream *in_tracker = new ifstream(argv[1]);
+
+  if(in_tracker->good()) {
 
-  ifstream in_tracker(argv[1]);
+    MTPTracker *tracker = new MTPTracker();
 
-  if(in_tracker.good()) {
+    cout << "Reading " << argv[1] << "." << endl;
+    tracker->read(in_tracker);
 
-    tracker.read(&in_tracker);
-    tracker.build_graph();
-    tracker.track();
-    cout << "Read " << argv[1] << endl;
+    cout << "Building the graph ... "; cout.flush();
+    gettimeofday(&start_time, 0);
+    tracker->build_graph();
+    gettimeofday(&end_time, 0);
+    cout << "done (" << diff_in_second(&start_time, &end_time) << "s)." << endl;
+
+    cout << "Tracking ... "; cout.flush();
+    gettimeofday(&start_time, 0);
+    tracker->track();
+    gettimeofday(&end_time, 0);
+    cout << "done (" << diff_in_second(&start_time, &end_time) << "s)." << endl;
 
     ofstream out_traj("result.trj");
-    tracker.write_trajectories(&out_traj);
+    tracker->write_trajectories(&out_traj);
     cout << "Wrote result.trj" << endl;
 
     ofstream out_dot("graph.dot");
-    tracker.print_graph_dot(&out_dot);
+    tracker->print_graph_dot(&out_dot);
     cout << "Wrote graph.dot" << endl;
 
+    delete tracker;
+
   } else {
 
     cerr << "Can not open " << argv[1] << endl;
@@ -58,5 +82,7 @@ int main(int argc, char **argv) {
 
   }
 
+  delete in_tracker;
+
   exit(EXIT_SUCCESS);
 }