# HG changeset patch
# User Wendlasida
# Date 1528141863 14400
# Node ID 9b53be469a3620dd2f4dce0d0c02e5c529f4afa8
# Parent  cf9d29de3dbf13076bfc0fbc142c634674b4dd43
getting ready for pull request

diff -r cf9d29de3dbf -r 9b53be469a36 c/Makefile
--- 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++
 
diff -r cf9d29de3dbf -r 9b53be469a36 python/moving.py
--- 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:'''