Merge pull request #47 from juliangehring/develop

Merge changes for v0.2.2

Author: juliangehring

.appveyor.yml

@@ -1,11 +1,7 @@
 environment:
   matrix:
-  - JULIAVERSION: "julialang/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
-  - JULIAVERSION: "julialang/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
-
-matrix:
-  allow_failures:
-  - JULIAVERSION: "julialang/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"  
 
 notifications:
   - provider: Email
@@ -14,9 +10,10 @@ notifications:
     on_build_status_changed: false
 
 install:
+  - ps: "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12"
 # Download most recent Julia Windows binary
   - ps: (new-object net.webclient).DownloadFile(
-        $("http://s3.amazonaws.com/"+$env:JULIAVERSION),
+        $env:JULIA_URL,
         "C:\projects\julia-binary.exe")
 # Run installer silently, output to C:\projects\julia
   - C:\projects\julia-binary.exe /S /D=C:\projects\julia

.travis.yml

@@ -7,10 +7,6 @@ julia:
   - 0.5
   - 0.6
 
-matrix:
-  allow_failures:
-    - julia: 0.6
-
 notifications:
   email:
     on_success: never

NEWS.md

@@ -1,5 +1,18 @@
 # MultipleTesting.jl News and Changes
 
+## Version 0.2.2
+
+### Changes
+
+- Makes the `PValues` type immutable and persistent
+- Finalises support of julia 0.6 with testing
+
+
+### Support
+
+- Requires julia 0.5 or 0.6
+
+
 ## Version 0.2.1
 
 ### Changes

README.md

@@ -1,6 +1,6 @@
 # MultipleTesting
 
-The `MultipleTesting` package offers common algorithms for p-value adjustment and the estimation of the proportion π₀ of true null hypotheses.
+The `MultipleTesting` package offers common algorithms for p-value adjustment and combination as well as the estimation of the proportion π₀ of true null hypotheses.
 
 ![xkcd p-value guide](pvalues.png)
 
@@ -118,7 +118,9 @@ The package is actively developed and uses [semantic versioning](http://semver.o
 
 [![DOI](https://zenodo.org/badge/27935122.svg)](https://zenodo.org/badge/latestdoi/27935122)
 
+[![Package Status](http://pkg.julialang.org/badges/MultipleTesting_0.6.svg)](http://pkg.julialang.org/?pkg=MultipleTesting)
 [![Package Status](http://pkg.julialang.org/badges/MultipleTesting_0.5.svg)](http://pkg.julialang.org/?pkg=MultipleTesting)
+
 [![Linux/Mac Build Status](https://travis-ci.org/juliangehring/MultipleTesting.jl.svg?branch=master)](https://travis-ci.org/juliangehring/MultipleTesting.jl)
 [![Windows Build Status](https://ci.appveyor.com/api/projects/status/1ld0ppptisirryt1/branch/master?svg=true)](https://ci.appveyor.com/project/juliangehring/multipletesting-jl/branch/master)
 [![Coverage Status](https://codecov.io/gh/juliangehring/MultipleTesting.jl/branch/master/graph/badge.svg)](https://codecov.io/gh/juliangehring/MultipleTesting.jl)

src/types.jl

@@ -13,7 +13,7 @@
 
 ## PValues
 
-type PValues{T<:AbstractFloat} <: AbstractVector{T}
+immutable PValues{T<:AbstractFloat} <: AbstractVector{T}
     values::AbstractVector{T}
     min::T
     max::T
@@ -23,7 +23,7 @@ type PValues{T<:AbstractFloat} <: AbstractVector{T}
         if min < 0.0 || max > 1.0
             throw(DomainError())
         end
-        new{T}(values, min, max)
+        new{T}(copy(values), min, max)
     end
 end
 
@@ -32,6 +32,8 @@ Base.convert{T<:AbstractFloat}(::Type{PValues}, x::AbstractVector{T}) = PValues(
 Base.size(pv::PValues) = (length(pv.values), )
 @compat Base.IndexStyle{T<:PValues}(::Type{T}) = IndexLinear()
 Base.getindex(pv::PValues, i::Integer) = pv.values[i]
+Base.setindex!(pv::PValues, x::AbstractFloat, i::Integer) =
+    throw(ErrorException("Modification of values is not permitted"))
 
 Base.values(pv::PValues) = pv.values
 Base.minimum(pv::PValues) = pv.min

test/test-types.jl

@@ -14,7 +14,7 @@ using Base.Test
         pv = PValues(vals)
 
         # basic vector functionality
-        @test values(pv) ≡ vals
+        @test values(pv) == vals
         @test sum(pv) == sum(vals)
         @test length(pv) == n
         @test ones(pv) == ones(eltype(vals), n)
@@ -27,10 +27,8 @@ using Base.Test
         # min/max are taken from the type fields,
         # not recomputed from the values
         pvt = PValues(vals)
-        pvt.min = 0.0
-        pvt.max = 1.0
-        @test minimum(pvt) == 0.0
-        @test maximum(pvt) == 1.0
+        @test_throws ErrorException pvt.min = 0.0
+        @test_throws ErrorException pvt.max = 1.0
 
         # parametric type that keeps input float type
         for T in (Float16, Float32, Float64)
@@ -54,6 +52,29 @@ using Base.Test
 
     end
 
+
+    @testset "PValues immutability" begin
+
+        n = 10
+        vals = rand(n)
+        ref = deepcopy(vals)
+
+        pv = PValues(vals)
+
+        @test pv.values == ref
+        @test extrema(pv) == extrema(pv.values)
+
+        vals[1] = 0.0
+        vals[2] = 1.0
+
+        @test pv.values == ref
+        @test pv.values != vals
+        @test extrema(pv) == extrema(pv.values)
+
+        @test_throws ErrorException pv[1] = 0.0
+
+    end
+
 end
 
 end