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

GraphMakie update #1115

Merged
merged 22 commits into from
Nov 18, 2024
Merged

GraphMakie update #1115

merged 22 commits into from
Nov 18, 2024

Conversation

vyudu
Copy link
Collaborator

@vyudu vyudu commented Nov 14, 2024

Refactoring the Graphviz code into GraphMakie. Some plots generated:

Brusselator species-reaction graph
fig1
Brusselator complex graph
fig2
Repressilator species-reaction graph
fig3

Might be worth playing around with the layouts a bit more to see if we can make the edge-lengths for these graphs more consistent and have the layouts be more horizontal. Will work on updating the documentation in a follow-up.

@isaacsas
Copy link
Member

isaacsas commented Nov 14, 2024

The first and third look great! The second is a bit strange. Do you want to tweak the layouts more in the PR, or get it merged as is and update later? (I ask as I'll review it sooner in the latter case, or wait till you say you are done in the former case).

@isaacsas
Copy link
Member

Also, is this based on the current master? I thought I had removed BifurcationKit there so the docs build but this seems to be crashing on it.

@vyudu
Copy link
Collaborator Author

vyudu commented Nov 14, 2024

Probably just merge this one as is and I'll look more at it in a follow-up. Also just rebased it, it seems like the remote branch was based on an earlier master commit

@isaacsas
Copy link
Member

It may still fail -- I have another PR that is completely removing Bifkit, so it may need one more rebasing once that is merged (but if tests pass and docs build as is I'll merge after reviewing).

Copy link
Member

@isaacsas isaacsas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there any way to add some tests for this?

ext/CatalystGraphMakieExtension.jl Outdated Show resolved Hide resolved
ext/CatalystGraphMakieExtension/rn_graph_plot.jl Outdated Show resolved Hide resolved
src/network_analysis.jl Outdated Show resolved Hide resolved
src/network_analysis.jl Outdated Show resolved Hide resolved
ext/CatalystGraphMakieExtension/rn_graph_plot.jl Outdated Show resolved Hide resolved
ext/CatalystGraphMakieExtension/rn_graph_plot.jl Outdated Show resolved Hide resolved
ext/CatalystGraphMakieExtension/rn_graph_plot.jl Outdated Show resolved Hide resolved
ext/CatalystGraphMakieExtension/rn_graph_plot.jl Outdated Show resolved Hide resolved
ext/CatalystGraphMakieExtension/rn_graph_plot.jl Outdated Show resolved Hide resolved
ext/CatalystGraphMakieExtension/rn_graph_plot.jl Outdated Show resolved Hide resolved
@isaacsas
Copy link
Member

@vyudu probably worth updating this to master now that the BifurcationKit PR is merged. That should hopefully have fixed some issues in tests and doc builds.

Copy link
Member

@isaacsas isaacsas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few last things then happy to merge.

ext/CatalystGraphMakieExtension.jl Outdated Show resolved Hide resolved
ext/CatalystGraphMakieExtension/rn_graph_plot.jl Outdated Show resolved Hide resolved
src/Catalyst.jl Outdated Show resolved Hide resolved
src/Catalyst.jl Outdated Show resolved Hide resolved
@isaacsas
Copy link
Member

@vyudu feel free to merge when done now.

@isaacsas
Copy link
Member

@vyudu ping -- are you done with this? Can we merge?

@vyudu
Copy link
Collaborator Author

vyudu commented Nov 18, 2024 via email

@vyudu vyudu merged commit 81d30a6 into SciML:master Nov 18, 2024
13 checks passed
@vyudu vyudu deleted the GraphMakie branch November 18, 2024 14:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants