X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=mtp.cc;h=61dcc21692df4a0e69b9e315e8abc66998697683;hb=c752952df0dd1d781ec80f25c4b9418bddac1b9e;hp=62ab56a431d56ba4fbc1634dda8de14c150e021d;hpb=a0f008effb41b45dd5ae2d51ec98a59cce81c7c3;p=mtp.git

diff --git a/mtp.cc b/mtp.cc
index 62ab56a..61dcc21 100644
--- a/mtp.cc
+++ b/mtp.cc
@@ -1,31 +1,43 @@
 
-///////////////////////////////////////////////////////////////////////////
-// 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;
@@ -36,12 +48,22 @@ int main(int argc, char **argv) {
 
   if(in_tracker->good()) {
 
-    Tracker *tracker = new Tracker();
+    MTPTracker *tracker = new MTPTracker();
 
+    cout << "Reading " << argv[1] << "." << endl;
     tracker->read(in_tracker);
+
+    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();
-    cout << "Read " << argv[1] << endl;
+    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);