diff --git a/Project.toml b/Project.toml index d7657434..303ef3db 100644 --- a/Project.toml +++ b/Project.toml @@ -52,7 +52,7 @@ JLD2 = "0.4, 0.5" Krylov = "^0.9" KrylovKit = "^0.7, ^0.8.2" LinearMaps = "2.7, ^3.0" -Makie = "^0.21, 0.22" +Makie = "^0.21, ^0.22" OrdinaryDiffEq = "^6.33" Parameters = "0.12.3" Plots = "1" diff --git a/ext/MakieExt/plot.jl b/ext/MakieExt/plot.jl index f4af308c..b2fe4c56 100644 --- a/ext/MakieExt/plot.jl +++ b/ext/MakieExt/plot.jl @@ -1,8 +1,8 @@ -using Makie: Point2f0 +using Makie: Point2f function Makie.convert_arguments(::PointBased, contres::AbstractBranchResult, vars = nothing, applytoY = identity, applytoX = identity) ind1, ind2 = get_plot_vars(contres, vars) - return ([Point2f0(i, j) for (i, j) in zip(map(applytoX, getproperty(contres.branch, ind1)), map(applytoY, getproperty(contres.branch, ind2)))],) + return ([Point2f(i, j) for (i, j) in zip(map(applytoX, getproperty(contres.branch, ind1)), map(applytoY, getproperty(contres.branch, ind2)))],) end function isplit(x::AbstractVector{T}, indices::AbstractVector{<:Integer}, splitval::Bool = true) where {T<:Real} diff --git a/src/periodicorbit/ShootingDE.jl b/src/periodicorbit/ShootingDE.jl index 2d3dba57..5f3ba897 100644 --- a/src/periodicorbit/ShootingDE.jl +++ b/src/periodicorbit/ShootingDE.jl @@ -1,4 +1,4 @@ -using SciMLBase: ODEProblem, DAEProblem, EnsembleProblem, terminate!, solve, VectorContinuousCallback, ContinuousCallback +using SciMLBase: ODEProblem, DAEProblem, EnsembleProblem, terminate!, VectorContinuousCallback, ContinuousCallback const ODEType = Union{ODEProblem, DAEProblem} function get_vector_field(prob::Union{ODEProblem, DAEProblem})