From 15576f4db169a9706f1b93f99f06ebbb6222931c Mon Sep 17 00:00:00 2001 From: gordonkoehn Date: Tue, 29 Aug 2023 10:36:04 +0200 Subject: [PATCH 1/3] setup mark02 for rerun --- workflows/mark02.smk | 2 +- workflows/tree_inference.smk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/workflows/mark02.smk b/workflows/mark02.smk index a5c9f02a..eee5e9f0 100644 --- a/workflows/mark02.smk +++ b/workflows/mark02.smk @@ -61,7 +61,7 @@ CS_seed = 42 # <-- configure cell simulation seed here ##################### # True Tree Parameters tree_types = ["r"] # <-- configure tree type here ["r","s","d"] -tree_seeds = [42]#, 34] # <-- configure tree seed here +tree_seeds = [42, 34] # <-- configure tree seed here ##################### ##################### diff --git a/workflows/tree_inference.smk b/workflows/tree_inference.smk index 918ee7f7..364d8f15 100644 --- a/workflows/tree_inference.smk +++ b/workflows/tree_inference.smk @@ -20,8 +20,8 @@ from pyggdrasil.tree_inference import ( ## Relative path from DATADIR to the repo root #REPODIR = "/cluster/work/bewi/members/gkoehn/repos/PYggdrasil" -REPODIR = ".." -#DATADIR = "/cluster/work/bewi/members/gkoehn/data" +#REPODIR = ".." +DATADIR = "/cluster/work/bewi/members/gkoehn/data" ############################################### From b0373f78dcca9a1bf26dad103bc14da3ff6423e2 Mon Sep 17 00:00:00 2001 From: gordonkoehn Date: Tue, 29 Aug 2023 12:58:26 +0200 Subject: [PATCH 2/3] fix paths --- workflows/tree_inference.smk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/workflows/tree_inference.smk b/workflows/tree_inference.smk index 364d8f15..92ff1943 100644 --- a/workflows/tree_inference.smk +++ b/workflows/tree_inference.smk @@ -19,8 +19,7 @@ from pyggdrasil.tree_inference import ( ############################################### ## Relative path from DATADIR to the repo root -#REPODIR = "/cluster/work/bewi/members/gkoehn/repos/PYggdrasil" -#REPODIR = ".." +REPODIR = "/cluster/work/bewi/members/gkoehn/repos/PYggdrasil" DATADIR = "/cluster/work/bewi/members/gkoehn/data" ############################################### From 76e358ca7d046f5df864244628d16dc966bd7aa6 Mon Sep 17 00:00:00 2001 From: gordonkoehn Date: Wed, 30 Aug 2023 09:52:57 +0200 Subject: [PATCH 3/3] untested legend outside of plot --- workflows/mark02.smk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/workflows/mark02.smk b/workflows/mark02.smk index a5c9f02a..1a2782f8 100644 --- a/workflows/mark02.smk +++ b/workflows/mark02.smk @@ -242,17 +242,17 @@ rule combined_chain_histogram: sublist = [float(x) for x in sublist] # Create histogram for the sublist with the color and label - ax.hist(sublist,bins='auto', range = (0,1),alpha=0.5,color=colors[color_index],label=labels[i]) + ax.hist(sublist, bins='auto', range = (0,1),alpha=0.5,color=colors[color_index],label=labels[i]) # Set labels and title ax.set_xlabel(f"Similarity: {wildcards.metric}") ax.set_ylabel('Frequency') # Add a legend - ax.legend() + ax.legend(bbox_to_anchor = (1.04, 0.5), loc = "center left", borderaxespad = 0) # save the histogram - fig.savefig(Path(output.combined_chain_histogram)) + fig.savefig(Path(output.combined_chain_histogram), bbox_inches="tight")