implement inplace conversion for dac to save memory, and fix rdann sampto case reading in one extra sample

cx1111 · cx1111 · commit 0ab2fa02b5b3 · 2017-09-27T09:50:04.000-04:00
diff --git a/setup.py b/setup.py
@@ -20,7 +20,7 @@
     # Versions should comply with PEP440. For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version='1.3.2',
+    version='1.3.3',
 
     description='The WFDB Python Toolbox',
     long_description=long_description,
diff --git a/wfdb/readwrite/_signals.py b/wfdb/readwrite/_signals.py
@@ -312,20 +312,17 @@ def dac(self, expanded=False, returnres=64, inplace=False):
 
         # Do inplace conversion and set relevant variables.
         if inplace:
-            # No clever memory saving here...
             if expanded:
-                p_signal = []
                 for ch in range(0, self.nsig):
                     # nan locations for the channel
-                    chnanlocs = self.e_d_signals[ch] == dnans[ch]
-                    
-                    p_signal.append(((self.e_d_signals[ch] - self.baseline[ch])/self.adcgain[ch]).astype(floatdtype, copy=False))
-                    p_signal[ch][chnanlocs] = np.nan
-
-                self.e_p_signals = p_signal
+                    ch_nanlocs = self.e_d_signals[ch] == dnans[ch]
+                    self.e_d_signals[ch] = self.e_d_signals[ch].astype(floatdtype, copy=False)
+                    np.subtract(self.e_d_signals[ch], self.baseline[ch], self.e_d_signals[ch])
+                    np.divide(self.e_d_signals[ch], self.adcgain[ch], self.e_d_signals[ch])
+                    self.e_d_signals[ch][ch_nanlocs] = np.nan
+                self.e_p_signals = self.e_d_signals
                 self.e_d_signals = None
             else:
-                # nan locations
                 nanlocs = self.d_signals == dnans
                 # Do float conversion immediately to avoid potential under/overflow
                 # of efficient int dtype
@@ -342,13 +339,17 @@ def dac(self, expanded=False, returnres=64, inplace=False):
                 p_signal = []
                 for ch in range(0, self.nsig):
                     # nan locations for the channel
-                    chnanlocs = self.e_d_signals[ch] == dnans[ch]
-                    p_signal.append(((self.e_d_signals[ch] - self.baseline[ch])/self.adcgain[ch]).astype(floatdtype, copy=False))
-                    p_signal[ch][chnanlocs] = np.nan
+                    ch_nanlocs = self.e_d_signals[ch] == dnans[ch]
+                    ch_p_signal = self.e_d_signals[ch].astype(floatdtype, copy=False)
+                    np.subtract(ch_p_signal, self.baseline[ch], ch_p_signal)
+                    np.divide(ch_p_signal, self.adcgain[ch], ch_p_signal)
+                    ch_p_signal[ch_nanlocs] = np.nan
+                    p_signal.append(ch_p_signal)
             else:
-                # nan locations
                 nanlocs = self.d_signals == dnans
-                p_signal = ((self.d_signals - self.baseline) / self.adcgain).astype(floatdtype, copy=False)
+                p_signal = self.d_signal.astype(floatdtype, copy=False)
+                np.subtract(p_signal, self.baseline, p_signal)
+                np.divide(p_signal, self.adcgain, p_signal)
                 p_signal[nanlocs] = np.nan
                     
             return p_signal
diff --git a/wfdb/readwrite/annotations.py b/wfdb/readwrite/annotations.py
@@ -1247,6 +1247,7 @@ def proc_ann_bytes(filebytes, sampto):
         subtype, chan, num, aux_note = update_extra_fields(subtype, chan, num, aux_note, update)
 
         if sampto and sampto<sample_total:
+            sample, label_store, subtype, chan, num, aux_note = rm_last(sample, label_store, subtype, chan, num, aux_note)
             break
 
     return sample, label_store, subtype, chan, num, aux_note
@@ -1442,7 +1443,15 @@ def lists_to_arrays(*args):
     """
     return [np.array(a, dtype='int') for a in args]
 
-
+def rm_last(*args):
+    """
+    Remove the last index from each list
+    """
+    if len(args) == 1:
+        return args[:-1]
+    else:
+        return [a[:-1] for a in args]
+    return
 
 ## ------------- /Reading Annotations ------------- ##
 
