From ce65c30264be9683dd3a59b35730d2f31e02d37f Mon Sep 17 00:00:00 2001 From: John Glover Date: Thu, 21 Oct 2010 13:39:28 +0100 Subject: Changed from floats to doubles in the C/C++ code, makes Python integration a bit easier. Fixed a bug that would cause SndObjSynthesis to crash if peak values were floats. --- __init__.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to '__init__.py') diff --git a/__init__.py b/__init__.py index ae44d93..44f2c37 100644 --- a/__init__.py +++ b/__init__.py @@ -20,10 +20,15 @@ from sndobj import SndObjPeakDetection, SndObjPartialTracking, SndObjSynthesis from sms import SMSPeakDetection, SMSPartialTracking, SMSSynthesis, SMSResidual from mq import MQPeakDetection, MQPartialTracking -from numpy import array as np_array -def array (n, type='float32'): - return(np_array(n, type)) +import numpy +#float = numpy.float64 + +def array (n, type=float): + return(numpy.array(n, dtype=type)) + +def asarray (n, type=float): + return(numpy.asarray(n, dtype=type)) + +def zeros (n, type=float): + return(numpy.zeros(n, dtype=type)) -from numpy import zeros as np_zeros -def zeros (n, type='float32'): - return(np_zeros(n, type)) -- cgit v1.2.3