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

Add macro edge aliases #121

Merged
merged 6 commits into from Jun 7, 2022
Merged

Add macro edge aliases #121

merged 6 commits into from Jun 7, 2022

Conversation

j6k4m8
Copy link
Member

@j6k4m8 j6k4m8 commented Jun 7, 2022

This adds support for complex edge constraints in macros:

decreasing_edge_weights(a, b, c) {
    a -> b as ab
    b -> c as bc
    ab.weight > bc.weight
}

...

In increasing levels of challengingness:

  • Add support for simple (edge-value) edge constraints in macros
  • Add support for dynamic (edge-edge) edge constraints in macros
  • Extend support for recursive calls to macros with simple constraints
  • Extend support for recursive calls to macros with dynamic constraints
  • Update documentation

This fixes #110 and finishes work started in #119.

@j6k4m8 j6k4m8 self-assigned this Jun 7, 2022
@j6k4m8 j6k4m8 added enhancement New feature or request DSL parser labels Jun 7, 2022
@codecov-commenter
Copy link

Codecov Report

Merging #121 (b493ac6) into master (16e5f84) will increase coverage by 1.20%.
The diff coverage is 97.15%.

@@            Coverage Diff             @@
##           master     #121      +/-   ##
==========================================
+ Coverage   90.12%   91.33%   +1.20%     
==========================================
  Files          22       22              
  Lines        1793     2112     +319     
==========================================
+ Hits         1616     1929     +313     
- Misses        177      183       +6     
Impacted Files Coverage Δ
dotmotif/parsers/v2/__init__.py 93.93% <92.64%> (-1.48%) ⬇️
dotmotif/__init__.py 97.59% <100.00%> (+3.33%) ⬆️
dotmotif/executors/GrandIsoExecutor.py 83.33% <100.00%> (+0.47%) ⬆️
dotmotif/executors/Neo4jExecutor.py 72.61% <100.00%> (+1.01%) ⬆️
dotmotif/executors/NetworkXExecutor.py 93.00% <100.00%> (+1.53%) ⬆️
dotmotif/executors/test_dm_cypher.py 100.00% <100.00%> (ø)
dotmotif/executors/test_grandisoexecutor.py 100.00% <100.00%> (ø)
dotmotif/executors/test_networkxexecutor.py 100.00% <100.00%> (ø)
dotmotif/parsers/v2/test_v2_parser.py 100.00% <100.00%> (ø)
... and 1 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 07e3b7c...b493ac6. Read the comment docs.

@j6k4m8 j6k4m8 merged commit 4320a8b into master Jun 7, 2022
@j6k4m8 j6k4m8 deleted the add-macro-edge-aliases branch June 7, 2022 18:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
DSL enhancement New feature or request parser
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Aliased edges and inter-edge comparisons
2 participants