Mercurial > repos > bgruening > sucos_clustering

changeset 3:bd12f4b4c3a8 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
"planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/chemicaltoolbox/sucos commit 8542cbcae3ebed4cb9a6c20b1fabd418a6efb7e8"
author bgruening
date Sat, 28 Mar 2020 05:16:44 -0400
parents 58d18838e244
children 791c86130585
files sucos_max.py
diffstat 1 files changed, 13 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/sucos_max.py	Thu Mar 19 07:25:25 2020 -0400
+++ b/sucos_max.py	Sat Mar 28 05:16:44 2020 -0400
@@ -103,19 +103,20 @@
                 scores_cum[1] += fm_score
                 scores_cum[2] += vol_score
 
-        if scores_max[0] > 0:
-            cluster_file_name_only = cluster_name.split(os.sep)[-1]
-            # utils.log("Max SuCOS:", scores[0], "FM:", scores[1], "P:", scores[2],"File:", cluster_file_name_only, "Index:", cluster_index)
-            mol.SetDoubleProp("Max_SuCOS_Score", scores_max[0])
-            mol.SetDoubleProp("Max_SuCOS_FeatureMap_Score", scores_max[1])
-            mol.SetDoubleProp("Max_SuCOS_Protrude_Score", scores_max[2])
-            mol.SetProp("Max_SuCOS_Cluster", cluster_file_name_only)
-            mol.SetIntProp("Max_SuCOS_Index", cluster_index)
+
+        cluster_file_name_only = cluster_name.split(os.sep)[-1]
 
-            # utils.log("Cum SuCOS:", scores[0], "FM:", scores[1], "P:", scores[2])
-            mol.SetDoubleProp("Cum_SuCOS_Score", scores_cum[0])
-            mol.SetDoubleProp("Cum_SuCOS_FeatureMap_Score", scores_cum[1])
-            mol.SetDoubleProp("Cum_SuCOS_Protrude_Score", scores_cum[2])
+        # utils.log("Max SuCOS:", scores[0], "FM:", scores[1], "P:", scores[2],"File:", cluster_file_name_only, "Index:", cluster_index)
+        mol.SetDoubleProp("Max_SuCOS_Score", scores_max[0] if scores_max[0] > 0 else 0)
+        mol.SetDoubleProp("Max_SuCOS_FeatureMap_Score", scores_max[1] if scores_max[1] > 0 else 0)
+        mol.SetDoubleProp("Max_SuCOS_Protrude_Score", scores_max[2] if scores_max[2] > 0 else 0)
+        mol.SetProp("Max_SuCOS_Cluster", cluster_file_name_only)
+        mol.SetIntProp("Max_SuCOS_Index", cluster_index)
+
+        # utils.log("Cum SuCOS:", scores[0], "FM:", scores[1], "P:", scores[2])
+        mol.SetDoubleProp("Cum_SuCOS_Score", scores_cum[0] if scores_cum[0] > 0 else 0)
+        mol.SetDoubleProp("Cum_SuCOS_FeatureMap_Score", scores_cum[1] if scores_cum[1] > 0 else 0)
+        mol.SetDoubleProp("Cum_SuCOS_Protrude_Score", scores_cum[2] if scores_cum[2] > 0 else 0)
 
         writer.write(mol)