From 3918739c1e80a742cadd0734700eb8e7ee98c0b4 Mon Sep 17 00:00:00 2001 From: RENU Date: Wed, 27 Mar 2024 20:11:43 +0100 Subject: [PATCH 1/6] interaction:fixed effects and corrections modified --- tools/maaslin2/maaslin2.xml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/maaslin2/maaslin2.xml b/tools/maaslin2/maaslin2.xml index 1d319ae0155..ea8e471f49e 100644 --- a/tools/maaslin2/maaslin2.xml +++ b/tools/maaslin2/maaslin2.xml @@ -55,7 +55,7 @@ cd outputFolder && mkdir -p figures/ && cp *.pdf figures - + @@ -87,7 +87,14 @@ cd outputFolder && mkdir -p figures/ && cp *.pdf figures - + + + + + + + +
From 8fa089e385e81b008c5458df5df84a39df8e8f75 Mon Sep 17 00:00:00 2001 From: RENU Date: Wed, 17 Apr 2024 23:02:34 +0200 Subject: [PATCH 2/6] fixed effects, random effects , corrections methods modified and version bumped --- tools/maaslin2/maaslin2.xml | 68 +++++++++++++++++++++++++------------ tools/maaslin2/macros.xml | 4 +-- 2 files changed, 48 insertions(+), 24 deletions(-) diff --git a/tools/maaslin2/maaslin2.xml b/tools/maaslin2/maaslin2.xml index ea8e471f49e..c56fe2308dd 100644 --- a/tools/maaslin2/maaslin2.xml +++ b/tools/maaslin2/maaslin2.xml @@ -7,6 +7,29 @@ - - - - - - - - - + + + + + +
@@ -87,13 +108,13 @@ cd outputFolder && mkdir -p figures/ && cp *.pdf figures - - - - - - - + + + + + + +
@@ -122,8 +143,8 @@ cd outputFolder && mkdir -p figures/ && cp *.pdf figures - - + +
@@ -205,7 +226,7 @@ cd outputFolder && mkdir -p figures/ && cp *.pdf figures - +
@@ -252,7 +273,7 @@ cd outputFolder && mkdir -p figures/ && cp *.pdf figures - +
@@ -354,6 +375,9 @@ Output - It only includes associations with q-values <= to the threshold. - Data frame with residuals for each feature (R data file) - This file contains a data frame with residuals for each feature. + +Correction methods to compute the q-value : https://www.rdocumentation.org/packages/stats/versions/3.6.2/topics/p.adjust + 2- Visualization output files - Heatmap of the significant associations (PDF file) - This file contains a heatmap of the significant associations. diff --git a/tools/maaslin2/macros.xml b/tools/maaslin2/macros.xml index 7903f9f7018..335c4eca97a 100644 --- a/tools/maaslin2/macros.xml +++ b/tools/maaslin2/macros.xml @@ -1,6 +1,6 @@ - 0.99.12 + 1.7.3 0 20.01 @@ -21,4 +21,4 @@ - \ No newline at end of file + From bfc500c276a8c39eeca5a8730c830266c901fcaa Mon Sep 17 00:00:00 2001 From: RENU Date: Fri, 19 Apr 2024 22:55:00 +0200 Subject: [PATCH 3/6] maaslin2: test cases added --- tools/maaslin2/maaslin2.xml | 105 ++++++++++++++++++++++++++++++++++-- tools/maaslin2/macros.xml | 2 +- 2 files changed, 103 insertions(+), 4 deletions(-) diff --git a/tools/maaslin2/maaslin2.xml b/tools/maaslin2/maaslin2.xml index c56fe2308dd..9b02af0511e 100644 --- a/tools/maaslin2/maaslin2.xml +++ b/tools/maaslin2/maaslin2.xml @@ -12,6 +12,7 @@ ## can only return indices with type="data_column" ## using awk so that the file is only parsed on command line execution +#if $fixed_effects #set idx = [] #for $i in $fixed_effects: #silent idx.append(f'${i}') @@ -20,7 +21,10 @@ fixed_effects=`awk -v OFS=',' -F"\t" 'NR == 1 { print $idx_for_awk}' '$input_metadata'` && echo 'Assigned fixed effects as:' \$fixed_effects && +#end if + +#if $random_effects #set idx = [] #for $i in $random_effects: #silent idx.append(f'${i}') @@ -29,6 +33,7 @@ echo 'Assigned fixed effects as:' \$fixed_effects && random_effects=`awk -v OFS=',' -F"\t" 'NR == 1 { print $idx_for_awk}' '$input_metadata'` && echo 'Assigned random effects as:' \$random_effects && +#end if ln -s '$input_data' 'input_data.tsv' && @@ -79,9 +84,9 @@ cd outputFolder && mkdir -p figures/ && cp *.pdf figures - + - + @@ -108,7 +113,7 @@ cd outputFolder && mkdir -p figures/ && cp *.pdf figures - + @@ -332,6 +337,100 @@ cd outputFolder && mkdir -p figures/ && cp *.pdf figures + + + + +
+ + + + + + + + +
+
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + +
+ + + + + + + + +
+
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
- 1.7.3 + 0.99.12 0 20.01 From 02ab4b6ef3b41f1eda8fd6e7a6f1652f3fb2ba5f Mon Sep 17 00:00:00 2001 From: RENU Date: Wed, 24 Apr 2024 19:46:29 +0200 Subject: [PATCH 4/6] maaslin2 : updated fixed and random effects to include just numbers in tests --- tools/maaslin2/maaslin2.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/maaslin2/maaslin2.xml b/tools/maaslin2/maaslin2.xml index 9b02af0511e..fa5a9f220d2 100644 --- a/tools/maaslin2/maaslin2.xml +++ b/tools/maaslin2/maaslin2.xml @@ -148,8 +148,8 @@ cd outputFolder && mkdir -p figures/ && cp *.pdf figures - - + +
@@ -231,7 +231,7 @@ cd outputFolder && mkdir -p figures/ && cp *.pdf figures - +
@@ -278,7 +278,7 @@ cd outputFolder && mkdir -p figures/ && cp *.pdf figures - +
@@ -340,7 +340,7 @@ cd outputFolder && mkdir -p figures/ && cp *.pdf figures - +
From 18bb723dfe440474b55b54f14d05894942ed5d4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gr=C3=BCning?= Date: Thu, 25 Apr 2024 14:55:00 +0200 Subject: [PATCH 5/6] Update tools/maaslin2/maaslin2.xml --- tools/maaslin2/maaslin2.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/maaslin2/maaslin2.xml b/tools/maaslin2/maaslin2.xml index fa5a9f220d2..67265b3f453 100644 --- a/tools/maaslin2/maaslin2.xml +++ b/tools/maaslin2/maaslin2.xml @@ -367,7 +367,7 @@ cd outputFolder && mkdir -p figures/ && cp *.pdf figures - + From 621439a832cac1a6ed4f860eb9dc54b2e25f55c9 Mon Sep 17 00:00:00 2001 From: RENU Date: Fri, 26 Apr 2024 14:45:16 +0200 Subject: [PATCH 6/6] maaslin2: update correction help --- tools/maaslin2/maaslin2.xml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tools/maaslin2/maaslin2.xml b/tools/maaslin2/maaslin2.xml index 67265b3f453..dbed38104d6 100644 --- a/tools/maaslin2/maaslin2.xml +++ b/tools/maaslin2/maaslin2.xml @@ -113,11 +113,8 @@ cd outputFolder && mkdir -p figures/ && cp *.pdf figures - - - - - + +