Merge remote-tracking branch 'origin/master'

Author: ChrisRackauckas

.travis.yml

@@ -5,8 +5,11 @@ os:
   - osx
 julia:
   - 0.5
+  - 0.6
+  - nightly
 matrix:
   allow_failures:
+    - julia: 0.6
     - julia: nightly
 notifications:
   email: false

appveyor.yml

@@ -2,8 +2,14 @@ environment:
   matrix:
     - JULIAVERSION: "julialang/bin/winnt/x86/0.5/julia-0.5-latest-win32.exe"
     - JULIAVERSION: "julialang/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
+    - JULIAVERSION: "julialang/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
+    - JULIAVERSION: "julialang/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
+    - JULIAVERSION: "julianightlies/bin/winnt/x86/julia-latest-win32.exe"
+    - JULIAVERSION: "julianightlies/bin/winnt/x64/julia-latest-win64.exe"
 matrix:
   allow_failures:
+    - JULIAVERSION: "julialang/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
+    - JULIAVERSION: "julialang/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
     - JULIAVERSION: "julianightlies/bin/winnt/x86/julia-latest-win32.exe"
     - JULIAVERSION: "julianightlies/bin/winnt/x64/julia-latest-win64.exe"
 branches:

src/array_partition.jl

@@ -25,30 +25,35 @@ function Base.ones(A::ArrayPartition)
   B
 end
 
-Base.:+(A::ArrayPartition, B::ArrayPartition) = ArrayPartition((x .+ y for (x,y) in zip(A.x,B.x))...)
+Base.:+(A::ArrayPartition, B::ArrayPartition) =
+    ArrayPartition((x .+ y for (x,y) in zip(A.x,B.x))...)
 Base.:+(A::Number, B::ArrayPartition) = ArrayPartition((A .+ x for x in B.x)...)
 Base.:+(A::ArrayPartition, B::Number) = ArrayPartition((B .+ x for x in A.x)...)
-Base.:-(A::ArrayPartition, B::ArrayPartition) = ArrayPartition((x .- y for (x,y) in zip(A.x,B.x))...)
+Base.:-(A::ArrayPartition, B::ArrayPartition) =
+    ArrayPartition((x .- y for (x,y) in zip(A.x,B.x))...)
 Base.:-(A::Number, B::ArrayPartition) = ArrayPartition((A .- x for x in B.x)...)
 Base.:-(A::ArrayPartition, B::Number) = ArrayPartition((x .- B for x in A.x)...)
 Base.:*(A::Number, B::ArrayPartition) = ArrayPartition((A .* x for x in B.x)...)
 Base.:*(A::ArrayPartition, B::Number) = ArrayPartition((x .* B for x in A.x)...)
 Base.:/(A::ArrayPartition, B::Number) = ArrayPartition((x ./ B for x in A.x)...)
 Base.:\(A::Number, B::ArrayPartition) = ArrayPartition((x ./ A for x in B.x)...)
 
-if VERSION < v"0.6-"
-  Base.:.+(A::ArrayPartition, B::ArrayPartition) = ArrayPartition((x .+ y for (x,y) in zip(A.x,B.x))...)
-  Base.:.+(A::Number, B::ArrayPartition) = ArrayPartition((A .+ x for x in B.x)...)
-  Base.:.+(A::ArrayPartition, B::Number) = ArrayPartition((B .+ x for x in A.x)...)
-  Base.:.-(A::ArrayPartition, B::ArrayPartition) = ArrayPartition((x .- y for (x,y) in zip(A.x,B.x))...)
-  Base.:.-(A::Number, B::ArrayPartition) = ArrayPartition((A .- x for x in B.x)...)
-  Base.:.-(A::ArrayPartition, B::Number) = ArrayPartition((x .- B for x in A.x)...)
-  Base.:.*(A::ArrayPartition, B::ArrayPartition) = ArrayPartition((x .* y for (x,y) in zip(A.x,B.x))...)
-  Base.:.*(A::Number, B::ArrayPartition) = ArrayPartition((A .* x for x in B.x)...)
-  Base.:.*(A::ArrayPartition, B::Number) = ArrayPartition((x .* B for x in A.x)...)
-  Base.:./(A::ArrayPartition, B::ArrayPartition) = ArrayPartition((x ./ y for (x,y) in zip(A.x,B.x))...)
-  Base.:./(A::ArrayPartition, B::Number) = ArrayPartition((x ./ B for x in A.x)...)
-  Base.:.\(A::Number, B::ArrayPartition) = ArrayPartition((x ./ A for x in B.x)...)
+@static if VERSION < v"0.6.0-dev.1614"
+    include_string(
+"""
+    Base.:(.+)(A::ArrayPartition, B::ArrayPartition) = A+B
+    Base.:(.+)(A::Number, B::ArrayPartition) = A+B
+    Base.:(.+)(A::ArrayPartition, B::Number) = A+B
+    Base.:(.-)(A::ArrayPartition, B::ArrayPartition) = A-B
+    Base.:(.-)(A::Number, B::ArrayPartition) = A-B
+    Base.:(.-)(A::ArrayPartition, B::Number) = A-B
+    Base.:(.*)(A::ArrayPartition, B::ArrayPartition) = A*B
+    Base.:(.*)(A::Number, B::ArrayPartition) = A*B
+    Base.:(.*)(A::ArrayPartition, B::Number) = A*B
+    Base.:(./)(A::ArrayPartition, B::ArrayPartition) = A/B
+    Base.:(./)(A::ArrayPartition, B::Number) = A/B
+    Base.:(.\\)(A::Number, B::ArrayPartition) = A\\B
+""")
 end
 
 @inline function Base.getindex( A::ArrayPartition,i::Int)