Skip to content

Commit f9abb18

Browse files
committed
formatting
1 parent a662da5 commit f9abb18

File tree

4 files changed

+68
-25
lines changed

4 files changed

+68
-25
lines changed

src/ModelingToolkit.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ export modelingtoolkitize
259259
export generate_initializesystem
260260

261261
export alg_equations, diff_equations, has_alg_equations, has_diff_equations
262-
export get_alg_eqs, get_diff_eqs, has_alg_eqs,has_diff_eqs
262+
export get_alg_eqs, get_diff_eqs, has_alg_eqs, has_diff_eqs
263263

264264
export @variables, @parameters, @constants, @brownian
265265
export @named, @nonamespace, @namespace, extend, compose, complete

src/systems/abstractsystem.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2520,7 +2520,6 @@ has_diff_equations(osys2) # returns `false`.
25202520
"""
25212521
has_diff_equations(sys::AbstractSystem) = any(is_diff_equation, equations(sys))
25222522

2523-
25242523
"""
25252524
get_alg_eqs(sys::AbstractSystem)
25262525
@@ -2619,4 +2618,4 @@ has_diff_eqs(osys12) # returns `true`.
26192618
has_diff_eqs(osys21) # returns `false`.
26202619
```
26212620
"""
2622-
has_diff_eqs(sys::AbstractSystem) = any(is_diff_equation, get_eqs(sys))
2621+
has_diff_eqs(sys::AbstractSystem) = any(is_diff_equation, get_eqs(sys))

test/equation_type_accessors.jl

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ import ModelingToolkit: t_nounits as t, D_nounits as D, wrap, get_eqs
66
# Creates equations.
77
@variables X(t) Y(t) Z(t)
88
@parameters a b c d
9-
eq1 = X^Z - Z^(X+1) ~ log(X - a + b) * Y
9+
eq1 = X^Z - Z^(X + 1) ~ log(X - a + b) * Y
1010
eq2 = X ~ Y^(X + 1)
11-
eq3 = a + b + c + d ~ X*(Y + d*(Y + Z))
11+
eq3 = a + b + c + d ~ X * (Y + d * (Y + Z))
1212
eq4 = X ~ sqrt(a + Z) + t
13-
eq5 = D(D(X)) ~ a^(2Y) + 3Z*t - 6
14-
eq6 = X *(Z - Z*(b+X)) ~ c^(X+D(Y))
15-
eq7 = sqrt(X + c) ~ 2*(Y + log(a + D(Z)))
13+
eq5 = D(D(X)) ~ a^(2Y) + 3Z * t - 6
14+
eq6 = X * (Z - Z * (b + X)) ~ c^(X + D(Y))
15+
eq7 = sqrt(X + c) ~ 2 * (Y + log(a + D(Z)))
1616
eq8 = -0.1 ~ D(Z) + X
1717

1818
@test is_alg_equation(eq1)
@@ -34,21 +34,15 @@ eq8 = -0.1 ~ D(Z) + X
3434
@test is_diff_equation(eq8)
3535

3636
# Creates systems.
37-
eqs1 = [
38-
X*Y + a ~ Z^3 - X*log(b + Y)
39-
X ~ Z*Y*X + a + b
40-
c*sin(X) + sin(Y) ~ d*(a + X*(b + Y* (c + Z)))
41-
]
42-
eqs2 = [
43-
X + Y + c ~ b*X^(X + Z + a)
44-
D(X) ~ a*Y + b*X + c*Z
45-
D(Z) + Z*Y ~ X - log(Z)
46-
]
47-
eqs3 = [
48-
D(X) ~ sqrt(X + b) + sqrt(Z + c)
49-
2Z * (Z + Y) ~ D(Y)*log(a)
50-
D(Z) + c*X ~ b/(X+Y^d) + D(Z)
51-
]
37+
eqs1 = [X * Y + a ~ Z^3 - X * log(b + Y)
38+
X ~ Z * Y * X + a + b
39+
c * sin(X) + sin(Y) ~ d * (a + X * (b + Y * (c + Z)))]
40+
eqs2 = [X + Y + c ~ b * X^(X + Z + a)
41+
D(X) ~ a * Y + b * X + c * Z
42+
D(Z) + Z * Y ~ X - log(Z)]
43+
eqs3 = [D(X) ~ sqrt(X + b) + sqrt(Z + c)
44+
2Z * (Z + Y) ~ D(Y) * log(a)
45+
D(Z) + c * X ~ b / (X + Y^d) + D(Z)]
5246
@named osys1 = ODESystem(eqs1, t)
5347
@named osys2 = ODESystem(eqs2, t)
5448
@named osys3 = ODESystem(eqs3, t)
@@ -150,7 +144,6 @@ osys3_33 = compose(osys3, [osys3, osys3])
150144
@test !has_alg_eqs(get_systems(osys3_33)[2])
151145
@test has_diff_eqs(get_systems(osys3_33)[2])
152146

153-
154147
# Test getters for composed systems.
155148
ns_eqs1 = namespace_equations(osys1)
156149
ns_eqs2 = namespace_equations(osys2)
@@ -186,4 +179,3 @@ isequal(alg_equations(get_systems(osys3_2)[1]), eqs2[1:1])
186179
isequal(diff_equations(get_systems(osys3_2)[1]), eqs2[2:3])
187180
isequal(get_alg_eqs(get_systems(osys3_2)[1]), eqs2[1:1])
188181
isequal(get_diff_eqs(get_systems(osys3_2)[1]), eqs2[2:3])
189-

test/runtests.jl

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,58 @@ end
1717
@time begin
1818
if GROUP == "All" || GROUP == "InterfaceI"
1919
@testset "InterfaceI" begin
20+
@safetestset "Linear Algebra Test" include("linalg.jl")
21+
@safetestset "AbstractSystem Test" include("abstractsystem.jl")
22+
@safetestset "Variable Scope Tests" include("variable_scope.jl")
23+
@safetestset "Symbolic Parameters Test" include("symbolic_parameters.jl")
24+
@safetestset "Parsing Test" include("variable_parsing.jl")
25+
@safetestset "Simplify Test" include("simplify.jl")
26+
@safetestset "Direct Usage Test" include("direct.jl")
27+
@safetestset "System Linearity Test" include("linearity.jl")
28+
@safetestset "Input Output Test" include("input_output_handling.jl")
29+
@safetestset "Clock Test" include("clock.jl")
30+
@safetestset "ODESystem Test" include("odesystem.jl")
31+
@safetestset "Dynamic Quantities Test" include("dq_units.jl")
32+
@safetestset "Unitful Quantities Test" include("units.jl")
33+
@safetestset "LabelledArrays Test" include("labelledarrays.jl")
34+
@safetestset "Mass Matrix Test" include("mass_matrix.jl")
35+
@safetestset "SteadyStateSystem Test" include("steadystatesystems.jl")
36+
@safetestset "SDESystem Test" include("sdesystem.jl")
37+
@safetestset "DDESystem Test" include("dde.jl")
38+
@safetestset "NonlinearSystem Test" include("nonlinearsystem.jl")
39+
@safetestset "InitializationSystem Test" include("initializationsystem.jl")
40+
@safetestset "PDE Construction Test" include("pde.jl")
41+
@safetestset "JumpSystem Test" include("jumpsystem.jl")
42+
@safetestset "Constraints Test" include("constraints.jl")
43+
@safetestset "Reduction Test" include("reduction.jl")
44+
@safetestset "Split Parameters Test" include("split_parameters.jl")
45+
@safetestset "StaticArrays Test" include("static_arrays.jl")
46+
@safetestset "Components Test" include("components.jl")
47+
@safetestset "Model Parsing Test" include("model_parsing.jl")
48+
@safetestset "print_tree" include("print_tree.jl")
49+
@safetestset "Error Handling" include("error_handling.jl")
50+
@safetestset "StructuralTransformations" include("structural_transformation/runtests.jl")
51+
@safetestset "State Selection Test" include("state_selection.jl")
52+
@safetestset "Symbolic Event Test" include("symbolic_events.jl")
53+
@safetestset "Stream Connect Test" include("stream_connectors.jl")
54+
@safetestset "Domain Connect Test" include("domain_connectors.jl")
55+
@safetestset "Lowering Integration Test" include("lowering_solving.jl")
56+
@safetestset "Test Big System Usage" include("bigsystem.jl")
57+
@safetestset "Dependency Graph Test" include("dep_graphs.jl")
58+
@safetestset "Function Registration Test" include("function_registration.jl")
59+
@safetestset "Precompiled Modules Test" include("precompile_test.jl")
60+
@safetestset "Variable Utils Test" include("variable_utils.jl")
61+
@safetestset "Variable Metadata Test" include("test_variable_metadata.jl")
62+
@safetestset "DAE Jacobians Test" include("dae_jacobian.jl")
63+
@safetestset "Jacobian Sparsity" include("jacobiansparsity.jl")
64+
@safetestset "Modelingtoolkitize Test" include("modelingtoolkitize.jl")
65+
@safetestset "OptimizationSystem Test" include("optimizationsystem.jl")
66+
@safetestset "FuncAffect Test" include("funcaffect.jl")
67+
@safetestset "Constants Test" include("constants.jl")
68+
@safetestset "Parameter Dependency Test" include("parameter_dependencies.jl")
69+
@safetestset "Generate Custom Function Test" include("generate_custom_function.jl")
70+
@safetestset "Initial Values Test" include("initial_values.jl")
71+
@safetestset "Discrete System" include("discrete_system.jl")
2072
@safetestset "Equation Type Accessors Test" include("equation_type_accessors.jl")
2173
end
2274
end

0 commit comments

Comments
 (0)