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.

Sign up for GitHub

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

fix: expand references to vars with any number of separated dimensions #112

Merged
merged 10 commits into from
Sep 27, 2021
Merged

fix: expand references to vars with any number of separated dimensions #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
92b7105
add DELAY FIXED function with test model
ToddFincannon Sep 9, 2021
994b172
set initial value in data buffer before delay time reached
ToddFincannon Sep 10, 2021
1b6c443
emit FIXED DELAY as a level with special support data
ToddFincannon Sep 11, 2021
00011fc
set init and eval references for the DELAY FIXED var
ToddFincannon Sep 11, 2021
4eec5c0
add subscripts to FixedDelay support vars when LHS subscripts used
ToddFincannon Sep 11, 2021
1ea5ed1
run prettier on source files
ToddFincannon Sep 11, 2021
179fa4a
fix: allow extra index subscripts in 2D const lists
ToddFincannon Sep 15, 2021
b6f0236
remove some obsolete Ramda usage
ToddFincannon Sep 16, 2021
dc64817
generalize visitSubscriptList to any number of dimensions
ToddFincannon Sep 16, 2021
d309f2a
Merge branch 'develop' into todd/111-ref-expand
chrispcampbell Sep 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 70 additions & 0 deletions models/sum/sum.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,76 @@ l[A2]
l[A3]
0 0.222222
1 0.222222
m[D1,E1]
0 11
m[D1,E2]
0 12
m[D2,E1]
0 21
m[D2,E2]
0 22
msum[D1]
0 23
1 23
msum[D2]
0 43
1 43
n[D1,E1,F1]
0 111
n[D1,E1,F2]
0 112
n[D1,E2,F1]
0 121
n[D1,E2,F2]
0 122
n[D2,E1,F1]
0 211
n[D2,E1,F2]
0 212
n[D2,E2,F1]
0 221
n[D2,E2,F2]
0 222
nsum[D1,E1]
0 223
1 223
nsum[D1,E2]
0 243
1 243
nsum[D2,E1]
0 423
1 423
nsum[D2,E2]
0 443
1 443
o[D1,E1,F1]
0 111
o[D1,E1,F2]
0 112
o[D1,E2,F1]
0 111
o[D1,E2,F2]
0 112
o[D2,E1,F1]
0 211
o[D2,E1,F2]
0 212
o[D2,E2,F1]
0 211
o[D2,E2,F2]
0 212
osum[D1,E1]
0 223
1 223
osum[D1,E2]
0 223
1 223
osum[D2,E1]
0 423
1 423
osum[D2,E2]
0 423
1 423
SAVEPER
0 1
1 1
Expand Down
62 changes: 62 additions & 0 deletions models/sum/sum.mdl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,69 @@ j[DimA] = a[DimA] / SUM(b[DimA!]) ~~|
k[SubA] = SUM(b 2[SubA!]) ~~|
l[SubA] = a 2[SubA] / SUM(b 2[SubA!]) ~~|

DimD: D1, D2 ~~|
DimE: E1, E2 ~~|
DimF: F1, F2 ~~|

m[D1, E1] = 11 ~~|
m[D1, E2] = 12 ~~|
m[D2, E1] = 21 ~~|
m[D2, E2] = 22 ~~|
msum[DimD] = SUM(m[DimD, DimE!])
~
~
2 separated dimensions
|

n[D1, E1, F1] = 111 ~~|
n[D1, E1, F2] = 112 ~~|
n[D1, E2, F1] = 121 ~~|
n[D1, E2, F2] = 122 ~~|
n[D2, E1, F1] = 211 ~~|
n[D2, E1, F2] = 212 ~~|
n[D2, E2, F1] = 221 ~~|
n[D2, E2, F2] = 222 ~~|
nsum[DimD, DimE] = SUM(n[DimD, DimE, DimF!])
~
~
3 separated dimensions
|

o[D1, DimE, F1] = 111 ~~|
o[D1, DimE, F2] = 112 ~~|
o[D2, DimE, F1] = 211 ~~|
o[D2, DimE, F2] = 212 ~~|
osum[DimD, DimE] = SUM(o[DimD, DimE, DimF!])
~
~
2 separated dimensions with 1 unseparated dimension
|

INITIAL TIME = 0 ~~|
FINAL TIME = 1 ~~|
TIME STEP = 1 ~~|
SAVEPER = TIME STEP ~~|

\\\---/// Sketch information - do not modify anything except names
V300 Do not put anything below this section - it will be ignored
*View 1
$0-0-0,0,|0||0-0-0|0-0-0|0-0-0|0-0-0|0-0-0|0,0,100,0
///---\\\
:L<%^E!@
9:sum
15:0,0,0,0,0,0
19:100,0
27:2,
34:0,
5:FINAL TIME
35:Date
36:YYYY-MM-DD
37:2000
38:1
39:1
40:2
41:0
42:1
24:0
25:0
26:0
Loading