From 1acbdca691f4d19a57cd2f892a417b3fda64fbf3 Mon Sep 17 00:00:00 2001 From: baileythegreen Date: Sat, 18 Jun 2022 00:05:27 +0100 Subject: [PATCH] Remove problematic indexing (`args.method` is a string, not list) --- pyani/scripts/subcommands/subcmd_plot.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pyani/scripts/subcommands/subcmd_plot.py b/pyani/scripts/subcommands/subcmd_plot.py index b42f959d..93bd84b1 100644 --- a/pyani/scripts/subcommands/subcmd_plot.py +++ b/pyani/scripts/subcommands/subcmd_plot.py @@ -194,7 +194,7 @@ def write_distribution( for fmt in outfmts: outfname = Path(args.outdir) / f"distribution_{matdata.name}_run{run_id}.{fmt}" logger.debug("\tWriting graphics to %s", outfname) - DISTMETHODS[args.method[0]]( + DISTMETHODS[args.method]( matdata.data, outfname, matdata.name, @@ -227,12 +227,13 @@ def write_heatmap( logger.info("Writing %s matrix heatmaps", matdata.name) cmap = pyani_config.get_colormap(matdata.data, matdata.name) for fmt in outfmts: - outfname = Path(args.outdir) / f"matrix_{matdata.name}_run{run_id}.{fmt}" + outfname = ( + Path(args.outdir) / f"matrix_{matdata.name}_run{run_id}_{args.method}.{fmt}" + ) logger.debug("\tWriting graphics to %s", outfname) params = pyani_graphics.Params(cmap, result_labels, result_classes) # Draw heatmap _, newicks = GMETHODS[args.method]( - matdata.data, outfname, title=f"matrix_{matdata.name}_run{run_id}", @@ -281,7 +282,7 @@ def write_scatter( logger.debug("\tWriting graphics to %s", outfname) params = pyani_graphics.Params(cmap, result_labels, result_classes) # Draw scatterplot - SMETHODS[args.method[0]]( + SMETHODS[args.method]( matdata1.data, matdata2.data, outfname,