Merge pull request #104 from tlycken/remove-build-woodbury-specs

WIP: Remove `_build_woodbury_specs`

Author: Tomas Lycken

REQUIRE

@@ -1,5 +1,5 @@
 julia 0.4
 
-WoodburyMatrices 0.1
+WoodburyMatrices 0.1.5
 Ratios
 AxisAlgorithms

src/b-splines/cubic.jl

@@ -167,7 +167,7 @@ function prefiltering_system{T,TC}(::Type{T}, ::Type{TC}, n::Int,
     du[1] = dl[end] = zero(T)
 
     # Now Woodbury correction to set `[1, 3], [n, n-2] ==> 1`
-    specs = _build_woodbury_specs(T, n, (1, 3, one(T)), (n, n-2, one(T)))
+    specs = WoodburyMatrices.sparse_factors(T, n, (1, 3, one(T)), (n, n-2, one(T)))
 
     Woodbury(lufact!(Tridiagonal(dl, d, du), Val{false}), specs...), zeros(TC, n)
 end
@@ -187,7 +187,7 @@ function prefiltering_system{T,TC}(::Type{T}, ::Type{TC}, n::Int,
     # now need Woodbury correction to set :
     #    - [1, 3] and [n, n-2] ==> -3
     #    - [1, 4] and [n, n-3] ==> 1
-    specs = _build_woodbury_specs(T, n,
+    specs = WoodburyMatrices.sparse_factors(T, n,
                                   (1, 3, T(-3)),
                                   (n, n-2, T(-3)),
                                   (1, 4, one(T)),
@@ -212,7 +212,7 @@ function prefiltering_system{T,TC}(::Type{T}, ::Type{TC}, n::Int,
     # now need Woodbury correction to set :
     #    - [1, 3] and [n, n-2] ==> -3
     #    - [1, 4] and [n, n-3] ==> 1
-    specs = _build_woodbury_specs(T, n,
+    specs = WoodburyMatrices.sparse_factors(T, n,
                                   (1, 3, T(5)),
                                   (n, n-2, T(5)),
                                   (1, 4, -one(T)),
@@ -239,7 +239,7 @@ function prefiltering_system{T,TC}(::Type{T}, ::Type{TC}, n::Int,
 
     # now need Woodbury correction to set :
     #    - [1, 3] and [n, n-2] ==> 1
-    specs = _build_woodbury_specs(T, n,
+    specs = WoodburyMatrices.sparse_factors(T, n,
                                   (1, 3, one(T)),
                                   (n, n-2, one(T)),
                                   )
@@ -251,7 +251,7 @@ function prefiltering_system{T,TC,GT<:GridType}(::Type{T}, ::Type{TC}, n::Int,
                                                 ::Type{Cubic{Periodic}}, ::Type{GT})
     dl, d, du = inner_system_diags(T,n,Cubic{Periodic})
 
-    specs = _build_woodbury_specs(T, n,
+    specs = WoodburyMatrices.sparse_factors(T, n,
                                   (1, n, du[1]),
                                   (n, 1, dl[end])
                                   )
@@ -273,7 +273,7 @@ function prefiltering_system{T,TC,GT<:GridType}(::Type{T}, ::Type{TC}, n::Int,
                                                 ::Type{Cubic{Free}}, ::Type{GT})
     dl, d, du = inner_system_diags(T,n,Cubic{Periodic})
 
-    specs = _build_woodbury_specs(T, n,
+    specs = WoodburyMatrices.sparse_factors(T, n,
                                   (1, n, du[1]),
                                   (n, 1, dl[end])
                                   )

src/b-splines/quadratic.jl

@@ -136,7 +136,7 @@ function prefiltering_system{T,TC,BC<:Union{Flat,Reflect}}(::Type{T}, ::Type{TC}
     d[1] = d[end] = -1
     du[1] = dl[end] = 0
 
-    specs = _build_woodbury_specs(T, n,
+    specs = WoodburyMatrices.sparse_factors(T, n,
                                   (1, 3, one(T)),
                                   (n, n-2, one(T))
                                  )
@@ -149,7 +149,7 @@ function prefiltering_system{T,TC,GT<:GridType}(::Type{T}, ::Type{TC}, n::Int, :
     d[1] = d[end] = 1
     du[1] = dl[end] = -2
 
-    specs = _build_woodbury_specs(T, n,
+    specs = WoodburyMatrices.sparse_factors(T, n,
                                   (1, 3, one(T)),
                                   (n, n-2, one(T)),
                                   )
@@ -162,7 +162,7 @@ function prefiltering_system{T,TC,GT<:GridType}(::Type{T}, ::Type{TC}, n::Int, :
     d[1] = d[end] = 1
     du[1] = dl[end] = -3
 
-    specs = _build_woodbury_specs(T, n,
+    specs = WoodburyMatrices.sparse_factors(T, n,
                                     (1, 3, 3),
                                     (1, 4, -1),
                                     (n, n-2, 3),
@@ -174,7 +174,7 @@ end
 function prefiltering_system{T,TC,GT<:GridType}(::Type{T}, ::Type{TC}, n::Int, ::Type{Quadratic{Periodic}}, ::Type{GT})
     dl,d,du = inner_system_diags(T,n,Quadratic{Periodic})
 
-    specs = _build_woodbury_specs(T, n,
+    specs = WoodburyMatrices.sparse_factors(T, n,
                                   (1, n, du[1]),
                                   (n, 1, dl[end])
                                   )

src/utils.jl

@@ -1,33 +1,2 @@
 @inline sqr(x) = x*x
 @inline cub(x) = x*x*x
-
-"""
-Build `rowspec`, `valspec`, `colspec` such that the product
-
-`out = rowspec * valspec * colspec` will be equivalent to:
-
-```julia
-out = zeros(n, n)
-
-for (i, j, v) in args
-    out[i, j] = v
-end
-```
-
-"""
-function _build_woodbury_specs{T}(::Type{T}, n::Int, args::Tuple{Int, Int, Any}...)
-    m = length(args)
-    rowspec = spzeros(T, n, m)
-    colspec = spzeros(T, m, n)
-    valspec = zeros(T, m, m)
-
-    ix = 1
-    for (i, (row, col, val)) in enumerate(args)
-        rowspec[row, ix] = 1
-        colspec[ix, col] = 1
-        valspec[ix, ix] = val
-        ix += 1
-    end
-
-    rowspec, valspec, colspec
-end

test/b-splines/cubic.jl

@@ -81,5 +81,4 @@ itp_flat_c = interpolate(A, BSpline(Cubic(Flat())), OnCell())
 @test_approx_eq_eps gradient(itp_flat_c, .5)[1] 0 eps()
 @test_approx_eq_eps gradient(itp_flat_c, ix[end]+.5)[1] 0 eps()
 
-
 end