Polishing examples.

Examples/CS1_1.jl

@@ -4,6 +4,7 @@ using JLD2
 
 ## CS1_1  - Case-study example: Monitoring flight actuator faults
 #           No measurements of control surface angles are used
+println("Case study CS1_1 with Fig8.2 and Fig8.3")
 
 ## Part 1 - Model setup
 # load matrices of the aircraft multiple-model SYSACM, 
@@ -137,9 +138,9 @@ y = [stepresp(Rtot[i][:,indf],10)[1] for i in 1:N];
 include("Fig8_3.jl")
 Fig8_3 = f
 
-#export Fig8_2, Fig8_3
-
 end  # module
 
 using Main.CS1_1
+CS1_1.Fig8_2
+CS1_1.Fig8_3
 

Examples/CS1_2.jl

@@ -4,7 +4,7 @@ using JLD2
 
 ## CS1_2 - Case-study example: Monitoring flight actuator faults
 #          Local measurements of control surface angles are used
-println("Case study CS1_2")
+println("Case study CS1_2 with Fig8.4")
 
 ## Part 1 - Model setup
 # load matrices of the aircraft multiple-model SYSACM, 
@@ -123,8 +123,6 @@ tout = Vector(0:0.02:2.)
 include("Fig8_4.jl")
 Fig8_4 = f
 
-export Fig8_4
-
 end  # module
 using Main.CS1_2
-
+CS1_2.Fig8_4 

Examples/CS2_1.jl

@@ -5,7 +5,7 @@ using FaultDetectionTools, DescriptorSystems, LinearAlgebra,
 
 ## CS2_1  - Case-study example: Monitoring air data sensor faults
 #           Robust least order LTI synthesis
-println("Case study CS2_1")
+println("Case study CS2_1 with Fig8.5, Fig8.6 and Fig8.7")
 
 ## Part 1 - Model setup
 # load matrices of the aircraft multiple-model SYSACSM and 
@@ -198,9 +198,9 @@ tout = Vector(0:0.1:10.)
 include("Fig8_7.jl")
 Fig8_7 = f
 
-export Fig8_5, Fig8_6, Fig8_7
-
 end  # module
 using Main.CS2_1
-
+CS2_1.Fig8_5
+CS2_1.Fig8_6
+CS2_1.Fig8_7
 

Examples/CS2_2.jl

@@ -4,7 +4,7 @@ using FaultDetectionTools, DescriptorSystems, LinearAlgebra,
 
 ## CS2_2  - Case-study example: Monitoring air data sensor faults
 #           Robust least order LPV synthesis
-println("Case study CS2_2")
+println("Case study CS2_2 with Fig8.8")
 
 ## Part 1 - Model setup
 # load matrices of the aircraft multiple-model SYSACM 
@@ -88,9 +88,8 @@ tout = Vector(0:0.1:10.)
 include("Fig8_8.jl")
 Fig8_8 = f
 
-export Fig8_8
-
 end  # module
 using Main.CS2_2
+CS2_2.Fig8_8 
 
 

Examples/Ex5_10.jl

@@ -57,3 +57,4 @@ R = FDIFilterIF(scale .* Rft; mf)
 # check all gaps are infinite
 @test all(fdif2ngap(R,S)[1] .== Inf)
 end # module
+using Main.Ex5_10

Examples/Ex5_11.jl

@@ -61,3 +61,4 @@ println("R = "); display(R)
 @test fdif2ngap(R,S)[1] ≈ [3,Inf]     # check gap
 
 end # module
+using Main.Ex5_11

Examples/Ex5_11c.jl

@@ -44,3 +44,4 @@ indfn = [Rt.faults;Rt.noise]
       iszero(vcat(Rt.sys...)[:,indfn]-vcat(R.sys...); atol) &&
       fdif2ngap(R,SFDI)[1] ≈ info.gap ≈ [3,Inf]
 end # module
+using Main.Ex5_11c

Examples/Ex5_12.jl

@@ -45,3 +45,4 @@ Qbar = glsol(Ge, Me; atol)[1]
 
 
 end # module
+using Main.Ex5_12

Examples/Ex5_13a.jl

@@ -1,4 +1,4 @@
-module Ex5_13
+module Ex5_13a
 using FaultDetectionTools
 using DescriptorSystems
 using LinearAlgebra
@@ -68,3 +68,4 @@ G = dss([Gu Gf;eye(mu,mu+mf)]); F = [zeros(mf,mu) M*Mr];
 @test iszero(Q*G-F; atol)
 
 end # module
+using Main.Ex5_13a

Examples/Ex5_14.jl

@@ -34,3 +34,4 @@ println("gamma_sub  = $(info.gammasub)")   # suboptimal performance
 
 
 end # module
+using Main.Ex5_14

Examples/Ex5_15.jl

@@ -35,3 +35,4 @@ println("gamma_sub_∞  = $(fdimmperf(R, info.M*Mr))")   # suboptimal performanc
 
 
 end # module
+using Main.Ex5_15

Examples/Ex5_16.jl

@@ -71,3 +71,4 @@ err_opt = glinfnorm(Qopt*G-F)[1]
 @test err_sub-err_opt < 0.002
 
 end # module
+using Main.Ex5_16

Examples/Ex5_16c.jl

@@ -2,7 +2,7 @@ module Ex5_16c
 using FaultDetectionTools, DescriptorSystems, Measurements, Test
 
 # Example 5.16c - Solution of an H∞ AMMP 
-println("Example 5.16c")
+println("Example 5.16c with Fig5.2")
 
 # define system with control, noise and actuator fault inputs 
 A = [-.8 0 0; 0 -.5 .6; 0 -.6 -.5]
@@ -56,8 +56,6 @@ yl = y .- yerr; yu = y .+ yerr  # lower and upper bounds
 include("Fig5_2.jl")
 Fig5_2 = f
 
-export Fig5_2
-
 end
 using Main.Ex5_16c
-
+Ex5_16c.Fig5_2

Examples/Ex5_17.jl

@@ -34,3 +34,4 @@ Ge = [sysf.sys[:,[sysf.faults;sysf.noise]]; zeros(mu,mf+mw)]; Me = [info.M*Mr.sy
 
 
 end # module
+using Main.Ex5_17

Examples/Ex5_4.jl

@@ -40,3 +40,4 @@ else
 end
 
 end # module
+using Main.Ex5_4

Examples/Ex5_5.jl

@@ -39,3 +39,4 @@ R = fdIFeval(Q, sysf; minimal = true, atol = 1.e-7)
 
 
 end # module
+using Main.Ex5_5

Examples/Ex5_6.jl

@@ -58,3 +58,4 @@ else
 end
 
 end # module
+using Main.Ex5_6

Examples/Ex5_7.jl

@@ -43,3 +43,4 @@ R = fdIFeval(Q, sysf; minimal = true, atol = 1.e-7)
 
 
 end # module
+using Main.Ex5_7

Examples/Ex5_9.jl

@@ -44,3 +44,4 @@ R = fdIFeval(Q, sysf; minimal = true, atol = 1.e-7)
 
 
 end # module
+using Main.Ex5_9

Examples/Ex6_1.jl

@@ -76,3 +76,4 @@ println("Norms of final residual models")
 display(distinf1)
 
 end # module
+using Main.Ex6_1

Examples/Ex6_1c.jl

@@ -2,7 +2,7 @@ module Ex6_1c
 using FaultDetectionTools, DescriptorSystems, LinearAlgebra, Test
 
 # Example 6.1c - Solution of an EMDP
-println("Example 6.1c")
+println("Example 6.1c with Fig6.1 and Fig6.2")
 
 # Lateral aircraft model without faults
 A = [-.4492 0.046 .0053 -.9926;
@@ -47,7 +47,7 @@ Fig6_1 = fig1
 include("Fig6_2.jl")
 Fig6_2 = fig2
 
-export Fig6_1, Fig6_2
-
 end
 using Main.Ex6_1c
+Ex6_1c.Fig6_1
+Ex6_1c.Fig6_2

Examples/Ex6_2.jl

@@ -71,3 +71,4 @@ println("Resulting gaps")
 display(gap)
 
 end # module
+using Main.Ex6_2

Examples/Ex6_2c.jl

@@ -3,7 +3,7 @@ module Ex6_2c
 using FaultDetectionTools, DescriptorSystems, LinearAlgebra, Test
 
 # Example 6.2c - Solution of an AMDP
-println("Example 6.2c")
+println("Example 6.2c with Fig6.3")
 
 # Lateral aircraft model without faults
 A = [-.4492 0.046 .0053 -.9926;
@@ -46,7 +46,6 @@ display(info.MDgap)
 include("Fig6_3.jl")
 Fig6_3 = fig
 
-export Fig6_3
-
 end
 using Main.Ex6_2c
+Ex6_2c.Fig6_3

Examples/Ex7_1.jl

@@ -1,7 +1,12 @@
 module Ex7_1
-# Generation of Fig7_1 with CairoMakie for Ex7_1
+
 using Makie, CairoMakie, LaTeXStrings
 using DescriptorSystems, Polynomials
+Makie.inline!(false)
+
+# Example 7.1 - Illustrating polynomial root sensitivity 
+println("Example 7.1 with Fig7_1")
+
 
 Makie.inline!(false)
 pexact = Vector(-25.:1.:-1.)
@@ -25,12 +30,10 @@ axislegend()
 
 Fig7_1 = fig     
 
-export Fig7_1
-
-
 # comment out next line to save plot
 #save("Fig7_1.pdf", fig, resolution = (600, 600))
 
 end
 using Main.Ex7_1
+Ex7_1.Fig7_1
 

Examples/Ex7_1a.jl

@@ -1,9 +1,13 @@
 module Ex7_1a
-# Generation of Fig7_1a with CairoMakie for Ex7_1
+
 using Makie, CairoMakie, LaTeXStrings
+using DescriptorSystems, Polynomials, GenericLinearAlgebra
 Makie.inline!(false)
 
-using DescriptorSystems, Polynomials, GenericLinearAlgebra
+
+# Example 7.1 - Illustrating high precision polynomial root computation 
+println("Example 7.1 with alternative Fig7_1a")
+
 
 pexact = BigFloat.(Vector(-25.:1.:-1.))
 g = rtf(1,Polynomial(fromroots(pexact),:s))
@@ -20,16 +24,13 @@ h2 = scatter!(ax, real(poles), imag(poles), color = :red, label = "Perturbed pol
 h2.marker = :star6
 xlims!.(ax, low = -30, high = 0) 
 ylims!.(ax, low = -15, high =15) 
-
 axislegend()
 
-
 Fig7_1a = fig     
 
-export Fig7_1a
-
 # comment out next line to save plot
 #save("Fig7_1a.pdf", fig, resolution = (600, 600))
 
 end
 using Main.Ex7_1a
+Ex7_1a.Fig7_1a

Examples/Ex7_3.jl

@@ -1,7 +1,7 @@
 module Ex7_3
 using DescriptorSystems, LinearAlgebra
 
-# Example 7.3 - Nullspace-based synthesis 
+# Example 7.3 - Illustrating nullspace-based synthesis paradigm
 # Uses only DescriptorSystems.jl 
 println("Example 7.3")
 

Examples/Ex7_3c.jl

@@ -34,3 +34,4 @@ println("Q = $(dss2rm(Q.sys))")
 println("Rf = $(dss2rm(Rf.sys))")
 
 end # module
+using Main.Ex7_3c

Examples/Ex7_4.jl

@@ -1,7 +1,7 @@
 module Ex7_4
 using DescriptorSystems, Test
 
-# Example 7.4 - Nullspace-based synthesis 
+# Example 7.4 - Illustrating least-order synthesis paradigm 
 # Uses only DescriptorSystems.jl 
 println("Example 7.4")
 

Examples/Ex7_4c.jl

@@ -38,3 +38,4 @@ println("rscond1 = $rscond1 ")
 println("rscond2 = $rscond2")
 
 end # module
+using Main.Ex7_4c

Examples/runbookexamples.jl

@@ -14,6 +14,6 @@ include("Ex6_1c.jl")  # solving EMDP
 include("Ex6_2c.jl")  # solving AMDP
 # Chapter 7
 include("Ex7_1.jl")   # Example for high sensitivity of polynomial poles
-include("Ex7_1a.jl")  # Example for high sensitivity of polynomial poles
-include("Ex7_3.jl")
-include("Ex7_4.jl")
+include("Ex7_1a.jl")  # Example for high precision pole computation
+include("Ex7_3.jl")   # Illustrating nullspace-based synthesis paradigm
+include("Ex7_4.jl")   # Illustrating least-order synthesis paradigm

Examples/runexamples.jl

@@ -1,6 +1,5 @@
 using FaultDetectionTools
 
-@testset "Examples" begin
 # LPV to noise inputs
 include("Ex2_4.jl")
 # solving EFDP