Merge pull request #78 from swharden/73

Fix RFFT_WithoutChecks overload
swharden · Aug 21, 2023 · f12b9e0 · f12b9e0
2 parents 6f4c322 + 18a4680
commit f12b9e0
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 7 deletions.
diff --git a/src/FftSharp.Tests/VsNumpy.cs b/src/FftSharp.Tests/VsNumpy.cs
@@ -58,7 +58,7 @@ public void Test_VsNumpy_Fft_SystemNumericsComplex()
         }
 
         [Test]
-        public void Test_VsNumpy_Rfft()
+        public void Test_VsNumpy_ForwardRealDoubles()
         {
             System.Numerics.Complex[] rfft = FftSharp.FFT.ForwardReal(values);
             System.Numerics.Complex[] numpyRfft = LoadData.Complex("fftReal.txt");
@@ -72,6 +72,22 @@ public void Test_VsNumpy_Rfft()
             }
         }
 
+        [Test]
+        public void Test_VsNumpy_ForwardRealComplex()
+        {
+            System.Numerics.Complex[] complexValues = values.Select(value => new System.Numerics.Complex(real: value, imaginary: 0)).ToArray();
+            System.Numerics.Complex[] rfft = FftSharp.FFT.ForwardReal(complexValues);
+            System.Numerics.Complex[] numpyRfft = LoadData.Complex("fftReal.txt");
+
+            Assert.AreEqual(numpyRfft.Length, rfft.Length);
+
+            for (int i = 0; i < rfft.Length; i++)
+            {
+                Assert.AreEqual(numpyRfft[i].Real, rfft[i].Real, 1e-10);
+                Assert.AreEqual(numpyRfft[i].Imaginary, rfft[i].Imaginary, 1e-10);
+            }
+        }
+
         [Test]
         public void Test_VsNumpy_FftMag()
         {

diff --git a/src/FftSharp/FftOperations.cs b/src/FftSharp/FftOperations.cs
@@ -92,12 +92,21 @@ public static void RFFT_WithoutChecks(Span<System.Numerics.Complex> destination,
     {
         System.Numerics.Complex[] temp = ArrayPool<System.Numerics.Complex>.Shared.Rent(input.Length);
 
-        Span<System.Numerics.Complex> buffer = temp.AsSpan(0, input.Length);
-
-        FFT_WithoutChecks(buffer);
-        buffer.Slice(0, destination.Length).CopyTo(destination);
-
-        ArrayPool<System.Numerics.Complex>.Shared.Return(temp);
+        try
+        {
+            Span<System.Numerics.Complex> buffer = temp.AsSpan(0, input.Length);
+            input.CopyTo(buffer);
+            FFT.Forward(buffer);
+            buffer.Slice(0, destination.Length).CopyTo(destination);
+        }
+        catch (Exception ex)
+        {
+            throw new Exception("Could not calculate RFFT", ex);
+        }
+        finally
+        {
+            ArrayPool<System.Numerics.Complex>.Shared.Return(temp);
+        }
     }
 
     /// <summary>