Skip to content

Commit 62818dc

Browse files
authored
Merge pull request #1136 from isaacsas/update_test_extension_project
Update test extensions Project.toml
2 parents 4f371e6 + c35e053 commit 62818dc

File tree

5 files changed

+11
-10
lines changed

5 files changed

+11
-10
lines changed

ext/CatalystGraphMakieExtension/rn_graph_plot.jl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ function gen_distances(g::SRGraphWrap; inc = 0.2)
6060
end
6161

6262
"""
63-
plot_network(rn::ReactionSystem; interactive=false)
63+
plot_network(rn::ReactionSystem)
6464
6565
Converts a [`ReactionSystem`](@ref) into a GraphMakie plot of the species reaction graph
6666
(or Petri net representation). Reactions correspond to small green circles, and
@@ -76,7 +76,6 @@ Notes:
7676
red arrow from `A` to the reaction node. In `k*A, A+B --> C`, there would be
7777
red and black arrows from `A` to the reaction node.
7878
"""
79-
# TODO: update docs for interacting with plots. The `interactive` flag sets the ability to interactively drag nodes and edges in the generated plot. Only allowed if `GLMakie` is the loaded Makie backend.
8079
function Catalyst.plot_network(rn::ReactionSystem)
8180
srg = SRGraphWrap(rn)
8281
ns = length(species(rn))
@@ -119,7 +118,7 @@ function Catalyst.plot_network(rn::ReactionSystem)
119118
end
120119

121120
"""
122-
plot_complexes(rn::ReactionSystem; interactive=false)
121+
plot_complexes(rn::ReactionSystem)
123122
124123
Creates a GraphMakie plot of the [`ReactionComplex`](@ref)s in `rn`. Reactions
125124
correspond to arrows and reaction complexes to blue circles.

test/extensions/Project.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
[deps]
22
BifurcationKit = "0f109fa4-8a5d-4b75-95aa-f515264e7665"
3-
Catalyst = "479239e8-5488-4da2-87a7-35f2df7eef83"
43
CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
4+
Catalyst = "479239e8-5488-4da2-87a7-35f2df7eef83"
55
GraphMakie = "1ecd5474-83a3-4783-bb4f-06765db800d2"
66
Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
77
HomotopyContinuation = "f213a82b-91d6-5c5d-acf7-10f1c761b327"
88
JumpProcesses = "ccbc3e58-028d-4f4c-8cd5-9ae44345cda5"
99
ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78"
10-
OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
10+
OrdinaryDiffEqDefault = "50262376-6c5a-4cf5-baba-aaf4f84d72d7"
11+
OrdinaryDiffEqTsit5 = "b1df2697-797e-41e3-8120-5422d3b24e4a"
1112
SteadyStateDiffEq = "9672c7b4-1e72-59bd-8a11-6ac3964bc41f"
12-
# StructuralIdentifiability = "220ca800-aa68-49bb-acd8-6037fa93a544"
13+
# StructuralIdentifiability = "220ca800-aa68-49bb-acd8-6037fa93a544"

test/extensions/graphmakie.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Catalyst, GraphMakie, GLMakie, Graphs
1+
using Catalyst, GraphMakie, CairoMakie, Graphs
22
include("../test_networks.jl")
33

44
# Test that speciesreactiongraph is generated correctly
@@ -103,4 +103,3 @@ let
103103
@test count(==(Graphs.Edge(1, s+2)), edges(srg)) == 2
104104
@test count(==(Graphs.Edge(2, s+3)), edges(srg)) == 2
105105
end
106-

test/extensions/lattice_simulation_plotting.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
### Preparations ###
22

33
# Fetch packages.
4-
using Catalyst, CairoMakie, GraphMakie, Graphs, JumpProcesses, OrdinaryDiffEqDefault, OrdinaryDiffEq, Test
4+
using Catalyst, CairoMakie, GraphMakie, Graphs
5+
using JumpProcesses, OrdinaryDiffEqDefault, OrdinaryDiffEqTsit5, Test
56

67

78
### Checks Basic Plot Cases ###

test/runtests.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,15 @@ end
8585
if GROUP == "All" || GROUP == "Extensions"
8686
activate_extensions_env()
8787

88+
@time @safetestset "Graph visualization" begin include("extensions/graphmakie.jl") end
8889
@time @safetestset "BifurcationKit Extension" begin include("extensions/bifurcation_kit.jl") end
8990
@time @safetestset "HomotopyContinuation Extension" begin include("extensions/homotopy_continuation.jl") end
9091

9192
# BROKEN
9293
# @time @safetestset "Structural Identifiability Extension" begin include("extensions/structural_identifiability.jl") end
9394

9495
# Tests stability computation (but requires the HomotopyContinuation extension).
95-
@time @safetestset "Steady State Stability Computations" begin include("extensions/stability_computation.jl") end
96+
#@time @safetestset "Steady State Stability Computations" begin include("extensions/stability_computation.jl") end
9697

9798
# Test spatial plotting, using CarioMakie and GraphMakie
9899
@time @safetestset "Lattice Simulation Plotting" begin include("extensions/lattice_simulation_plotting.jl") end

0 commit comments

Comments
 (0)