diff --git a/models/delay/delay.csv b/models/delay/delay.csv
index 5dec2a66..272ffbb7 100644
--- a/models/delay/delay.csv
+++ b/models/delay/delay.csv
@@ -1,12 +1,12 @@
Months,d1,d10,d11[A1],d11[A2],d11[A3],d12[A2],d12[A3],d2[A1],d2[A2],d2[A3],d3[A1],d3[A2],d3[A3],d4[A1],d4[A2],d4[A3],d5[A1],d5[A2],d5[A3],d6[A2],d6[A3],d7,d8[A1],d8[A2],d8[A3],d9[A2],d9[A3],delay 2,delay 4,delay a[A1],delay a[A2],delay a[A3],init 1,init 2[A2],init 2[A3],init a[A1],init a[A2],init a[A3],input,input 2[A2],input 2[A3],input a[A1],input a[A2],input a[A3],k
0,10,420,420,420,420,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,10,10,10,0,0,5,5,1,2,3,0,0,0,0,0,0,10,20,30,10,20,30,42
-1,10,420,420,420,420,0,0,2,4,6,10,5,3.33333333333,2,2,2,10,10,10,4,6,10,10,10,10,0,0,5,5,1,2,3,0,0,0,0,0,0,10,20,30,10,20,30,42
-2,10,420,420,420,420,0,0,3.6,7.2,10.8,10,7.5,5.55555555556,3.6,3.6,3.6,10,15,16.6666666667,7.2,10.8,10,10,10,10,0,0,5,5,1,2,3,0,0,0,0,0,0,10,20,30,10,20,30,42
-3,10,420,420,420,420,181.44,272.16,4.88,9.76,14.64,10,8.75,7.03703703704,4.88,4.88,4.88,10,17.5,21.1111111111,9.76,14.64,10,10,10,10,4.32,6.48,5,5,1,2,3,0,0,0,0,0,0,10,20,30,10,20,30,42
-4,10,420,420,420,420,399.168,598.752,5.904,11.808,17.712,10,9.375,8.02469135802,5.904,5.904,5.904,10,18.75,24.0740740741,11.808,17.712,10,10,10,10,9.504,14.256,5,5,1,2,3,0,0,0,0,0,0,0,20,30,10,20,30,42
-5,8,420,420,420,420,573.3504,860.0256,6.7232,13.4464,20.1696,0,4.6875,5.34979423868,4.7232,4.7232,4.7232,10,19.375,26.049382716,13.4464,20.1696,10,10,10,10,13.6512,20.4768,5,5,1,2,3,0,0,0,0,0,0,0,20,30,10,20,30,42
-6,6.4,420,420,420,420,689.472,1034.208,7.37856,14.75712,22.13568,0,2.34375,3.56652949246,3.77856,3.77856,3.77856,10,19.6875,27.366255144,14.75712,22.13568,10,10,10,10,16.416,24.624,5,5,1,2,3,0,0,0,0,0,0,0,20,30,10,20,30,42
-7,5.12,329.28,0,0,0,759.14496,1138.71744,7.902848,15.805696,23.708544,0,1.171875,2.3776863283,3.022848,3.022848,3.022848,10,19.84375,28.244170096,15.805696,23.708544,7.84,0,0,0,18.07488,27.11232,5,5,1,2,3,0,0,0,0,0,0,0,20,30,10,20,30,42
-8,4.096,220.416,0,0,0,798.1618176,1197.2427264,8.3222784,16.6445568,24.9668352,0,0.5859375,1.58512421887,2.4182784,2.4182784,2.4182784,10,19.921875,28.8294467307,16.6445568,24.9668352,5.248,0,0,0,19.0038528,28.5057792,5,5,1,2,3,0,0,0,0,0,0,0,20,30,10,20,30,42
-9,3.2768,133.3248,0,0,0,818.97080832,1228.45621248,8.65782272,17.31564544,25.97346816,0,0.29296875,1.05674947925,1.93462272,1.93462272,1.93462272,10,19.9609375,29.2196311538,17.31564544,25.97346816,3.1744,0,0,0,19.49930496,29.24895744,5,5,1,2,3,0,0,0,0,0,0,0,20,30,10,20,30,42
-10,2.62144,75.264,0,0,0,829.672574976,1244.50886246,8.926258176,17.852516352,26.778774528,0,0.146484375,0.704499652831,1.547698176,1.547698176,1.547698176,10,19.98046875,29.4797541025,17.852516352,26.778774528,1.792,0,0,0,19.754108928,29.631163392,5,5,1,2,3,0,0,0,0,0,0,0,20,30,10,20,30,42
+1,10,420,420,420,420,10.06425,15.096375,1.8549375,3.709875,5.5648125,6.8359375,4.13818359375,2.93933256173,1.8549375,1.8549375,1.8549375,6.8359375,8.2763671875,8.81799768519,3.709875,5.5648125,10,10,10,10,0.239625,0.3594375,5,5,1,2,3,0,0,0,0,0,0,10,20,30,10,20,30,42
+2,10,420,420,420,420,88.3787303109,132.568095466,3.36579568711,6.73159137422,10.0973870613,8.99887084961,6.56391084194,5.01469753261,3.36579568711,3.36579568711,3.36579568711,8.99887084961,13.1278216839,15.0440925978,6.73159137422,10.0973870613,10,10,10,10,2.10425548359,3.15638322539,5,5,1,2,3,0,0,0,0,0,0,10,20,30,10,20,30,42
+3,10,420,420,420,420,221.912807572,332.869211358,4.59639912337,9.19279824675,13.7891973701,9.68323647976,7.98582762,6.48004371986,4.59639912337,4.59639912337,4.59639912337,9.68323647976,15.97165524,19.4401311596,9.19279824675,13.7891973701,10,10,10,10,5.28363827553,7.9254574133,5,5,1,2,3,0,0,0,0,0,0,10,20,30,10,20,30,42
+4,10,420,420,420,420,368.441371358,552.662057036,5.59873331348,11.197466627,16.7961999404,9.89977404242,8.81932912979,7.51467593087,5.59873331348,5.59873331348,5.59873331348,9.89977404242,17.6386582596,22.5440277926,11.197466627,16.7961999404,10,10,10,10,8.77241360375,13.1586204056,5,5,1,2,3,0,0,0,0,0,0,0,20,30,10,20,30,42
+5,8.1450625,414.967875,109.921875,356.323242188,398.671875,499.887126474,749.830689711,6.41514077591,12.8302815518,19.2454223277,3.13235038061,5.16972881851,5.30586276542,4.56020327591,4.56020327591,4.56020327591,9.96828788061,18.6158248245,24.7355859815,12.8302815518,19.2454223277,9.8801875,2.6171875,8.48388671875,9.4921875,11.9020744399,17.8531116598,5,5,1,2,3,0,0,0,0,0,0,0,20,30,10,20,30,42
+6,6.63420431289,375.810634845,1.77520751953,155.288726091,284.988098145,604.944829544,907.417244316,7.08010975661,14.1602195132,21.2403292698,0.991095237615,3.03040012042,3.74629324598,3.7143140695,3.7143140695,3.7143140695,9.98996608722,19.1886219247,26.2829723358,14.1602195132,21.2403292698,8.9478722582,0.0422668457031,3.69735062122,6.7854309082,14.4034483225,21.6051724837,5,5,1,2,3,0,0,0,0,0,0,0,20,30,10,20,30,42
+7,5.40360087663,309.043596214,0.0157964229584,47.6887862533,164.083503485,682.856474289,1024.28471143,7.62173114745,15.2434622949,22.8651934423,0.313588727527,1.77636491434,2.64513307361,3.02533202407,3.02533202407,3.02533202407,9.99682520729,19.5243850687,27.3755303804,15.2434622949,22.8651934423,7.35818086223,0.000376105308533,1.13544729174,3.90675008297,16.2584874831,24.3877312246,5,5,1,2,3,0,0,0,0,0,0,0,20,30,10,20,30,42
+8,4.40126668652,235.779314321,0.000110403634608,12.2493161447,82.7866409579,737.682959973,1106.52443996,8.06288515541,16.1257703108,24.1886554662,0.099221433319,1.04127249984,1.86764049627,2.46415184193,2.46415184193,2.46415184193,9.99899547574,19.7212032592,28.1469492814,16.1257703108,24.1886554662,5.61379319812,0.00000262865796685,0.291650384399,1.971110499,17.5638799994,26.345819999,5,5,1,2,3,0,0,0,0,0,0,0,20,30,10,20,30,42
+9,3.58485922409,170.056436763,6.76500349073e-7,2.8279650782,38.3293816352,774.795301886,1162.19295283,8.42220785212,16.8444157042,25.2666235564,0.0313942816361,0.610374822291,1.31867884384,2.0070670762,2.0070670762,2.0070670762,9.99968216225,19.8365744691,28.691622513,16.8444157042,25.2666235564,4.04896278007,1.61071511684e-8,0.0673325018618,0.912604324649,18.4475071878,27.6712607816,5,5,1,2,3,0,0,0,0,0,0,0,20,30,10,20,30,42
+10,2.91989024339,117.527585228,3.81540132821e-9,0.608359432687,16.716498684,799.177120818,1198.76568123,8.71487843435,17.4297568687,26.144635303,0.00993334692392,0.357790514727,0.931075277426,1.63476867774,1.63476867774,1.63476867774,9.99989943415,19.9042029542,29.076198168,17.4297568687,26.144635303,2.79827583877,9.08428887669e-11,0.0144847483973,0.398011873429,19.0280266861,28.5420400292,5,5,1,2,3,0,0,0,0,0,0,0,20,30,10,20,30,42
diff --git a/models/delay/delay.dat b/models/delay/delay.dat
index 839faab6..8df4aa0d 100644
--- a/models/delay/delay.dat
+++ b/models/delay/delay.dat
@@ -1,1695 +1,327 @@
-#d10>DELAY3#
-0 10
-1 10
-2 10
-3 10
-4 10
-5 10
-6 10
-7 7.84
-8 5.248
-9 3.1744
-10 1.792
-#d10>DELAY3>DL#
-0 1.66667
-1 1.66667
-2 1.66667
-3 1.66667
-4 1.66667
-5 1.66667
-6 1.66667
-7 1.66667
-8 1.66667
-9 1.66667
-10 1.66667
-#d10>DELAY3>LV1#
-0 16.6667
-1 16.6667
-2 16.6667
-3 16.6667
-4 16.6667
-5 6.66667
-6 2.66667
-7 1.06667
-8 0.426667
-9 0.170667
-10 0.0682667
-#d10>DELAY3>LV2#
-0 16.6667
-1 16.6667
-2 16.6667
-3 16.6667
-4 16.6667
-5 16.6667
-6 10.6667
-7 5.86667
-8 2.98667
-9 1.45067
-10 0.682667
-#d10>DELAY3>LV3#
-0 16.6667
-1 16.6667
-2 16.6667
-3 16.6667
-4 16.6667
-5 16.6667
-6 16.6667
-7 13.0667
-8 8.74667
-9 5.29067
-10 2.98667
-#d10>DELAY3>RT1#
-0 10
-1 10
-2 10
-3 10
-4 10
-5 4
-6 1.6
-7 0.64
-8 0.256
-9 0.1024
-10 0.04096
-#d10>DELAY3>RT2#
-0 10
-1 10
-2 10
-3 10
-4 10
-5 10
-6 6.4
-7 3.52
-8 1.792
-9 0.8704
-10 0.4096
-#d11>DELAY3#[A1]
-0 10
-1 10
-2 10
-3 10
-4 10
-5 10
-6 10
-7 -260
-8 1360
-9 -5120
-10 16480
-#d11>DELAY3#[A2]
-0 10
-1 10
-2 10
-3 10
-4 10
-5 10
-6 10
-7 -23.75
-8 26.875
-9 -23.75
-10 18.4375
-#d11>DELAY3#[A3]
-0 10
-1 10
-2 10
-3 10
-4 10
-5 10
-6 10
-7 0
-8 0
-9 0
-10 0
-#d11>DELAY3>DL#[A1]
-0 0.333333
-1 0.333333
-2 0.333333
-3 0.333333
-4 0.333333
-5 0.333333
-6 0.333333
-7 0.333333
-8 0.333333
-9 0.333333
-10 0.333333
-#d11>DELAY3>DL#[A2]
-0 0.666667
-1 0.666667
-2 0.666667
-3 0.666667
-4 0.666667
-5 0.666667
-6 0.666667
-7 0.666667
-8 0.666667
-9 0.666667
-10 0.666667
-#d11>DELAY3>DL#[A3]
-0 1
-1 1
-2 1
-3 1
-4 1
-5 1
-6 1
-7 1
-8 1
-9 1
-10 1
-#d11>DELAY3>LV1#[A1]
-0 3.33333
-1 3.33333
-2 3.33333
-3 3.33333
-4 3.33333
-5 -6.66667
-6 13.3333
-7 -26.6667
-8 53.3333
-9 -106.667
-10 213.333
-#d11>DELAY3>LV1#[A2]
-0 6.66667
-1 6.66667
-2 6.66667
-3 6.66667
-4 6.66667
-5 -3.33333
-6 1.66667
-7 -0.833333
-8 0.416667
-9 -0.208333
-10 0.104167
-#d11>DELAY3>LV1#[A3]
-0 10
-1 10
-2 10
-3 10
-4 10
-5 0
-6 0
-7 0
-8 0
-9 0
-10 0
-#d11>DELAY3>LV2#[A1]
-0 3.33333
-1 3.33333
-2 3.33333
-3 3.33333
-4 3.33333
-5 3.33333
-6 -26.6667
-7 93.3333
-8 -266.667
-9 693.333
-10 -1706.67
-#d11>DELAY3>LV2#[A2]
-0 6.66667
-1 6.66667
-2 6.66667
-3 6.66667
-4 6.66667
-5 6.66667
-6 -8.33333
-7 6.66667
-8 -4.58333
-9 2.91667
-10 -1.77083
-#d11>DELAY3>LV2#[A3]
-0 10
-1 10
-2 10
-3 10
-4 10
-5 10
-6 0
-7 0
-8 0
-9 0
-10 0
-#d11>DELAY3>LV3#[A1]
-0 3.33333
-1 3.33333
-2 3.33333
-3 3.33333
-4 3.33333
-5 3.33333
-6 3.33333
-7 -86.6667
-8 453.333
-9 -1706.67
-10 5493.33
-#d11>DELAY3>LV3#[A2]
-0 6.66667
-1 6.66667
-2 6.66667
-3 6.66667
-4 6.66667
-5 6.66667
-6 6.66667
-7 -15.8333
-8 17.9167
-9 -15.8333
-10 12.2917
-#d11>DELAY3>LV3#[A3]
-0 10
-1 10
-2 10
-3 10
-4 10
-5 10
-6 10
-7 0
-8 0
-9 0
-10 0
-#d11>DELAY3>RT1#[A1]
-0 10
-1 10
-2 10
-3 10
-4 10
-5 -20
-6 40
-7 -80
-8 160
-9 -320
-10 640
-#d11>DELAY3>RT1#[A2]
-0 10
-1 10
-2 10
-3 10
-4 10
-5 -5
-6 2.5
-7 -1.25
-8 0.625
-9 -0.3125
-10 0.15625
-#d11>DELAY3>RT1#[A3]
-0 10
-1 10
-2 10
-3 10
-4 10
-5 0
-6 0
-7 0
-8 0
-9 0
-10 0
-#d11>DELAY3>RT2#[A1]
-0 10
-1 10
-2 10
-3 10
-4 10
-5 10
-6 -80
-7 280
-8 -800
-9 2080
-10 -5120
-#d11>DELAY3>RT2#[A2]
-0 10
-1 10
-2 10
-3 10
-4 10
-5 10
-6 -12.5
-7 10
-8 -6.875
-9 4.375
-10 -2.65625
-#d11>DELAY3>RT2#[A3]
-0 10
-1 10
-2 10
-3 10
-4 10
-5 10
-6 0
-7 0
-8 0
-9 0
-10 0
-#d12>DELAY3I#[A2]
-0 0
-1 0
-2 0
-3 4.32
-4 9.504
-5 13.6512
-6 16.416
-7 18.0749
-8 19.0039
-9 19.4993
-10 19.7541
-#d12>DELAY3I#[A3]
-0 0
-1 0
-2 0
-3 6.48
-4 14.256
-5 20.4768
-6 24.624
-7 27.1123
-8 28.5058
-9 29.249
-10 29.6312
-#d12>DELAY3I>DL#[A2]
-0 1.66667
-1 1.66667
-2 1.66667
-3 1.66667
-4 1.66667
-5 1.66667
-6 1.66667
-7 1.66667
-8 1.66667
-9 1.66667
-10 1.66667
-#d12>DELAY3I>DL#[A3]
-0 1.66667
-1 1.66667
-2 1.66667
-3 1.66667
-4 1.66667
-5 1.66667
-6 1.66667
-7 1.66667
-8 1.66667
-9 1.66667
-10 1.66667
-#d12>DELAY3I>LV1#[A2]
-0 0
-1 20
-2 28
-3 31.2
-4 32.48
-5 32.992
-6 33.1968
-7 33.2787
-8 33.3115
-9 33.3246
-10 33.3298
-#d12>DELAY3I>LV1#[A3]
-0 0
-1 30
-2 42
-3 46.8
-4 48.72
-5 49.488
-6 49.7952
-7 49.9181
-8 49.9672
-9 49.9869
-10 49.9948
-#d12>DELAY3I>LV2#[A2]
-0 0
-1 0
-2 12
-3 21.6
-4 27.36
-5 30.432
-6 31.968
-7 32.7053
-8 33.0493
-9 33.2066
-10 33.2774
-#d12>DELAY3I>LV2#[A3]
-0 0
-1 0
-2 18
-3 32.4
-4 41.04
-5 45.648
-6 47.952
-7 49.0579
-8 49.574
-9 49.8099
-10 49.9161
-#d12>DELAY3I>LV3#[A2]
-0 0
-1 0
-2 0
-3 7.2
-4 15.84
-5 22.752
-6 27.36
-7 30.1248
-8 31.6731
-9 32.4988
-10 32.9235
-#d12>DELAY3I>LV3#[A3]
-0 0
-1 0
-2 0
-3 10.8
-4 23.76
-5 34.128
-6 41.04
-7 45.1872
-8 47.5096
-9 48.7483
-10 49.3853
-#d12>DELAY3I>RT1#[A2]
-0 0
-1 12
-2 16.8
-3 18.72
-4 19.488
-5 19.7952
-6 19.9181
-7 19.9672
-8 19.9869
-9 19.9948
-10 19.9979
-#d12>DELAY3I>RT1#[A3]
-0 0
-1 18
-2 25.2
-3 28.08
-4 29.232
-5 29.6928
-6 29.8771
-7 29.9508
-8 29.9803
-9 29.9921
-10 29.9969
-#d12>DELAY3I>RT2#[A2]
-0 0
-1 0
-2 7.2
-3 12.96
-4 16.416
-5 18.2592
-6 19.1808
-7 19.6232
-8 19.8296
-9 19.924
-10 19.9664
-#d12>DELAY3I>RT2#[A3]
-0 0
-1 0
-2 10.8
-3 19.44
-4 24.624
-5 27.3888
-6 28.7712
-7 29.4348
-8 29.7444
-9 29.886
-10 29.9497
-#d1>DELAY1#
-0 10
-1 10
-2 10
-3 10
-4 10
-5 8
-6 6.4
-7 5.12
-8 4.096
-9 3.2768
-10 2.62144
-#d1>DELAY1>LV1#
-0 50
-1 50
-2 50
-3 50
-4 50
-5 40
-6 32
-7 25.6
-8 20.48
-9 16.384
-10 13.1072
-#d2>DELAY1I#[A1]
-0 0
-1 2
-2 3.6
-3 4.88
-4 5.904
-5 6.7232
-6 7.37856
-7 7.90285
-8 8.32228
-9 8.65782
-10 8.92626
-#d2>DELAY1I#[A2]
-0 0
-1 4
-2 7.2
-3 9.76
-4 11.808
-5 13.4464
-6 14.7571
-7 15.8057
-8 16.6446
-9 17.3156
-10 17.8525
-#d2>DELAY1I#[A3]
-0 0
-1 6
-2 10.8
-3 14.64
-4 17.712
-5 20.1696
-6 22.1357
-7 23.7085
-8 24.9668
-9 25.9735
-10 26.7788
-#d2>DELAY1I>LV1#[A1]
-0 0
-1 10
-2 18
-3 24.4
-4 29.52
-5 33.616
-6 36.8928
-7 39.5142
-8 41.6114
-9 43.2891
-10 44.6313
-#d2>DELAY1I>LV1#[A2]
-0 0
-1 20
-2 36
-3 48.8
-4 59.04
-5 67.232
-6 73.7856
-7 79.0285
-8 83.2228
-9 86.5782
-10 89.2626
-#d2>DELAY1I>LV1#[A3]
-0 0
-1 30
-2 54
-3 73.2
-4 88.56
-5 100.848
-6 110.678
-7 118.543
-8 124.834
-9 129.867
-10 133.894
-#d3>DELAY1I#[A1]
-0 0
-1 10
-2 10
-3 10
-4 10
-5 0
-6 0
-7 0
-8 0
-9 0
-10 0
-#d3>DELAY1I#[A2]
-0 0
-1 5
-2 7.5
-3 8.75
-4 9.375
-5 4.6875
-6 2.34375
-7 1.17188
-8 0.585938
-9 0.292969
-10 0.146484
-#d3>DELAY1I#[A3]
-0 0
-1 3.33333
-2 5.55556
-3 7.03704
-4 8.02469
-5 5.34979
-6 3.56653
-7 2.37769
-8 1.58512
-9 1.05675
-10 0.7045
-#d3>DELAY1I>LV1#[A1]
-0 0
-1 10
-2 10
-3 10
-4 10
-5 0
-6 0
-7 0
-8 0
-9 0
-10 0
-#d3>DELAY1I>LV1#[A2]
-0 0
-1 10
-2 15
-3 17.5
-4 18.75
-5 9.375
-6 4.6875
-7 2.34375
-8 1.17188
-9 0.585938
-10 0.292969
-#d3>DELAY1I>LV1#[A3]
-0 0
-1 10
-2 16.6667
-3 21.1111
-4 24.0741
-5 16.0494
-6 10.6996
-7 7.13306
-8 4.75537
-9 3.17025
-10 2.1135
-#d4>DELAY1I#[A1]
-0 0
-1 2
-2 3.6
-3 4.88
-4 5.904
-5 4.7232
-6 3.77856
-7 3.02285
-8 2.41828
-9 1.93462
-10 1.5477
-#d4>DELAY1I#[A2]
-0 0
-1 2
-2 3.6
-3 4.88
-4 5.904
-5 4.7232
-6 3.77856
-7 3.02285
-8 2.41828
-9 1.93462
-10 1.5477
-#d4>DELAY1I#[A3]
-0 0
-1 2
-2 3.6
-3 4.88
-4 5.904
-5 4.7232
-6 3.77856
-7 3.02285
-8 2.41828
-9 1.93462
-10 1.5477
-#d4>DELAY1I>LV1#[A1]
-0 0
-1 10
-2 18
-3 24.4
-4 29.52
-5 23.616
-6 18.8928
-7 15.1142
-8 12.0914
-9 9.67311
-10 7.73849
-#d4>DELAY1I>LV1#[A2]
-0 0
-1 10
-2 18
-3 24.4
-4 29.52
-5 23.616
-6 18.8928
-7 15.1142
-8 12.0914
-9 9.67311
-10 7.73849
-#d4>DELAY1I>LV1#[A3]
-0 0
-1 10
-2 18
-3 24.4
-4 29.52
-5 23.616
-6 18.8928
-7 15.1142
-8 12.0914
-9 9.67311
-10 7.73849
-#d5>DELAY1I#[A1]
-0 0
-1 10
-2 10
-3 10
-4 10
-5 10
-6 10
-7 10
-8 10
-9 10
-10 10
-#d5>DELAY1I#[A2]
-0 0
-1 10
-2 15
-3 17.5
-4 18.75
-5 19.375
-6 19.6875
-7 19.8438
-8 19.9219
-9 19.9609
-10 19.9805
-#d5>DELAY1I#[A3]
-0 0
-1 10
-2 16.6667
-3 21.1111
-4 24.0741
-5 26.0494
-6 27.3663
-7 28.2442
-8 28.8294
-9 29.2196
-10 29.4798
-#d5>DELAY1I>LV1#[A1]
-0 0
-1 10
-2 10
-3 10
-4 10
-5 10
-6 10
-7 10
-8 10
-9 10
-10 10
-#d5>DELAY1I>LV1#[A2]
-0 0
-1 20
-2 30
-3 35
-4 37.5
-5 38.75
-6 39.375
-7 39.6875
-8 39.8438
-9 39.9219
-10 39.9609
-#d5>DELAY1I>LV1#[A3]
-0 0
-1 30
-2 50
-3 63.3333
-4 72.2222
-5 78.1481
-6 82.0988
-7 84.7325
-8 86.4883
-9 87.6589
-10 88.4393
-#d6>DELAY1I#[A2]
-0 0
-1 4
-2 7.2
-3 9.76
-4 11.808
-5 13.4464
-6 14.7571
-7 15.8057
-8 16.6446
-9 17.3156
-10 17.8525
-#d6>DELAY1I#[A3]
-0 0
-1 6
-2 10.8
-3 14.64
-4 17.712
-5 20.1696
-6 22.1357
-7 23.7085
-8 24.9668
-9 25.9735
-10 26.7788
-#d6>DELAY1I>LV1#[A2]
-0 0
-1 20
-2 36
-3 48.8
-4 59.04
-5 67.232
-6 73.7856
-7 79.0285
-8 83.2228
-9 86.5782
-10 89.2626
-#d6>DELAY1I>LV1#[A3]
-0 0
-1 30
-2 54
-3 73.2
-4 88.56
-5 100.848
-6 110.678
-7 118.543
-8 124.834
-9 129.867
-10 133.894
-#d7>DELAY3#
-0 10
-1 10
-2 10
-3 10
-4 10
-5 10
-6 10
-7 7.84
-8 5.248
-9 3.1744
-10 1.792
-#d7>DELAY3>DL#
-0 1.66667
-1 1.66667
-2 1.66667
-3 1.66667
-4 1.66667
-5 1.66667
-6 1.66667
-7 1.66667
-8 1.66667
-9 1.66667
-10 1.66667
-#d7>DELAY3>LV1#
-0 16.6667
-1 16.6667
-2 16.6667
-3 16.6667
-4 16.6667
-5 6.66667
-6 2.66667
-7 1.06667
-8 0.426667
-9 0.170667
-10 0.0682667
-#d7>DELAY3>LV2#
-0 16.6667
-1 16.6667
-2 16.6667
-3 16.6667
-4 16.6667
-5 16.6667
-6 10.6667
-7 5.86667
-8 2.98667
-9 1.45067
-10 0.682667
-#d7>DELAY3>LV3#
-0 16.6667
-1 16.6667
-2 16.6667
-3 16.6667
-4 16.6667
-5 16.6667
-6 16.6667
-7 13.0667
-8 8.74667
-9 5.29067
-10 2.98667
-#d7>DELAY3>RT1#
-0 10
-1 10
-2 10
-3 10
-4 10
-5 4
-6 1.6
-7 0.64
-8 0.256
-9 0.1024
-10 0.04096
-#d7>DELAY3>RT2#
-0 10
-1 10
-2 10
-3 10
-4 10
-5 10
-6 6.4
-7 3.52
-8 1.792
-9 0.8704
-10 0.4096
-#d8>DELAY3#[A1]
-0 10
-1 10
-2 10
-3 10
-4 10
-5 10
-6 10
-7 -260
-8 1360
-9 -5120
-10 16480
-#d8>DELAY3#[A2]
-0 10
-1 10
-2 10
-3 10
-4 10
-5 10
-6 10
-7 -23.75
-8 26.875
-9 -23.75
-10 18.4375
-#d8>DELAY3#[A3]
-0 10
-1 10
-2 10
-3 10
-4 10
-5 10
-6 10
-7 0
-8 0
-9 0
-10 0
-#d8>DELAY3>DL#[A1]
-0 0.333333
-1 0.333333
-2 0.333333
-3 0.333333
-4 0.333333
-5 0.333333
-6 0.333333
-7 0.333333
-8 0.333333
-9 0.333333
-10 0.333333
-#d8>DELAY3>DL#[A2]
-0 0.666667
-1 0.666667
-2 0.666667
-3 0.666667
-4 0.666667
-5 0.666667
-6 0.666667
-7 0.666667
-8 0.666667
-9 0.666667
-10 0.666667
-#d8>DELAY3>DL#[A3]
-0 1
-1 1
-2 1
-3 1
-4 1
-5 1
-6 1
-7 1
-8 1
-9 1
-10 1
-#d8>DELAY3>LV1#[A1]
-0 3.33333
-1 3.33333
-2 3.33333
-3 3.33333
-4 3.33333
-5 -6.66667
-6 13.3333
-7 -26.6667
-8 53.3333
-9 -106.667
-10 213.333
-#d8>DELAY3>LV1#[A2]
-0 6.66667
-1 6.66667
-2 6.66667
-3 6.66667
-4 6.66667
-5 -3.33333
-6 1.66667
-7 -0.833333
-8 0.416667
-9 -0.208333
-10 0.104167
-#d8>DELAY3>LV1#[A3]
-0 10
-1 10
-2 10
-3 10
-4 10
-5 0
-6 0
-7 0
-8 0
-9 0
-10 0
-#d8>DELAY3>LV2#[A1]
-0 3.33333
-1 3.33333
-2 3.33333
-3 3.33333
-4 3.33333
-5 3.33333
-6 -26.6667
-7 93.3333
-8 -266.667
-9 693.333
-10 -1706.67
-#d8>DELAY3>LV2#[A2]
-0 6.66667
-1 6.66667
-2 6.66667
-3 6.66667
-4 6.66667
-5 6.66667
-6 -8.33333
-7 6.66667
-8 -4.58333
-9 2.91667
-10 -1.77083
-#d8>DELAY3>LV2#[A3]
-0 10
-1 10
-2 10
-3 10
-4 10
-5 10
-6 0
-7 0
-8 0
-9 0
-10 0
-#d8>DELAY3>LV3#[A1]
-0 3.33333
-1 3.33333
-2 3.33333
-3 3.33333
-4 3.33333
-5 3.33333
-6 3.33333
-7 -86.6667
-8 453.333
-9 -1706.67
-10 5493.33
-#d8>DELAY3>LV3#[A2]
-0 6.66667
-1 6.66667
-2 6.66667
-3 6.66667
-4 6.66667
-5 6.66667
-6 6.66667
-7 -15.8333
-8 17.9167
-9 -15.8333
-10 12.2917
-#d8>DELAY3>LV3#[A3]
-0 10
-1 10
-2 10
-3 10
-4 10
-5 10
-6 10
-7 0
-8 0
-9 0
-10 0
-#d8>DELAY3>RT1#[A1]
-0 10
-1 10
-2 10
-3 10
-4 10
-5 -20
-6 40
-7 -80
-8 160
-9 -320
-10 640
-#d8>DELAY3>RT1#[A2]
-0 10
-1 10
-2 10
-3 10
-4 10
-5 -5
-6 2.5
-7 -1.25
-8 0.625
-9 -0.3125
-10 0.15625
-#d8>DELAY3>RT1#[A3]
-0 10
-1 10
-2 10
-3 10
-4 10
-5 0
-6 0
-7 0
-8 0
-9 0
-10 0
-#d8>DELAY3>RT2#[A1]
-0 10
-1 10
-2 10
-3 10
-4 10
-5 10
-6 -80
-7 280
-8 -800
-9 2080
-10 -5120
-#d8>DELAY3>RT2#[A2]
-0 10
-1 10
-2 10
-3 10
-4 10
-5 10
-6 -12.5
-7 10
-8 -6.875
-9 4.375
-10 -2.65625
-#d8>DELAY3>RT2#[A3]
-0 10
-1 10
-2 10
-3 10
-4 10
-5 10
-6 0
-7 0
-8 0
-9 0
-10 0
-#d9>DELAY3I#[A2]
-0 0
-1 0
-2 0
-3 4.32
-4 9.504
-5 13.6512
-6 16.416
-7 18.0749
-8 19.0039
-9 19.4993
-10 19.7541
-#d9>DELAY3I#[A3]
-0 0
-1 0
-2 0
-3 6.48
-4 14.256
-5 20.4768
-6 24.624
-7 27.1123
-8 28.5058
-9 29.249
-10 29.6312
-#d9>DELAY3I>DL#[A2]
-0 1.66667
-1 1.66667
-2 1.66667
-3 1.66667
-4 1.66667
-5 1.66667
-6 1.66667
-7 1.66667
-8 1.66667
-9 1.66667
-10 1.66667
-#d9>DELAY3I>DL#[A3]
-0 1.66667
-1 1.66667
-2 1.66667
-3 1.66667
-4 1.66667
-5 1.66667
-6 1.66667
-7 1.66667
-8 1.66667
-9 1.66667
-10 1.66667
-#d9>DELAY3I>LV1#[A2]
-0 0
-1 20
-2 28
-3 31.2
-4 32.48
-5 32.992
-6 33.1968
-7 33.2787
-8 33.3115
-9 33.3246
-10 33.3298
-#d9>DELAY3I>LV1#[A3]
-0 0
-1 30
-2 42
-3 46.8
-4 48.72
-5 49.488
-6 49.7952
-7 49.9181
-8 49.9672
-9 49.9869
-10 49.9948
-#d9>DELAY3I>LV2#[A2]
-0 0
-1 0
-2 12
-3 21.6
-4 27.36
-5 30.432
-6 31.968
-7 32.7053
-8 33.0493
-9 33.2066
-10 33.2774
-#d9>DELAY3I>LV2#[A3]
-0 0
-1 0
-2 18
-3 32.4
-4 41.04
-5 45.648
-6 47.952
-7 49.0579
-8 49.574
-9 49.8099
-10 49.9161
-#d9>DELAY3I>LV3#[A2]
-0 0
-1 0
-2 0
-3 7.2
-4 15.84
-5 22.752
-6 27.36
-7 30.1248
-8 31.6731
-9 32.4988
-10 32.9235
-#d9>DELAY3I>LV3#[A3]
-0 0
-1 0
-2 0
-3 10.8
-4 23.76
-5 34.128
-6 41.04
-7 45.1872
-8 47.5096
-9 48.7483
-10 49.3853
-#d9>DELAY3I>RT1#[A2]
-0 0
-1 12
-2 16.8
-3 18.72
-4 19.488
-5 19.7952
-6 19.9181
-7 19.9672
-8 19.9869
-9 19.9948
-10 19.9979
-#d9>DELAY3I>RT1#[A3]
-0 0
-1 18
-2 25.2
-3 28.08
-4 29.232
-5 29.6928
-6 29.8771
-7 29.9508
-8 29.9803
-9 29.9921
-10 29.9969
-#d9>DELAY3I>RT2#[A2]
-0 0
-1 0
-2 7.2
-3 12.96
-4 16.416
-5 18.2592
-6 19.1808
-7 19.6232
-8 19.8296
-9 19.924
-10 19.9664
-#d9>DELAY3I>RT2#[A3]
-0 0
-1 0
-2 10.8
-3 19.44
-4 24.624
-5 27.3888
-6 28.7712
-7 29.4348
-8 29.7444
-9 29.886
-10 29.9497
d1
0 10
1 10
2 10
3 10
4 10
-5 8
-6 6.4
-7 5.12
-8 4.096
-9 3.2768
-10 2.62144
+5 8.14506
+6 6.6342
+7 5.4036
+8 4.40127
+9 3.58486
+10 2.91989
d10
0 420
1 420
2 420
3 420
4 420
-5 420
-6 420
-7 329.28
-8 220.416
-9 133.325
-10 75.264
+5 414.968
+6 375.811
+7 309.044
+8 235.779
+9 170.056
+10 117.528
d11[A1]
0 420
1 420
2 420
3 420
4 420
-5 420
-6 420
-7 -10920
-8 57120
-9 -215040
-10 692160
+5 109.922
+6 1.77521
+7 0.0157964
+8 0.000110404
+9 6.765e-07
+10 3.8154e-09
d11[A2]
0 420
1 420
2 420
3 420
4 420
-5 420
-6 420
-7 -997.5
-8 1128.75
-9 -997.5
-10 774.375
+5 356.323
+6 155.289
+7 47.6888
+8 12.2493
+9 2.82797
+10 0.608359
d11[A3]
0 420
1 420
2 420
3 420
4 420
-5 420
-6 420
-7 0
-8 0
-9 0
-10 0
+5 398.672
+6 284.988
+7 164.084
+8 82.7866
+9 38.3294
+10 16.7165
d12[A2]
0 0
-1 0
-2 0
-3 181.44
-4 399.168
-5 573.35
-6 689.472
-7 759.145
-8 798.162
-9 818.971
-10 829.673
+1 10.0642
+2 88.3787
+3 221.913
+4 368.441
+5 499.887
+6 604.945
+7 682.856
+8 737.683
+9 774.795
+10 799.177
d12[A3]
0 0
-1 0
-2 0
-3 272.16
-4 598.752
-5 860.026
-6 1034.21
-7 1138.72
-8 1197.24
-9 1228.46
-10 1244.51
+1 15.0964
+2 132.568
+3 332.869
+4 552.662
+5 749.831
+6 907.417
+7 1024.28
+8 1106.52
+9 1162.19
+10 1198.77
d2[A1]
0 0
-1 2
-2 3.6
-3 4.88
-4 5.904
-5 6.7232
-6 7.37856
-7 7.90285
-8 8.32228
-9 8.65782
-10 8.92626
+1 1.85494
+2 3.3658
+3 4.5964
+4 5.59873
+5 6.41514
+6 7.08011
+7 7.62173
+8 8.06289
+9 8.42221
+10 8.71488
d2[A2]
0 0
-1 4
-2 7.2
-3 9.76
-4 11.808
-5 13.4464
-6 14.7571
-7 15.8057
-8 16.6446
-9 17.3156
-10 17.8525
+1 3.70987
+2 6.73159
+3 9.1928
+4 11.1975
+5 12.8303
+6 14.1602
+7 15.2435
+8 16.1258
+9 16.8444
+10 17.4298
d2[A3]
0 0
-1 6
-2 10.8
-3 14.64
-4 17.712
-5 20.1696
-6 22.1357
-7 23.7085
-8 24.9668
-9 25.9735
-10 26.7788
+1 5.56481
+2 10.0974
+3 13.7892
+4 16.7962
+5 19.2454
+6 21.2403
+7 22.8652
+8 24.1887
+9 25.2666
+10 26.1446
d3[A1]
0 0
-1 10
-2 10
-3 10
-4 10
-5 0
-6 0
-7 0
-8 0
-9 0
-10 0
+1 6.83594
+2 8.99887
+3 9.68324
+4 9.89977
+5 3.13235
+6 0.991095
+7 0.313589
+8 0.0992214
+9 0.0313943
+10 0.00993335
d3[A2]
0 0
-1 5
-2 7.5
-3 8.75
-4 9.375
-5 4.6875
-6 2.34375
-7 1.17188
-8 0.585938
-9 0.292969
-10 0.146484
+1 4.13818
+2 6.56391
+3 7.98583
+4 8.81933
+5 5.16973
+6 3.0304
+7 1.77636
+8 1.04127
+9 0.610375
+10 0.357791
d3[A3]
0 0
-1 3.33333
-2 5.55556
-3 7.03704
-4 8.02469
-5 5.34979
-6 3.56653
-7 2.37769
-8 1.58512
-9 1.05675
-10 0.7045
+1 2.93933
+2 5.0147
+3 6.48004
+4 7.51468
+5 5.30586
+6 3.74629
+7 2.64513
+8 1.86764
+9 1.31868
+10 0.931075
d4[A1]
0 0
-1 2
-2 3.6
-3 4.88
-4 5.904
-5 4.7232
-6 3.77856
-7 3.02285
-8 2.41828
-9 1.93462
-10 1.5477
+1 1.85494
+2 3.3658
+3 4.5964
+4 5.59873
+5 4.5602
+6 3.71431
+7 3.02533
+8 2.46415
+9 2.00707
+10 1.63477
d4[A2]
0 0
-1 2
-2 3.6
-3 4.88
-4 5.904
-5 4.7232
-6 3.77856
-7 3.02285
-8 2.41828
-9 1.93462
-10 1.5477
+1 1.85494
+2 3.3658
+3 4.5964
+4 5.59873
+5 4.5602
+6 3.71431
+7 3.02533
+8 2.46415
+9 2.00707
+10 1.63477
d4[A3]
0 0
-1 2
-2 3.6
-3 4.88
-4 5.904
-5 4.7232
-6 3.77856
-7 3.02285
-8 2.41828
-9 1.93462
-10 1.5477
+1 1.85494
+2 3.3658
+3 4.5964
+4 5.59873
+5 4.5602
+6 3.71431
+7 3.02533
+8 2.46415
+9 2.00707
+10 1.63477
d5[A1]
0 0
-1 10
-2 10
-3 10
-4 10
-5 10
-6 10
-7 10
-8 10
-9 10
-10 10
+1 6.83594
+2 8.99887
+3 9.68324
+4 9.89977
+5 9.96829
+6 9.98997
+7 9.99683
+8 9.999
+9 9.99968
+10 9.9999
d5[A2]
0 0
-1 10
-2 15
-3 17.5
-4 18.75
-5 19.375
-6 19.6875
-7 19.8438
-8 19.9219
-9 19.9609
-10 19.9805
+1 8.27637
+2 13.1278
+3 15.9717
+4 17.6387
+5 18.6158
+6 19.1886
+7 19.5244
+8 19.7212
+9 19.8366
+10 19.9042
d5[A3]
0 0
-1 10
-2 16.6667
-3 21.1111
-4 24.0741
-5 26.0494
-6 27.3663
-7 28.2442
-8 28.8294
-9 29.2196
-10 29.4798
+1 8.818
+2 15.0441
+3 19.4401
+4 22.544
+5 24.7356
+6 26.283
+7 27.3755
+8 28.1469
+9 28.6916
+10 29.0762
d6[A2]
0 0
-1 4
-2 7.2
-3 9.76
-4 11.808
-5 13.4464
-6 14.7571
-7 15.8057
-8 16.6446
-9 17.3156
-10 17.8525
+1 3.70987
+2 6.73159
+3 9.1928
+4 11.1975
+5 12.8303
+6 14.1602
+7 15.2435
+8 16.1258
+9 16.8444
+10 17.4298
d6[A3]
0 0
-1 6
-2 10.8
-3 14.64
-4 17.712
-5 20.1696
-6 22.1357
-7 23.7085
-8 24.9668
-9 25.9735
-10 26.7788
+1 5.56481
+2 10.0974
+3 13.7892
+4 16.7962
+5 19.2454
+6 21.2403
+7 22.8652
+8 24.1887
+9 25.2666
+10 26.1446
d7
0 10
1 10
2 10
3 10
4 10
-5 10
-6 10
-7 7.84
-8 5.248
-9 3.1744
-10 1.792
+5 9.88019
+6 8.94787
+7 7.35818
+8 5.61379
+9 4.04896
+10 2.79828
d8[A1]
0 10
1 10
2 10
3 10
4 10
-5 10
-6 10
-7 -260
-8 1360
-9 -5120
-10 16480
+5 2.61719
+6 0.0422668
+7 0.000376105
+8 2.62866e-06
+9 1.61072e-08
+10 9.08429e-11
d8[A2]
0 10
1 10
2 10
3 10
4 10
-5 10
-6 10
-7 -23.75
-8 26.875
-9 -23.75
-10 18.4375
+5 8.48389
+6 3.69735
+7 1.13545
+8 0.29165
+9 0.0673325
+10 0.0144847
d8[A3]
0 10
1 10
2 10
3 10
4 10
-5 10
-6 10
-7 0
-8 0
-9 0
-10 0
+5 9.49219
+6 6.78543
+7 3.90675
+8 1.97111
+9 0.912604
+10 0.398012
d9[A2]
0 0
-1 0
-2 0
-3 4.32
-4 9.504
-5 13.6512
-6 16.416
-7 18.0749
-8 19.0039
-9 19.4993
-10 19.7541
+1 0.239625
+2 2.10426
+3 5.28364
+4 8.77241
+5 11.9021
+6 14.4034
+7 16.2585
+8 17.5639
+9 18.4475
+10 19.028
d9[A3]
0 0
-1 0
-2 0
-3 6.48
-4 14.256
-5 20.4768
-6 24.624
-7 27.1123
-8 28.5058
-9 29.249
-10 29.6312
+1 0.359437
+2 3.15638
+3 7.92546
+4 13.1586
+5 17.8531
+6 21.6052
+7 24.3877
+8 26.3458
+9 27.6713
+10 28.542
delay
0 5
delay 2
@@ -1742,15 +374,5 @@ k
0 42
SAVEPER
0 1
-1 1
-2 1
-3 1
-4 1
-5 1
-6 1
-7 1
-8 1
-9 1
-10 1
TIME STEP
-0 1
+0 0.25
diff --git a/models/delay/delay.mdl b/models/delay/delay.mdl
index 4517ff60..a6967034 100755
--- a/models/delay/delay.mdl
+++ b/models/delay/delay.mdl
@@ -33,5 +33,5 @@ d12[SubA] = k * DELAY3I(input 2[SubA], delay 2, init 2[SubA]) ~~|
INITIAL TIME = 0 ~~|
FINAL TIME = 10 ~~|
-TIME STEP = 1 ~~|
-SAVEPER = TIME STEP ~~|
+TIME STEP = 0.25 ~~|
+SAVEPER = 1 ~~|
diff --git a/models/delay/delay.stmx b/models/delay/delay.stmx
index 118122fd..d3414a4a 100644
--- a/models/delay/delay.stmx
+++ b/models/delay/delay.stmx
@@ -7,10 +7,10 @@
isee systems, inc.
Stella Architect
-
+
0
10
- 1
+ 0.25
diff --git a/packages/compile/src/model/read-equations.spec.ts b/packages/compile/src/model/read-equations.spec.ts
index 2bc54ed0..b97f7a03 100644
--- a/packages/compile/src/model/read-equations.spec.ts
+++ b/packages/compile/src/model/read-equations.spec.ts
@@ -5619,13 +5619,13 @@ describe('readEquations', () => {
refId: '_final_time',
varType: 'const'
}),
- v('TIME STEP', '1', {
+ v('TIME STEP', '0.25', {
refId: '_time_step',
varType: 'const'
}),
- v('SAVEPER', 'TIME STEP', {
+ v('SAVEPER', '1', {
refId: '_saveper',
- references: ['_time_step']
+ varType: 'const'
}),
v('Time', '', {
refId: '_time',
diff --git a/packages/compile/src/model/read-variables.spec.ts b/packages/compile/src/model/read-variables.spec.ts
index 4d667a41..5ca7d894 100644
--- a/packages/compile/src/model/read-variables.spec.ts
+++ b/packages/compile/src/model/read-variables.spec.ts
@@ -502,8 +502,8 @@ describe('readVariables', () => {
}),
v('INITIAL TIME', '0'),
v('FINAL TIME', '10'),
- v('TIME STEP', '1'),
- v('SAVEPER', 'TIME STEP'),
+ v('TIME STEP', '0.25'),
+ v('SAVEPER', '1'),
v('Time', '')
])
})