Skip to content

Commit 84d0eb3

Browse files
TorkelETorkelE
committed
merge fix
1 parent d1cb46b commit 84d0eb3

File tree

1 file changed

+68
-63
lines changed

1 file changed

+68
-63
lines changed

‎test/runtests.jl

+68-63
Original file line numberDiff line numberDiff line change
@@ -10,68 +10,73 @@ using SafeTestsets, Test
1010
### Run Tests ###
1111
@time begin
1212

13-
# Tests the `ReactionSystem` structure and its properties.
14-
@time @safetestset "Reaction Structure" begin include("reactionsystem_core/reaction.jl") end
15-
@time @safetestset "ReactionSystem Structure" begin include("reactionsystem_core/reactionsystem.jl") end
16-
@time @safetestset "Higher Order Reactions" begin include("reactionsystem_core/higher_order_reactions.jl") end
17-
@time @safetestset "Symbolic Stoichiometry" begin include("reactionsystem_core/symbolic_stoichiometry.jl") end
18-
@time @safetestset "Parameter Type Designation" begin include("reactionsystem_core/parameter_type_designation.jl") end
19-
@time @safetestset "Custom CRN Functions" begin include("reactionsystem_core/custom_crn_functions.jl") end
20-
@time @safetestset "Coupled CRN/Equation Systems" begin include("reactionsystem_core/coupled_equation_crn_systems.jl") end
21-
@time @safetestset "Events" begin include("reactionsystem_core/events.jl") end
22-
23-
# Tests model creation via the @reaction_network DSL.
24-
@time @safetestset "DSL Basic Model Construction" begin include("dsl/dsl_basic_model_construction.jl") end
25-
@time @safetestset "DSL Advanced Model Construction" begin include("dsl/dsl_advanced_model_construction.jl") end
26-
@time @safetestset "DSL Options" begin include("dsl/dsl_options.jl") end
27-
28-
# Tests compositional and hierarchical modelling.
29-
@time @safetestset "ReactionSystem Components Based Creation" begin include("compositional_modelling/component_based_model_creation.jl") end
30-
31-
# Tests various miscellaneous features.
32-
@time @safetestset "API" begin include("miscellaneous_tests/api.jl") end
33-
@time @safetestset "Units" begin include("miscellaneous_tests/units.jl") end
34-
@time @safetestset "Compound Species" begin include("miscellaneous_tests/compound_macro.jl") end
35-
@time @safetestset "Reaction Balancing" begin include("miscellaneous_tests/reaction_balancing.jl") end
36-
@time @safetestset "ReactionSystem Serialisation" begin include("miscellaneous_tests/reactionsystem_serialisation.jl") end
37-
38-
# Tests reaction network analysis features.
39-
@time @safetestset "Conservation Laws" begin include("network_analysis/conservation_laws.jl") end
40-
@time @safetestset "Network Properties" begin include("network_analysis/network_properties.jl") end
41-
42-
# Tests ODE, SDE, jump simulations, nonlinear solving, and steady state simulations.
43-
@time @safetestset "ODE System Simulations" begin include("simulation_and_solving/simulate_ODEs.jl") end
44-
@time @safetestset "Automatic Jacobian Construction" begin include("simulation_and_solving/jacobian_construction.jl") end
45-
@time @safetestset "SDE System Simulations" begin include("simulation_and_solving/simulate_SDEs.jl") end
46-
@time @safetestset "Jump System Simulations" begin include("simulation_and_solving/simulate_jumps.jl") end
47-
@time @safetestset "Nonlinear and SteadyState System Solving" begin include("simulation_and_solving/solve_nonlinear.jl") end
48-
49-
# Tests upstream SciML and DiffEq stuff.
50-
@time @safetestset "MTK Structure Indexing" begin include("upstream/mtk_structure_indexing.jl") end
51-
@time @safetestset "MTK Problem Inputs" begin include("upstream/mtk_problem_inputs.jl") end
52-
53-
# Tests network visualisation.
54-
@time @safetestset "Latexify" begin include("visualisation/latexify.jl") end
55-
# Disable on Macs as can't install GraphViz via jll
56-
if !Sys.isapple()
57-
@time @safetestset "Graphs Visualisations" begin include("visualisation/graphs.jl") end
58-
end
59-
60-
# Tests extensions.
61-
@time @safetestset "BifurcationKit Extension" begin include("extensions/bifurcation_kit.jl") end
62-
@time @safetestset "HomotopyContinuation Extension" begin include("extensions/homotopy_continuation.jl") end
63-
@time @safetestset "Structural Identifiability Extension" begin include("extensions/structural_identifiability.jl") end
64-
65-
# Tests stability computation (uses HomotopyContinuation extension).
66-
@time @safetestset "Steady State Stability Computations" begin include("miscellaneous_tests/stability_computation.jl") end
67-
68-
# Tests spatial modelling and simulations.
69-
@time @safetestset "PDE Systems Simulations" begin include("spatial_modelling/simulate_PDEs.jl") end
70-
@time @safetestset "Spatial Reactions" begin include("spatial_modelling/spatial_reactions.jl") end
71-
@time @safetestset "Lattice Reaction Systems" begin include("spatial_modelling/lattice_reaction_systems.jl") end
72-
@time @safetestset "Spatial Lattice Variants" begin include("spatial_modelling/lattice_reaction_systems_lattice_types.jl") end
73-
@time @safetestset "ODE Lattice Systems Simulations" begin include("spatial_modelling/lattice_reaction_systems_ODEs.jl") end
74-
@time @safetestset "Jump Lattice Systems Simulations" begin include("spatial_modelling/lattice_reaction_systems_jumps.jl") end
75-
@time @safetestset "Jump Solution Interfacing" begin include("spatial_modelling/lattice_solution_interfacing.jl") end
13+
#if GROUP == "All" || GROUP == "ModelCreation"
14+
# Tests the `ReactionSystem` structure and its properties.
15+
@time @safetestset "Reaction Structure" begin include("reactionsystem_core/reaction.jl") end
16+
@time @safetestset "ReactionSystem Structure" begin include("reactionsystem_core/reactionsystem.jl") end
17+
@time @safetestset "Higher Order Reactions" begin include("reactionsystem_core/higher_order_reactions.jl") end
18+
@time @safetestset "Symbolic Stoichiometry" begin include("reactionsystem_core/symbolic_stoichiometry.jl") end
19+
@time @safetestset "Parameter Type Designation" begin include("reactionsystem_core/parameter_type_designation.jl") end
20+
@time @safetestset "Custom CRN Functions" begin include("reactionsystem_core/custom_crn_functions.jl") end
21+
# @time @safetestset "Coupled CRN/Equation Systems" begin include("reactionsystem_core/coupled_equation_crn_systems.jl") end
22+
@time @safetestset "Events" begin include("reactionsystem_core/events.jl") end
23+
24+
# Tests model creation via the @reaction_network DSL.
25+
@time @safetestset "DSL Basic Model Construction" begin include("dsl/dsl_basic_model_construction.jl") end
26+
@time @safetestset "DSL Advanced Model Construction" begin include("dsl/dsl_advanced_model_construction.jl") end
27+
@time @safetestset "DSL Options" begin include("dsl/dsl_options.jl") end
28+
29+
# Tests compositional and hierarchical modelling.
30+
@time @safetestset "ReactionSystem Components Based Creation" begin include("compositional_modelling/component_based_model_creation.jl") end
31+
#end
32+
33+
#if GROUP == "All" || GROUP == "Miscellaneous-NetworkAnalysis"
34+
# Tests various miscellaneous features.
35+
@time @safetestset "API" begin include("miscellaneous_tests/api.jl") end
36+
@time @safetestset "Units" begin include("miscellaneous_tests/units.jl") end
37+
@time @safetestset "Steady State Stability Computations" begin include("miscellaneous_tests/stability_computation.jl") end
38+
@time @safetestset "Compound Species" begin include("miscellaneous_tests/compound_macro.jl") end
39+
@time @safetestset "Reaction Balancing" begin include("miscellaneous_tests/reaction_balancing.jl") end
40+
@time @safetestset "ReactionSystem Serialisation" begin include("miscellaneous_tests/reactionsystem_serialisation.jl") end
41+
42+
# Tests reaction network analysis features.
43+
@time @safetestset "Conservation Laws" begin include("network_analysis/conservation_laws.jl") end
44+
@time @safetestset "Network Properties" begin include("network_analysis/network_properties.jl") end
45+
#end
46+
47+
#if GROUP == "All" || GROUP == "Simulation"
48+
# Tests ODE, SDE, jump simulations, nonlinear solving, and steady state simulations.
49+
@time @safetestset "ODE System Simulations" begin include("simulation_and_solving/simulate_ODEs.jl") end
50+
@time @safetestset "Automatic Jacobian Construction" begin include("simulation_and_solving/jacobian_construction.jl") end
51+
@time @safetestset "SDE System Simulations" begin include("simulation_and_solving/simulate_SDEs.jl") end
52+
@time @safetestset "Jump System Simulations" begin include("simulation_and_solving/simulate_jumps.jl") end
53+
@time @safetestset "Nonlinear and SteadyState System Solving" begin include("simulation_and_solving/solve_nonlinear.jl") end
54+
55+
# Tests upstream SciML and DiffEq stuff.
56+
@time @safetestset "MTK Structure Indexing" begin include("upstream/mtk_structure_indexing.jl") end
57+
@time @safetestset "MTK Problem Inputs" begin include("upstream/mtk_problem_inputs.jl") end
58+
#end
59+
60+
#if GROUP == "All" || GROUP == "Spatial"
61+
# Tests spatial modelling and simulations.
62+
@time @safetestset "PDE Systems Simulations" begin include("spatial_modelling/simulate_PDEs.jl") end
63+
@time @safetestset "Lattice Reaction Systems" begin include("spatial_modelling/lattice_reaction_systems.jl") end
64+
@time @safetestset "ODE Lattice Systems Simulations" begin include("spatial_modelling/lattice_reaction_systems_ODEs.jl") end
65+
@time @safetestset "Jump Lattice Systems Simulations" begin include("spatial_reaction_systems/lattice_reaction_systems_jumps.jl") end
66+
#end
67+
68+
#if GROUP == "All" || GROUP == "Visualisation-Extensions"
69+
# Tests network visualisation.
70+
@time @safetestset "Latexify" begin include("visualisation/latexify.jl") end
71+
# Disable on Macs as can't install GraphViz via jll
72+
if !Sys.isapple()
73+
@time @safetestset "Graphs Visualisations" begin include("visualisation/graphs.jl") end
74+
end
75+
76+
# Tests extensions.
77+
# @time @safetestset "BifurcationKit Extension" begin include("extensions/bifurcation_kit.jl") end
78+
# @time @safetestset "HomotopyContinuation Extension" begin include("extensions/homotopy_continuation.jl") end
79+
# @time @safetestset "Structural Identifiability Extension" begin include("extensions/structural_identifiability.jl") end
80+
#end
7681

7782
end # @time

0 commit comments

Comments
 (0)