From 63273086b0b5969c13b7ae7a0133bf9b46c9a294 Mon Sep 17 00:00:00 2001 From: Marabesemer Date: Tue, 30 Jun 2026 16:17:21 +0200 Subject: [PATCH 1/3] Add Formular vs Individual Factors in model specification --- tools/maaslin3/maaslin3.xml | 191 ++++++++++++++++++++++++------------ tools/maaslin3/macros.xml | 5 +- 2 files changed, 133 insertions(+), 63 deletions(-) diff --git a/tools/maaslin3/maaslin3.xml b/tools/maaslin3/maaslin3.xml index f84851ba612..c8f3bee41f9 100644 --- a/tools/maaslin3/maaslin3.xml +++ b/tools/maaslin3/maaslin3.xml @@ -7,53 +7,80 @@ - - + + + + + + + + + + + + + + + + - + - - - -
@@ -276,19 +300,30 @@ - + + + + + + + + - + + + + + @@ -304,12 +339,12 @@ - + - + @@ -319,14 +354,17 @@ - + - + + + + @@ -336,12 +374,21 @@
+ + + + + - + + + + + @@ -361,14 +408,17 @@ - +
- + + + + @@ -383,7 +433,11 @@ - + + + + + @@ -399,12 +453,12 @@ - + - + @@ -414,13 +468,13 @@ - + - + - + @@ -428,7 +482,10 @@ - + + + + @@ -444,7 +501,11 @@ - + + + + + @@ -460,12 +521,12 @@ - + - + @@ -475,7 +536,7 @@ - + @@ -483,9 +544,17 @@ 0.99.16 - 0 + 1 25.0 maaslin3 + r-ggplot2 - \ No newline at end of file + From 836ceab3145ea32f41450793911f67447430f8e5 Mon Sep 17 00:00:00 2001 From: Marabesemer Date: Wed, 1 Jul 2026 09:03:17 +0200 Subject: [PATCH 2/3] Fix MaAsLin3 test expectations for Linux CI --- tools/maaslin3/maaslin3.xml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tools/maaslin3/maaslin3.xml b/tools/maaslin3/maaslin3.xml index c8f3bee41f9..84ab104e991 100644 --- a/tools/maaslin3/maaslin3.xml +++ b/tools/maaslin3/maaslin3.xml @@ -339,12 +339,12 @@ - + - + @@ -354,7 +354,7 @@ - + @@ -408,7 +408,7 @@ - + @@ -453,12 +453,12 @@ - + - + @@ -468,10 +468,10 @@ - + - + @@ -521,12 +521,12 @@ - + - + @@ -536,7 +536,7 @@ - + From b7e5e3d11329dfacf862790af5b27dcc1c0c520b Mon Sep 17 00:00:00 2001 From: Marabesemer Date: Wed, 1 Jul 2026 09:24:17 +0200 Subject: [PATCH 3/3] Fix MaAsLin3 plot RDS test --- tools/maaslin3/maaslin3.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/maaslin3/maaslin3.xml b/tools/maaslin3/maaslin3.xml index 84ab104e991..dcda72518e7 100644 --- a/tools/maaslin3/maaslin3.xml +++ b/tools/maaslin3/maaslin3.xml @@ -474,7 +474,7 @@ - +