comparison bindings/python/pyadb.py @ 743:63a75a2b5fa6

Added insert featureData and powerData from numpy ndarray pathway

 		Insert features into database.  Can be done with data provided directly or by giving a path to a binary fftExtract style feature file.  If power and/or timing is engaged in the database header, it must be provided (via the same means as the feature) or a Usage exception will be raised. Power files should be of the same binary type as features.  Times files should be the ascii number length of time in seconds from the begining of the file to segment start, one per line.
 		If providing data directly, featData should be a numpy array with shape= (number of Dimensions, number of Vectors)
 		"""
 		#While python style normally advocates leaping before looking, these check are nessecary as 
 		#it is very difficult to assertain why the insertion failed once it has been called.
-		if (self.hasPower and (((featFile) and powerFile==None) or ((featData) and powerData==None))):
+		if (self.hasPower and (((featFile) and powerFile==None) or ((not featData==None) and powerData==None))):
 			raise(Usage, "The db you are attempting an insert on (%s) expects power and you either\
  haven't provided any or have done so in the wrong format."%self.path)
-		if (self.hasTimes and (((timesFile) and timesFile==None) or ((timesData) and timesData==None))):
+		if (self.hasTimes and (((timesFile) and timesFile==None) or ((not timesData==None) and timesData==None))):
 			raise(Usage, "The db you are attempting an insert on (%s) expects times and you either\
  haven't provided any or have done so in the wrong format."%self.path)
 		args = {"db":self._db}
 		if featFile:
 			args["features"] = featFile

 		else:
 			raise(Usage, "Must provide some feature data!")
 		if self.hasPower:
 			if featFile:
 				args["power"]=powerFile
-			elif featData:
-				pass
+			elif featData.any():
+				args["power"]=powerData
 		if self.hasTimes:
 			if featFile:
 				args["times"]=timesFile
-			elif timesData:
+			elif timesData.any():
 				pass
 		if key:
 			args["key"]=str(key)
 		if featFile:
 			if not _pyadb._pyadb_insertFromFile(**args):
 				raise RuntimeError("Insertion from file failed for an unknown reason.")
 			else:
 				self._updateDBAttributes()
 				return
 		elif (featData != None):
-			if (len(args["features"].shape) == 1) : args["features"] = args["features"].reshape((args["features"].shape[0],1))
+			if (len(args["features"].shape) == 1) : 
+				args["features"] = args["features"].reshape((args["features"].shape[0],1))
 			args["nVect"], args["nDim"] = args["features"].shape
 			args["features"] = args["features"].flatten()
+			if(powerData != None):
+				if (len(args["power"].shape) == 1) : 
+					args["power"] = args["power"].reshape((args["power"].shape[0],1))
+				args["power"] = args["power"].flatten()
 			print "args: " + str(args)
 			ok = _pyadb._pyadb_insertFromArray(**args)
 			if not (ok==0):
 				raise RuntimeError("Direct data insertion failed for an unknown reason. err code = %i"%ok)
 			else: