@@ -240,7 +240,7 @@ rule dnds_plots:
240240 "../scripts/report/dnds_plots.R"
241241
242242
243- rule af_time_correlation_per_snp_data :
243+ rule af_time_correlation_data :
244244 conda : "../envs/renv.yaml"
245245 params :
246246 cor_method = config ["COR" ]["METHOD" ],
@@ -250,76 +250,44 @@ rule af_time_correlation_per_snp_data:
250250 metadata = config ["METADATA" ],
251251 output :
252252 fmt_variants = temp (OUTDIR / f"{ OUTPUT_NAME } .variants.filled.dated.tsv" ),
253- correlations = report (REPORT_DIR_TABLES / "af_time_correlation_per_snp.csv" ), # fig 6
253+ correlations = report (REPORT_DIR_TABLES / "af_time_correlation.csv" ),
254+ subset = REPORT_DIR_TABLES / "af_time_correlation.subset.txt" ,
254255 log :
255- LOGDIR / "af_time_correlation_per_snp_data " / "log.txt"
256+ LOGDIR / "af_time_correlation_data " / "log.txt"
256257 script :
257- "../scripts/report/af_time_correlation_per_snp_data .R"
258+ "../scripts/report/af_time_correlation_data .R"
258259
259260
260- rule af_time_correlation_per_snp_plot :
261+ rule af_time_correlation_plot :
261262 conda : "../envs/renv.yaml"
262263 params :
263264 design = config ["PLOTS" ],
264265 input :
265- correlations = REPORT_DIR_TABLES / "af_time_correlation_per_snp .csv" ,
266+ correlations = REPORT_DIR_TABLES / "af_time_correlation .csv" ,
266267 output :
267- plot = report (REPORT_DIR_PLOTS / "af_time_correlation_per_snp .png" ), # fig 6
268+ plot = report (REPORT_DIR_PLOTS / "af_time_correlation .png" ),
268269 log :
269- LOGDIR / "af_time_correlation_per_snp_plot " / "log.txt"
270+ LOGDIR / "af_time_correlation_plot " / "log.txt"
270271 script :
271- "../scripts/report/af_time_correlation_per_snp_plot .R"
272+ "../scripts/report/af_time_correlation_plot .R"
272273
273274
274- rule af_trajectory_panel_data : # panel with AF trajectories in time
275- # TODO
276- conda : "../envs/renv.yaml"
277- input :
278- fmt_variants = OUTDIR / f"{ OUTPUT_NAME } .variants.filled.dated.tsv" ,
279- correlations = REPORT_DIR_TABLES / "af_time_correlation_per_snp.csv" ,
280- output :
281- table = report (REPORT_DIR_TABLES / "af_trajectory_panel.csv" ), # fig 7
282- log :
283- LOGDIR / "af_trajectory_panel_data" / "log.txt"
284- script :
285- "../scripts/report/af_trajectory_panel_data.R"
286-
287-
288- rule af_trajectory_panel_plot : # panel with AF trajectories in time
289- # TODO
275+ rule af_trajectory_panel_plot :
290276 conda : "../envs/renv.yaml"
291277 params :
292278 design = config ["PLOTS" ],
279+ random_color_seed = 7291 ,
293280 input :
294- table = REPORT_DIR_TABLES / "af_trajectory_panel.csv" ,
281+ fmt_variants = OUTDIR / f"{ OUTPUT_NAME } .variants.filled.dated.tsv" ,
282+ subset = REPORT_DIR_TABLES / "af_time_correlation.subset.txt"
295283 output :
296- plot = report (REPORT_DIR_PLOTS / "af_trajectory_panel.png" ), # fig 7
284+ plot = report (REPORT_DIR_PLOTS / "af_trajectory_panel.png" ),
297285 log :
298286 LOGDIR / "af_trajectory_panel_plot" / "log.txt"
299287 script :
300288 "../scripts/report/af_trajectory_panel_plot.R"
301289
302290
303- # rule snp_plots:
304- # conda: "../envs/renv.yaml"
305- # params:
306- # design = config["PLOTS"],
307- # cor_method = config["COR"]["METHOD"],
308- # cor_exact = config["COR"]["EXACT"]
309- # input:
310- # vcf = OUTDIR/f"{OUTPUT_NAME}.variants.tsv",
311- # metadata = config["METADATA"]
312- # output:
313- # pseudovolcano = report(REPORT_DIR_PLOTS/"figure_6.png"),
314- # snp_panel = report(REPORT_DIR_PLOTS/"figure_7.png"),
315- # table_1 = report(REPORT_DIR_TABLES/"figure_6.csv"),
316- # table_2 = report(REPORT_DIR_TABLES/"figure_7.csv")
317- # log:
318- # LOGDIR / "snp_plots" / "log.txt"
319- # script:
320- # "../scripts/report/snp_plots.R"
321-
322-
323291rule summary_table :
324292 conda : "../envs/renv.yaml"
325293 input :
@@ -344,8 +312,8 @@ rule report:
344312 fig_cor = report (REPORT_DIR_PLOTS / "figure_4.png" ),
345313 SNV = report (REPORT_DIR_PLOTS / "figure_5a.png" ),
346314 SNV_spike = report (REPORT_DIR_PLOTS / "figure_5b.png" ),
347- volcano = report (REPORT_DIR_TABLES / "af_time_correlation_per_snp .png" ),
348- panel = report (REPORT_DIR_TABLES / "af_trajectory_panel.png" ),
315+ volcano = report (REPORT_DIR_PLOTS / "af_time_correlation .png" ),
316+ panel = report (REPORT_DIR_PLOTS / "af_trajectory_panel.png" ),
349317 tree = report (REPORT_DIR_PLOTS / "allele_freq_tree.png" ),
350318 temest = report (REPORT_DIR_PLOTS / "time_signal.png" ),
351319 heat_table = report (REPORT_DIR_TABLES / "heatmap.csv" ),
0 commit comments