Changeset 1221 for framspy

Timestamp:

04/17/23 02:36:01 (21 months ago)

Author:

Maciej Komosinski

Message:

Cosmetic

Location:

framspy

Files:

• FramsticksLib.py (modified) (1 diff)
• dissimilarity/density-distribution.py (modified) (2 diffs)
• recording-body-coords.sim (modified) (1 diff)

framspy/FramsticksLib.py

@@ -151 +151 @@
                 """
                         :param method: -1 = genetic Levenshtein distance; 0, 1, 2 = phenetic dissimilarity (SimilMeasureGreedy, SimilMeasureHungarian, SimilMeasureDistribution); -2, -3 = phenetic density distribution (count, frequency).
-                        See also prepareDissimilarityCalculation().
                         :return: A square array with dissimilarities of each pair of genotypes.
                 """

framspy/dissimilarity/density-distribution.py

@@ -187 +187 @@
         """
 
-        min_x = np.min([np.min(array1[:,0]),np.min(array2[:,0])])   
+        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])])
@@ -248 +248 @@
             print("Base voxels fig1: ", numvox1, " fig2: ", numvox2)
             print("After reduction voxels fig1: ", sum(s1[1]), " fig2: ", sum(s2[1]))
-            raise ValueError("BAd signature!")
+            raise ValueError("Bad signature!")
 
         reduce_fun = self.reduceSignaturesFreq if self.frequency else self.reduceSignaturesDens

framspy/recording-body-coords.sim

@@ -15 +15 @@
 # Adjust 'Energy0' to achieve the lifespan you need.
 # 'evalcount' should likely be 1 unless you need other performance criteria (like vertpos or distance) averaged from multiple evaluations.
-# Put this file in the "data" subdirectory within the Framsticks distribution.
+# Put this file in the "data" subdirectory within the Framsticks distribution unless you prefer to provide its path when loading.
 
 sim_params: