Changeset 1266 for framspy

Timestamp:

07/05/23 18:37:46 (17 months ago)

Author:

oriona

Message:

Signature values normalization added.

File:

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

framspy/dissimilarity/density-distribution.py

@@ -231 +231 @@
 
 
+    def normalize(self, signature):
+        """Normalizes the signature values by dividing it by the sum of elements.
+        Args:
+            signature np.array(,dtype=float): array of signature values.
+
+        Returns:
+            np.array(,dtype=float): array of normalized signature
+        """
+        total = np.sum(signature)
+        return np.divide(signature, total)
+
+
     def calculateDissimforVoxels(self, voxels1, voxels2):
         """Calculates EMD for pair of voxels representing models.
@@ -278 +290 @@
 
             if self.frequency:
-                out = emd(s1,s2,np.array(dist_matrix,dtype=np.float64))
+                out = emd(self.normalize(s1),self.normalize(s2),np.array(dist_matrix,dtype=np.float64))
             else:
-                out = emd(s1[1],s2[1],dist_matrix)
+                out = emd(self.normalize(s1[1]),self.normalize(s2[1]),dist_matrix)
 
             self.libm.feclearexcept(0x04) # restoring default flag values...