Commit a6cbfc92 authored by Alessia Marcolini's avatar Alessia Marcolini
Browse files

Remove ancient flags

parent dbc4e4fb
...@@ -131,7 +131,7 @@ rule ml_juxt_tr: ...@@ -131,7 +131,7 @@ rule ml_juxt_tr:
rule ml_juxt_val: rule ml_juxt_val:
input: input:
ancient("{outfolder}/{dataset}/{target}/{model}/{split_id}/juxt/{layers}_tr_{model}_KBest.log"), "{outfolder}/{dataset}/{target}/{model}/{split_id}/juxt/{layers}_tr_{model}_KBest.log",
os.path.join(DATAFOLDER, "{dataset}/{target}/{split_id}/{layers}_tr.txt"), os.path.join(DATAFOLDER, "{dataset}/{target}/{split_id}/{layers}_tr.txt"),
os.path.join(DATAFOLDER, "{dataset}/{target}/{split_id}/{layers}_ts.txt"), os.path.join(DATAFOLDER, "{dataset}/{target}/{split_id}/{layers}_ts.txt"),
os.path.join(DATAFOLDER, "{dataset}/{target}/{split_id}/labels_{target}_ts.txt") os.path.join(DATAFOLDER, "{dataset}/{target}/{split_id}/labels_{target}_ts.txt")
...@@ -142,10 +142,10 @@ rule ml_juxt_val: ...@@ -142,10 +142,10 @@ rule ml_juxt_val:
rule snf: rule snf:
input: input:
ancient(expand("{datafolder}/{dataset}/{target}/{split_id}/{layer}_tr_{{cv_n}}_{{cv_k}}.txt", expand("{datafolder}/{dataset}/{target}/{split_id}/{layer}_tr_{{cv_n}}_{{cv_k}}.txt",
datafolder=DATAFOLDER, dataset=DATASET, target=TARGET, layer=LAYERS, split_id=SPLIT_ID)), datafolder=DATAFOLDER, dataset=DATASET, target=TARGET, layer=LAYERS, split_id=SPLIT_ID),
ancient(expand("{datafolder}/{dataset}/{target}/{split_id}/labels_{target}_tr_{{cv_n}}_{{cv_k}}.txt", expand("{datafolder}/{dataset}/{target}/{split_id}/labels_{target}_tr_{{cv_n}}_{{cv_k}}.txt",
datafolder=DATAFOLDER, dataset=DATASET, target=TARGET, split_id=SPLIT_ID)), datafolder=DATAFOLDER, dataset=DATASET, target=TARGET, split_id=SPLIT_ID),
threads: 8 threads: 8
output: output:
expand("{outfolder}/{dataset}/{target}/{model}/{split_id}/rSNF/INF_{layers}_tr_{{cv_n}}_{{cv_k}}.txt", expand("{outfolder}/{dataset}/{target}/{model}/{split_id}/rSNF/INF_{layers}_tr_{{cv_n}}_{{cv_k}}.txt",
...@@ -161,12 +161,12 @@ rule snf: ...@@ -161,12 +161,12 @@ rule snf:
rule ml_rsnf_tr: rule ml_rsnf_tr:
input: input:
ancient(expand("{datafolder}/{dataset}/{target}/{split_id}/{layers}_tr.txt", expand("{datafolder}/{dataset}/{target}/{split_id}/{layers}_tr.txt",
datafolder=DATAFOLDER, dataset=DATASET, target=TARGET, layers=LAYERS_CONCAT, split_id=SPLIT_ID)), datafolder=DATAFOLDER, dataset=DATASET, target=TARGET, layers=LAYERS_CONCAT, split_id=SPLIT_ID),
ancient(expand("{datafolder}/{dataset}/{target}/{split_id}/labels_{target}_tr.txt", expand("{datafolder}/{dataset}/{target}/{split_id}/labels_{target}_tr.txt",
datafolder=DATAFOLDER, dataset=DATASET, target=TARGET, split_id=SPLIT_ID)), datafolder=DATAFOLDER, dataset=DATASET, target=TARGET, split_id=SPLIT_ID),
snf_rankings = ancient(expand("{outfolder}/{dataset}/{target}/{model}/{split_id}/rSNF/INF_{layers}_tr_{cv_n}_{cv_k}.txt", snf_rankings = expand("{outfolder}/{dataset}/{target}/{model}/{split_id}/rSNF/INF_{layers}_tr_{cv_n}_{cv_k}.txt",
outfolder=OUTFOLDER, dataset=DATASET, target=TARGET, model=MODEL, split_id=SPLIT_ID, layers=LAYERS_CONCAT, cv_n=list(range(CV_N)), cv_k=list(range(CV_K)))) outfolder=OUTFOLDER, dataset=DATASET, target=TARGET, model=MODEL, split_id=SPLIT_ID, layers=LAYERS_CONCAT, cv_n=list(range(CV_N)), cv_k=list(range(CV_K)))
output: output:
"{outfolder}/{dataset}/{target}/{model}/{split_id}/rSNF/{layers}_tr_{model}_rankList.log", "{outfolder}/{dataset}/{target}/{model}/{split_id}/rSNF/{layers}_tr_{model}_rankList.log",
shell: shell:
...@@ -175,12 +175,12 @@ rule ml_rsnf_tr: ...@@ -175,12 +175,12 @@ rule ml_rsnf_tr:
rule ml_rsnf_val: rule ml_rsnf_val:
input: input:
ancient(expand("{outfolder}/{dataset}/{target}/{model}/{split_id}/rSNF/{layers}_tr_{model}_rankList.log", expand("{outfolder}/{dataset}/{target}/{model}/{split_id}/rSNF/{layers}_tr_{model}_rankList.log",
outfolder=OUTFOLDER, dataset=DATASET, target=TARGET, model=MODEL, layers=LAYERS_CONCAT, split_id=SPLIT_ID)), outfolder=OUTFOLDER, dataset=DATASET, target=TARGET, model=MODEL, layers=LAYERS_CONCAT, split_id=SPLIT_ID),
ancient(expand("{datafolder}/{dataset}/{target}/{split_id}/{layers}_ts.txt", expand("{datafolder}/{dataset}/{target}/{split_id}/{layers}_ts.txt",
datafolder=DATAFOLDER, dataset=DATASET, target=TARGET, layers=LAYERS_CONCAT, split_id=SPLIT_ID)), datafolder=DATAFOLDER, dataset=DATASET, target=TARGET, layers=LAYERS_CONCAT, split_id=SPLIT_ID),
ancient(expand("{datafolder}/{dataset}/{target}/{split_id}/labels_{target}_ts.txt", expand("{datafolder}/{dataset}/{target}/{split_id}/labels_{target}_ts.txt",
datafolder=DATAFOLDER, dataset=DATASET, target=TARGET, layers=LAYERS_CONCAT, split_id=SPLIT_ID)), datafolder=DATAFOLDER, dataset=DATASET, target=TARGET, layers=LAYERS_CONCAT, split_id=SPLIT_ID),
output: output:
"{outfolder}/{dataset}/{target}/{model}/{split_id}/rSNF/{layers}_tr_MCC_scores.txt", "{outfolder}/{dataset}/{target}/{model}/{split_id}/rSNF/{layers}_tr_MCC_scores.txt",
shell: shell:
...@@ -189,10 +189,10 @@ rule ml_rsnf_val: ...@@ -189,10 +189,10 @@ rule ml_rsnf_val:
rule myintersect: rule myintersect:
input: input:
ancient(expand("{outfolder}/{dataset}/{target}/{model}/{split_id}/juxt/{layers}_tr_{model}_KBest.log", expand("{outfolder}/{dataset}/{target}/{model}/{split_id}/juxt/{layers}_tr_{model}_KBest.log",
outfolder=OUTFOLDER, dataset=DATASET, target=TARGET, model=MODEL, layers=LAYERS_CONCAT, split_id=SPLIT_ID)), outfolder=OUTFOLDER, dataset=DATASET, target=TARGET, model=MODEL, layers=LAYERS_CONCAT, split_id=SPLIT_ID),
ancient(expand("{outfolder}/{dataset}/{target}/{model}/{split_id}/rSNF/{layers}_tr_{model}_rankList.log", expand("{outfolder}/{dataset}/{target}/{model}/{split_id}/rSNF/{layers}_tr_{model}_rankList.log",
outfolder=OUTFOLDER, dataset=DATASET, target=TARGET, model=MODEL, layers=LAYERS_CONCAT, split_id=SPLIT_ID)) outfolder=OUTFOLDER, dataset=DATASET, target=TARGET, model=MODEL, layers=LAYERS_CONCAT, split_id=SPLIT_ID)
output: output:
expand("{outfolder}/{dataset}/{target}/{model}/{split_id}/rSNFi/{layers}_intersect_tr.txt", expand("{outfolder}/{dataset}/{target}/{model}/{split_id}/rSNFi/{layers}_intersect_tr.txt",
outfolder=OUTFOLDER, dataset=DATASET, target=TARGET, model=MODEL, layers=LAYERS_CONCAT, split_id=SPLIT_ID) outfolder=OUTFOLDER, dataset=DATASET, target=TARGET, model=MODEL, layers=LAYERS_CONCAT, split_id=SPLIT_ID)
...@@ -202,10 +202,10 @@ rule myintersect: ...@@ -202,10 +202,10 @@ rule myintersect:
rule extract: rule extract:
input: input:
ancient(expand("{datafolder}/{dataset}/{target}/{split_id}/{layers}_ts.txt", expand("{datafolder}/{dataset}/{target}/{split_id}/{layers}_ts.txt",
datafolder=DATAFOLDER, dataset=DATASET, target=TARGET, layers=LAYERS_CONCAT, split_id=SPLIT_ID)), datafolder=DATAFOLDER, dataset=DATASET, target=TARGET, layers=LAYERS_CONCAT, split_id=SPLIT_ID),
ancient(expand("{outfolder}/{dataset}/{target}/{model}/{split_id}/rSNFi/{layers}_intersect_tr.txt", expand("{outfolder}/{dataset}/{target}/{model}/{split_id}/rSNFi/{layers}_intersect_tr.txt",
outfolder=OUTFOLDER, dataset=DATASET, target=TARGET, model=MODEL, layers=LAYERS_CONCAT, split_id=SPLIT_ID)) outfolder=OUTFOLDER, dataset=DATASET, target=TARGET, model=MODEL, layers=LAYERS_CONCAT, split_id=SPLIT_ID)
output: output:
expand("{outfolder}/{dataset}/{target}/{model}/{split_id}/rSNFi/{layers}_ts.txt", expand("{outfolder}/{dataset}/{target}/{model}/{split_id}/rSNFi/{layers}_ts.txt",
outfolder=OUTFOLDER, dataset=DATASET, target=TARGET, model=MODEL, layers=LAYERS_CONCAT, split_id=SPLIT_ID) outfolder=OUTFOLDER, dataset=DATASET, target=TARGET, model=MODEL, layers=LAYERS_CONCAT, split_id=SPLIT_ID)
...@@ -227,8 +227,8 @@ rule ml_rsnfi_tr: ...@@ -227,8 +227,8 @@ rule ml_rsnfi_tr:
rule ml_rsnfi_val: rule ml_rsnfi_val:
input: input:
ancient(expand("{outfolder}/{dataset}/{target}/{model}/{split_id}/rSNFi/{layers}_ts_{model}_KBest.log", expand("{outfolder}/{dataset}/{target}/{model}/{split_id}/rSNFi/{layers}_ts_{model}_KBest.log",
outfolder=OUTFOLDER, dataset=DATASET, target=TARGET, model=MODEL, split_id=SPLIT_ID, layers=LAYERS_CONCAT)), outfolder=OUTFOLDER, dataset=DATASET, target=TARGET, model=MODEL, split_id=SPLIT_ID, layers=LAYERS_CONCAT),
expand("{datafolder}/{dataset}/{target}/{split_id}/{layers}_ts2.txt", expand("{datafolder}/{dataset}/{target}/{split_id}/{layers}_ts2.txt",
datafolder=DATAFOLDER, dataset=DATASET, target=TARGET, split_id=SPLIT_ID, layers=LAYERS_CONCAT), datafolder=DATAFOLDER, dataset=DATASET, target=TARGET, split_id=SPLIT_ID, layers=LAYERS_CONCAT),
expand("{datafolder}/{dataset}/{target}/{split_id}/labels_{target}_ts2.txt", expand("{datafolder}/{dataset}/{target}/{split_id}/labels_{target}_ts2.txt",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment