From 449094d8755f8d5e79eb0c1a8553e8238c7528d9 Mon Sep 17 00:00:00 2001 From: thorek1 Date: Thu, 30 Jan 2025 22:07:24 +0100 Subject: [PATCH] fix JET for 1.11 --- src/MacroModelling.jl | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/MacroModelling.jl b/src/MacroModelling.jl index 1975a3ee..e5fbfac4 100644 --- a/src/MacroModelling.jl +++ b/src/MacroModelling.jl @@ -925,11 +925,11 @@ function choose_matrix_format(A::ℒ.Diagonal{S, Vector{S}}; end -function choose_matrix_format(A::ℒ.Adjoint{S, <: DenseMatrix{S}}; +function choose_matrix_format(A::ℒ.Adjoint{S, M}; density_threshold::Float64 = .1, min_length::Int = 1000, tol::R = 1e-14, - multithreaded::Bool = true)::Union{Matrix{S}, SparseMatrixCSC{S, Int}, ThreadedSparseArrays.ThreadedSparseMatrixCSC{S, Int, SparseMatrixCSC{S, Int}}} where {R <: AbstractFloat, S <: Real} + multithreaded::Bool = true)::Union{Matrix{S}, SparseMatrixCSC{S, Int}, ThreadedSparseArrays.ThreadedSparseMatrixCSC{S, Int, SparseMatrixCSC{S, Int}}} where {R <: AbstractFloat, S <: Real, M <: AbstractMatrix{S}} choose_matrix_format(convert(typeof(transpose(A)),A), density_threshold = density_threshold, min_length = min_length, @@ -937,17 +937,17 @@ function choose_matrix_format(A::ℒ.Adjoint{S, <: DenseMatrix{S}}; tol = tol) end -function choose_matrix_format(A::ℒ.Adjoint{S, <: AbstractSparseMatrix{S}}; - density_threshold::Float64 = .1, - min_length::Int = 1000, - tol::R = 1e-14, - multithreaded::Bool = true)::Union{Matrix{S}, SparseMatrixCSC{S, Int}, ThreadedSparseArrays.ThreadedSparseMatrixCSC{S, Int, SparseMatrixCSC{S, Int}}} where {R <: AbstractFloat, S <: Real} - choose_matrix_format(convert(typeof(transpose(A)),A), - density_threshold = density_threshold, - min_length = min_length, - multithreaded = multithreaded, - tol = tol) -end +# function choose_matrix_format(A::ℒ.Adjoint{S, <: AbstractSparseMatrix{S}}; +# density_threshold::Float64 = .1, +# min_length::Int = 1000, +# tol::R = 1e-14, +# multithreaded::Bool = true)::Union{Matrix{S}, SparseMatrixCSC{S, Int}, ThreadedSparseArrays.ThreadedSparseMatrixCSC{S, Int, SparseMatrixCSC{S, Int}}} where {R <: AbstractFloat, S <: Real} +# choose_matrix_format(convert(typeof(transpose(A)),A), +# density_threshold = density_threshold, +# min_length = min_length, +# multithreaded = multithreaded, +# tol = tol) +# end function choose_matrix_format(A::DenseMatrix{S}; density_threshold::Float64 = .1,