From 53a217cff62f840beaaff5d26d906790ffc0df71 Mon Sep 17 00:00:00 2001 From: DSVarga Date: Wed, 24 Jan 2024 15:46:16 +0100 Subject: [PATCH] Version bump. --- .github/workflows/CI.yml | 8 ++++---- Project.toml | 1 + src/FDIsynthesis.jl | 8 ++++---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index a7d8ce4..5dc827c 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -16,13 +16,13 @@ jobs: fail-fast: false matrix: version: - - '1.8' - - '1.9' + # - '1.8' + # - '1.9' - '1' - - 'nightly' + #- 'nightly' os: - ubuntu-latest - - windows-latest + #- windows-latest arch: - x64 steps: diff --git a/Project.toml b/Project.toml index b328095..46d6753 100644 --- a/Project.toml +++ b/Project.toml @@ -16,6 +16,7 @@ Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" Combinatorics = "1.0" DescriptorSystems = "1.4" JLD2 = "0.4" +LinearAlgebra = "1" MatrixEquations = "2.0" MatrixPencils = "1.8" Measurements = "2.11" diff --git a/src/FDIsynthesis.jl b/src/FDIsynthesis.jl index ff6d08f..5fbac3d 100644 --- a/src/FDIsynthesis.jl +++ b/src/FDIsynthesis.jl @@ -840,10 +840,10 @@ function efdisyn(sysf::FDIModel{T}, SFDI::Union{BitMatrix,BitVector,Array{Bool,2 sdeg::Union{Real,Missing} = missing, smarg::Union{Real,Missing} = missing, nullspace::Bool = true, minimal::Bool = true, simple::Bool = false, separate::Bool = false, FDtol::Real = 0.0001, FDGainTol::Real = 0.01, FDfreq::Union{AbstractVector{<:Real},Real,Missing} = missing, - tcond::Real = 1.e4, HDesign::Union{Vector{Matrix{T1}},Missing} = missing, + tcond::Real = 1.e4, HDesign::Union{Vector{Matrix{<:Real}},Missing} = missing, offset::Real = sqrt(eps(float(real(T)))), atol::Real = zero(float(real(T))), atol1::Real = atol, atol2::Real = atol, atol3::Real = atol, rtol::Real = ((size(sysf.sys.A,1)+1)*eps(real(float(one(T)))))*iszero(max(atol1,atol2)), - fast::Bool = true) where {T, T1 <: Real} + fast::Bool = true) where {T} Ts = sysf.sys.Ts disc = (Ts != 0); # system type (continuous- or discrete-time) @@ -2669,11 +2669,11 @@ function afdisyn(sysf::FDIModel{T}, SFDI::Union{BitMatrix,BitVector,Array{Bool,2 sdeg::Union{Real,Missing} = missing, smarg::Union{Real,Missing} = missing, nullspace::Bool = true, minimal::Bool = true, simple::Bool = false, separate::Bool = false, FDtol::Real = 0.0001, FDGainTol::Real = 0.01, FDfreq::Union{AbstractVector{<:Real},Real,Missing} = missing, - tcond::Real = 1.e4, HDesign::Union{Vector{Matrix{T1}},Missing} = missing, HDesign2::Union{Vector{Matrix{T2}},Missing} = missing, + tcond::Real = 1.e4, HDesign::Union{Vector{Matrix{<: Real}},Missing} = missing, HDesign2::Union{Vector{Matrix{<: Real}},Missing} = missing, offset::Real = sqrt(eps(float(real(T)))), atol::Real = zero(float(real(T))), atol1::Real = atol, atol2::Real = atol, atol3::Real = atol, rtol::Real = ((size(sysf.sys.A,1)+1)*eps(real(float(one(T)))))*iszero(max(atol1,atol2)), fast::Bool = true, exact::Bool = false, gamma::Real = 1, epsreg::Real = 0.1, - sdegzer::Union{Real,Missing} = missing, nonstd::Int = 1, freq::Real = rand(), scale2::Union{Vector{Real},Missing} = missing) where {T, T1 <: Real, T2 <: Real} + sdegzer::Union{Real,Missing} = missing, nonstd::Int = 1, freq::Real = rand(), scale2::Union{Vector{Real},Missing} = missing) where {T} Ts = sysf.sys.Ts disc = (Ts != 0); # system type (continuous- or discrete-time)