dev

cx1111 · cx1111 · commit d361e2919de6 · 2017-02-16T15:59:53.000-05:00
diff --git a/devtests.ipynb b/devtests.ipynb
@@ -1199,12 +1199,71 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 4,
    "metadata": {
     "collapsed": false
    },
-   "outputs": [],
-   "source": []
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "array([ 1,  3,  6, 10, 15])"
+      ]
+     },
+     "execution_count": 4,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "import numpy as np\n",
+    "        \n",
+    "np.cumsum([1,2,3,4,5])"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 5,
+   "metadata": {
+    "collapsed": false
+   },
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "-66"
+      ]
+     },
+     "execution_count": 5,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "min(np.diff([1,2,3,4,59,99,33]))"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 6,
+   "metadata": {
+    "collapsed": false
+   },
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "1"
+      ]
+     },
+     "execution_count": 6,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "min([1,2,3])\n"
+   ]
   },
   {
    "cell_type": "code",
diff --git a/wfdb/annotations.py b/wfdb/annotations.py
@@ -23,7 +23,7 @@ def wrann(self):
         # Write the header file using the specified fields
         self.wrannfile()
 
-    # Check all fields of the annotation object
+    # Check the mandatory and set fields of the annotation object
     def checkfields(self):
 
         # Mandatory write fields
@@ -46,16 +46,43 @@ def checkfield(self, field):
             if type(self.fs) not in annfieldtypes['fs']:
                 print('The fs field must be one of the following types: ', annfieldtypes['fs'])
                 sys.exit()
-            # Particular condition
+            # Field specific check
             if self.fs <=0:
                 sys.exit('The fs field must be a non-negative number')
 
         else:
-            # Ensure the field is an array
-            
-            # Check the field type of the list elements
-
+            # Ensure the field is a list
+            if type(getattr(self, field)) != list:
+                print('The ', field, ' field must be a list')
+                sys.exit()
 
+            # Check the field type of the list elements
+            for fd in getattr(self, field):
+                if type(fd) not in annfieldtypes[field]:
+                    print('All elements of the ' field, 'field must be one of the following: ', annfieldtypes[field])
+                    sys.exit()
+
+            # Field specific checks
+            if field == 'annsamp':
+                sampdiffs = np.diff(self.annsamp)
+                if min(self.annsamp) < 0 :
+                    sys.exit('The annsamp field must only contain non-negative integers')
+                if min(sampdiffs) < 0 :
+                    sys.exit('The annsamp field must contain monotonically increasing sample numbers')
+            elif field == 'anntype':
+                print('to find out...')
+            elif field == 'num':
+                if min(self.num) < 0 :
+                    sys.exit('The num field must only contain non-negative integers')
+            elif field == 'subtype':
+                if min(self.subtype) < 0 :
+                    sys.exit('The subtype field must only contain non-negative integers')
+            elif field == 'chan':
+                if min(self.chan) < 0 :
+                    sys.exit('The chan field must only contain non-negative integers')
+            elif field == 'aux':
+                if min(self.aux) < 0 :
+                    sys.exit('The aux field must only contain non-negative integers')
 
 
     # Ensure all set annotation fields have the same length
@@ -67,10 +94,7 @@ def checkfieldcohesion(self):
         for field in annfields[1:-1]:
             if getarr(self, field) is not None:
                 if len(getattr(self, field)) != nannots:
-
-
-
-
+                    sys.exit('All set annotation fields (aside from fs) must have the same length')
 
     def wrannfile(self):
         print('on it')
