Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/aertslab/pySCENIC
Browse files Browse the repository at this point in the history
  • Loading branch information
bramvds committed Apr 16, 2018
2 parents a010758 + 7d2a0a4 commit 270eadc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ First we import the necessary modules and declare some constants:
.. code-block:: python
import os
import glob
import pandas as pd
import numpy as np
Expand Down Expand Up @@ -222,7 +223,7 @@ for the co-expression module inference is used.
.. code-block:: python
N_SAMPLES = ex_matrix.shape[1] # Full dataset
adjancencies = grnboost2(expression_data=ex_matrix.T.sample(n=N_SAMPLES, replace=False),
adjacencies = grnboost2(expression_data=ex_matrix.T.sample(n=N_SAMPLES, replace=False),
tf_names=tf_names, verbose=True)
Derive potential regulons from these co-expression modules
Expand Down
2 changes: 1 addition & 1 deletion src/pyscenic/transform.py
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ def module2df(db: Type[RankingDatabase], module: Regulon, motif_annotations: pd.


def modules2df(db: Type[RankingDatabase], modules: Sequence[Regulon], motif_annotations: pd.DataFrame,
weighted_recovery=False, module2features_func=module2features) -> pd.DataFrame:
weighted_recovery=False, return_recovery_curves=False, module2features_func=module2features) -> pd.DataFrame:
# Make sure return recovery curves is always set to false because the metadata for the distributed dataframe needs
# to be fixed for the dask framework.
#TODO: Remove this restriction.
Expand Down

0 comments on commit 270eadc

Please sign in to comment.