Changeset 1329 for framspy/dissimilarity

Timestamp:

12/26/24 01:43:47 (2 days ago)

Author:

Maciej Komosinski

Message:

Cosmetic

File:

• framspy/dissimilarity/density_distribution.py (modified) (6 diffs)

framspy/dissimilarity/density_distribution.py

@@ -6 +6 @@
 
 class DensityDistribution:
-    """Two dissimilarity measures based on the spatial distribution of two Models. The Model bounding box is divided into a grid of equally-sized cuboids, the number of which is the 'resolution' parameter cubed. Then the Model surface is covered with points; the density of the surface sampling is determined by the 'density' parameter. There are two versions of the measure. In the default version ('frequency'=False), a signature of each cuboid is the centroid and the number of samples. In the 'frequency'=True version, FFT is computed from the vector containing the number of samples in each cuboid. The final result of the dissimilarity measure is the distance between the signatures and it can be computed using EMD, L1, or L2 norms (the 'metric' parameter).
+    """Two dissimilarity measures based on the spatial distribution of two Models. The Model bounding box is divided into a grid of equally-sized cuboids, the number of which is the 'resolution' parameter cubed. Then the Model surface is covered with points; the density of the surface sampling is determined by the 'density' parameter. There are two versions of the measure. In the default version ('frequency'=False), the signature of each cuboid is the centroid and the number of samples. In the 'frequency'=True version, FFT is computed from the vector containing the number of samples in each cuboid. The final result of the dissimilarity measure is the distance between the signatures and it can be computed using EMD, L1, or L2 norms (the 'metric' parameter).
     """
 
@@ -43 +43 @@
     def calculateNeighborhood(self,array,mean_coords):
         """ Calculates number of elements for given sample and set ups the center of this sample
-        to the center of mass (calculated by mean of every coordinate)
+        to the center of mass (calculated by mean of every coordinate).
         Args:
             array ([[float,float,float],...,[float,float,float]]): array of voxels that belong to given sample.
@@ -61 +61 @@
 
 
-    def calculateDistPoints(self,point1, point2):
-        """ Returns Euclidean distance between two points
-        Args (distribution):
-            point1 ([float,float,float]) - coordinates of first point
-            point2 ([float,float,float]) - coordinates of second point
+    def calculateDistPoints(self, point1, point2):
+        """ Returns Euclidean distance between two samples (1D for frequency) or points (3D for distribution).
         Args (frequency):
             point1 (float) - value of the first sample
             point2 (float) - value of the second sample
+        Args (distribution):
+            point1 ([float,float,float]) - coordinates of the first point
+            point2 ([float,float,float]) - coordinates of the second point
 
         Returns:
@@ -74 +74 @@
         """
         if self.frequency:
-            return abs(point1-point2) # TODO vector instead of scalar returned?
+            return abs(point1-point2)
         else:
             return np.linalg.norm(point1-point2, ord=2)
 
 
-    def calculateDistanceMatrix(self,array1, array2):
+    def calculateDistanceMatrix(self, array1, array2):
         """
         Args:
@@ -138 +138 @@
             steps3 ([float,float,float]): [size of interval for x axis, size of interval for y axis, size of interval for y axis] 
 
+        Returns (frequency):
+           signature np.array(,dtype=np.float64): returns signatuere np.array of coefficients
         Returns (distribution):
            signature [np.array(,dtype=np.float64),np.array(,dtype=np.float64)]: returns signatuere [np.array of points, np.array of weights]
-        Returns (frequency):
-           signature np.array(,dtype=np.float64): returns signatuere np.array of coefficients
         """
         edges_x,edges_y,edges_z = edges3
@@ -212 +212 @@
 
     def getVoxels(self,geno):
-        """Generates voxels for genotype using frams.ModelGeometry
+        """Generates voxels for genotype using frams.ModelGeometry.
 
         Args: