diff --git a/Project.toml b/Project.toml index 68541ff..394412a 100644 --- a/Project.toml +++ b/Project.toml @@ -12,6 +12,7 @@ LinearMaps = "7a12625a-238d-50fd-b39a-03d52299707e" Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01" RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd" +Reexport = "189a3867-3050-52da-a836-e630ba90ab69" StaticArrays = "90137ffa-7385-5640-81b9-e52037218182" [weakdeps] @@ -35,5 +36,6 @@ OrdinaryDiffEq = "^5.49.0, 6" Plots = "^1.10.0" RecipesBase = "1" RecursiveArrayTools = "^2.10.0" +Reexport = "1" StaticArrays = "0.12, 1.0" julia = "1.9" diff --git a/examples/CPG_examples.jl b/examples/CPG_examples.jl index 5fe7ec2..39ea4ab 100644 --- a/examples/CPG_examples.jl +++ b/examples/CPG_examples.jl @@ -2,19 +2,12 @@ # #md # [![](https://img.shields.io/badge/show-nbviewer-579ACA.svg)](@__NBVIEWER_ROOT_URL__/examples/CPG_examples.ipynb) -using AlgebraicDynamics.DWDDynam -using AlgebraicDynamics.CPortGraphDynam +using AlgebraicDynamics using AlgebraicDynamics.CPortGraphDynam: draw, barbell, gridpath, grid, meshpath - using Catlab -using Catlab.WiringDiagrams -using Catlab.WiringDiagrams.CPortGraphs -using Catlab.Theories -using Catlab.CategoricalAlgebra using OrdinaryDiffEq using Plots, Plots.PlotMeasures - using PrettyTables # ## SIR Epidemiology Model diff --git a/examples/Cyber-Physical.jl b/examples/Cyber-Physical.jl index 5e40073..71857c4 100644 --- a/examples/Cyber-Physical.jl +++ b/examples/Cyber-Physical.jl @@ -9,11 +9,7 @@ # 2. Categorical Semantics of Cyber-Physical Systems Theory - [https://doi.org/10.1145/3461669](https://doi.org/10.1145/3461669) using AlgebraicDynamics -using AlgebraicDynamics.DWDDynam - -using Catlab.WiringDiagrams -using Catlab.Graphics -using Catlab.Graphics.Graphviz +using Catlab using LabelledArrays using DifferentialEquations diff --git a/examples/Ecosystem.jl b/examples/Ecosystem.jl index 059091a..e3cb1b4 100644 --- a/examples/Ecosystem.jl +++ b/examples/Ecosystem.jl @@ -3,13 +3,7 @@ #md # [![](https://img.shields.io/badge/show-nbviewer-579ACA.svg)](@__NBVIEWER_ROOT_URL__/examples/Ecosystem.ipynb) using AlgebraicDynamics -using AlgebraicDynamics.DWDDynam -using AlgebraicDynamics.UWDDynam - -using Catlab.CategoricalAlgebra -using Catlab.WiringDiagrams -using Catlab.Graphics -using Catlab.Programs +using Catlab using LabelledArrays using OrdinaryDiffEq @@ -266,4 +260,4 @@ sol = solve(prob, Tsit5()) plot(sol, ecosystem, lw=2, title = "Decoupled Ecosystem", xlabel = "time", ylabel = "population size" -) \ No newline at end of file +) diff --git a/examples/Lotka-Volterra.jl b/examples/Lotka-Volterra.jl index f957f11..bc2155b 100644 --- a/examples/Lotka-Volterra.jl +++ b/examples/Lotka-Volterra.jl @@ -22,8 +22,8 @@ # However, there are not two independent rabbit populations --- one that grows and one that gets eaten by foxes. Likewise, there are not two independent fox populations --- one that declines and one that feasts on rabbits. To capture these interactions between the trio of resource sharers, we compose them by identifying the exposed rabbit populations and identifying the exposed fox populations. using AlgebraicDynamics -using AlgebraicDynamics.UWDDynam using Catlab.WiringDiagrams, Catlab.Programs + using LabelledArrays using OrdinaryDiffEq, Plots, Plots.PlotMeasures diff --git a/examples/Ross-Macdonald.jl b/examples/Ross-Macdonald.jl index f738c20..374aa13 100644 --- a/examples/Ross-Macdonald.jl +++ b/examples/Ross-Macdonald.jl @@ -4,11 +4,11 @@ # Authors: Sean L. Wu and Sophie Libkind -using AlgebraicDynamics.DWDDynam -using Catlab.WiringDiagrams +using AlgebraicDynamics +using Catlab.WiringDiagrams, Catlab.Graphics + using LabelledArrays -using Catlab.Graphics using DelayDiffEq, DifferentialEquations using Plots @@ -279,4 +279,4 @@ plot!(sol.t, fill(Z̄, N), label = "infectious mosquito equilibrium", ls = :dash # to intervention, incorporating additional biological realism can produce more plausible results regarding # the expected time for interventions to affect the system. In any case, such simple models are best used as # tools to explain basic concepts in malaria epidemiology rather than descriptions of real systems, which are -# likely far from equilibrium and affected by weather, climate, policy, and other external forces. \ No newline at end of file +# likely far from equilibrium and affected by weather, climate, policy, and other external forces. diff --git a/src/AlgebraicDynamics.jl b/src/AlgebraicDynamics.jl index 313d49d..e207bd5 100644 --- a/src/AlgebraicDynamics.jl +++ b/src/AlgebraicDynamics.jl @@ -1,9 +1,13 @@ module AlgebraicDynamics -using Catlab +using Reexport include("uwd_dynam.jl") include("dwd_dynam.jl") include("cpg_dynam.jl") +@reexport using .DWDDynam +@reexport using .UWDDynam +@reexport using .CPortGraphDynam + end # module