Fixed a bug in PCA tool - standard deviation & prop variance values are now sorted by PC order.

tools/multivariate_stats/pca.py

@@ -83,10 +83,12 @@ summary = r.summary(pc, loadings="TRUE")
 ncomps = len(summary['sdev'])
 
 if type(summary['sdev']) == type({}):
-    comps = summary['sdev'].keys()
+    comps_unsorted = summary['sdev'].keys()
+    comps=[]
     sd = summary['sdev'].values()
     for i in range(ncomps):
-        sd[comps.index('Comp.%s' %(i+1))] = summary['sdev'].values()[i]
+        sd[i] = summary['sdev'].values()[comps_unsorted.index('Comp.%s' %(i+1))]
+        comps.append('Comp.%s' %(i+1))
 elif type(summary['sdev']) == type([]):
     comps=[]
     for i in range(ncomps):

tools/multivariate_stats/pca.xml

@@ -1,4 +1,4 @@
-<tool id="pca1" name="Principal Component Analysis" version="1.0.1">
+<tool id="pca1" name="Principal Component Analysis" version="1.0.2">
   <description> </description>
   <command interpreter="python">
     pca.py