Merge pull request #3102 from rveltz/master

towards BifurcationKit @0.4

Author: ChrisRackauckas

Project.toml

@@ -75,7 +75,7 @@ MTKLabelledArraysExt = "LabelledArrays"
 [compat]
 AbstractTrees = "0.3, 0.4"
 ArrayInterface = "6, 7"
-BifurcationKit = "0.3"
+BifurcationKit = "0.4"
 BlockArrays = "1.1"
 ChainRulesCore = "1"
 Combinatorics = "1"

ext/MTKBifurcationKitExt.jl

@@ -113,7 +113,7 @@ function BifurcationKit.BifurcationProblem(nsys::NonlinearSystem,
         # If the plot var is a normal state.
         if any(isequal(plot_var, var) for var in unknowns(nsys))
             plot_idx = findfirst(isequal(plot_var), unknowns(nsys))
-            record_from_solution = (x, p) -> x[plot_idx]
+            record_from_solution = (x, p; k...) -> x[plot_idx]
 
             # If the plot var is an observed state.
         elseif any(isequal(plot_var, eq.lhs) for eq in observed(nsys))
@@ -132,7 +132,7 @@ function BifurcationKit.BifurcationProblem(nsys::NonlinearSystem,
     return BifurcationKit.BifurcationProblem(F,
         u0_bif_vals,
         p_vals,
-        (@lens _[bif_idx]),
+        (BifurcationKit.@optic _[bif_idx]),
         args...;
         record_from_solution = record_from_solution,
         J = J,

test/extensions/bifurcationkit.jl

@@ -36,8 +36,8 @@ let
     bprob_BK = BifurcationProblem(f_BK,
         [1.0, 1.0],
         [-1.0, 1.0],
-        (@lens _[1]);
-        record_from_solution = (x, p) -> x[1])
+        (BifurcationKit.@optic _[1]);
+        record_from_solution = (x, p; k...) -> x[1])
     bif_dia_BK = bifurcationdiagram(bprob_BK,
         PALC(),
         2,