Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = "0.2.0"
[deps]
AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
DynamicalSystems = "61744808-ddfa-5f27-97ff-6e42cc95d634"
DynamicalSystemsBase = "6e36e845-645a-534a-86f2-f5d4aa5a06b4"
FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
HerbConstraints = "1fa96474-3206-4513-b4fa-23913f296dfc"
Expand All @@ -22,7 +22,7 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
[compat]
AbstractTrees = "0.4.5"
DocStringExtensions = "0.9.3"
DynamicalSystems = "3"
DynamicalSystemsBase = "3.13.2"
FileIO = "1"
Graphs = "1.12"
HerbConstraints = "0.2.4"
Expand All @@ -32,6 +32,6 @@ HerbSearch = "0.4.1"
MLStyle = "0.4.17"
MetaGraphsNext = "0.7"
Random = "1.10"
SoleLogics = "0.12"
SoleLogics = "0.12.0"
Statistics = "1.10"
julia = "1.6"
3 changes: 0 additions & 3 deletions src/GraphDynamicalSystems.jl
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
module GraphDynamicalSystems

using DocStringExtensions
using DynamicalSystems
using MetaGraphsNext
using SoleLogics


include("boolean_networks.jl")
Expand Down
2 changes: 1 addition & 1 deletion src/boolean_networks.jl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module BooleanNetworks

using DocStringExtensions
using MetaGraphsNext: MetaGraph, add_edge!, SimpleDiGraph, nv, labels
using DynamicalSystems: ArbitrarySteppable
using DynamicalSystemsBase: ArbitrarySteppable
using SoleLogics:
Formula,
Atom,
Expand Down
9 changes: 5 additions & 4 deletions src/qualitative_networks.jl
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import DynamicalSystems: get_state, set_state!
import DynamicalSystemsBase: get_state, set_state!

using AbstractTrees: Leaves
using DynamicalSystemsBase: ArbitrarySteppable
using HerbConstraints: addconstraint!, DomainRuleNode, VarNode, Ordered, Forbidden
using HerbCore: AbstractGrammar, RuleNode, get_rule
using HerbGrammar: add_rule!, rulenode2expr, @csgrammar
using HerbConstraints: addconstraint!, DomainRuleNode, VarNode, Ordered, Forbidden
using HerbSearch
using HerbSearch: rand
using MLStyle: @match
using MetaGraphsNext: MetaGraph, SimpleDiGraph, add_edge!, nv
using MetaGraphsNext: MetaGraph, SimpleDiGraph, add_edge!, nv, labels

base_qn_grammar = @csgrammar begin
Val = Val + Val
Expand Down
2 changes: 1 addition & 1 deletion test/Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[deps]
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
DynamicalSystems = "61744808-ddfa-5f27-97ff-6e42cc95d634"
DynamicalSystemsBase = "6e36e845-645a-534a-86f2-f5d4aa5a06b4"
Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
HerbCore = "2b23ba43-8213-43cb-b5ea-38c12b45bd45"
JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
Expand Down
2 changes: 1 addition & 1 deletion test/test-bn.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using MetaGraphsNext: nv, MetaGraph
using DynamicalSystems: trajectory
using DynamicalSystemsBase: trajectory
using SoleLogics: cnf, AbstractSyntaxStructure, LeftmostLinearForm, ∧

@testset "Boolean Network Sampling" begin
Expand Down
3 changes: 1 addition & 2 deletions test/test-qn.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using DynamicalSystems
using GraphDynamicalSystems
using DynamicalSystemsBase: step!, get_state, set_state!
using Graphs: ne, nv

@testset "QN Grammar Creation" begin
Expand Down
Loading