Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor "src/dsl.jl" file #985

Open
wants to merge 44 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
efd44be
save progress
TorkelE May 27, 2024
d2985c0
save progress
TorkelE May 28, 2024
b06068f
save progress
TorkelE May 28, 2024
5cc8f41
save progress
TorkelE May 28, 2024
15273f1
save progress
TorkelE May 28, 2024
b105b3e
add additional tests
TorkelE May 28, 2024
1324428
up
TorkelE May 28, 2024
71c9b5c
fix
TorkelE Jun 2, 2024
9ab9290
Merge branch 'master' into dsl_file_improvements
TorkelE Jun 11, 2024
d45f0a7
merge fixes
TorkelE Jun 11, 2024
b6ba044
Merge branch 'master' into src___refactoring___dsl_file
TorkelE Jul 13, 2024
cdac225
merge fixes
TorkelE Jul 13, 2024
ea9aae3
up
TorkelE Jul 13, 2024
7084133
test fixes
TorkelE Jul 14, 2024
a6b4c3a
format
TorkelE Jul 14, 2024
160668f
up
TorkelE Jul 14, 2024
9c265ee
observables fix
TorkelE Jul 14, 2024
34fc2c0
spatial transport reaction dsl fix
TorkelE Jul 14, 2024
e9fa7ba
Merge branch 'master' into src___refactoring___dsl_file
TorkelE Jul 16, 2024
37ea1d9
iv is now a parmaeter
TorkelE Jul 16, 2024
87464f7
Add tests for various erroneous declarations
TorkelE Jul 17, 2024
8156eca
update old @variable test
TorkelE Jul 17, 2024
fba3f5e
Merge branch 'master' into src___refactoring___dsl_file
TorkelE Jan 16, 2025
50f8f82
save progress
TorkelE Jan 16, 2025
4e720ee
save progress
TorkelE Jan 16, 2025
a1e967a
save progress
TorkelE Jan 17, 2025
fadeb67
Merge branch 'master' into src___refactoring___dsl_file
TorkelE Jan 18, 2025
b235784
save progress
TorkelE Jan 18, 2025
18fcbf1
prepare formatting round
TorkelE Jan 18, 2025
9230667
up
TorkelE Jan 18, 2025
78ca087
multiple fixes
TorkelE Jan 18, 2025
9d62c28
docstring fix
TorkelE Jan 18, 2025
9a928fe
fixes
TorkelE Jan 18, 2025
53a6254
up
TorkelE Jan 18, 2025
27f7add
fix function expansion of differentials
TorkelE Jan 18, 2025
99e54d2
spelling fix
TorkelE Jan 18, 2025
7ec7383
better handling of forbidden symbols and more tests
TorkelE Jan 19, 2025
5f35480
improve option error handling, more tests
TorkelE Jan 19, 2025
292da20
minor upodates after read through
TorkelE Jan 19, 2025
2902101
doc fix, combinatorial_ratelaw error handling
TorkelE Jan 20, 2025
5e342fb
minor ups
TorkelE Jan 20, 2025
7ff3f7d
code spell check
TorkelE Jan 20, 2025
97cd2ac
Update api.md
TorkelE Jan 21, 2025
109cfa2
Merge remote-tracking branch 'origin/src___refactoring___dsl_file' in…
TorkelE Jan 21, 2025
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
1 change: 1 addition & 0 deletions src/Catalyst.jl
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import ModelingToolkit: check_variables,

import Base: (==), hash, size, getindex, setindex, isless, Sort.defalg, length, show
import MacroTools, Graphs
using MacroTools: striplines
TorkelE marked this conversation as resolved.
Show resolved Hide resolved
import Graphs: DiGraph, SimpleGraph, SimpleDiGraph, vertices, edges, add_vertices!, nv, ne
import DataStructures: OrderedDict, OrderedSet
import Parameters: @with_kw_noshow
Expand Down
2 changes: 1 addition & 1 deletion src/chemistry_functionality.jl
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ function make_compound(expr)
# Cannot extract directly using e.g. "getfield.(composition, :reactant)" because then
# we get something like :([:C, :O]), rather than :([C, O]).
composition = Catalyst.recursive_find_reactants!(expr.args[3], 1,
Vector{ReactantStruct}(undef, 0))
Vector{ReactantInternal}(undef, 0))
TorkelE marked this conversation as resolved.
Show resolved Hide resolved
components = :([]) # Becomes something like :([C, O]).
coefficients = :([]) # Becomes something like :([1, 2]).
for comp in composition
Expand Down
Loading
Loading