Skip to content

Commit 0eaebbd

Browse files
authored
Merge pull request #517 from atrigila/expose_dream_params
2 parents c1e587a + f426e9f commit 0eaebbd

File tree

6 files changed

+100
-7
lines changed

6 files changed

+100
-7
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
### Added
99

10+
- [[#517](https://github.com/nf-core/differentialabundance/pull/473)] - Expose DREAM options as pipeline params. ([@atrigila](https://github.com/atrigila), review by [@pinin4fjords](https://github.com/pinin4fjords) and [@grst](https://github.com/grst)).
1011
-[[#510]](https://github.com/nf-core/differentialabundance/pull/510) - Add decoupler module to differential functional enrichment subworkflow. ([@antoniasaracco](https://github.com/antoniasaracco), review by [@pinin4fjords](https://github.com/pinin4fjords) and [@grst](https://github.com/grst)).
11-
1212
- [[#473](https://github.com/nf-core/differentialabundance/pull/473)] - Allow formula-based contrasts in DESEQ2. ([@atrigila](https://github.com/atrigila), review by [@pinin4fjords](https://github.com/pinin4fjords) and [@grst](https://github.com/grst)).
1313
- [[#443](https://github.com/nf-core/differentialabundance/pull/443)] - Add toolsheet-related implementations. ([@suzannejin](https://github.com/suzannejin), review by [@pinin4fjords](https://github.com/pinin4fjords), [@mirpedrol](https://github.com/mirpedrol) and [@JoseEspinosa](https://github.com/JoseEspinosa))
1414
- [[#450](https://github.com/nf-core/differentialabundance/pull/441)] - Allow usage of strings for makeContrasts in DREAM. ([@atrigila](https://github.com/atrigila), review by [@pinin4fjords](https://github.com/pinin4fjords), [@suzannejin](https://github.com/suzannejin) and [@grst](https://github.com/grst)).

conf/modules.config

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,21 @@ process {
356356
pattern: '*.dream.results.tsv'
357357
]
358358
]
359+
ext.args = { [
360+
"--adjust.method ${meta.params.dream_adjust_method}",
361+
"--p.value ${meta.params.dream_p_value}",
362+
"--lfc ${meta.params.dream_lfc}",
363+
"--confint ${meta.params.dream_confint}",
364+
"--proportion ${meta.params.dream_proportion}",
365+
"--stdev_coef_lim ${meta.params.dream_stdev_coef_lim}",
366+
"--trend ${meta.params.dream_trend}",
367+
"--robust ${meta.params.dream_robust}",
368+
"--winsor_tail_p ${meta.params.dream_winsor_tail_p}",
369+
"--ddf ${meta.params.dream_ddf}",
370+
"--reml ${meta.params.dream_reml}",
371+
"--apply_voom ${meta.params.dream_apply_voom}",
372+
((meta.blocking == null) ? '' : "--blocking_variables $meta.blocking")
373+
].join(' ').trim() }
359374
}
360375

361376
withName: CUSTOM_FILTERDIFFERENTIALTABLE {

modules.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
},
128128
"variancepartition/dream": {
129129
"branch": "master",
130-
"git_sha": "73b1b0fc276e2a6bd753e4d3d10d754b72a3e345",
130+
"git_sha": "342edbcb60c7e59db0d5c3f8bb64dbb2d9d62785",
131131
"installed_by": ["abundance_differential_filter"]
132132
},
133133
"zip": {

modules/nf-core/variancepartition/dream/templates/dream.R

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nextflow.config

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,20 @@ params {
138138
limma_confint = false
139139
limma_use_voom = false
140140

141+
// DREAM-specific options
142+
dream_adjust_method = "BH"
143+
dream_p_value = 1
144+
dream_lfc = 0
145+
dream_confint = false
146+
dream_proportion = 0.01
147+
dream_stdev_coef_lim = '0.1,4'
148+
dream_trend = false
149+
dream_robust = false
150+
dream_winsor_tail_p = '0.05,0.1'
151+
dream_ddf = 'adaptive'
152+
dream_reml = false
153+
dream_apply_voom = false
154+
141155
// IMMUNEDECONV options
142156
immunedeconv_run = false
143157
immunedeconv_method = "quantiseq" // Other options can be found in https://omnideconv.org/immunedeconv/articles/immunedeconv.html

nextflow_schema.json

Lines changed: 59 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -356,13 +356,13 @@
356356
"properties": {
357357
"filtering_min_abundance": {
358358
"type": "number",
359-
"default": 1.0,
359+
"default": 1,
360360
"description": "Minimum abundance value",
361361
"fa_icon": "fas fa-compress-alt"
362362
},
363363
"filtering_min_samples": {
364364
"type": "number",
365-
"default": 1.0,
365+
"default": 1,
366366
"description": "Minimum observations that must pass the threshold to retain the row/ feature (e.g. gene).",
367367
"fa_icon": "fas fa-compress-alt"
368368
},
@@ -541,13 +541,13 @@
541541
},
542542
"differential_min_fold_change": {
543543
"type": "number",
544-
"default": 2.0,
544+
"default": 2,
545545
"description": "Minimum fold change used to calculate differential feature numbers",
546546
"fa_icon": "fas fa-angle-double-down"
547547
},
548548
"differential_max_pval": {
549549
"type": "number",
550-
"default": 1.0,
550+
"default": 1,
551551
"description": "Maximum p value used to calculate differential feature numbers",
552552
"fa_icon": "fas fa-angle-double-up"
553553
},
@@ -805,7 +805,7 @@
805805
},
806806
"limma_p_value": {
807807
"type": "number",
808-
"default": 1.0,
808+
"default": 1,
809809
"description": "cutoff value for adjusted p-values. Only genes with lower p-values are listed.",
810810
"fa_icon": "fas fa-angle-double-up"
811811
},
@@ -817,6 +817,57 @@
817817
},
818818
"fa_icon": "fas fa-border-all"
819819
},
820+
"differential_dream_specific_options": {
821+
"title": "[differential] DREAM specific options",
822+
"type": "object",
823+
"description": "",
824+
"default": "",
825+
"properties": {
826+
"dream_p_value": {
827+
"type": "integer",
828+
"default": 1
829+
},
830+
"dream_lfc": {
831+
"type": "integer",
832+
"default": 0
833+
},
834+
"dream_confint": {
835+
"type": "boolean"
836+
},
837+
"dream_proportion": {
838+
"type": "number",
839+
"default": 0.01
840+
},
841+
"dream_stdev_coef_lim": {
842+
"type": "string",
843+
"default": "0.1,4"
844+
},
845+
"dream_trend": {
846+
"type": "boolean"
847+
},
848+
"dream_robust": {
849+
"type": "boolean"
850+
},
851+
"dream_winsor_tail_p": {
852+
"type": "string",
853+
"default": "0.05,0.1"
854+
},
855+
"dream_ddf": {
856+
"type": "string",
857+
"default": "adaptive"
858+
},
859+
"dream_reml": {
860+
"type": "boolean"
861+
},
862+
"dream_apply_voom": {
863+
"type": "boolean"
864+
},
865+
"dream_adjust_method": {
866+
"type": "string",
867+
"default": "BH"
868+
}
869+
}
870+
},
820871
"functional_functional_analysis_options": {
821872
"title": "[functional] Functional analysis options",
822873
"type": "object",
@@ -1369,6 +1420,9 @@
13691420
{
13701421
"$ref": "#/$defs/differential_limma_specific_options"
13711422
},
1423+
{
1424+
"$ref": "#/$defs/differential_dream_specific_options"
1425+
},
13721426
{
13731427
"$ref": "#/$defs/functional_functional_analysis_options"
13741428
},

0 commit comments

Comments
 (0)