Changeset 443 for trunk/src/signals/analogs.py

Timestamp:

01/18/10 16:45:34 (2 years ago)

Author:

apdavison

Message:

datastore key-generators now work properly if the component is the __main__ module.
Fixed a couple of rounding errors in signals.

Files:

• trunk/src/signals/analogs.py (modified) (3 diffs)

trunk/src/signals/analogs.py

@@ -209 +209 @@
         
         t = self.time_axis()
-        i_start = int((t_start-self.t_start)/self.dt)
-        i_stop = int((t_stop-self.t_start)/self.dt)
+        i_start = int(round((t_start-self.t_start)/self.dt))
+        i_stop = int(round((t_stop-self.t_start)/self.dt))
         signal = self.signal[i_start:i_stop]
         result = AnalogSignal(signal, self.dt, t_start, t_stop)
@@ -471 +471 @@
             errmsgs = []
             for attr in "dt", "t_start", "t_stop":
-                if getattr(val, attr) != getattr(self, attr):
-                    errmsgs.append("%s: %g != %g" % (attr, getattr(val, attr), getattr(self, attr)))
+                if getattr(self, attr) == 0:
+                    if getattr(val, attr) != 0:
+                        errmsgs.append("%s: %g != %g (diff=%g)" % (attr, getattr(val, attr), getattr(self, attr), getattr(val, attr)-getattr(self, attr)))
+                elif (getattr(val, attr) - getattr(self, attr))/getattr(self, attr) > 1e-12:
+                    errmsgs.append("%s: %g != %g (diff=%g)" % (attr, getattr(val, attr), getattr(self, attr), getattr(val, attr)-getattr(self, attr)))
             if len(val) != self.signal_length:
                 errmsgs.append("signal length: %g != %g" % (len(val), self.signal_length))
@@ -703 +706 @@
             mean
         """
-        result = numpy.zeros((len(self), int((self.t_stop - self.t_start)/self.dt)),float)
+        result = numpy.zeros((len(self), int(round((self.t_stop - self.t_start)/self.dt))), float)
         for count, id in enumerate(self.id_list()):
             try: