Merge branch 'master' into sparsearrays-triangular-operations

mcognetta · Aug 7, 2018 · 88f364c · 88f364c
2 parents b0b3688 + f92a55a
commit 88f364c
Show file tree

Hide file tree

Showing 7 changed files with 1,751 additions and 1,717 deletions.
diff --git a/HISTORY.md b/HISTORY.md
diff --git a/NEWS.md b/NEWS.md
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.0.0-DEV
+1.0.0-rc1
diff --git a/base/iterators.jl b/base/iterators.jl
@@ -801,7 +801,7 @@ iterate(::ProductIterator{Tuple{}}, state) = nothing
 @inline isdone(P::ProductIterator) = any(isdone, P.iterators)
 @inline function _pisdone(iters, states)
     iter1 = first(iters)
-    done1 = isdone(iter1, first(states)) # check step
+    done1 = isdone(iter1, first(states)[2]) # check step
     done1 === true || return done1 # false or missing
     done1 = isdone(iter1) # check restart
     done1 === true || return done1 # false or missing

diff --git a/doc/src/manual/types.md b/doc/src/manual/types.md
@@ -1383,7 +1383,7 @@ for cases where you don't need a more elaborate hierarchy.
 julia> struct Val{x}
        end
 
-julia> Base.@pure Val(x) = Val{x}()
+julia> Val(x) = Val{x}()
 Val
 ```
 

diff --git a/stdlib/LinearAlgebra/src/qr.jl b/stdlib/LinearAlgebra/src/qr.jl
@@ -322,7 +322,10 @@ solution and if the solution is not unique, the one with smallest norm is return
 
 Multiplication with respect to either full/square or non-full/square `Q` is allowed, i.e. both `F.Q*F.R`
 and `F.Q*A` are supported. A `Q` matrix can be converted into a regular matrix with
-[`Matrix`](@ref).
+[`Matrix`](@ref).  This operation returns the "thin" Q factor, i.e., if `A` is `m`×`n` with `m>=n`, then
+`Matrix(F.Q)` yields an `m`×`n` matrix with orthonormal columns.  To retrieve the "full" Q factor, an
+`m`×`m` orthogonal matrix, use `F.Q*Matrix(I,m,m)`.  If `m<=n`, then `Matrix(F.Q)` yields an `m`×`m`
+orthogonal matrix.
 
 # Examples
 ```jldoctest

diff --git a/test/iterators.jl b/test/iterators.jl
@@ -270,7 +270,8 @@ let iters = (1:2,
              rand(2, 2, 2),
              take(1:4, 2),
              product(1:2, 1:3),
-             product(rand(2, 2), rand(1, 1, 1))
+             product(rand(2, 2), rand(1, 1, 1)),
+             repeated([1, -1], 2)  # 28497
              )
     for method in [size, length, ndims, eltype]
         for i = 1:length(iters)
-Original file line number
+Diff line change
@@ Expand Up @@
     julia> struct Val{x}
            end
-    julia> Base.@pure Val(x) = Val{x}()
+    julia> Val(x) = Val{x}()
     Val
     ```
@@ Expand Down @@