diff --git a/examples/Makefile b/examples/Makefile index 01291ea..1bc4b37 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -5,5 +5,6 @@ all: clean: snakemake -c 4 --delete-all-output + rm -f *.csv *.png cleanall: clean all diff --git a/examples/Snakefile b/examples/Snakefile index aff9997..c9d50a1 100644 --- a/examples/Snakefile +++ b/examples/Snakefile @@ -78,9 +78,10 @@ rule plot2_10sketches_cut: cmp="10sketches.cmp", labels="10sketches.cmp.labels_to.csv", output: - "plot2.cut.10sketches.cmp.png", + png="plot2.cut.10sketches.cmp.png", + clusters=expand("10sketches.cmp.{n}.csv", n=range(1,7)), shell: """ - sourmash scripts plot2 {input.cmp} {input.labels} -o {output} \ + sourmash scripts plot2 {input.cmp} {input.labels} -o {output.png} \ --cut-point=1.35 --cluster-out --figsize-x=5 --figsize-y=3 """ @@ -100,7 +101,7 @@ rule mds_10sketches: input: cmp="10sketches.cmp", labels="10sketches.cmp.labels_to.csv", - categories="10sketches-categories.csv", + categories="sketches/10sketches-categories.csv", output: "mds.10sketches.cmp.png" shell: """ @@ -110,7 +111,7 @@ rule mds_10sketches: rule cmp_64sketches: input: - "64sketches.sig.zip", + "sketches/64sketches.sig.zip", output: cmp="64sketches.cmp", labels="64sketches.cmp.labels.txt", @@ -144,7 +145,7 @@ rule r10sketches_pairwise: rule mds2_10sketches: input: cmp="10sketches.pairwise.csv", - categories="10sketches-categories.csv", + categories="sketches/10sketches-categories.csv", output: "mds2.10sketches.cmp.png" shell: """ @@ -154,7 +155,7 @@ rule mds2_10sketches: rule r64sketches_pairwise: input: - "64sketches.sig.zip", + "sketches/64sketches.sig.zip", output: cmp="64sketches.pairwise.csv", shell: """ @@ -226,7 +227,7 @@ rule plot3_10sketches: input: cmp="10sketches.cmp", labels="10sketches.cmp.labels_to.csv", - categories="10sketches-categories.csv", + categories="sketches/10sketches-categories.csv", output: "plot3.10sketches.cmp.png", shell: """ @@ -247,7 +248,7 @@ rule r10sketches_manysearch: rule clustermap1_10sketches: input: cmp="10sketches.manysearch.csv", - categories="10sketches-categories.csv", + categories="sketches/10sketches-categories.csv", output: "clustermap1.10sketches.png", shell: """ diff --git a/examples/10sketches-categories.csv b/examples/sketches/10sketches-categories.csv similarity index 100% rename from examples/10sketches-categories.csv rename to examples/sketches/10sketches-categories.csv diff --git a/examples/64sketches.sig.zip b/examples/sketches/64sketches.sig.zip similarity index 100% rename from examples/64sketches.sig.zip rename to examples/sketches/64sketches.sig.zip