Skip to content

Commit 971a8a6

Browse files
Merge branch 'develop' into barber-candes-#81
2 parents 98696de + ac27637 commit 971a8a6

19 files changed

+1120
-70
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
**/.ipynb_checkpoints/
2+
docs/build/

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,5 @@ script:
2323

2424
after_success:
2525
- julia -e 'cd(Pkg.dir("MultipleTesting")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder(), flags="julia_$(VERSION.major)_$(VERSION.minor)")'
26+
- julia -e 'Pkg.add("Documenter")'
27+
- julia -e 'cd(Pkg.dir("MultipleTesting")); include(joinpath("docs", "make.jl"))'

Makefile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
COLOR := yes
2+
3+
.PHONY: test docs
4+
5+
all: test docs
6+
7+
test:
8+
julia --color=$(COLOR) test/runtests.jl
9+
10+
docs:
11+
julia --color=$(COLOR) docs/make.jl
12+

NEWS.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
### Changes
7070

7171
- Adds compatibility with julia 0.6 development versions, including automated tests
72-
- Fixes Censored BUM π0 edge case when all p-values are equal to 1
72+
- Fixes Censored BUM π₀ edge case when all p-values are equal to 1
7373
- Updates test cases and reference values for `qValues`
7474
- Introduces `Compat` as a new dependency
7575
- Separates test coverage reports for different julia versions
@@ -122,7 +122,7 @@
122122

123123
### New Features
124124

125-
- New π0 estimators: BUM, Censored BUM, Flat Grenander
125+
- New π₀ estimators: BUM, Censored BUM, Flat Grenander
126126
- New p-value adjustment methods: Forward Stop, Benjamini-Liu
127127
- BUM model for simulating p-value distributions
128128
- Fast isotonic regression
@@ -153,7 +153,7 @@
153153

154154
### New features
155155

156-
- New π0 estimators: Two Step, Right Boundary
156+
- New π₀ estimators: Two Step, Right Boundary
157157
- New p-value adjustment methods: Benjamini-Hochberg Adaptive, Oracle, Sidak
158158
- Package precompilation
159159

docs/make.jl

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
using Documenter
2+
using MultipleTesting
3+
4+
makedocs(
5+
modules = [MultipleTesting],
6+
format = :html,
7+
sitename = "MultipleTesting.jl",
8+
doctest = true,
9+
checkdocs = :exports,
10+
linkcheck = true,
11+
html_disable_git = true, # disable source and edit links to github
12+
html_canonical = "https://juliangehring.github.io/MultipleTesting.jl/stable/",
13+
pages = [
14+
"Home" => "index.md",
15+
"Library" => Any[
16+
"adjustment.md",
17+
"combination.md",
18+
"pi0.md",
19+
"higher-criticism.md",
20+
"models.md",
21+
]
22+
]
23+
)
24+
25+
deploydocs(
26+
repo = "github.com/juliangehring/MultipleTesting.jl.git",
27+
julia = "0.6",
28+
target = "build",
29+
latest = "develop",
30+
deps = nothing,
31+
make = nothing
32+
)

docs/src/adjustment.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Adjustment of p-Values
2+
3+
```@meta
4+
CurrentModule = MultipleTesting
5+
DocTestSetup = quote
6+
using MultipleTesting
7+
end
8+
```
9+
10+
## Methods
11+
12+
```@docs
13+
adjust
14+
```
15+
16+
17+
## Types
18+
19+
```@docs
20+
Bonferroni
21+
BenjaminiHochberg
22+
BenjaminiHochbergAdaptive
23+
BenjaminiYekutieli
24+
BenjaminiLiu
25+
Hochberg
26+
Holm
27+
Hommel
28+
Sidak
29+
ForwardStop
30+
BarberCandes
31+
```

docs/src/combination.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Combination of p-Values
2+
3+
```@meta
4+
CurrentModule = MultipleTesting
5+
DocTestSetup = quote
6+
using MultipleTesting
7+
end
8+
```
9+
10+
## Methods
11+
12+
```@docs
13+
combine
14+
```
15+
16+
17+
## Types
18+
19+
```@docs
20+
FisherCombination
21+
LogitCombination
22+
StoufferCombination
23+
TippettCombination
24+
SimesCombination
25+
WilkinsonCombination
26+
MinimumCombination
27+
```

docs/src/higher-criticism.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Higher Criticism
2+
3+
```@meta
4+
CurrentModule = MultipleTesting
5+
DocTestSetup = quote
6+
using MultipleTesting
7+
end
8+
```
9+
10+
11+
```@docs
12+
HigherCriticismScores
13+
HigherCriticismThreshold
14+
```

docs/src/index.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# MultipleTesting.jl
2+
3+
```@meta
4+
CurrentModule = MultipleTesting
5+
DocTestSetup = quote
6+
using MultipleTesting
7+
end
8+
```
9+
10+
11+
## Package Features
12+
13+
## Manual
14+
15+
```@contents
16+
```

docs/src/models.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Modelling of p-Value Distributions
2+
3+
```@meta
4+
CurrentModule = MultipleTesting
5+
DocTestSetup = quote
6+
using MultipleTesting
7+
end
8+
```
9+
10+
11+
```@docs
12+
BetaUniformMixtureModel
13+
```

0 commit comments

Comments
 (0)