Skip to content

Commit 88f5623

Browse files
committed
update README & test script
1 parent 4ed2358 commit 88f5623

2 files changed

Lines changed: 21 additions & 4 deletions

File tree

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ layer_name = "layer1" # name of the layer to be interpreted, you should be abl
6666
concept_fscores_dataframe, motif_cav_trainers, bed_cav_trainer = run_tpcav(
6767
model=model,
6868
layer_name=layer_name,
69-
meme_motif_file=motif_path,
69+
motif_file=motif_path,
70+
motif_file_fmt='meme',
7071
genome_fasta=genome_fasta,
7172
num_motif_insertions=[4, 8],
7273
bed_seq_file=bed_seq_concept,

test/test_cav_trainer.py

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,29 @@ def test_run_tpcav_random_control(self):
111111
cavs_fscores_df, motif_cav_trainers, bed_cav_trainer = run_tpcav(
112112
model=model,
113113
layer_name=layer_name,
114-
meme_motif_file=str(motif_path),
114+
motif_file=str(motif_path),
115115
genome_fasta=genome_fasta,
116116
num_motif_insertions=[4, 8],
117117
bed_seq_file="data/hg38_rmsk.head50k.bed",
118118
output_dir="data/test_run_tpcav_output/",
119119
)
120120

121+
def test_run_tpcav_consensus_random_control(self):
122+
motif_path = Path("data") / "custom_motifs_alan.tsv"
123+
genome_fasta = "data/hg38.analysisSet.fa"
124+
model = DummyModelSeq()
125+
layer_name = "layer1"
126+
127+
cavs_fscores_df, motif_cav_trainers, bed_cav_trainer = run_tpcav(
128+
model=model,
129+
layer_name=layer_name,
130+
motif_file=str(motif_path),
131+
motif_file_fmt='consensus',
132+
genome_fasta=genome_fasta,
133+
num_motif_insertions=[4, 8],
134+
output_dir="data/test_run_tpcav_output/",
135+
)
136+
121137
def test_run_tpcav_permute_control(self):
122138
motif_path = Path("data") / "motif-clustering-v2.1beta_consensus_pwms.test.meme"
123139
genome_fasta = "data/hg38.analysisSet.fa"
@@ -127,7 +143,7 @@ def test_run_tpcav_permute_control(self):
127143
cavs_fscores_df, motif_cav_trainers, bed_cav_trainer = run_tpcav(
128144
model=model,
129145
layer_name=layer_name,
130-
meme_motif_file=str(motif_path),
146+
motif_file=str(motif_path),
131147
motif_control_type='permute',
132148
genome_fasta=genome_fasta,
133149
num_motif_insertions=[4, 8],
@@ -144,7 +160,7 @@ def test_run_tpcav_no_pca(self):
144160
cavs_fscores_df, motif_cav_trainers, bed_cav_trainer = run_tpcav(
145161
model=model,
146162
layer_name=layer_name,
147-
meme_motif_file=str(motif_path),
163+
motif_file=str(motif_path),
148164
genome_fasta=genome_fasta,
149165
num_motif_insertions=[4, 8],
150166
bed_seq_file="data/hg38_rmsk.head50k.bed",

0 commit comments

Comments
 (0)