Skip to content
Snippets Groups Projects
Commit 37c82d2b authored by Valentina Galata's avatar Valentina Galata
Browse files

fixed a type in analysis.smk (rules/steps) in target paths

parent 7bc8732e
No related branches found
No related tags found
1 merge request!76Merge "cleanup" branch with "master" branch
...@@ -48,7 +48,7 @@ rule analysis_bbmap_rename: ...@@ -48,7 +48,7 @@ rule analysis_bbmap_rename:
input: input:
os.path.join(RESULTS_DIR, "annotation/prodigal/{rtype}/{tool}/proteins.faa") os.path.join(RESULTS_DIR, "annotation/prodigal/{rtype}/{tool}/proteins.faa")
output: output:
temp(os.path.join(RESULTS_DIR, "annalysis/cdhit/{rtype}_{tool}.faa")) temp(os.path.join(RESULTS_DIR, "analysis/cdhit/{rtype}_{tool}.faa"))
log: log:
out="logs/analysis_bbmap_rename_{rtype}.{tool}.out.log", out="logs/analysis_bbmap_rename_{rtype}.{tool}.out.log",
err="logs/analysis_bbmap_rename_{rtype}.{tool}.err.log" err="logs/analysis_bbmap_rename_{rtype}.{tool}.err.log"
...@@ -69,11 +69,11 @@ rule analysis_bbmap_rename: ...@@ -69,11 +69,11 @@ rule analysis_bbmap_rename:
rule analysis_cdhit: rule analysis_cdhit:
input: input:
faa1=os.path.join(RESULTS_DIR, "annalysis/cdhit/{rtype1}_{tool1}.faa"), faa1=os.path.join(RESULTS_DIR, "analysis/cdhit/{rtype1}_{tool1}.faa"),
faa2=os.path.join(RESULTS_DIR, "annalysis/cdhit/{rtype2}_{tool2}.faa") faa2=os.path.join(RESULTS_DIR, "analysis/cdhit/{rtype2}_{tool2}.faa")
output: output:
faa12=os.path.join(RESULTS_DIR, "annalysis/cdhit/{rtype1}_{tool1}__{rtype2}_{tool2}.faa"), faa12=os.path.join(RESULTS_DIR, "analysis/cdhit/{rtype1}_{tool1}__{rtype2}_{tool2}.faa"),
faa21=os.path.join(RESULTS_DIR, "annalysis/cdhit/{rtype2}_{tool2}__{rtype1}_{tool1}.faa") faa21=os.path.join(RESULTS_DIR, "analysis/cdhit/{rtype2}_{tool2}__{rtype1}_{tool1}.faa")
log: log:
out="logs/analysis_cdhit.{rtype1}.{tool1}.{rtype2}.{tool2}.out.log", out="logs/analysis_cdhit.{rtype1}.{tool1}.{rtype2}.{tool2}.out.log",
err="logs/analysis_cdhit.{rtype1}.{tool1}.{rtype2}.{tool2}.err.log" err="logs/analysis_cdhit.{rtype1}.{tool1}.{rtype2}.{tool2}.err.log"
......
...@@ -29,11 +29,11 @@ rule ANALYSIS_PROTEINS: ...@@ -29,11 +29,11 @@ rule ANALYSIS_PROTEINS:
rtype_tool=["%s/%s" % (rtype, tool) for rtype, tool in READ_ASSEMBLERS] rtype_tool=["%s/%s" % (rtype, tool) for rtype, tool in READ_ASSEMBLERS]
), ),
expand( expand(
os.path.join(RESULTS_DIR, "annalysis/cdhit/{combi}.faa"), os.path.join(RESULTS_DIR, "analysis/cdhit/{combi}.faa"),
combi=["%s_%s__%s_%s" % (p[0][0], p[0][1], p[1][0], p[1][1]) for p in READ_ASSEMBLER_PAIRS] combi=["%s_%s__%s_%s" % (p[0][0], p[0][1], p[1][0], p[1][1]) for p in READ_ASSEMBLER_PAIRS]
), ),
expand( expand(
os.path.join(RESULTS_DIR, "annalysis/cdhit/{combi}.faa"), os.path.join(RESULTS_DIR, "analysis/cdhit/{combi}.faa"),
combi=["%s_%s__%s_%s" % (p[1][0], p[1][1], p[0][0], p[0][1]) for p in READ_ASSEMBLER_PAIRS] combi=["%s_%s__%s_%s" % (p[1][0], p[1][1], p[0][0], p[0][1]) for p in READ_ASSEMBLER_PAIRS]
) )
output: output:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment