Mercurial > hg > audiodb
comparison bindings/python/pyadb.py @ 749:dd4b9fec8d85
added support for timesData
author | mas01mc |
---|---|
date | Wed, 24 Nov 2010 13:50:05 +0000 |
parents | e5f96902afaf |
children | d93292ae7c1b |
comparison
equal
deleted
inserted
replaced
748:e5f96902afaf | 749:dd4b9fec8d85 |
---|---|
70 if self.hasPower: | 70 if self.hasPower: |
71 if featFile: | 71 if featFile: |
72 args["power"]=powerFile | 72 args["power"]=powerFile |
73 elif featData.any(): | 73 elif featData.any(): |
74 args["power"]=powerData | 74 args["power"]=powerData |
75 if timesData != None: | |
76 self.hasTimes=True | |
75 if self.hasTimes: | 77 if self.hasTimes: |
76 if featFile: | 78 if featFile: |
77 args["times"]=timesFile | 79 args["times"]=timesFile |
78 elif timesData.any(): | 80 elif timesData.any(): |
79 pass | 81 args["times"]=timesData |
80 if key: | 82 if key: |
81 args["key"]=str(key) | 83 args["key"]=str(key) |
82 if featFile: | 84 if featFile: |
83 if not _pyadb._pyadb_insertFromFile(**args): | 85 if not _pyadb._pyadb_insertFromFile(**args): |
84 raise RuntimeError("Insertion from file failed for an unknown reason.") | 86 raise RuntimeError("Insertion from file failed for an unknown reason.") |
92 args["features"] = args["features"].flatten() | 94 args["features"] = args["features"].flatten() |
93 if(self.hasPower and powerData != None): | 95 if(self.hasPower and powerData != None): |
94 if (len(args["power"].shape) == 1) : | 96 if (len(args["power"].shape) == 1) : |
95 args["power"] = args["power"].reshape((args["power"].shape[0],1)) | 97 args["power"] = args["power"].reshape((args["power"].shape[0],1)) |
96 args["power"] = args["power"].flatten() | 98 args["power"] = args["power"].flatten() |
99 if(self.hasTimes and timesData != None): | |
100 if (len(args["times"].shape) == 1) : | |
101 args["times"] = args["times"].reshape((args["times"].shape[0],1)) | |
102 args["times"] = args["times"].flatten() | |
103 | |
97 print "args: " + str(args) | 104 print "args: " + str(args) |
98 ok = _pyadb._pyadb_insertFromArray(**args) | 105 ok = _pyadb._pyadb_insertFromArray(**args) |
99 if not (ok==0): | 106 if not (ok==0): |
100 raise RuntimeError("Direct data insertion failed for an unknown reason. err code = %i"%ok) | 107 raise RuntimeError("Direct data insertion failed for an unknown reason. err code = %i"%ok) |
101 else: | 108 else: |