handle cases with more than one analysis point

Author: baggepinnen

src/Blocks/analysis_points.jl

@@ -149,6 +149,7 @@ function get_sensitivity(sys, ap::AnalysisPoint; kwargs...)
     end
     @set! sys.eqs = new_eqs
     @set! sys.states = [states(sys); d]
+    sys = expand_analysis_points(sys)
     ModelingToolkit.linearize(sys, [d], [ap.out.u]; kwargs...)
 end
 
@@ -172,6 +173,7 @@ function get_comp_sensitivity(sys, ap::AnalysisPoint; kwargs...)
     end
     @set! sys.eqs = new_eqs
     @set! sys.states = [states(sys); d]
+    sys = expand_analysis_points(sys)
     ModelingToolkit.linearize(sys, [d], [ap.in.u]; kwargs...)
 end
 
@@ -193,6 +195,7 @@ function get_looptransfer(sys, ap::AnalysisPoint; kwargs...)
         0 ~ 0 # we just want to open the connection
     end
     @set! sys.eqs = new_eqs
+    sys = expand_analysis_points(sys)
     ModelingToolkit.linearize(sys, [ap.out.u], [ap.in.u]; kwargs...)
 end
 

test/Blocks/test_analysis_points.jl

@@ -77,3 +77,13 @@ matrices, _ = linearize(open_sys, [u], [y])
 @test matrices.A[] == -1
 @test matrices.B[] * matrices.C[] == -1 # either one negative
 @test matrices.D[] == 0
+
+# Test with more than one AnalysisPoint
+eqs = [connect(P.output, :plant_output, C.input)
+       connect(C.output, :plant_input, P.input)]
+sys = ODESystem(eqs, t, systems = [P, C], name = :hej)
+
+matrices, _ = get_sensitivity(sys, :plant_input)
+@test matrices.A[] == -2
+@test matrices.B[] * matrices.C[] == -1 # either one negative
+@test matrices.D[] == 1