Fix data crop method

mfitzp · Apr 30, 2014 · efc1ecf · efc1ecf
1 parent 1cf9fd5
commit efc1ecf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/pathomx/data.py b/pathomx/data.py
@@ -681,9 +681,9 @@ def crop(self,shape):
                 self.scales[d] = self.scales[d][:s]
                 self.classes[d] = self.classes[d][:s]
                 final_shape[d] = shape[d]
-                
-        self.data.resize( final_shape )
-
+
+        # Crop numpy array to shape                
+        self.data = self.data[ [slice(0,n) for n in shape] ]                
 
     @property 
     def is_empty(self):

diff --git a/pathomx/plugins/pca/pca.py b/pathomx/plugins/pca/pca.py
@@ -91,17 +91,15 @@ def generate(self, input=None):
         scored.labels[0] = input.labels[0]
         scored.classes[0] = input.classes[0]
         scored.data = scores
-
+        
         for n in range(0, scored.shape[1]):
             scored.labels[1][n] = 'Principal Component %d (%0.2f%%)' % (n+1, pca.explained_variance_ratio_[0] * 100.)
 
         weightsd = DataSet(size=pca.components_.shape)
         weightsd.data = pca.components_
 
         weightsd.scales[1] = input.scales[1]
-
-        print weightsd.shape, "@"
-        print pca.components_.shape, "|"
+
 
         dso_pc = {}
         for n in range(0, pca.components_.shape[0] ):
@@ -123,6 +121,7 @@ def generate(self, input=None):
 
     def prerender(self, dso=None, pca=None, scores=None, pc1=None, pc2=None, pc3=None, pc4=None, pc5=None, **kwargs):
         scores.crop( (scores.shape[0], 2) )
+        print scores.data
         return {
             'Scores':{'dso': scores}, 
             'PC1':{'dso':pc1},