added param for predictor adjustment

python/src/manocca.py

@@ -99,7 +99,7 @@ class MANOCCA:
 
     """
     def __init__(self, predictors, outputs, covariates=None, cols_outputs = None,
-                 cols_predictors = None, cols_covariates = None, prodV_red=None, n_comp = None, prod_to_keep = None, use_resid = True, use_pca = True, use_extended = False, n_jobs = 1):
+                 cols_predictors = None, cols_covariates = None, prodV_red=None, n_comp = None, prod_to_keep = None, use_resid = True, use_pca = True, adj_pred = False, use_extended = False, n_jobs = 1):
 
         ### Initializing 
         self.outputs = outputs
@@ -127,6 +127,7 @@ class MANOCCA:
         self.use_resid = use_resid
         self.use_pca = use_pca
         self.use_extended = use_extended
+        self.adj_pred = adj_pred
 
         # Filled later
         self.prodV = None
@@ -169,8 +170,9 @@ class MANOCCA:
                 print("computing residuals")
                 print("adjusting outputs")
                 self.prodV_red = np.apply_along_axis(lambda x : pt.adjust_covariates(x,covariates), axis = 0, arr = self.prodV_red)
-                print("adjusting predictor")
-                self.predictors = np.apply_along_axis(lambda x : pt.adjust_covariates(x,covariates), axis = 0, arr = self.predictors)
+                if self.adj_pred :
+                    print("adjusting predictor")
+                    self.predictors = np.apply_along_axis(lambda x : pt.adjust_covariates(x,covariates), axis = 0, arr = self.predictors)
                 # print("adjusting predictor")
                 # self.predictors = np.apply_along_axis(lambda x : pt.adjust_covariates(x,covariates), axis = 0, arr = self.predictors)
                 # print(self.predictors.mean())