Fix conflicts after merge v10

Author: vyudu

src/linearization.jl

@@ -143,17 +143,6 @@ function eq_idxs(sys::AbstractSystem)
     diff_idxs, alge_idxs
 end
 
-"""
-Return the set of indexes of differential equations and algebraic equations in the simplified system.
-"""
-function eq_idxs(sys::AbstractSystem)
-    eqs = equations(sys)
-    alge_idxs = findall(!isdiffeq, eqs)
-    diff_idxs = setdiff(1:length(eqs), alge_idxs)
-
-    diff_idxs, alge_idxs
-end
-
 """
     $(TYPEDEF)
 
@@ -618,7 +607,7 @@ function markio!(state, orig_inputs, inputs, outputs, disturbances; check = true
         end
         (all(values(outputset)) || error(
             "Some specified outputs were not found in system. The following Dict indicates the found variables ",
-            outputset))
+        outputset))
     end
     state, orig_inputs
 end

test/downstream/linearize.jl

@@ -87,10 +87,10 @@ connections = [f.y ~ c.r # filtered reference to controller reference
 
 @named cl = ODESystem(connections, t, systems = [f, c, p])
 
-lsys0, ssys = linearize(cl, [f.u], [p.x])
+lsys0, ssys = linearize(cl)
 desired_order = [f.x, p.x]
 lsys = ModelingToolkit.reorder_unknowns(lsys0, unknowns(ssys), desired_order)
-lsys1, ssys = linearize(cl, [f.u], [p.x]; autodiff = AutoFiniteDiff())
+lsys1, ssys = linearize(cl; autodiff = AutoFiniteDiff())
 lsys2 = ModelingToolkit.reorder_unknowns(lsys1, unknowns(ssys), desired_order)
 
 @test lsys.A == lsys2.A == [-2 0; 1 -2]
@@ -266,7 +266,7 @@ closed_loop = ODESystem(connections, t, systems = [model, pid, filt, sensor, r,
         filt.xd => 0.0
     ])
 
-@test_nowarn linearize(closed_loop, :r, :y; warn_empty_op = false)
+@test_nowarn linearize(closed_loop; warn_empty_op = false)
 
 # https://discourse.julialang.org/t/mtk-change-in-linearize/115760/3
 @mtkmodel Tank_noi begin