feat: implementation of new SymbolicIndexingInterface #2345
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
AayushSabharwal
force-pushed
the
as/indexing-rework
branch
from
dafacf2 to
d2e291d
Compare
| [getfield(sys, :iv)] | ||
| #Treat the result as a vector of symbols always | ||
| function SymbolicIndexingInterface.is_variable(sys::AbstractSystem, sym) | ||
| if unwrap(sym) isa Int # [x, 1] coerces 1 to a Num |
There was a problem hiding this comment.
this seems really ugly.
There was a problem hiding this comment.
Yeah it is. It's the only way I could find to cover all the cases
- we need the
isa Intcheck because[x, 1]wraps1in aNum(e.g.sol(1.0, idxs=[1, x]) - The next one is necessary since
sol[x + y]is a possibility, andgetnameerrors onx+y - The
getnamecase is necessary for namespaced variables
There was a problem hiding this comment.
It gets the value inside a Num, which is usually either a SymbolicUtils.BasicSymbolic for symbolic variables or a number in the case of something like Num(1)
| @@ -224,8 +224,12 @@ function SymbolicIndexingInterface.variable_symbols(sys::AbstractSystem) | |||
| end | |||
|
|
|||
| function SymbolicIndexingInterface.is_parameter(sys::AbstractSystem, sym) | |||
| usym = unwrap(sym) | |||
| if unwrap(sym) isa Int | |||
src/systems/abstractsystem.jl
Outdated
| return unwrap(sym) in 1:length(parameters(sys)) | ||
| return usym in 1:length(parameters(sys)) | ||
| end | ||
| if istree(usym) && operation(usym) != getindex |
There was a problem hiding this comment.
return !istree(usym) || operation(usym) == getindex
AayushSabharwal
force-pushed
the
as/indexing-rework
branch
from
f245c52 to
11ebc18
Compare
AayushSabharwal
force-pushed
the
as/indexing-rework
branch
from
11ebc18 to
ed2b237
Compare
AayushSabharwal
force-pushed
the
as/indexing-rework
branch
from
ed2b237 to
d179b4f
Compare
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.