Changeset 1210 for framspy

Timestamp:

04/02/23 20:39:42 (21 months ago)

Author:

Maciej Komosinski

Message:

EPSILON used only where necessary

File:

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

framspy/dissimilarity/density-distribution.py

@@ -188 +188 @@
         """
 
-        min_x = np.min([np.min(array1[:,0]),np.min(array2[:,0])]) - self.EPSILON  # EPSILON added and removed to deal boundary voxels
-        max_x = np.max([np.max(array1[:,0]),np.max(array2[:,0])]) + self.EPSILON
-        min_y = np.min([np.min(array1[:,1]),np.min(array2[:,1])]) - self.EPSILON
-        max_y = np.max([np.max(array1[:,1]),np.max(array2[:,1])]) + self.EPSILON
-        min_z = np.min([np.min(array1[:,2]),np.min(array2[:,2])]) - self.EPSILON
-        max_z = np.max([np.max(array1[:,2]),np.max(array2[:,2])]) + self.EPSILON
+        min_x = np.min([np.min(array1[:,0]),np.min(array2[:,0])])
+        max_x = np.max([np.max(array1[:,0]),np.max(array2[:,0])])
+        min_y = np.min([np.min(array1[:,1]),np.min(array2[:,1])])
+        max_y = np.max([np.max(array1[:,1]),np.max(array2[:,1])])
+        min_z = np.min([np.min(array1[:,2]),np.min(array2[:,2])])
+        max_z = np.max([np.max(array1[:,2]),np.max(array2[:,2])])
 
         x_steps,x_step = np.linspace(min_x,max_x,self.steps,retstep=True)
@@ -199 +199 @@
         z_steps,z_step = np.linspace(min_z,max_z,self.steps,retstep=True)
         
-        if self.steps == 1:
-            x_steps = [min_x,max_x]
-            y_steps = [min_y,max_y]
-            z_steps = [min_z,max_z]
-            x_step = max_x - min_x
-            y_step = max_y - min_y
-            z_step = max_z - min_z
+        for intervals in (x_steps, y_steps, z_steps):  # EPSILON subtracted to deal with boundary voxels (one-sided open intervals and comparisons in loops in function getSignatures())
+            intervals[0] -= self.EPSILON
 
         steps_all = (x_steps,y_steps,z_steps)