Skip to content

Fix bubbler reset #198

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.

Sign up for GitHub

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

Merged
RemDelaporteMathurin merged 5 commits into from
Jan 13, 2026
Merged

Fix bubbler reset #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
de1340f
fix template
RemDelaporteMathurin Jan 12, 2026
6eb5e23
update test file to catch the bug
RemDelaporteMathurin Jan 12, 2026
36e549c
fixed test
RemDelaporteMathurin Jan 12, 2026
9611fb5
added upper bound
RemDelaporteMathurin Jan 13, 2026
0a63ffa
upper bound on pathsim-chem
RemDelaporteMathurin Jan 13, 2026
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
4 changes: 2 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ classifiers = [
]
requires-python = ">=3.8"
dependencies = [
"pathsim>=0.8.2",
"pathsim-chem",
"pathsim>=0.8.2,<0.14.0",
"pathsim-chem<0.1.1",
"matplotlib>=3.7.0",
"numpy>=1.24.0",
"plotly>=6.0",
Expand Down
4 changes: 2 additions & 2 deletions src/python/templates/block_macros.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
{{ create_block(node) }}

{%- if node["data"].get("replacement_times") %}
events_{{ node["var_name"] }} = {{ node["var_name"] }}.create_reset_events()
events += events_{{ node["var_name"] }}
{{ node["var_name"] }}._create_reset_events()
events += {{ node["var_name"] }}.events
{%- endif %}

{%- endmacro -%}
Expand Down
2 changes: 1 addition & 1 deletion test/test_convert_python.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ def test_bubbler_has_reset_times():
}
code = convert_graph_to_python(sample_data)
print(code)
assert "bubbler_1.create_reset_events()" in code
assert "bubbler_1._create_reset_events()" in code


if __name__ == "__main__":
Expand Down
2 changes: 1 addition & 1 deletion test/test_files/bubbler.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"data": {
"label": "bubbler 1",
"conversion_efficiency": "",
"replacement_times": "",
"replacement_times": "[1]",
"vial_efficiency": ""
},
"measured": {
Expand Down
Loading