Changeset 1269

Timestamp:

07/08/23 14:35:36 (17 months ago)

Author:

oriona

Message:

FFT is now calculated after the signature reduction, to increase efficiency.

File:

• framspy/dissimilarity/density-distribution.py (modified) (2 diffs)

framspy/dissimilarity/density-distribution.py

@@ -170 +170 @@
         if self.frequency:
             samples = np.array(feature_array,dtype=np.float64)
-            return abs(np.fft.fft(samples))
+            return samples
         else:
             return [np.array(feature_array,dtype=np.float64), np.array(weight_array,dtype=np.float64)]
@@ -267 +267 @@
                     print("After reduction voxels fig1: ", sum(s1[1]), " fig2: ", sum(s2[1]))
                     raise RuntimeError("Voxel reduction error!")
+        
+        if self.frequency:
+           s1 = abs(np.fft.fft(s1))
+           s2 = abs(np.fft.fft(s2))
         
         if self.metric == 'l1':