Changeset 1295

Timestamp:

02/21/24 18:04:48 (10 months ago)

Author:

Maciej Komosinski

Message:

Updated for Python 3.9+

Location:

framspy

Files:

• FramsticksLib.py (modified) (1 diff)
• dissimilarity/density_distribution.py (moved) (moved from framspy/dissimilarity/density-distribution.py) (3 diffs)

framspy/FramsticksLib.py

@@ -222 +222 @@
                 elif method in (-2, -3):
                         if self.dissim_measure_density_distribution is None:
-                                from dissimilarity.densityDistribution import DensityDistribution
+                                from dissimilarity.density_distribution import DensityDistribution
                                 self.dissim_measure_density_distribution = DensityDistribution(frams)
                         self.dissim_measure_density_distribution.frequency = (method == -3)

framspy/dissimilarity/density_distribution.py

@@ -3 +3 @@
 from ctypes import cdll
 from ctypes.util import find_library
-from alignmodel import align
+from .alignmodel import align
 
 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).
     """
-    
-    libm = cdll.LoadLibrary(find_library('m')) # for disabling/enabling floating point exceptions (division by zero occurs in the EMD library)
+
+    OLD_FPEX = False # update floating point exception handling/pyemd problems (if still needed) for new python versions
+    if OLD_FPEX:
+        libm = cdll.LoadLibrary(find_library('m')) # for disabling/enabling floating point exceptions (division by zero occurs in the EMD library)
     EPSILON = 0.0001
     
@@ -291 +293 @@
                 dist_matrix = self.calculateDistanceMatrix(s1[0],s2[0])
 
-            self.libm.fedisableexcept(0x04)  # change default flag value - don't cause exceptions when dividing by 0 (pyemd does it)
+            if self.OLD_FPEX:
+                self.libm.fedisableexcept(0x04)  # change default flag value - don't cause exceptions when dividing by 0 (pyemd does it)
 
             if self.frequency:
@@ -298 +301 @@
                 out = emd(self.normalize(s1[1]),self.normalize(s2[1]),dist_matrix)
 
-            self.libm.feclearexcept(0x04) # restoring default flag values...
-            self.libm.feenableexcept(0x04)
+            if self.OLD_FPEX:
+                self.libm.feclearexcept(0x04) # restoring default flag values...
+                self.libm.feenableexcept(0x04)
 
         else: