Changeset 5334 for trunk/GSASIIseqGUI.py

Timestamp:

Sep 15, 2022 12:58:51 PM (15 months ago)

Author:

vondreele

Message:

fix to cluster analysis

File:

• trunk/GSASIIseqGUI.py (modified) (2 diffs)

trunk/GSASIIseqGUI.py

@@ -1568 +1568 @@
     import scipy.cluster.hierarchy as SCH
     import scipy.cluster.vq as SCV
-    import sklearn.cluster as SKC
-    import sklearn.ensemble as SKE
-    import sklearn.neighbors as SKN
-    import sklearn.svm as SKVM
-    import sklearn.metrics as SKM
+    try:
+        import sklearn.cluster as SKC
+        import sklearn.ensemble as SKE
+        import sklearn.neighbors as SKN
+        import sklearn.svm as SKVM
+        import sklearn.metrics as SKM
+    except:
+        ClusData['SKLearn'] = False
         
     SKLearnCite = '''If you use Scikit-Learn Cluster Analysis, please cite:
@@ -2061 +2064 @@
                 mainSizer.Add(ScikitSizer())
                 
-        if len(ClusData['DataMatrix']) > 15:
+        if ClusData['SKLearn'] and len(ClusData['DataMatrix']) > 15:
             G2G.HorizontalLine(mainSizer,G2frame.dataWindow)
             mainSizer.Add(outlierSizer())