Changeset 68

Timestamp:

08/20/07 16:40:47

Author:

cbc

Message:

Fulfill ticket #9: Compute sample time interval

Files:

• sodar/trunk/sodar/data.py (modified) (5 diffs)

sodar/trunk/sodar/data.py

@@ -60 +60 @@
-import re
-import numpy as n
+import datetime
-
-class Data(list):
@@ -112 +113 @@
-        self._copy()
-        self._convert()
-
+
+
-        # correct for missing times
-        # compute minium altitude
@@ -134 +136 @@
-        INVALID = "-9999"
-        for sample in self.samples:
-
-
+
-                for key,value in altitude.items():
-                    try:
@@ -143 +144 @@
-                    except (ValueError, TypeError, KeyError):
-                        altitude[key] = n.NaN
+            for key,value in sample['header'].items():
+                try:
+                    if value == INVALID:
+                        raise ValueError
+                    sample['header'][key] = int(value)
+                except (ValueError, TypeError, KeyError):
+                    sample['header'][key] = n.NaN
+    
+    def _stamp(self):
+        """Add a datetime stamp to each sample."""
+        for sample in self.samples:
+            try:
+                header = sample['header']
+                sample['stamp'] = datetime.datetime(header['YEAR'],
+                                                    header['MONTH'],
+                                                    header['DAY'],
+                                                    header['HOUR'],
+                                                    header['MIN'])
+            except (KeyError, TypeError):
+                sample['stamp'] = datatime.datetime.min
+    
+    def _timeInterval(self):
+        """Add a time interval attribute"""
+        intervals = zip([sample['stamp'] for sample in self.samples[:-1]],
+                        [sample['stamp'] for sample in self.samples[1:]])
+        intervals = [interval[1] - interval[0] for interval in intervals]
+        accumulator = {}
+        for interval in intervals:
+            if interval in accumulator:
+                accumulator[interval] += 1
+            else:
+                accumulator[interval] = 1
+        maxVotes = max(accumulator.values())
+        for key,value in accumulator.items():
+            if value == maxVotes:
+                self.timeInterval = key
+                break
+        self.timeInterval = getattr(self,
+                                    'timeInterval',
+                                    datetime.timedelta.resolution)
-
-
@@ -176 +217 @@
-    
-    def _copy(self):
-
-
+
+
+
-
-