Move special_points function to base/tools.jl

tkf · Jun 23, 2018 · 98b8cf7 · 98b8cf7
1 parent eab0da4
commit 98b8cf7
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/src/base/base.jl b/src/base/base.jl
@@ -6,5 +6,6 @@ include("problem.jl")
 include("solution.jl")
 include("solver.jl")
 include("interface.jl")
+include("tools.jl")
 include("display.jl")
 end  # module
diff --git a/src/base/tools.jl b/src/base/tools.jl
@@ -0,0 +1,4 @@
+special_points(solver::BifurcationSolver) = special_points(solver.sol)
+special_points(sol::BifurcationSolution) =
+    [point for sweep in sol.sweeps for point in special_points(sweep)]
+special_points(sweep::BifurcationSweep) = sweep.special_points
diff --git a/src/codim1/resolve_point.jl b/src/codim1/resolve_point.jl
@@ -1,6 +1,6 @@
 using Parameters: @unpack
 using ..Continuations: find_zero!
-using ..BifurcationsBase: AbstractSpecialPoint
+using ..BifurcationsBase: AbstractSpecialPoint, special_points
 
 resolved_points(solver::Codim1Solver) =
     [resolve_point(point, solver) for point in special_points(solver)]

diff --git a/src/codim1/tools.jl b/src/codim1/tools.jl
@@ -59,8 +59,3 @@ function curves_by_stability(sol::Codim1Solution)
     end
     return info, curves
 end
-
-special_points(solver::Codim1Solver) = special_points(solver.sol)
-special_points(sol::Codim1Solution) =
-    [point for sweep in sol.sweeps for point in special_points(sweep)]
-special_points(sweep::Codim1Sweep) = sweep.special_points
diff --git a/src/plotting.jl b/src/plotting.jl
@@ -2,9 +2,10 @@ using RecipesBase
 
 using .Continuations: as, ContinuationSweep,
     ContinuationSolution, sweeps_as_vectors
+using .BifurcationsBase: special_points
 using .Codim1: Codim1Sweep, Codim1Solution, Codim1Solver,
     stabilities, curves_by_stability,
-    SpecialPoint, SpecialPointInterval, special_points, resolved_points
+    SpecialPoint, SpecialPointInterval, resolved_points
 
 const AbstractSweep = Union{ContinuationSweep, Codim1Sweep}