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

Reexport Catlab functionality #44

Merged
merged 2 commits into from
Aug 23, 2024
Merged

Reexport Catlab functionality #44

merged 2 commits into from
Aug 23, 2024

Conversation

GeorgeR227
Copy link
Contributor

Added apex from DiagrammaticEquations and @relation, to_graphviz from Catlab to exports. These are required to use the composition code and the visualization code.

Added `apex` and `@relation`, `to_graphviz` from Catlab
@GeorgeR227
Copy link
Contributor Author

Close #43

@GeorgeR227 GeorgeR227 requested a review from lukem12345 June 17, 2024 16:22
Copy link

codecov bot commented Jun 17, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 86.80%. Comparing base (d2fa4a4) to head (73664f5).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main      #44   +/-   ##
=======================================
  Coverage   86.80%   86.80%           
=======================================
  Files          13       13           
  Lines         894      894           
=======================================
  Hits          776      776           
  Misses        118      118           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@lukem12345
Copy link
Member

This might be tailoring a little too close to the happy path. What about when we want to compose Decapodes with oplus. Why only export some composition functionality from Catlab but not all?

@jpfairbanks thoughts?

@GeorgeR227
Copy link
Contributor Author

I was just adding what I thought were the most often used functions. We can add some more if we want but if we start re-exporting too much then at that point it'd be better to just get the user to have Catlab.

@lukem12345 lukem12345 changed the title Reexport Catlab fuctionality Reexport Catlab functionality Jun 24, 2024
@lukem12345 lukem12345 added the enhancement New feature or request label Jun 24, 2024
@jpfairbanks jpfairbanks merged commit b14f09d into main Aug 23, 2024
7 of 8 checks passed
@jpfairbanks jpfairbanks deleted the gr/export-relation branch August 23, 2024 17:45
GeorgeR227 added a commit that referenced this pull request Aug 30, 2024
Added `apex` and `@relation`, `to_graphviz` from Catlab

Co-authored-by: James <[email protected]>
GeorgeR227 added a commit that referenced this pull request Sep 13, 2024
Added `apex` and `@relation`, `to_graphviz` from Catlab

Co-authored-by: James <[email protected]>
GeorgeR227 added a commit that referenced this pull request Sep 18, 2024
Added `apex` and `@relation`, `to_graphviz` from Catlab

Co-authored-by: James <[email protected]>
quffaro added a commit that referenced this pull request Oct 3, 2024
* Set version to 0.1.7

* Added more exports (#44)

Added `apex` and `@relation`, `to_graphviz` from Catlab

Co-authored-by: James <[email protected]>

* Add type rules for vectorfields

* Add musical overload resolution

* Take advantage of :infer in type rules

* Initial attempt at rewriting

Converts ACSet to a series of Symbolic terms that can be rewritten with a provided rewriter

* Added proof of concept

Added a short script showcasing how rewriting could be done with the `Sort` types and a reference ACSet.

* Added ability to do through-op rewrites

This now supports the ability for ACSet intermediate expressions to be merged into one single expression upon which rewriting rules (like dd=0) may be performed.

* Added Space import

* Completed full pipeline

Can take ACSets to Symbolics back to  ACSets

* Remove metadata usage

This needs to switch to use the new type system

* Added DECQuantity types

Also switched to using SymbolicsUtils' `substitute`. Still needs tests and code needs to be cleaned up.

* Completed pipeline again

Addition now works as well but rewriting seems to be janky, unrelated to this pipeline specifically I believe.

* fixed bug where type-checking subtraction uses +(S1,S2), which is obsolete

* George and I debugged rewriting. Incorrect type passed to resulting term meant typed rewriting would fail

* Cleaning up pipeline

This black boxes the intermediate symbolic expressions to the user. The user will simply submit a rewriter that will then be applied

* Fixed order of inclusions

* adding support for Parameters and Constants

* Added tests for acset2symbolic

* etc

* Literals testing

* parameters test passing after some debugging.

* supporting Infer, better Base.nameof, better tests

* Clean out-of-order vector constructions

* Convert to symbolics inside merge_equations

* Reduce cases of topological sort

* Reify via recursive function, not lambda case

* Further improvement of acset2symbolics

Remove special DerivOp handling, fixed bug where multiple equations with the same variable result were being dropped, more tests to cover these cases and further clean up.

* Remove extraneous tangents

* Remove redundant helper functions

* Pass indexed names and types directly

* Removed extraneous d arg

* fixing work on tumor invasion

* macros which create export stmts will fail inside @testset due to JuliaLang issue #51325

* removed ghost emoji and added convenience function for rules. aqua's failing persistent tasks.

* Added more tests for acset2symbolics

* Fixed persistence issue

Also set default form dim to 2 and allowed it to vary.

* Final touches

* Remove unused fuctionality

---------

Co-authored-by: AlgebraicJulia Bot <[email protected]>
Co-authored-by: James <[email protected]>
Co-authored-by: Luke Morris <[email protected]>
Co-authored-by: Matt <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants