Mercurial Hosting > traffic-intelligence

changeset 1016:9b53be469a36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
getting ready for pull request
author Wendlasida
date Mon, 04 Jun 2018 15:51:03 -0400
parents cf9d29de3dbf
children 89cbc4056c13
files c/Makefile python/moving.py
diffstat 2 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/c/Makefile	Mon Jun 04 11:25:49 2018 -0400
+++ b/c/Makefile	Mon Jun 04 15:51:03 2018 -0400
@@ -1,6 +1,6 @@
 EXE_DIR=../bin
 SCRIPTS_DIR=../scripts
-TRAJECTORYMANAGEMENT_DIR=$(HOME)/Research/Code/trajectorymanagementandanalysis/trunk/src/TrajectoryManagementAndAnalysis
+TRAJECTORYMANAGEMENT_DIR=$(HOME)/Bureau/stage_montreal/trajectorymanagementandanalysis/trunk/src/TrajectoryManagementAndAnalysis
 
 CXX = g++
 
--- a/python/moving.py	Mon Jun 04 11:25:49 2018 -0400
+++ b/python/moving.py	Mon Jun 04 15:51:03 2018 -0400
@@ -1978,7 +1978,7 @@
     axis('equal')
 
 
-'''if __name__ == "__main__":
+if __name__ == "__main__":
     import doctest
     import unittest
     suite = doctest.DocFileSuite('tests/moving.txt')
@@ -1989,4 +1989,3 @@
     if shapelyAvailable: 
         suite = doctest.DocFileSuite('tests/moving_shapely.txt')
         unittest.TextTestRunner().run(suite)
-            for t in newTimeInterval:'''