New new examples #81
Closed
New new examples #81
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…dependency. Added Pkg.activate(../../..) to top of all new examples to ensure they use the versions in Project.toml (will likely need to do this for the old examples as well).
…rease to 1.9 when we update Catlab and AlgebraicRewriting versions)
Fixed Algebraic Rewriting version to be < 0.2 as opposed to < 2.0
…r symbol, return index of first stock with matching name.
…nfer links, deal with attributes.
… sums (still need to get wildcards working)
…o work, now just need to debug
… in stratification. EG, *death* would match all symbols which have death as a substring. Currently case sensitive...
…ented out StratifyDSL test file (no tests yet)
…p to (can change this behaviour with a const in Syntax)
… get rid of _. Matches now don't overwrite; that is, if you have a match on a previous line, a future match won't redo it.
… \Xi => to function as _ =>
fixed typo in sindex functions
…write(seir_model, quote end))
…eleting something deletes all links, swapping dyvars for other types) it is very powerful
|
Yeah @Saityi I think I'm gonna need help figuring out how the heck I'm gonna merge stuff at this point |
|
It should probably go without saying, but this should not be merged yet |
…definitions in StockFlow.jl. infer_links can now look at position to deal with tiebreakers (eg, vA = A + A, vB = B + B, vA -> vB, A -> B, we can figure out which LV maps to which by checking the positions of A and B)
…ert_vector to syntax. Use max instead of ternary when converting back to vector.
|
This should be the first time in a while that the tests pass. |
…aram twice, or a sum variable has the same stock twice), now always map to the first. Additional tests in Syntax. Some refactoring and comment updates.
|
Ok, gonna start splitting this into other branches and try getting the stratification DSL merged. It's a function which takes three stockflows and a quoteblock. |
…If I"m going to map it all to the same thing, why should we care about position at all. Consequently, updated tests a bit.
|
See #83. Specifically only includes stratification. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Rewrote the new examples using the Stratification, Composition and Rewriting DSLs.
Needs cleaning up, but I got all the examples to work.
I really cheated making the Rewriting DSL, I converted the stock flow back into a stock and flow block.