diff --git a/PythonWrapper/examples/testdsp.py b/PythonWrapper/examples/testdsp.py index ca6759aa..502fa31a 100644 --- a/PythonWrapper/examples/testdsp.py +++ b/PythonWrapper/examples/testdsp.py @@ -266,17 +266,6 @@ resultR=Q15toF32(resultR) resultI = realToIm1D(resultR)*16 print(resultI) -nb = 128 -signal = np.cos(2 * np.pi * np.arange(nb) / nb) - -result=np.fft.fft(signal) -print(result) -cfftradix4f32=dsp.arm_cfft_radix4_instance_f32() -rfftf32=dsp.arm_rfft_instance_f32() -status=dsp.arm_rfft_init_f32(rfftf32,cfftradix4f32,nb,0,1) -print(status) -resultI = dsp.arm_rfft_f32(rfftf32,signal) -print(result) nb = 128 signal = np.cos(2 * np.pi * np.arange(nb) / nb) @@ -311,16 +300,6 @@ signal = np.cos(2 * np.pi * np.arange(nb) / nb) result=dct(signal,4,norm='ortho') print(result) -cfftradix4f32=dsp.arm_cfft_radix4_instance_f32() -rfftf32=dsp.arm_rfft_instance_f32() -dct4f32=dsp.arm_dct4_instance_f32() -status=dsp.arm_dct4_init_f32(dct4f32,rfftf32,cfftradix4f32,nb,nb2,0.125) -print(status) -state=np.zeros(2*nb) -resultI = dsp.arm_dct4_f32(dct4f32,state,signal) -print(resultI) - - signal = signal / 10.0 result=dct(signal,4,norm='ortho') signalQ31=toQ31(signal) diff --git a/PythonWrapper/examples/testdsp5.py b/PythonWrapper/examples/testdsp5.py index 099616e3..d4f6dc49 100755 --- a/PythonWrapper/examples/testdsp5.py +++ b/PythonWrapper/examples/testdsp5.py @@ -90,7 +90,8 @@ a[11]=[0.262866, 0.809017, 0.425325] scaled= np.dot(a.T , w) -ref=np.sum(scaled,axis=0)/np.sum(w) +print(scaled) +ref=scaled/np.sum(w) #print(ref) points = np.array(a).reshape(12*3) @@ -100,9 +101,9 @@ weights = w.reshape(12) #print(weights) result=dsp.arm_barycenter_f32(points,weights,12,3) -#print(result) -assert_allclose(ref,result,1e-6) + +assert_allclose(ref,result,rtol=1e-6,atol=1e-6) print("Weighted sum")