correction of plot_DCont_branch

Author: rveltz

ext/GLMakieExt/GLMakieExt.jl

@@ -21,7 +21,9 @@ module GLMakieExt
                            get_color,
                            colorbif,
                            get_plot_backend,
-                           BK_Makie
+                           BK_Makie,
+                           plotAllDCBranch,
+                           plot_DCont_branch
 
     # TODO block precompilation
     get_plot_backend() = BK_Makie()

ext/GLMakieExt/plot.jl

@@ -239,4 +239,13 @@ function _plot_bifdiag_makie!(ax, bd::Vector{BifDiagNode}; code = (), level = (-
         _plot_bifdiag_makie!(ax, b; code, level, k... )
     end
 end
-####################################################################################################
+####################################################################################################
+plotAllDCBranch(branches) = plot(branches...)
+
+function plot_DCont_branch(::BK_Makie,
+                            branches, 
+                            nbrs::Int, 
+                            nactive::Int,
+                            nstep::Int)
+    plot(branches...)
+end

ext/PlotsExt/PlotsExt.jl

@@ -16,7 +16,10 @@ module PlotsExt
                            _hasstability,
                            filter_bifurcations,
                            get_color,
-                           AbstractResult
+                           AbstractResult,
+                           BK_NoPlot, BK_Plots,
+                           plotAllDCBranch,
+                           plot_DCont_branch
 
     include("plot.jl")
 end

ext/PlotsExt/plot.jl

@@ -41,7 +41,24 @@ function plot_branch_cont(contres::ContResult,
                 label = "",
                 subplot = 2) |> display
 end
+####################################################################################################
+plotAllDCBranch(branches) = display(plot(branches..., label = ""))
 
+function plot_DCont_branch(::Union{BK_Plots, BK_NoPlot},
+                            branches, 
+                            nbrs::Int, 
+                            nactive::Int,
+                            nstep::Int)
+    plot(branches...; label = "", title  = "$nbrs branches, actives = $(nactive), step = $nstep")
+    for br in branches
+    (length(br) > 1) && plot!([br.branch[end-1:end].param], 
+            [getproperty(br.branch,1)[end-1:end]], 
+            label = "", arrow = true, color = :red)
+    end
+    scatter!([br.branch[1].param for br in branches], 
+             [br.branch[1][1] for br in branches], 
+              marker = :cross, color=:green, label = "") |> display
+end
 ####################################################################################################
 # plotting function of the periodic orbits
 function plot_periodic_potrap(x, M, Nx, Ny; ratio = 2, kwargs...)

src/DeflatedContinuation.jl

@@ -166,26 +166,8 @@ function get_states_contResults(iter::DefContIterable, roots::Vector{Tvec}) wher
 end
 
 # plotting functions
-function plot_DCont_branch(branches, 
-                            nbrs::Int, 
-                            nactive::Int,
-                            nstep::Int)
-    _bcd_plot = get_plot_backend()
-    if _bcd_plot == BK_Plots()
-        plot(branches...; label = "", title  = "$nbrs branches, actives = $(nactive), step = $nstep")
-    else
-        plot(branches...)
-    end
-    for br in branches
-        (length(br) > 1 && _bcd_plot == BK_Plots()) && plot!([br.branch[end-1:end].param], 
-                                [getproperty(br.branch,1)[end-1:end]], 
-                                label = "", arrow = true, color = :red)
-    end
-    _bcd_plot == BK_Plots() && scatter!([br.branch[1].param for br in branches], 
-             [br.branch[1][1] for br in branches], 
-             marker = :cross, color=:green, label = "") |> display
-end
-plotAllDCBranch(branches) = display(plot(branches..., label = ""))
+function plotAllDCBranch end
+function plot_DCont_branch end
 
 
 """
@@ -316,7 +298,7 @@ function deflatedContinuation(dcIter::DefContIterable,
         # number of active branches
         nactive = mapreduce(isactive, +, dcstates)
         if plot && mod(nstep, contParams.plot_every_step) == 0
-            plot_DCont_branch(branches, nbrs, nactive, nstep)
+            plot_DCont_branch(get_plot_backend(), branches, nbrs, nactive, nstep)
         end
 
         # only look for new branches if the number of active branches is too small