cellml stuff added to handle Beeler-Reuter #6
Conversation
This file contains hidden or 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
anandijain
reviewed
Mar 15, 2021
| return parse_node(firstelement(node)) | ||
| elseif nodename(node) == "piece" | ||
| c = parse_node.(elements(node)) | ||
| return Symbolics.IfElse.ifelse(c[2] > 0.5, c[1], otherwise) |
There was a problem hiding this comment.
I have an IfElse dep, I think you can just have IfElse.ifelse(c[2] > 0.5, c[1], otherwise)
Comment on lines
125
to
144
| # """ | ||
| # parse_piecewise(node) | ||
|
|
||
| # parse a <piecewise> node | ||
| # parse a <piecewise> node | ||
| # want to recursively call ifelse on the pieces | ||
| # """ | ||
| # function parse_piecewise(node) | ||
| # es = elements(node) | ||
| # IfElse.ifelse(a, b, | ||
| # IfElse.ifelse(c, d, | ||
| # IfElse.ifelse(a, b, | ||
| # IfElse.ifelse(c, d, | ||
| # IfElse.ifelse(e, f, otherwise))) | ||
| # end | ||
|
|
||
| # """ | ||
| # parse_piece(node) | ||
|
|
||
| # parse a <piece> node | ||
| # parse a <piece> node | ||
| # Each <piece> element contains exactly two children. | ||
| # The conditional is the second child and the return is the first. | ||
| # """ |
There was a problem hiding this comment.
could you just delete all this?
|
|
||
| "and" => x -> Base.:*(x...), | ||
| "or" => heaviside_or, | ||
| "xor" => x -> x[1]*(one(x[2])-x[2]) + (one(x[1])-x[1])*x[2], |
There was a problem hiding this comment.
this is fine but there must be an easier way
|
oh actually could you add a piecewise test? ideally one with some nesting, i have a few in |
anandijain
reviewed
Mar 15, 2021
| @@ -180,45 +211,72 @@ function check_ivs(node) | |||
| all(y -> y.content == x[1].content, x) | |||
| end | |||
|
|
|||
| # need to check the arities | |||
| H(x) = Symbolics.IfElse.ifelse(x > 0, one(x), zero(x)) | |||
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.
No description provided.