fixeltype in collocation!

tkf · Aug 9, 2018 · 96defff · 96defff
1 parent ca1d29d
commit 96defff
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/codim1lc/problem.jl b/src/codim1lc/problem.jl
@@ -5,6 +5,7 @@ using StaticArrays: SVector, SMatrix, Size
 
 using Jacobi: lagrange, zgj, wgj
 using ..PolyUtils: dlagrange
+using ..ArrayUtils: fixeltype
 
 using ..CompatUtils: @required
 import ..Continuations: get_prob_cache, get_u0, residual!, residual_jacobian!,
@@ -250,7 +251,10 @@ end
     xτ = get_samples(cache, u, j) # xₚ(τₖ)
     x = xτ * lpv'                    # x(ζ) = x(τ) * ℓ
     dx = xτ * lpd'                   # x'(ζ) = x'(τ) * ℓ
-    return x, dx
+    return (
+        fixeltype(eltype(u), x),  # TODO: don't
+        fixeltype(eltype(u), dx),
+    )
 end
 # TODO: store ℓ (not ℓᵀ) in lpv? (Why not?)
 

diff --git a/src/utils/array_utils.jl b/src/utils/array_utils.jl
@@ -55,18 +55,14 @@ fixeltype(::Type{T}, v::AbstractArray{T}) where {T} = v
     end
 end
 
-#=
-@generated function fixeltype(::Type{E}, M::SMatrix) where {E}
-    s = Size(M)
-    S1 = s[1]
-    S2 = s[2]
+@generated function fixeltype(::Type{E}, M::SMatrix{S1, S2, Any}
+                              ) where {E, S1, S2}
     L = S1 * S2
     values = [:(M[$i]) for i in 1:L]
     quote
         SMatrix{$S1, $S2, $E}($(values...))
     end
 end
-=#
 
 isalmostzero(xs::AbstractArray, atol) = all(x -> isalmostzero(x, atol), xs)
 isalmostzero(x, atol) = abs(x) < atol