Mercurial Hosting > traffic-intelligence

changeset 265:7a3bf04cf016

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added plotting of indicators
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Thu, 26 Jul 2012 19:46:36 -0400
parents a04a6af4b810
children aba9711b3149
files python/extrapolation.py python/indicators.py
diffstat 2 files changed, 11 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/python/extrapolation.py	Thu Jul 26 03:54:41 2012 -0400
+++ b/python/extrapolation.py	Thu Jul 26 19:46:36 2012 -0400
@@ -167,16 +167,18 @@
         saveSafetyPoints(outCZ, obj1.num, obj2.num, i, crossingZones[i])
 
         if debug:
-            from matplotlib.pyplot import figure, axis
+            from matplotlib.pyplot import figure, axis, title
             figure()
             obj1.draw('r')
             obj2.draw('b')
             for et in extrapolatedTrajectories1:
                 et.predictPosition(timeHorizon)
                 et.draw('rx')
+                
             for et in extrapolatedTrajectories2:
                 et.predictPosition(timeHorizon)
                 et.draw('bx')
+            title('instant {0}'.format(i))
             axis('equal')
                 
 
--- a/python/indicators.py	Thu Jul 26 03:54:41 2012 -0400
+++ b/python/indicators.py	Thu Jul 26 19:46:36 2012 -0400
@@ -75,6 +75,14 @@
         else: 
             return values
 
+    def plot(self, options = '', **kwargs):
+        from matplotlib.pylab import plot
+        if not self.timeInterval and type(self.values)==dict:
+            time = sorted(self.values.keys())
+            plot(time, [self.values[i] for i in time], options, **kwargs)
+        else:
+            plot(list(getTimeInterval()), self.values, options, **kwargs)
+
 class SeverityIndicator(TemporalIndicator):
     '''Class for severity indicators 
     field mostSevereIsMax is True