diff --git a/snekmer/rules/cluster.smk b/snekmer/rules/cluster.smk index 87f703d..01d4a8a 100644 --- a/snekmer/rules/cluster.smk +++ b/snekmer/rules/cluster.smk @@ -101,7 +101,7 @@ use rule unzip from process_input with: # read and process parameters from config use rule preprocess from process_input with: input: - fasta=lambda wildcards: join("input", f"{wildcards.nb}.{fa_map[wildcards.nb]}"), + fasta=lambda wildcards: join("input", f"{wildcards.nb}.{FA_MAP[wildcards.nb]}"), output: data=join(out_dir, "processed", "full", "{nb}.json"), desc=join(out_dir, "processed", "full", "{nb}_description.csv"), @@ -124,7 +124,7 @@ use rule vectorize_full from kmerize with: input: kmers=join(out_dir, "labels", "full", "{nb}.txt"), params=join(out_dir, "processed", "{nb}.json"), - fasta=lambda wildcards: join("input", f"{wildcards.nb}.{fa_map[wildcards.nb]}"), + fasta=lambda wildcards: join("input", f"{wildcards.nb}.{FA_MAP[wildcards.nb]}"), log: join(out_dir, "features", "log", "{nb}.log"), output: diff --git a/snekmer/rules/model.smk b/snekmer/rules/model.smk index 469eb6d..d41dd25 100644 --- a/snekmer/rules/model.smk +++ b/snekmer/rules/model.smk @@ -375,7 +375,6 @@ rule model: ) # collate ROC-AUC results - # collate PR-AUC results results["family"] += [family] * cv results["alphabet_name"] += [alphabet_name.lower()] * cv results["k"] += [config["k"]] * cv