Add (and utilize) a constructor for ParametricNonLinEq from ModelNonlinearEquation

Author: martinholters

src/ACME.jl

@@ -127,6 +127,16 @@ end
 nn(nleq::ModelNonlinearEquation) = size(nleq.fq, 2)
 np(nleq::ModelNonlinearEquation) = size(nleq.pexp, 2)
 nq(nleq::ModelNonlinearEquation) = size(nleq.pexp, 1)
+expand_p(nleq::ModelNonlinearEquation, p) = nleq.q0 + nleq.pexp * p
+evaluate(nleq::ModelNonlinearEquation, pfull, z) = nleq.func(pfull, nleq.fq, z)
+calc_Jp(nleq::ModelNonlinearEquation, Jq) = Jq * nleq.pexp
+function ParametricNonLinEq(nleq::ModelNonlinearEquation)
+    return ParametricNonLinEq{nn(nleq), np(nleq), nq(nleq)}(
+        (pfull, z) -> evaluate(nleq, pfull, z),
+        (p) -> expand_p(nleq, p),
+        (Jq) -> calc_Jp(nleq, Jq),
+    )
+end
 
 mutable struct DiscreteModel{Solvers}
     a::Matrix{Float64}
@@ -246,15 +256,7 @@ function DiscreteModel(circ::Circuit, t::Real, ::Type{Solver}=HomotopySolver{Cac
     ]
 
     solvers = Tuple(
-        Solver(
-            ParametricNonLinEq{nn(nleq), np(nleq), nq(nleq)}(
-                (pfull, z) -> nleq.func(pfull, nleq.fq, z),
-                (p) -> nleq.q0 + nleq.pexp * p,
-                (Jq) -> Jq * nleq.pexp,
-            ),
-            zeros(np(nleq)),
-            init_z,
-        )
+        Solver(ParametricNonLinEq(nleq), zeros(np(nleq)), init_z)
         for (nleq, init_z) in zip(nonlinear_eqs, init_zs)
     )
     return DiscreteModel(mats, nonlinear_eqs, solvers)