List example modules, instead of problems

tkf · Jul 1, 2018 · 4bbb213 · 4bbb213
1 parent 82c67ef
commit 4bbb213
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/src/examples/examples.jl b/src/examples/examples.jl
@@ -6,11 +6,18 @@ include("calcium.jl")
 include("predator_prey.jl")
 include("bazykin_85.jl")
 
-const PROBLEMS = [
-    Pitchfork.prob,
-    Transcritical.prob,
-    Calcium.prob,
-    PredatorPrey.prob,
-    Bazykin85.prob,
+using Compat
+
+example_modules() = [
+    Pitchfork,
+    Transcritical,
+    Calcium,
+    PredatorPrey,
+    Bazykin85,
 ]
+
+examples() = [nameof(ex) => ex for ex in example_modules()]
+
 end  # module
+
+using .Examples: examples
diff --git a/test/test_examples.jl b/test/test_examples.jl
@@ -3,7 +3,7 @@ include("preamble.jl")
 
 using Bifurcations: Codim1, resolved_points
 using Bifurcations.Continuations: find_errors, print_errors
-using Bifurcations.Examples: PROBLEMS
+using Bifurcations: examples
 using Bifurcations.Examples.Calcium: CalciumParam
 using Bifurcations.Examples.Bazykin85: Bazykin85Param
 
@@ -31,7 +31,8 @@ function make_codim2(::Bazykin85Param, point, solver1)
     )
 end
 
-@testset "PROBLEMS[$i]" for (i, prob1) in enumerate(PROBLEMS)
+@testset "example $name" for (name, ex) in examples()
+    prob1 = ex.prob
     solver1 = init(prob1)
     solve!(solver1)
     errors = find_errors(solver1)

diff --git a/test/test_smoke.jl b/test/test_smoke.jl
@@ -2,9 +2,10 @@ module TestSmoke
 include("preamble_plots.jl")
 
 using Bifurcations.Codim1: resolved_points, SpecialPoint
-using Bifurcations.Examples: PROBLEMS
+using Bifurcations: examples
 
-@testset "smoke PROBLEMS[$i]" for (i, prob) in enumerate(PROBLEMS)
+@testset "smoke $name" for (name, ex) in examples()
+    prob = ex.prob
     solver = init(prob)
     solve!(solver)
     points = resolved_points(solver)