Skip to content

Commit

Permalink
Merge pull request #206 from BambOoxX/fix-makie-0.22
Browse files Browse the repository at this point in the history
Fix makie 0.22
  • Loading branch information
rveltz authored Jan 30, 2025
2 parents 2b754ea + 8826f51 commit dd3d716
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions ext/MakieExt/plot.jl
Original file line number Diff line number Diff line change
@@ -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}
Expand Down
2 changes: 1 addition & 1 deletion src/periodicorbit/ShootingDE.jl
Original file line number Diff line number Diff line change
@@ -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})
Expand Down

0 comments on commit dd3d716

Please sign in to comment.