diff --git a/ecolab b/ecolab index 1566333bf..40fc8e681 160000 --- a/ecolab +++ b/ecolab @@ -1 +1 @@ -Subproject commit 1566333bf799d39b0acba4719b8482debb8f7700 +Subproject commit 40fc8e68176f20a1304bb1bb56caabc1ea31ea11 diff --git a/examples/1Free.mky b/examples/1Free.mky index f328df869..143b08bf8 100644 --- a/examples/1Free.mky +++ b/examples/1Free.mky @@ -1,6 +1,7 @@ 3 - 3.4.0-beta.3 + 3.22.0 + 64 @@ -9,12 +10,12 @@ 106.48 298.831 - 79.69 - 332.087 - 39.0426 - 123.31 + 79.953 + 331.76 + 39.7047 + 125.033 18.98 - 20.96 + 23.96 @@ -24,12 +25,12 @@ 151.48 298.831 - 86.1867 - 367.607 - 36.5644 - 165.632 - -2.52 - 52.96 + 86.8521 + 366.906 + 37.7355 + 166.989 + 1.48 + 53.96 @@ -39,10 +40,10 @@ 189.48 299.831 - 40.0946 - 428.809 - -2.52 - 84.96 + 41.5872 + 427.52 + 2.98 + 83.96 @@ -179,8 +180,8 @@ 1 12 Variable:stock - 96.58 - 160.26 + 92.18 + 158.26 NaN NaN 1 @@ -212,7 +213,7 @@ 1 14 Variable:stock - 128.58 + 122.18 162.26 NaN NaN @@ -245,8 +246,8 @@ 1 16 Variable:stock - 160.58 - 162.26 + 152.18 + 161.26 NaN NaN 1 @@ -278,7 +279,7 @@ 1 18 Variable:stock - 192.58 + 182.18 156.26 NaN NaN @@ -311,8 +312,8 @@ 1 20 Variable:flow - 47.48 - 20.96 + 45.48 + 23.96 NaN NaN 1 @@ -346,7 +347,7 @@ 23 Variable:flow 36.48 - 52.96 + 53.96 NaN NaN 1 @@ -379,8 +380,8 @@ 1 26 Variable:flow - 36.48 - 84.96 + 37.48 + 83.96 NaN NaN 1 diff --git a/examples/4MonetaryMinskyModelLessUnstableStart.mky b/examples/4MonetaryMinskyModelLessUnstableStart.mky index 05907f18a..99bda91c6 100644 --- a/examples/4MonetaryMinskyModelLessUnstableStart.mky +++ b/examples/4MonetaryMinskyModelLessUnstableStart.mky @@ -1,6 +1,7 @@ 3 - 3.4.0-beta.3 + 3.22.0 + 593 @@ -127,10 +128,10 @@ 525 54 - 31.9999 + 28.9999 481.001 - 189.994 - 498.029 + 189.695 + 498.32 207 472.001 @@ -353,10 +354,10 @@ 513 134 - 472.5 + 470 575 - 476.139 - 534.987 + 473.739 + 533.884 500.999 532.001 @@ -541,12 +542,12 @@ 401 200 - 922 + 919 269.5 - 945.383 - 282.491 - 752.097 - 333.409 + 941.976 + 282.265 + 752.058 + 332.295 775 330.001 @@ -606,16 +607,16 @@ 357 208 - 739 + 738 214.5 - 758.148 - 202.227 - 673.699 - 189.46 - 699.231 - 142.325 - 740.473 - 139.38 + 757.176 + 202.209 + 672.604 + 189.424 + 698.173 + 142.22 + 739.475 + 139.271 746 143.001 @@ -2623,7 +2624,7 @@ false true -1 - 1 + 300 0.1 false @@ -2689,7 +2690,7 @@ false true -1 - 1 + 900 0.1 false @@ -2722,7 +2723,7 @@ false true -1 - 1 + 1.25 0.1 false @@ -2958,7 +2959,7 @@ false true -1 - 1 + 56.905 0.1 false @@ -2992,7 +2993,7 @@ false true -1 - 1 + 300 0.1 false @@ -3162,7 +3163,7 @@ false true -1 - 1 + 6 0.1 false @@ -3230,7 +3231,7 @@ false true -1 - 1 + 45.524 0.1 false @@ -3702,7 +3703,7 @@ false true -1 - 1 + 1.25 0.1 false @@ -4136,7 +4137,7 @@ false true -1 - 1 + 900 0.1 false @@ -4236,7 +4237,7 @@ false true -1 - 1 + 1.25 0.1 false @@ -4504,7 +4505,7 @@ false true -1 - 1 + 1.25 0.1 false @@ -4962,8 +4963,8 @@ 1 436 Variable:stock - 650.2 - 1017.81 + 646.9 + 1018.31 NaN NaN 1 @@ -4995,8 +4996,8 @@ 1 438 Variable:stock - 682.2 - 1021.81 + 676.9 + 1022.31 NaN NaN 1 @@ -5028,8 +5029,8 @@ 1 440 Variable:stock - 714.2 - 1016.81 + 706.9 + 1017.31 NaN NaN 1 @@ -5061,8 +5062,8 @@ 1 442 Variable:stock - 746.2 - 1017.81 + 736.9 + 1018.31 NaN NaN 1 @@ -5094,8 +5095,8 @@ 1 444 Variable:stock - 778.2 - 1019.81 + 766.9 + 1020.31 NaN NaN 1 @@ -5127,8 +5128,8 @@ 1 446 Variable:stock - 810.2 - 1012.81 + 796.9 + 1013.31 NaN NaN 1 @@ -5160,8 +5161,8 @@ 1 448 Variable:stock - 842.2 - 1011.81 + 826.9 + 1011.31 NaN NaN 1 @@ -5193,8 +5194,8 @@ 1 450 Variable:stock - 874.2 - 1015.81 + 856.9 + 1016.31 NaN NaN 1 @@ -5226,8 +5227,8 @@ 1 452 Variable:stock - 906.2 - 1016.81 + 886.9 + 1018.31 NaN NaN 1 @@ -5259,8 +5260,8 @@ 1 454 Variable:stock - 938.199 - 1014.81 + 916.899 + 1014.31 NaN NaN 1 @@ -5292,8 +5293,8 @@ 1 456 Variable:flow - 595 - 430.508 + 593 + 431.008 NaN NaN 1 @@ -5326,8 +5327,8 @@ 1 459 Variable:flow - 596 - 462.508 + 593 + 461.008 NaN NaN 1 @@ -5360,8 +5361,8 @@ 1 462 Variable:flow - 596 - 494.508 + 593 + 491.008 NaN NaN 1 @@ -5394,8 +5395,8 @@ 1 465 Variable:flow - 596 - 526.508 + 592 + 521.008 NaN NaN 1 @@ -5428,8 +5429,8 @@ 1 468 Variable:flow - 596 - 558.508 + 593 + 551.008 NaN NaN 1 @@ -5462,8 +5463,8 @@ 1 471 Variable:flow - 596 - 590.508 + 593 + 581.008 NaN NaN 1 @@ -5496,8 +5497,8 @@ 1 474 Variable:flow - 596 - 622.508 + 592 + 611.008 NaN NaN 1 @@ -5530,8 +5531,8 @@ 1 477 Variable:flow - 595 - 654.508 + 592 + 641.008 NaN NaN 1 @@ -5564,8 +5565,8 @@ 1 480 Variable:flow - 599 - 686.508 + 596 + 671.008 NaN NaN 1 @@ -5598,8 +5599,8 @@ 1 483 Variable:flow - 597 - 718.508 + 595 + 701.008 NaN NaN 1 @@ -5633,7 +5634,7 @@ 486 Variable:flow 582 - 784.508 + 763.008 NaN NaN 1 @@ -5667,7 +5668,7 @@ 489 Variable:flow 584 - 886.508 + 859.008 NaN NaN 1 @@ -5701,7 +5702,7 @@ 492 Variable:flow 583 - 920.508 + 891.008 NaN NaN 1 @@ -5734,8 +5735,8 @@ 1 495 Variable:flow - 582 - 852.508 + 581 + 827.008 NaN NaN 1 @@ -5769,7 +5770,7 @@ 498 Variable:flow 580 - 818.508 + 795.008 NaN NaN 1 @@ -5803,7 +5804,7 @@ 501 Variable:flow 584 - 750.508 + 731.008 NaN NaN 1 @@ -5836,8 +5837,8 @@ 1 504 Variable:stock - 970.199 - 1011.81 + 946.899 + 1011.31 NaN NaN 1 @@ -5984,7 +5985,7 @@ false true - -1 + -10 -1 0.1 @@ -6215,9 +6216,9 @@ false true - -1 - 1 - 0.1 + -0.4 + 0.4 + 0.004 false @@ -6380,7 +6381,7 @@ false true - -33.3333 + -333.333 1 0.1 diff --git a/examples/BasicGrowthModel.mky b/examples/BasicGrowthModel.mky index 443140488..6d36f0444 100644 --- a/examples/BasicGrowthModel.mky +++ b/examples/BasicGrowthModel.mky @@ -1,6 +1,7 @@ 3 - 3.4.0-beta.3 + 3.22.0 + 74 @@ -373,7 +374,7 @@ 1 36 Variable:integral - 891 + 875 174 NaN NaN diff --git a/examples/EndogenousMoney.mky b/examples/EndogenousMoney.mky index a9e933c2e..a9c24b3fc 100644 --- a/examples/EndogenousMoney.mky +++ b/examples/EndogenousMoney.mky @@ -1,6 +1,7 @@ 3 - 3.4.0-beta.3 + 3.22.0 + 454 @@ -900,8 +901,8 @@ 1 80 Variable:stock - 1353.98 - 545.406 + 1349.03 + 545.906 NaN NaN 1 @@ -933,8 +934,8 @@ 1 82 Variable:stock - 1417.98 - 538.406 + 1409.03 + 540.906 NaN NaN 1 @@ -966,8 +967,8 @@ 1 84 Variable:stock - 1449.98 - 548.406 + 1439.03 + 547.906 NaN NaN 1 @@ -999,8 +1000,8 @@ 1 86 Variable:stock - 1481.98 - 542.406 + 1469.03 + 543.906 NaN NaN 1 @@ -1032,8 +1033,8 @@ 1 88 Variable:stock - 1513.98 - 537.406 + 1499.03 + 540.906 NaN NaN 1 @@ -1065,8 +1066,8 @@ 1 90 Variable:flow - 1298.51 - 104.213 + 1297.01 + 111.713 NaN NaN 1 @@ -1083,7 +1084,7 @@ false true -1 - 1.42857 + 1 0.1 false @@ -1099,8 +1100,8 @@ 1 93 Variable:flow - 1307.51 - 136.213 + 1305.01 + 141.713 NaN NaN 1 @@ -1133,8 +1134,8 @@ 1 96 Variable:flow - 1293.51 - 168.213 + 1293.01 + 171.713 NaN NaN 1 @@ -1151,7 +1152,7 @@ false true -1 - 1.11111 + 1 0.1 false @@ -1167,8 +1168,8 @@ 1 99 Variable:flow - 1289.51 - 200.213 + 1290.01 + 201.713 NaN NaN 1 @@ -1201,8 +1202,8 @@ 1 102 Variable:flow - 1291.51 - 234.213 + 1291.01 + 233.713 NaN NaN 1 @@ -1235,8 +1236,8 @@ 1 105 Variable:flow - 1297.51 - 268.213 + 1295.01 + 265.713 NaN NaN 1 @@ -1253,7 +1254,7 @@ false true -1 - 13.3333 + 1 0.1 false @@ -1269,8 +1270,8 @@ 1 108 Variable:flow - 1295.51 - 302.213 + 1294.01 + 297.713 NaN NaN 1 @@ -1287,7 +1288,7 @@ false true -1 - 45 + 1 0.1 false @@ -1303,8 +1304,8 @@ 1 111 Variable:flow - 1290.51 - 336.213 + 1289.01 + 329.713 NaN NaN 1 @@ -1337,8 +1338,8 @@ 1 114 Variable:flow - 1292.51 - 370.213 + 1291.01 + 361.713 NaN NaN 1 @@ -1371,8 +1372,8 @@ 1 117 Variable:flow - 1292.51 - 404.213 + 1291.01 + 393.713 NaN NaN 1 @@ -1405,8 +1406,8 @@ 1 120 Variable:flow - 1294.51 - 438.213 + 1292.01 + 425.713 NaN NaN 1 @@ -1439,7 +1440,7 @@ 1 123 Variable:stock - 821.478 + 816.528 261.422 NaN NaN @@ -1472,8 +1473,8 @@ 1 125 Variable:flow - 773.728 - 33.9082 + 771.228 + 38.9082 NaN NaN 1 @@ -1490,7 +1491,7 @@ false true -1 - 13.3333 + 1 0.1 false @@ -1506,8 +1507,8 @@ 1 128 Variable:flow - 771.728 - 67.9082 + 770.228 + 70.9082 NaN NaN 1 @@ -1524,7 +1525,7 @@ false true -1 - 45 + 1 0.1 false @@ -1540,8 +1541,8 @@ 1 131 Variable:flow - 768.728 - 101.908 + 767.228 + 102.908 NaN NaN 1 @@ -1574,8 +1575,8 @@ 1 134 Variable:flow - 766.728 - 135.908 + 765.228 + 134.908 NaN NaN 1 @@ -1608,8 +1609,8 @@ 1 137 Variable:flow - 765.728 - 169.908 + 766.228 + 166.908 NaN NaN 1 @@ -1642,8 +1643,8 @@ 1 140 Variable:stock - 853.478 - 250.422 + 846.528 + 253.422 NaN NaN 1 @@ -1675,8 +1676,8 @@ 1 142 Variable:stock - 829.682 - 764.04 + 825.282 + 763.54 NaN NaN 1 @@ -1708,8 +1709,8 @@ 1 144 Variable:flow - 781.51 - 430.823 + 779.51 + 438.323 NaN NaN 1 @@ -1726,7 +1727,7 @@ false true -1 - 13.3333 + 1 0.1 false @@ -1742,8 +1743,8 @@ 1 147 Variable:flow - 779.51 - 464.823 + 778.51 + 470.323 NaN NaN 1 @@ -1760,7 +1761,7 @@ false true -1 - 45 + 1 0.1 false @@ -1776,8 +1777,8 @@ 1 150 Variable:flow - 778.51 - 498.823 + 776.51 + 502.323 NaN NaN 1 @@ -1810,8 +1811,8 @@ 1 153 Variable:flow - 776.51 - 532.823 + 775.51 + 534.323 NaN NaN 1 @@ -1844,8 +1845,8 @@ 1 156 Variable:flow - 791.51 - 566.823 + 789.51 + 566.323 NaN NaN 1 @@ -1878,8 +1879,8 @@ 1 159 Variable:flow - 782.51 - 598.823 + 781.51 + 596.323 NaN NaN 1 @@ -1896,7 +1897,7 @@ false true -1 - 1.42857 + 1 0.1 false @@ -1913,7 +1914,7 @@ 162 Variable:flow 777.51 - 630.823 + 626.323 NaN NaN 1 @@ -1930,7 +1931,7 @@ false true -1 - 1.11111 + 1 0.1 false @@ -1947,7 +1948,7 @@ 165 Variable:flow 775.51 - 662.823 + 656.323 NaN NaN 1 @@ -1980,8 +1981,8 @@ 1 168 Variable:stock - 861.682 - 749.04 + 855.282 + 753.54 NaN NaN 1 @@ -2013,8 +2014,8 @@ 1 170 Variable:stock - 893.682 - 741.04 + 885.282 + 747.54 NaN NaN 1 @@ -2046,8 +2047,8 @@ 1 172 Variable:stock - 1385.98 - 533.406 + 1379.03 + 537.906 NaN NaN 1 @@ -2199,7 +2200,7 @@ false true -1 - 1 + 210 0.1 false @@ -2233,7 +2234,7 @@ false true -1 - 1 + 23.3333 0.1 false @@ -2502,9 +2503,9 @@ false true - -1 - 7 - 0.1 + 3 + 20 + 1 false @@ -2766,9 +2767,9 @@ false true - -1 - 9 - 0.1 + 5 + 20 + 1 false @@ -2799,9 +2800,9 @@ false true - -1 - 1 - 0.1 + -3 + 3 + 0.03 false @@ -2900,9 +2901,9 @@ false true - -1 - 1 - 0.1 + -7 + 7 + 0.07 false @@ -3033,9 +3034,9 @@ false true - -1 - 1 - 0.1 + -5 + 5 + 0.05 false @@ -4045,8 +4046,8 @@ 1 313 Variable:stock - 1322.48 - 895.228 + 1317.53 + 893.728 NaN NaN 1 @@ -4078,8 +4079,8 @@ 1 315 Variable:flow - 1269.73 - 701.017 + 1268.23 + 705.517 NaN NaN 1 @@ -4112,8 +4113,8 @@ 1 318 Variable:flow - 1267.73 - 735.017 + 1266.23 + 737.517 NaN NaN 1 @@ -4146,8 +4147,8 @@ 1 321 Variable:flow - 1268.73 - 769.017 + 1268.23 + 769.517 NaN NaN 1 @@ -4180,8 +4181,8 @@ 1 324 Variable:flow - 1266.73 - 803.017 + 1267.23 + 801.517 NaN NaN 1 @@ -4214,8 +4215,8 @@ 1 327 Variable:stock - 1354.48 - 897.228 + 1347.53 + 897.728 NaN NaN 1 diff --git a/examples/GoodwinLinear.mky b/examples/GoodwinLinear.mky index f4f47de5d..22089f2bd 100644 --- a/examples/GoodwinLinear.mky +++ b/examples/GoodwinLinear.mky @@ -1,6 +1,7 @@ 3 - 3.4.0-beta.3 + 3.22.0 + 89 @@ -80,10 +81,10 @@ 33 26 - 379.29 + 378.29 227.48 - 352.686 - 365.34 + 351.624 + 365.659 474.79 407.24 @@ -108,10 +109,10 @@ 54 30 - 701.5 + 692 420.7 - 744.548 - 500.403 + 733.677 + 497.865 470.22 543.97 @@ -134,10 +135,10 @@ 17 22 - 293.74 + 306.24 151.25 - -8.83005 - 227.203 + 6.2403 + 226.558 348.95 414.5 @@ -147,10 +148,10 @@ 42 73 - 547.86 + 541.36 254.1 - 729.434 - 213.373 + 726.001 + 212.685 889.35 376.31 @@ -160,12 +161,12 @@ 17 74 - 293.74 + 306.24 151.25 - 760.505 - -43.8858 - 751.138 - 497.81 + 764.444 + -40.307 + 755.249 + 491.454 889.35 376.31 @@ -707,7 +708,7 @@ 1 58 Variable:integral - 344.24 + 350.24 151.25 NaN NaN diff --git a/examples/GoodwinLinear02.mky b/examples/GoodwinLinear02.mky index c6639570c..c31adbe7e 100644 --- a/examples/GoodwinLinear02.mky +++ b/examples/GoodwinLinear02.mky @@ -1,6 +1,7 @@ 3 - 3.15.0 + 3.22.0 + 102 @@ -42,16 +43,16 @@ 9 32 - 448.002 - -82.9996 - 456.065 - -75.942 - 492.365 - -64.851 - 475.222 - -7.38029 - 483.5 - 23 + 444.002 + 49.0004 + 452.01 + 56.0095 + 488.06 + 67.0242 + 471.035 + 124.1 + 477 + 155 @@ -69,12 +70,12 @@ 17 41 - 30 - 42 - 1.81027 - -27.4666 - 7.9998 - -64.9998 + 26.0001 + 174 + -2.13879 + 104.659 + 4.9999 + 67.0002 @@ -97,14 +98,14 @@ 31 60 - 404.5 - 23 - 356.996 - -104.336 - 21.0227 - -32.8331 - 191 - -51.25 + 403 + 155 + 373.128 + 74.9263 + 161.855 + 119.89 + 262 + 137 @@ -117,12 +118,12 @@ 85 14 - 167.734 - 173.335 - 119.515 - 41.2432 - 94.0001 - 11 + 164.234 + 305.335 + 115.959 + 173.09 + 90.0002 + 143 @@ -130,12 +131,12 @@ 85 61 - 167.734 - 173.335 - 110.036 - 57.8325 - 191 - -13.75 + 164.234 + 305.335 + 104.657 + 186.071 + 262 + 137 @@ -143,12 +144,12 @@ 31 101 - 404.5 - 23 - 421.546 - 146.99 - 337.5 - 173.335 + 403 + 155 + 420.175 + 279.927 + 333 + 305.335 @@ -176,14 +177,14 @@ 85 94 - 167.734 - 173.335 - 170.589 - 124.535 - 173.177 - 123.208 - 234.316 - 181.504 + 164.234 + 305.335 + 167.064 + 256.957 + 169.63 + 255.642 + 230.232 + 313.501 @@ -1075,9 +1076,9 @@ false true - -10 - 10 - 0.002 + 1.79769e+308 + -1.79769e+308 + 0 false @@ -1230,16 +1231,16 @@ false true - -9.09091 - 9.09091 - 0.00181818 + 1.79769e+308 + -1.79769e+308 + 0 false - Phillips Curve + Phillips Curve NaN NaN NaN diff --git a/examples/LoanableFunds.mky b/examples/LoanableFunds.mky index ffc23126f..1f30ab5a5 100644 --- a/examples/LoanableFunds.mky +++ b/examples/LoanableFunds.mky @@ -1,6 +1,7 @@ 3 - 3.4.0-beta.3 + 3.22.0 + 550 @@ -1021,7 +1022,7 @@ 1 85 Variable:stock - 558.63 + 554.23 414.231 NaN NaN @@ -1190,8 +1191,8 @@ 1 99 Variable:flow - 514.922 - 242.147 + 510.922 + 233.147 NaN NaN 1 @@ -1208,7 +1209,7 @@ false true -1 - 375 + 1 0.1 false @@ -1224,8 +1225,8 @@ 1 102 Variable:flow - 516.922 - 276.147 + 512.922 + 265.147 NaN NaN 1 @@ -1242,7 +1243,7 @@ false true -1 - 2.5 + 1 0.1 false @@ -1258,8 +1259,8 @@ 1 105 Variable:flow - 518.922 - 174.147 + 513.922 + 169.147 NaN NaN 1 @@ -1276,7 +1277,7 @@ false true -1 - 4 + 1 0.1 false @@ -1292,8 +1293,8 @@ 1 108 Variable:flow - 518.922 - 310.147 + 515.922 + 297.147 NaN NaN 1 @@ -1310,7 +1311,7 @@ false true -1 - 1.25 + 1 0.1 false @@ -1326,8 +1327,8 @@ 1 111 Variable:flow - 518.922 - 208.147 + 514.922 + 201.147 NaN NaN 1 @@ -1344,7 +1345,7 @@ false true -1 - 30 + 1 0.1 false @@ -1360,8 +1361,8 @@ 1 114 Variable:flow - 513.922 - 106.147 + 510.922 + 105.147 NaN NaN 1 @@ -1378,7 +1379,7 @@ false true -1 - 120 + 1 0.1 false @@ -1394,8 +1395,8 @@ 1 117 Variable:flow - 515.922 - 140.147 + 512.922 + 137.147 NaN NaN 1 @@ -1412,7 +1413,7 @@ false true -1 - 22.2222 + 1 0.1 false @@ -1428,8 +1429,8 @@ 1 120 Variable:flow - 505.922 - -21.8528 + 504.922 + -14.8528 NaN NaN 1 @@ -1446,7 +1447,7 @@ false true -1 - 8.57143 + 1 0.1 false @@ -1462,8 +1463,8 @@ 1 123 Variable:flow - 510.922 - 74.1472 + 508.922 + 75.1472 NaN NaN 1 @@ -1497,7 +1498,7 @@ 126 Variable:flow 500.922 - 10.1472 + 15.1472 NaN NaN 1 @@ -1514,7 +1515,7 @@ false true -1 - 1.11111 + 1 0.1 false @@ -1530,8 +1531,8 @@ 1 129 Variable:flow - 514.922 - 42.1472 + 512.922 + 45.1472 NaN NaN 1 @@ -1564,8 +1565,8 @@ 1 132 Variable:flow - 878.311 - 188.478 + 874.311 + 178.978 NaN NaN 1 @@ -1582,7 +1583,7 @@ false true -1 - 2.5 + 1 0.1 false @@ -1598,8 +1599,8 @@ 1 135 Variable:flow - 880.311 - 222.478 + 875.311 + 210.978 NaN NaN 1 @@ -1616,7 +1617,7 @@ false true -1 - 4 + 1 0.1 false @@ -1632,8 +1633,8 @@ 1 138 Variable:flow - 876.311 - 256.478 + 872.311 + 242.978 NaN NaN 1 @@ -1650,7 +1651,7 @@ false true -1 - 375 + 1 0.1 false @@ -1666,8 +1667,8 @@ 1 141 Variable:flow - 872.311 - 122.478 + 870.311 + 116.978 NaN NaN 1 @@ -1700,8 +1701,8 @@ 1 144 Variable:flow - 880.311 - 290.478 + 876.311 + 274.978 NaN NaN 1 @@ -1718,7 +1719,7 @@ false true -1 - 30 + 1 0.1 false @@ -1734,8 +1735,8 @@ 1 147 Variable:flow - 867.311 - 26.478 + 866.311 + 26.978 NaN NaN 1 @@ -1752,7 +1753,7 @@ false true -1 - 8.57143 + 1 0.1 false @@ -1769,7 +1770,7 @@ 150 Variable:flow 862.311 - 58.478 + 56.978 NaN NaN 1 @@ -1786,7 +1787,7 @@ false true -1 - 1.11111 + 1 0.1 false @@ -1802,8 +1803,8 @@ 1 153 Variable:flow - 875.311 - 154.478 + 872.311 + 146.978 NaN NaN 1 @@ -1820,7 +1821,7 @@ false true -1 - 120 + 1 0.1 false @@ -1836,8 +1837,8 @@ 1 156 Variable:flow - 876.311 - 90.478 + 874.311 + 86.978 NaN NaN 1 @@ -1870,8 +1871,8 @@ 1 159 Variable:stock - 948.28 - 362.795 + 941.88 + 363.295 NaN NaN 1 @@ -1887,7 +1888,7 @@ false true -1 - 10 + 1 0.1 false @@ -1903,8 +1904,8 @@ 1 161 Variable:stock - 980.28 - 370.795 + 971.88 + 371.295 NaN NaN 1 @@ -1936,8 +1937,8 @@ 1 163 Variable:flow - 587.311 - 404.242 + 582.311 + 397.242 NaN NaN 1 @@ -1954,7 +1955,7 @@ false true -1 - 4 + 1 0.1 false @@ -1970,8 +1971,8 @@ 1 166 Variable:flow - 587.311 - 438.242 + 584.311 + 429.242 NaN NaN 1 @@ -1988,7 +1989,7 @@ false true -1 - 1.25 + 1 0.1 false @@ -2004,8 +2005,8 @@ 1 169 Variable:flow - 587.311 - 472.242 + 583.311 + 461.242 NaN NaN 1 @@ -2022,7 +2023,7 @@ false true -1 - 30 + 1 0.1 false @@ -2038,8 +2039,8 @@ 1 172 Variable:flow - 574.311 - 274.242 + 573.311 + 275.242 NaN NaN 1 @@ -2056,7 +2057,7 @@ false true -1 - 8.57143 + 1 0.1 false @@ -2073,7 +2074,7 @@ 175 Variable:flow 569.311 - 306.242 + 305.242 NaN NaN 1 @@ -2090,7 +2091,7 @@ false true -1 - 1.11111 + 1 0.1 false @@ -2106,8 +2107,8 @@ 1 178 Variable:flow - 584.311 - 370.242 + 581.311 + 365.242 NaN NaN 1 @@ -2124,7 +2125,7 @@ false true -1 - 22.2222 + 1 0.1 false @@ -2140,8 +2141,8 @@ 1 181 Variable:flow - 583.311 - 338.242 + 581.311 + 335.242 NaN NaN 1 @@ -2174,7 +2175,7 @@ 1 184 Variable:stock - 687.28 + 678.88 546.076 NaN NaN @@ -2207,8 +2208,8 @@ 1 186 Variable:flow - 847 - 368.379 + 846 + 366.379 NaN NaN 1 @@ -2225,7 +2226,7 @@ false true -1 - 375 + 1 0.1 false @@ -2242,7 +2243,7 @@ 189 Variable:flow 846 - 300.379 + 302.379 NaN NaN 1 @@ -2259,7 +2260,7 @@ false true -1 - 120 + 1 0.1 false @@ -2293,7 +2294,7 @@ false true -1 - 22.2222 + 1 0.1 false @@ -2309,7 +2310,7 @@ 1 195 Variable:stock - 917 + 913.9 442.287 NaN NaN @@ -2733,7 +2734,7 @@ false true -1 - 1 + 60 0.1 false @@ -2765,9 +2766,9 @@ false true - -1 - 7 - 0.1 + 5 + 30 + 1 false @@ -2831,9 +2832,9 @@ false true - -1 - 9 - 0.1 + 5 + 30 + 1 false @@ -2998,7 +2999,7 @@ false true -1 - 1 + 60 0.1 false @@ -3064,7 +3065,7 @@ false true -1 - 1 + 20 0.1 false @@ -3130,7 +3131,7 @@ false true -1 - 1 + 60 0.1 false @@ -3163,7 +3164,7 @@ false true -1 - 1 + 20 0.1 false @@ -3196,7 +3197,7 @@ false true -1 - 1 + 15 0.1 false @@ -3229,7 +3230,7 @@ false true -1 - 1 + 5 0.1 false @@ -3262,7 +3263,7 @@ false true -1 - 1 + 5 0.1 false @@ -3460,7 +3461,7 @@ false true -1 - 1 + 60 0.1 false @@ -3493,7 +3494,7 @@ false true -1 - 1 + 20 0.1 false @@ -3526,7 +3527,7 @@ false true -1 - 1 + 15 0.1 false @@ -3559,7 +3560,7 @@ false true -1 - 1 + 5 0.1 false @@ -3966,7 +3967,7 @@ false true -1 - 1 + 60 0.1 false @@ -3999,7 +4000,7 @@ false true -1 - 1 + 20 0.1 false @@ -4032,7 +4033,7 @@ false true -1 - 1 + 15 0.1 false @@ -4065,7 +4066,7 @@ false true -1 - 1 + 5 0.1 false @@ -4317,8 +4318,8 @@ 1 343 Variable:stock - 655.28 - 540.076 + 648.88 + 541.076 NaN NaN 1 @@ -4334,7 +4335,7 @@ false true -1 - 10 + 1 0.1 false @@ -4926,8 +4927,8 @@ 1 394 Variable:stock - 590.63 - 388.231 + 584.23 + 396.231 NaN NaN 1 @@ -4959,8 +4960,8 @@ 1 396 Variable:stock - 624.63 - 385.231 + 616.23 + 393.231 NaN NaN 1 @@ -4992,8 +4993,8 @@ 1 398 Variable:stock - 658.63 - 390.231 + 648.23 + 397.231 NaN NaN 1 @@ -5025,8 +5026,8 @@ 1 400 Variable:stock - 692.63 - 388.231 + 680.23 + 394.231 NaN NaN 1 @@ -5058,8 +5059,8 @@ 1 402 Variable:stock - 914.28 - 365.795 + 909.88 + 367.295 NaN NaN 1 @@ -5091,8 +5092,8 @@ 1 404 Variable:stock - 621.28 - 540.076 + 616.88 + 542.076 NaN NaN 1 @@ -5124,8 +5125,8 @@ 1 406 Variable:stock - 883 - 436.288 + 881.9 + 438.288 NaN NaN 1 diff --git a/examples/MinskyGovernmentNonlinear.mky b/examples/MinskyGovernmentNonlinear.mky index 6ebbe667e..59cde3c8f 100644 --- a/examples/MinskyGovernmentNonlinear.mky +++ b/examples/MinskyGovernmentNonlinear.mky @@ -1,6 +1,7 @@ 3 - 3.4.0-beta.3 + 3.22.0 + 411 @@ -212,12 +213,12 @@ 254 380 - 815 + 808 402 - 797.077 - 423.969 - 858.358 - 516.463 + 789.631 + 424.516 + 852.438 + 519.314 1096 405 @@ -302,10 +303,10 @@ 236 120 - 911.5 + 914 606 - 917.972 - 561.623 + 920.647 + 560.422 836 570 @@ -325,10 +326,10 @@ 260 97 - 716 + 720.5 574 - 666.602 - 442.604 + 670.197 + 440.198 504 489 @@ -423,10 +424,10 @@ 216 160 - 635.5 + 633.5 73 - 579.361 - 151.593 + 577.781 + 151.005 550 197 @@ -506,10 +507,10 @@ 271 145 - 446.5 + 440.5 705 - 1118.35 - 717.826 + 1118.8 + 717.949 1064 639 @@ -519,10 +520,10 @@ 64 73 - 1379 + 1371.5 124 - 1370.81 - 617.457 + 1363.34 + 615.548 1242 614 @@ -557,14 +558,14 @@ 239 191 - 80.5 + 90 542 - 55.4796 - 519.983 - -9.57349 - 282.789 - 52.4771 - 20.5744 + 65 + 520.001 + 3.8147e-05 + 283.001 + 62 + 21 110 6 @@ -589,10 +590,10 @@ 251 372 - 788.5 + 786.5 370 - 928.382 - 236.595 + 927.28 + 235.738 1096 405 @@ -607,12 +608,12 @@ 194 179 - 12 + 24 268 - 303.58 - 373.737 - 601.568 - 476.271 + 312.43 + 372.595 + 607.198 + 474.021 1011 601 @@ -1983,7 +1984,7 @@ 1 197 Variable:integral - 270 + 266 0 NaN NaN @@ -2001,7 +2002,7 @@ false true -1 - 1 + 317.234 0.1 false @@ -2051,7 +2052,7 @@ 1 202 Variable:integral - 398 + 389 66 NaN NaN @@ -2069,7 +2070,7 @@ false true -1 - 1 + 1.11405 0.1 false @@ -2153,7 +2154,7 @@ 1 210 Variable:integral - 544 + 538 118 NaN NaN @@ -2171,7 +2172,7 @@ false true -1 - 1 + 105.548 0.1 false @@ -2289,7 +2290,7 @@ 1 221 Variable:integral - 1346 + 1342 124 NaN NaN @@ -2833,7 +2834,7 @@ 1 268 Variable:integral - 282 + 280 768 NaN NaN @@ -3071,7 +3072,7 @@ 1 288 Variable:integral - 63 + 69 268 NaN NaN diff --git a/examples/MinskyNonLinear.mky b/examples/MinskyNonLinear.mky index fac85f742..aeb99431b 100644 --- a/examples/MinskyNonLinear.mky +++ b/examples/MinskyNonLinear.mky @@ -1,6 +1,7 @@ 3 - 3.4.0-beta.3 + 3.22.0 + 507 @@ -72,16 +73,16 @@ 124 35 - 980.845 + 979.845 95.688 - 1088.41 - 84.181 - 1054.41 - 399.233 - 1023.16 - 521.477 - 1030.41 - 601.192 + 1087.41 + 84.1814 + 1053.41 + 399.224 + 1022.16 + 521.464 + 1029.41 + 601.176 970.444 662.032 @@ -249,10 +250,10 @@ 191 87 - 43.1987 + 45.6987 108 - 34.1144 - 83.7479 + 36.5824 + 83.6626 37.6948 38.9999 @@ -407,10 +408,10 @@ 412 55 - 507.959 + 509.459 646.994 - 168.668 - 589.386 + 169.265 + 589.233 28.3957 446 @@ -1494,7 +1495,7 @@ 1 108 Variable:integral - 410.233 + 409.233 134.552 NaN NaN @@ -1934,7 +1935,7 @@ 1 143 Variable:integral - 900.205 + 899.205 76.3416 NaN NaN @@ -2206,7 +2207,7 @@ 1 166 Variable:integral - 226.099 + 224.099 615.597 NaN NaN @@ -2628,9 +2629,9 @@ false true - 0 + -1 1 - 1 + 0.1 false diff --git a/examples/MinskyPricesFinal.mky b/examples/MinskyPricesFinal.mky index 606704cf1..5b862be04 100644 --- a/examples/MinskyPricesFinal.mky +++ b/examples/MinskyPricesFinal.mky @@ -1,6 +1,7 @@ 3 - 3.4.0-beta.3 + 3.22.0 + 659 @@ -272,10 +273,10 @@ 275 74 - 463 + 463.5 626.842 - -2.69669 - 425.914 + -2.51532 + 425.776 103.25 261.466 @@ -600,12 +601,12 @@ 558 554 - 594.747 - 269.734 - 630.462 - 165.308 - 634.605 - 255.977 + 608.056 + 271.608 + 628.842 + 210.828 + 631.818 + 265.479 @@ -678,12 +679,12 @@ 601 594 - 956.053 - 610.943 - 828.045 - 198.274 - 925.084 - 604.301 + 945.387 + 610.97 + 850.685 + 305.673 + 930.456 + 592.91 @@ -701,12 +702,12 @@ 603 599 - 953.424 - 619.269 - 822.699 - 181.626 - 909.964 - 605.569 + 940.37 + 620.533 + 860.65 + 353.641 + 913.091 + 615.23 @@ -774,12 +775,12 @@ 646 639 - 862.655 - 53.0157 - 819.286 - 21.2976 - 896.863 - 39.6966 + 876.665 + 53.4908 + 842.53 + 28.5262 + 891.396 + 28.6346 @@ -792,12 +793,12 @@ 648 640 - 856.025 - 56.0028 - 817.17 - 19.6132 - 896.863 - 36.7297 + 871.658 + 56.6906 + 852.596 + 38.8396 + 891.396 + 46.6346 @@ -805,12 +806,12 @@ 648 644 - 856.025 - 56.0028 - 817.742 - 20.1413 - 907.368 - 46.6664 + 871.658 + 56.6906 + 848.916 + 35.3894 + 902.649 + 57.2786 @@ -1904,8 +1905,8 @@ 1 156 Variable:flow - 154.469 - -14.04 + 156.469 + -13.54 NaN NaN 1 @@ -1938,8 +1939,8 @@ 1 159 Variable:flow - 162.469 - 17.96 + 161.469 + 16.46 NaN NaN 1 @@ -1972,8 +1973,8 @@ 1 162 Variable:flow - 156.469 - 49.96 + 155.469 + 46.46 NaN NaN 1 @@ -2006,8 +2007,8 @@ 1 165 Variable:flow - 152.469 - 113.96 + 154.469 + 106.46 NaN NaN 1 @@ -2041,7 +2042,7 @@ 168 Variable:flow 153.469 - 145.96 + 136.46 NaN NaN 1 @@ -2075,7 +2076,7 @@ 171 Variable:flow 151.469 - 177.96 + 166.46 NaN NaN 1 @@ -2108,8 +2109,8 @@ 1 174 Variable:flow - 153.469 - 209.96 + 154.469 + 196.46 NaN NaN 1 @@ -2142,8 +2143,8 @@ 1 177 Variable:stock - 208.269 - 289.76 + 204.969 + 290.26 NaN NaN 1 @@ -2175,8 +2176,8 @@ 1 179 Variable:stock - 240.269 - 290.76 + 234.969 + 291.26 NaN NaN 1 @@ -2208,8 +2209,8 @@ 1 181 Variable:stock - 272.269 - 292.76 + 264.969 + 293.26 NaN NaN 1 @@ -2241,8 +2242,8 @@ 1 183 Variable:stock - 304.269 - 290.76 + 294.969 + 290.26 NaN NaN 1 @@ -2410,7 +2411,7 @@ 1 196 Variable:integral - 435.25 + 434.25 353.466 NaN NaN @@ -2478,7 +2479,7 @@ 1 201 Variable:integral - 1043.25 + 1042.25 259.467 NaN NaN @@ -2648,8 +2649,8 @@ 1 215 Variable:flow - 154.469 - 81.96 + 153.469 + 76.46 NaN NaN 1 @@ -3187,7 +3188,7 @@ 1 258 Variable:integral - 230.25 + 229.25 262.467 NaN NaN diff --git a/examples/MonetaryMinskyNeoPrices.mky b/examples/MonetaryMinskyNeoPrices.mky index 6b1e4db21..9bc769e8e 100644 --- a/examples/MonetaryMinskyNeoPrices.mky +++ b/examples/MonetaryMinskyNeoPrices.mky @@ -1,6 +1,7 @@ 3 - 3.4.0-beta.3 + 3.22.0 + 827 @@ -272,10 +273,10 @@ 324 74 - 420 + 420.5 639 - 0.00747681 - 498.834 + 0.162323 + 498.719 103.249 334.955 @@ -740,12 +741,12 @@ 697 703 - 583.406 - 310.035 - 580.013 - 304.484 - 586.652 - 303.144 + 592.625 + 310.958 + 587.322 + 302.283 + 580.859 + 312.769 @@ -863,12 +864,12 @@ 769 762 - 954.314 - 634.183 - 823.372 - 265.373 - 923.345 - 627.541 + 943.648 + 634.21 + 846.776 + 361.359 + 928.717 + 616.15 @@ -886,12 +887,12 @@ 771 767 - 951.685 - 642.509 - 818.413 - 251.758 - 908.225 - 628.809 + 938.631 + 643.773 + 857.356 + 405.475 + 911.352 + 638.47 @@ -959,12 +960,12 @@ 814 807 - 825.155 - 244.675 - 752.947 - 180.52 - 859.363 - 231.356 + 839.165 + 245.15 + 782.331 + 194.654 + 853.896 + 220.294 @@ -977,12 +978,12 @@ 816 808 - 818.525 - 247.662 - 749.508 - 177.248 - 859.363 - 228.389 + 834.158 + 248.35 + 800.301 + 213.808 + 853.896 + 238.294 @@ -990,12 +991,12 @@ 816 812 - 818.525 - 247.662 - 750.517 - 178.274 - 869.868 - 238.325 + 834.158 + 248.35 + 793.76 + 207.133 + 865.149 + 248.938 @@ -2576,7 +2577,7 @@ 1 228 Variable:flow - 1496.22 + 1497.22 87.373 NaN NaN @@ -2594,7 +2595,7 @@ false true -1 - 9.73867 + 1 0.1 false @@ -2610,8 +2611,8 @@ 1 231 Variable:flow - 1494.22 - 221.373 + 1495.22 + 213.373 NaN NaN 1 @@ -2628,7 +2629,7 @@ false true -1 - 80 + 1 0.1 false @@ -2645,7 +2646,7 @@ 234 Variable:flow 1495.22 - 321.373 + 307.373 NaN NaN 1 @@ -2814,7 +2815,7 @@ 1 248 Variable:integral - 435.249 + 434.249 426.955 NaN NaN @@ -2882,7 +2883,7 @@ 1 253 Variable:integral - 1043.24 + 1042.24 332.956 NaN NaN @@ -3557,7 +3558,7 @@ 1 307 Variable:integral - 230.249 + 229.249 335.956 NaN NaN @@ -4609,8 +4610,8 @@ 1 396 Variable:flow - 1506.22 - 119.373 + 1504.22 + 117.373 NaN NaN 1 @@ -4643,8 +4644,8 @@ 1 399 Variable:flow - 1500.22 - 187.373 + 1498.22 + 181.373 NaN NaN 1 @@ -4677,8 +4678,8 @@ 1 402 Variable:flow - 1502.22 - 153.373 + 1500.22 + 149.373 NaN NaN 1 @@ -4711,8 +4712,8 @@ 1 405 Variable:flow - 1497.22 - 253.373 + 1496.22 + 243.373 NaN NaN 1 @@ -4745,8 +4746,8 @@ 1 408 Variable:flow - 1496.22 - 287.373 + 1494.22 + 275.373 NaN NaN 1 @@ -4779,7 +4780,7 @@ 1 411 Variable:stock - 1550.6 + 1546.2 390.59 NaN NaN @@ -4812,7 +4813,7 @@ 1 413 Variable:stock - 1584.6 + 1578.2 391.59 NaN NaN @@ -4845,7 +4846,7 @@ 1 415 Variable:stock - 1618.6 + 1610.2 393.59 NaN NaN @@ -4878,8 +4879,8 @@ 1 417 Variable:stock - 1652.6 - 391.59 + 1642.2 + 390.59 NaN NaN 1 @@ -5081,7 +5082,7 @@ 1 434 Variable:integral - 1460 + 1458 759 NaN NaN diff --git a/examples/PredatorPrey.mky b/examples/PredatorPrey.mky index 42f036a6b..c4a1d4ccb 100644 --- a/examples/PredatorPrey.mky +++ b/examples/PredatorPrey.mky @@ -1,6 +1,7 @@ 3 - 3.4.0-beta.3 + 3.22.0 + 125 @@ -451,7 +452,7 @@ 1 43 Variable:integral - 353.332 + 348.332 280.553 NaN NaN @@ -485,7 +486,7 @@ 1 45 Variable:integral - 316.332 + 314.332 403.553 NaN NaN diff --git a/examples/Solow.mky b/examples/Solow.mky index 9a379904a..59c6298cf 100644 --- a/examples/Solow.mky +++ b/examples/Solow.mky @@ -1,16 +1,17 @@ 3 - 3.4.0-beta.3 + 3.22.0 + 112 37 2 - 360 + 348 147.363 - 376.057 - 184.901 + 364.024 + 184.824 352 255.363 @@ -73,10 +74,10 @@ 61 27 - 65 + 62 165.363 - 84.1424 - 163.098 + 82.5757 + 162.928 102.5 155.363 @@ -96,10 +97,10 @@ 48 26 - 97.5 + 86 121.999 - 104.988 - 120.683 + 96.4487 + 120.163 102.5 137.363 @@ -134,10 +135,10 @@ 54 23 - 125.5 + 108.5 230.363 - 157.523 - 214.606 + 144.053 + 212.869 159.636 159.181 @@ -147,10 +148,10 @@ 37 98 - 360 + 348 147.363 - 406.461 - 153.875 + 400.013 + 154.653 456.5 167.363 @@ -514,7 +515,7 @@ 1 45 Variable:integral - 823.545 + 812.545 184.727 NaN NaN diff --git a/examples/Steve.mky b/examples/Steve.mky index 1ac7eb2eb..2b24d181a 100644 --- a/examples/Steve.mky +++ b/examples/Steve.mky @@ -1,6 +1,7 @@ 3 - 3.4.0-beta.3 + 3.22.0 + 197 @@ -127,10 +128,10 @@ 37 160 - 74 + 69 414.04 - 196.738 - 326.543 + 193.134 + 325.548 462 272.04 @@ -458,7 +459,7 @@ false true -1 - 1 + 100 0.1 false @@ -525,7 +526,7 @@ false true -1 - 1 + 50 0.1 false @@ -778,8 +779,8 @@ 1 61 Variable:stock - 488.5 - 247.04 + 486.5 + 250.04 NaN NaN 1 @@ -811,8 +812,8 @@ 1 63 Variable:stock - 520.5 - 247.04 + 516.5 + 249.04 NaN NaN 1 @@ -844,7 +845,7 @@ 1 65 Variable:stock - 552.5 + 546.5 256.04 NaN NaN @@ -877,8 +878,8 @@ 1 67 Variable:stock - 584.5 - 245.04 + 576.5 + 247.04 NaN NaN 1 @@ -910,8 +911,8 @@ 1 69 Variable:flow - 419 - -30.66 + 420 + -25.66 NaN NaN 1 @@ -945,7 +946,7 @@ 72 Variable:flow 420 - 1.34 + 4.34 NaN NaN 1 @@ -979,7 +980,7 @@ 75 Variable:flow 420 - 33.34 + 34.34 NaN NaN 1 @@ -1012,8 +1013,8 @@ 1 78 Variable:flow - 420 - 65.34 + 419 + 64.34 NaN NaN 1 @@ -1047,7 +1048,7 @@ 81 Variable:flow 420 - 97.34 + 94.34 NaN NaN 1 @@ -1081,7 +1082,7 @@ 84 Variable:flow 420 - 129.34 + 124.34 NaN NaN 1 @@ -1114,8 +1115,8 @@ 1 87 Variable:flow - 420 - 161.34 + 419 + 154.34 NaN NaN 1 diff --git a/examples/SteveTest028.mky b/examples/SteveTest028.mky index fe151d92b..6c622ce12 100644 --- a/examples/SteveTest028.mky +++ b/examples/SteveTest028.mky @@ -1,6 +1,7 @@ 3 - 3.4.0-beta.3 + 3.22.0 + 128 @@ -112,10 +113,10 @@ 35 111 - 37.5 + 37 33 - 63.2275 - -11.6846 + 62.7676 + -11.7543 326 129 @@ -130,10 +131,10 @@ 37 113 - 38.5 + 39 164 - 154.429 - 266.175 + 154.73 + 266 326 129 @@ -417,7 +418,7 @@ false true -1 - 1 + 100 0.1 false @@ -550,7 +551,7 @@ false true -1 - 1 + 200 0.1 false @@ -737,7 +738,7 @@ 60 Variable:stock 413.5 - 278 + 277.5 NaN NaN 1 @@ -769,8 +770,8 @@ 1 62 Variable:stock - 445.5 - 277 + 443.5 + 277.5 NaN NaN 1 @@ -802,8 +803,8 @@ 1 64 Variable:stock - 477.5 - 278 + 473.5 + 278.5 NaN NaN 1 @@ -835,8 +836,8 @@ 1 66 Variable:stock - 509.5 - 280 + 503.5 + 280.5 NaN NaN 1 @@ -868,8 +869,8 @@ 1 68 Variable:stock - 541.5 - 278 + 533.5 + 276.5 NaN NaN 1 @@ -901,8 +902,8 @@ 1 70 Variable:flow - 376 - 43.4 + 377 + 43.9 NaN NaN 1 @@ -936,7 +937,7 @@ 73 Variable:flow 377 - 75.4 + 73.9 NaN NaN 1 @@ -970,7 +971,7 @@ 76 Variable:flow 377 - 109.4 + 105.9 NaN NaN 1 @@ -1003,8 +1004,8 @@ 1 79 Variable:flow - 377 - 141.4 + 376 + 135.9 NaN NaN 1 @@ -1038,7 +1039,7 @@ 82 Variable:flow 377 - 173.4 + 165.9 NaN NaN 1 @@ -1072,7 +1073,7 @@ 85 Variable:flow 377 - 205.4 + 195.9 NaN NaN 1 diff --git a/examples/UDFCallGroup.mky b/examples/UDFCallGroup.mky index 52acad6c0..38c2c5602 100644 --- a/examples/UDFCallGroup.mky +++ b/examples/UDFCallGroup.mky @@ -1,6 +1,7 @@ 3 - 3.4.0-beta.3 + 3.22.0 + 44 @@ -350,7 +351,7 @@ 1 29 Variable:integral - 477 + 475 211 NaN NaN @@ -363,6 +364,13 @@ 31 false + + false + true + 1.79769e+308 + -1.79769e+308 + 0 + false @@ -423,8 +431,8 @@ false true -1 - 52.81 - 0.1 + 1 + 0.0002 false @@ -455,9 +463,9 @@ false true - -1 - 1 - 0.1 + 1.79769e+308 + -1.79769e+308 + 0 false diff --git a/examples/UWS05.mky b/examples/UWS05.mky index f4620b49a..f10038b9e 100644 --- a/examples/UWS05.mky +++ b/examples/UWS05.mky @@ -1,6 +1,7 @@ 3 - 3.4.0-beta.3 + 3.22.0 + 127 @@ -92,10 +93,10 @@ 27 111 - 32.5 + 28 99 - 182.958 - -22.5951 + 180.057 + -23.8877 300 304 @@ -105,10 +106,10 @@ 23 112 - 36.5 + 33.5 150 - 174.345 - 77.5731 + 172.516 + 76.9576 300 304 @@ -118,10 +119,10 @@ 21 113 - 36.5 + 33 205 - 176.78 - 129.809 + 174.914 + 128.933 300 304 @@ -390,8 +391,8 @@ false true -1 - 1000 - 0.1001 + 100 + 0.1 false @@ -457,7 +458,7 @@ false true -1 - 500 + 50 0.1 false @@ -610,7 +611,7 @@ 45 Variable:stock 375.5 - 256 + 258 NaN NaN 1 @@ -642,8 +643,8 @@ 1 47 Variable:stock - 407.5 - 256 + 405.5 + 259 NaN NaN 1 @@ -675,8 +676,8 @@ 1 49 Variable:stock - 439.5 - 250 + 435.5 + 253 NaN NaN 1 @@ -708,8 +709,8 @@ 1 51 Variable:stock - 471.5 - 254 + 465.5 + 255 NaN NaN 1 @@ -741,7 +742,7 @@ 1 53 Variable:stock - 503.5 + 495.5 265 NaN NaN @@ -774,8 +775,8 @@ 1 55 Variable:flow - 338 - 44.5 + 339 + 50.5 NaN NaN 1 @@ -809,7 +810,7 @@ 58 Variable:flow 339 - 76.5 + 80.5 NaN NaN 1 @@ -843,7 +844,7 @@ 61 Variable:flow 339 - 108.5 + 110.5 NaN NaN 1 @@ -876,7 +877,7 @@ 1 64 Variable:flow - 339 + 338 140.5 NaN NaN @@ -911,7 +912,7 @@ 67 Variable:flow 339 - 172.5 + 170.5 NaN NaN 1 diff --git a/examples/binaryInterpolation.mky b/examples/binaryInterpolation.mky index 97710477c..eac78aaec 100644 --- a/examples/binaryInterpolation.mky +++ b/examples/binaryInterpolation.mky @@ -1,6 +1,7 @@ 3 - 3.4.0-beta.3 + 3.22.0 + 55 @@ -348,13 +349,13 @@ false /home/scratch/github/minsky-develop/examples/binaryInterpolation-x3.csv - 1 - 2 - 2 , " \ . + 1 + 2 + 2 false false false @@ -450,13 +451,13 @@ false /home/scratch/github/minsky-develop/examples/binaryInterpolation-x4.csv - 1 - 2 - 2 , " \ . + 1 + 2 + 2 false false false @@ -552,13 +553,13 @@ false /home/scratch/github/minsky-develop/examples/binaryInterpolation-x3.csv - 1 - 2 - 2 , " \ . + 1 + 2 + 2 false false false @@ -628,13 +629,13 @@ false /home/scratch/github/minsky-develop/examples/binaryInterpolation-x4.csv - 1 - 2 - 2 , " \ . + 1 + 2 + 2 false false false @@ -752,9 +753,9 @@ false true - 0 + -1 0 - 5.43231e-312 + 0.0001 false @@ -795,7 +796,7 @@ 1 42 Variable:integral - 743 + 741 75 NaN NaN @@ -808,6 +809,13 @@ 44 false + + false + true + 1.79769e+308 + -1.79769e+308 + 0 + false @@ -873,7 +881,7 @@ 1 49 Variable:integral - 1480 + 1477 563 NaN NaN @@ -886,6 +894,13 @@ 51 false + + false + true + 1.79769e+308 + -1.79769e+308 + 0 + false diff --git a/examples/data-example.mky b/examples/data-example.mky index 6dbf5d685..6c98f97a2 100644 --- a/examples/data-example.mky +++ b/examples/data-example.mky @@ -1,6 +1,7 @@ 3 - 3.4.0-beta.3 + 3.22.0 + 31 diff --git a/examples/differenceOps.mky b/examples/differenceOps.mky index 3b003dfa8..828af5468 100644 --- a/examples/differenceOps.mky +++ b/examples/differenceOps.mky @@ -1,6 +1,7 @@ 3 - 3.4.0-beta.3 + 3.22.0 + 18 diff --git a/examples/exponentialGrowth.mky b/examples/exponentialGrowth.mky index ba65f17c4..f5b01d6af 100644 --- a/examples/exponentialGrowth.mky +++ b/examples/exponentialGrowth.mky @@ -1,6 +1,7 @@ 3 - 3.4.0-beta.3 + 3.22.0 + 35 @@ -20,10 +21,10 @@ 1 7 - 126.5 + 124.5 57 - 196.269 - 19.7895 + 192.332 + 20.8227 84 22 @@ -106,7 +107,7 @@ 1 8 Variable:integral - 110 + 109 57 NaN NaN diff --git a/examples/exponentialGrowthWithExtraLabel.mky b/examples/exponentialGrowthWithExtraLabel.mky index 0b5221c84..d79c6633a 100644 --- a/examples/exponentialGrowthWithExtraLabel.mky +++ b/examples/exponentialGrowthWithExtraLabel.mky @@ -1,6 +1,7 @@ 3 - 3.4.0-beta.3 + 3.22.0 + 38 @@ -35,10 +36,10 @@ 11 7 - 142 + 140 27 - 154.1 - -7.3889 + 151.684 + -6.2063 84 24 @@ -111,7 +112,7 @@ 1 8 Variable:integral - 87 + 86 63 NaN NaN @@ -195,7 +196,7 @@ false true - -0.1 + -1 -0.1 0.01 diff --git a/examples/fundamentalConstants.mky b/examples/fundamentalConstants.mky index 0097c668e..9adcec41d 100644 --- a/examples/fundamentalConstants.mky +++ b/examples/fundamentalConstants.mky @@ -1,6 +1,7 @@ 3 - 3.4.0-beta.3 + 3.22.0 + 156 @@ -747,7 +748,7 @@ 1 61 Variable:integral - 320.246 + 318.246 523.39 NaN NaN diff --git a/examples/gammaAndFriends.mky b/examples/gammaAndFriends.mky index 5ea07a0a3..e3fcf21dc 100644 --- a/examples/gammaAndFriends.mky +++ b/examples/gammaAndFriends.mky @@ -1,6 +1,7 @@ 3 - 3.4.0-beta.3 + 3.22.0 + 58 @@ -495,7 +496,7 @@ 1 40 Variable:integral - 435 + 433 137 NaN NaN @@ -508,6 +509,13 @@ 42 false + + false + true + 1.79769e+308 + -1.79769e+308 + 0 + false @@ -549,7 +557,7 @@ 1 46 Variable:integral - 435 + 432 179 NaN NaN @@ -562,6 +570,13 @@ 48 false + + false + true + 1.79769e+308 + -1.79769e+308 + 0 + false @@ -603,7 +618,7 @@ 1 52 Variable:integral - 431 + 428 219 NaN NaN @@ -616,6 +631,13 @@ 54 false + + false + true + 1.79769e+308 + -1.79769e+308 + 0 + false diff --git a/examples/histogram.mky b/examples/histogram.mky index 12ed8d27c..6ea3bb1fe 100644 --- a/examples/histogram.mky +++ b/examples/histogram.mky @@ -1,6 +1,7 @@ 3 - 3.4.0-beta.3 + 3.22.0 + 30 diff --git a/examples/importedCSV.mky b/examples/importedCSV.mky index c12bc0366..424c7d269 100644 --- a/examples/importedCSV.mky +++ b/examples/importedCSV.mky @@ -1,6 +1,7 @@ 3 - 3.4.0-beta.3 + 3.22.0 + 12 diff --git a/examples/indexing.mky b/examples/indexing.mky index b0a6c33d4..628ed7770 100644 --- a/examples/indexing.mky +++ b/examples/indexing.mky @@ -1,16 +1,17 @@ 3 - 3.4.0-beta.3 + 3.22.0 + 39 1 3 - 149 + 146 208 - 210.561 - 48.7746 + 208.407 + 46.5858 359 166.25 @@ -60,10 +61,10 @@ 1 30 - 149 + 146 208 - 196.814 - 370.368 + 194.095 + 371.321 241 406 @@ -78,10 +79,10 @@ 1 35 - 149 + 146 208 - 162.963 - 432.41 + 160.018 + 433.297 302 514 diff --git a/examples/inner-outer-example.mky b/examples/inner-outer-example.mky index 0f96204a7..f0a9dfa67 100644 --- a/examples/inner-outer-example.mky +++ b/examples/inner-outer-example.mky @@ -1,6 +1,7 @@ 3 - 3.4.0-beta.3 + 3.22.0 + 32 @@ -270,7 +271,7 @@ 1 20 Variable:integral - 392 + 390 183 NaN NaN @@ -283,6 +284,13 @@ 22 false + + false + true + 1.79769e+308 + -1.79769e+308 + 0 + false @@ -324,7 +332,7 @@ 1 26 Variable:integral - 369 + 366 383 NaN NaN @@ -337,6 +345,13 @@ 28 false + + false + true + 1.79769e+308 + -1.79769e+308 + 0 + false diff --git a/examples/math-examples.mky b/examples/math-examples.mky index 0943c746d..b26ea61ea 100644 --- a/examples/math-examples.mky +++ b/examples/math-examples.mky @@ -1,6 +1,7 @@ 3 - 3.4.0-beta.3 + 3.22.0 + diff --git a/examples/plotWidget.mky b/examples/plotWidget.mky index ac574019e..47d379787 100644 --- a/examples/plotWidget.mky +++ b/examples/plotWidget.mky @@ -1,6 +1,7 @@ 3 - 3.4.0-beta.3 + 3.22.0 + 87 @@ -767,13 +768,13 @@ false /home/rks/github/minsky/xxx.csv - 1 - 2 - 2 , " \ . + 1 + 2 + 2 false false false @@ -843,13 +844,13 @@ false /home/rks/github/minsky/xxx.csv - 1 - 2 - 2 , " \ . + 1 + 2 + 2 false false false diff --git a/examples/rand-gather-interpolation.mky b/examples/rand-gather-interpolation.mky index 31516db3c..b216efde8 100644 --- a/examples/rand-gather-interpolation.mky +++ b/examples/rand-gather-interpolation.mky @@ -1,6 +1,7 @@ 3 - 3.4.0-beta.3 + 3.22.0 + 31 diff --git a/examples/reductionExample.mky b/examples/reductionExample.mky index 1bde8618b..c376f4766 100644 --- a/examples/reductionExample.mky +++ b/examples/reductionExample.mky @@ -1,6 +1,7 @@ 3 - 3.4.0-beta.3 + 3.22.0 + 66 @@ -476,7 +477,7 @@ 1 41 Variable:integral - 430 + 429 202 NaN NaN diff --git a/examples/reductionsTest.mky b/examples/reductionsTest.mky index 8fbb63a88..f0d329f5e 100644 --- a/examples/reductionsTest.mky +++ b/examples/reductionsTest.mky @@ -1,6 +1,7 @@ 3 - 3.4.0-beta.3 + 3.22.0 + 217 @@ -1997,7 +1998,7 @@ 1 169 Variable:integral - 527 + 525 87 NaN NaN @@ -2010,6 +2011,13 @@ 171 false + + false + true + 1.79769e+308 + -1.79769e+308 + 0 + false @@ -2051,7 +2059,7 @@ 1 175 Variable:integral - 529 + 526 142 NaN NaN @@ -2064,6 +2072,13 @@ 177 false + + false + true + 1.79769e+308 + -1.79769e+308 + 0 + false @@ -2105,7 +2120,7 @@ 1 181 Variable:integral - 534 + 531 191 NaN NaN @@ -2118,6 +2133,13 @@ 183 false + + false + true + 1.79769e+308 + -1.79769e+308 + 0 + false @@ -2159,7 +2181,7 @@ 1 187 Variable:integral - 533 + 530 255 NaN NaN @@ -2172,6 +2194,13 @@ 189 false + + false + true + 1.79769e+308 + -1.79769e+308 + 0 + false @@ -2213,7 +2242,7 @@ 1 193 Variable:integral - 533 + 531 298 NaN NaN @@ -2226,6 +2255,13 @@ 195 false + + false + true + 1.79769e+308 + -1.79769e+308 + 0 + false @@ -2267,7 +2303,7 @@ 1 199 Variable:integral - 530 + 527 348 NaN NaN @@ -2280,6 +2316,13 @@ 201 false + + false + true + 1.79769e+308 + -1.79769e+308 + 0 + false @@ -2321,7 +2364,7 @@ 1 205 Variable:integral - 513 + 510 437 NaN NaN @@ -2334,6 +2377,13 @@ 207 false + + false + true + 1.79769e+308 + -1.79769e+308 + 0 + false @@ -2375,7 +2425,7 @@ 1 211 Variable:integral - 527 + 524 518 NaN NaN @@ -2388,6 +2438,13 @@ 213 false + + false + true + 1.79769e+308 + -1.79769e+308 + 0 + false diff --git a/examples/scansTest.mky b/examples/scansTest.mky index 0b4d76006..a93c18345 100644 --- a/examples/scansTest.mky +++ b/examples/scansTest.mky @@ -1,6 +1,7 @@ 3 - 3.4.0-beta.3 + 3.22.0 + 85 @@ -718,7 +719,7 @@ 1 58 Variable:integral - 795.116 + 793.116 156.901 NaN NaN @@ -731,6 +732,13 @@ 60 false + + false + true + 1.79769e+308 + -1.79769e+308 + 0 + false @@ -772,7 +780,7 @@ 1 64 Variable:integral - 798.116 + 795.116 194.901 NaN NaN @@ -785,6 +793,13 @@ 66 false + + false + true + 1.79769e+308 + -1.79769e+308 + 0 + false @@ -826,7 +841,7 @@ 1 70 Variable:integral - 793.116 + 790.116 233.901 NaN NaN @@ -839,6 +854,13 @@ 72 false + + false + true + 1.79769e+308 + -1.79769e+308 + 0 + false diff --git a/examples/statistics.mky b/examples/statistics.mky index 27f912107..a86ad7538 100644 --- a/examples/statistics.mky +++ b/examples/statistics.mky @@ -1,6 +1,7 @@ 3 - 3.4.0-beta.3 + 3.22.0 + 83 @@ -714,7 +715,7 @@ 1 58 Variable:integral - 649 + 647 130 NaN NaN @@ -727,6 +728,13 @@ 60 false + + false + true + 1.79769e+308 + -1.79769e+308 + 0 + false @@ -768,7 +776,7 @@ 1 64 Variable:integral - 651 + 648 176 NaN NaN @@ -781,6 +789,13 @@ 66 false + + false + true + 1.79769e+308 + -1.79769e+308 + 0 + false @@ -822,7 +837,7 @@ 1 70 Variable:integral - 654 + 651 230 NaN NaN @@ -835,6 +850,13 @@ 72 false + + false + true + 1.79769e+308 + -1.79769e+308 + 0 + false @@ -876,7 +898,7 @@ 1 76 Variable:integral - 692 + 689 292 NaN NaN @@ -889,6 +911,13 @@ 78 false + + false + true + 1.79769e+308 + -1.79769e+308 + 0 + false diff --git a/examples/switchBlock.mky b/examples/switchBlock.mky index 183b85ce6..6346564be 100644 --- a/examples/switchBlock.mky +++ b/examples/switchBlock.mky @@ -1,6 +1,7 @@ 3 - 3.4.0-beta.3 + 3.22.0 + 46 @@ -196,7 +197,7 @@ 1 13 Variable:integral - 209 + 207 60 NaN NaN diff --git a/examples/tensor-switch.mky b/examples/tensor-switch.mky index ef327d4d7..d73f392d5 100644 --- a/examples/tensor-switch.mky +++ b/examples/tensor-switch.mky @@ -1,6 +1,7 @@ 3 - 3.4.0-beta.3 + 3.22.0 + 85 diff --git a/gui-js/apps/minsky-electron/src/app/app.ts b/gui-js/apps/minsky-electron/src/app/app.ts index 286d061b3..e27b88337 100644 --- a/gui-js/apps/minsky-electron/src/app/app.ts +++ b/gui-js/apps/minsky-electron/src/app/app.ts @@ -75,6 +75,8 @@ export default class App { catch (err) { // Macs sometimes put extra guff on the command line, so ignore errors } + } else { // start an empty model + await CommandsManager.createNewSystem(); } } diff --git a/gui-js/apps/minsky-electron/src/app/managers/ApplicationMenuManager.ts b/gui-js/apps/minsky-electron/src/app/managers/ApplicationMenuManager.ts index ff072329a..6521bf24f 100644 --- a/gui-js/apps/minsky-electron/src/app/managers/ApplicationMenuManager.ts +++ b/gui-js/apps/minsky-electron/src/app/managers/ApplicationMenuManager.ts @@ -1,4 +1,4 @@ -import { +import { Functions, importCSVvariableName, InstallCase, @@ -368,6 +368,18 @@ export class ApplicationMenuManager { label: 'Group selection', async click() {minsky.canvas.groupSelection();}, }, + { + label: 'Author', + async click() { + let author=encodeURIComponent(await minsky.author()); + WindowManager.createPopupWindowWithRouting({ + width: 400, + height: 80, + title: 'Author', + url: `#/headless/menu/edit/author?author=${author}`, + }); + }, + }, { label: 'Dimensions', click() { diff --git a/gui-js/apps/minsky-electron/src/app/managers/CommandsManager.ts b/gui-js/apps/minsky-electron/src/app/managers/CommandsManager.ts index 7ff12e7e9..c776ec54f 100644 --- a/gui-js/apps/minsky-electron/src/app/managers/CommandsManager.ts +++ b/gui-js/apps/minsky-electron/src/app/managers/CommandsManager.ts @@ -17,6 +17,7 @@ import { homedir } from 'os'; import JSON5 from 'json5'; import { extname, join, dirname } from 'path'; import { tmpdir } from 'os'; +import fullname from 'fullname'; import { HelpFilesManager } from './HelpFilesManager'; import { WindowManager } from './WindowManager'; import { StoreManager } from './StoreManager'; @@ -475,6 +476,12 @@ export class CommandsManager { minsky.clearAllMaps(); minsky.pushFlags(); minsky.clearHistory(); + try + { + minsky.author(await fullname()); + } catch { + minsky.author(''); // initialise to blank on error + } minsky.model.setZoom(1); minsky.canvas.recentre(); minsky.popFlags(); diff --git a/gui-js/libs/menu/src/lib/edit/author/author.html b/gui-js/libs/menu/src/lib/edit/author/author.html new file mode 100644 index 000000000..a3f7b0aad --- /dev/null +++ b/gui-js/libs/menu/src/lib/edit/author/author.html @@ -0,0 +1,4 @@ + diff --git a/gui-js/libs/menu/src/lib/edit/author/author.scss b/gui-js/libs/menu/src/lib/edit/author/author.scss new file mode 100644 index 000000000..e69de29bb diff --git a/gui-js/libs/menu/src/lib/edit/author/author.ts b/gui-js/libs/menu/src/lib/edit/author/author.ts new file mode 100644 index 000000000..8eb25e4c5 --- /dev/null +++ b/gui-js/libs/menu/src/lib/edit/author/author.ts @@ -0,0 +1,41 @@ +import { Component, OnDestroy} from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import { ElectronService, WindowUtilityService } from '@minsky/core'; +import { Subject, takeUntil } from 'rxjs'; +import { InputModalComponent} from '@minsky/ui-components'; + + +@Component({ + selector: 'author', + templateUrl: './author.html', + styleUrls: ['./author.scss'], + standalone: true, + imports: [InputModalComponent], +}) +export class AuthorComponent implements OnDestroy { + author=''; + + destroy$ = new Subject(); + + constructor( + private route: ActivatedRoute, + private electronService: ElectronService, + private windowUtilityService: WindowUtilityService + ) { + this.route.queryParams.pipe(takeUntil(this.destroy$)).subscribe((params) => { + this.author=params.author ?? ''; + }); + } + + async handleEditAuthor(author: string) { + if (this.electronService.isElectron) { + await this.electronService.minsky.author(author); + } + this.windowUtilityService.closeCurrentWindowIfNotMain(); + } + + ngOnDestroy() { + this.destroy$.next(); + this.destroy$.complete(); + } +} diff --git a/gui-js/libs/menu/src/lib/edit/edit-routing.module.ts b/gui-js/libs/menu/src/lib/edit/edit-routing.module.ts index a61b7c94c..4e9e6f348 100644 --- a/gui-js/libs/menu/src/lib/edit/edit-routing.module.ts +++ b/gui-js/libs/menu/src/lib/edit/edit-routing.module.ts @@ -1,8 +1,12 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { DimensionsComponent } from './dimensions/dimensions.component'; +import {AuthorComponent } from './author/author'; -const routes: Routes = [{ path: 'dimensions', component: DimensionsComponent }]; +const routes: Routes = [ + { path: 'author', component: AuthorComponent }, + { path: 'dimensions', component: DimensionsComponent }, +]; @NgModule({ imports: [RouterModule.forChild(routes)], diff --git a/gui-js/libs/menu/src/lib/edit/edit.module.ts b/gui-js/libs/menu/src/lib/edit/edit.module.ts index 5e7585d83..bd8f01ae2 100644 --- a/gui-js/libs/menu/src/lib/edit/edit.module.ts +++ b/gui-js/libs/menu/src/lib/edit/edit.module.ts @@ -1,11 +1,12 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; +import {AuthorComponent } from './author/author'; import { DimensionsComponent } from './dimensions/dimensions.component'; import { EditRoutingModule } from './edit-routing.module'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; @NgModule({ - imports: [CommonModule, EditRoutingModule, FormsModule, ReactiveFormsModule, DimensionsComponent], + imports: [CommonModule, EditRoutingModule, FormsModule, ReactiveFormsModule, AuthorComponent, DimensionsComponent], }) export class EditModule {} diff --git a/gui-js/libs/shared/src/lib/backend/minsky.ts b/gui-js/libs/shared/src/lib/backend/minsky.ts index 49c4621be..bb4abf247 100644 --- a/gui-js/libs/shared/src/lib/backend/minsky.ts +++ b/gui-js/libs/shared/src/lib/backend/minsky.ts @@ -1304,6 +1304,7 @@ export class Minsky extends CppClass { async addNewPublicationTab(a1: string): Promise {return this.$callMethod('addNewPublicationTab',a1);} async allGodleyFlowVars(): Promise {return this.$callMethod('allGodleyFlowVars');} async assetClasses(): Promise {return this.$callMethod('assetClasses');} + async author(...args: string[]): Promise {return this.$callMethod('author',...args);} async autoLayout(): Promise {return this.$callMethod('autoLayout');} async autoSaveFile(): Promise {return this.$callMethod('autoSaveFile');} async availableOperations(): Promise {return this.$callMethod('availableOperations');} diff --git a/gui-js/package-lock.json b/gui-js/package-lock.json index bfc9d1e51..8d2960cdf 100644 --- a/gui-js/package-lock.json +++ b/gui-js/package-lock.json @@ -24,6 +24,7 @@ "electron-log": "^5.4.1", "electron-progressbar": "^2.2.1", "electron-store": "^8.2.0", + "fullname": "^5.0.0", "glob": "^11.1.0", "JSONStream": "^1.3.5", "mathjax": "^3.2.2", @@ -10862,6 +10863,15 @@ } } }, + "node_modules/deep-extend": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", + "license": "MIT", + "engines": { + "node": ">=4.0.0" + } + }, "node_modules/deepmerge": { "version": "4.3.1", "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", @@ -12198,7 +12208,6 @@ "version": "5.1.1", "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", - "dev": true, "license": "MIT", "dependencies": { "cross-spawn": "^7.0.3", @@ -12222,7 +12231,6 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "dev": true, "license": "MIT", "engines": { "node": ">=10" @@ -12235,7 +12243,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", - "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -12248,7 +12255,6 @@ "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true, "license": "ISC" }, "node_modules/exit": { @@ -12608,6 +12614,18 @@ "node": ">=8" } }, + "node_modules/filter-obj": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-5.1.0.tgz", + "integrity": "sha512-qWeTREPoT7I0bifpPUXtxkZJ1XJzxWtfoWWkdVGqa+eCr3SHW/Ocp89o8vLvbUuQnadybJpjOKu4V+RwO6sGng==", + "license": "MIT", + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/finalhandler": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.2.tgz", @@ -13030,6 +13048,148 @@ "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } }, + "node_modules/fullname": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/fullname/-/fullname-5.0.0.tgz", + "integrity": "sha512-RVjGQY8ryXcWMrvjyXK4v9pK2kFyHOEqJz/JslPadc+HQMzqbSwX+y5Emvzg5I+TPNe8f5VqF5xQn72qUnP6Iw==", + "license": "MIT", + "dependencies": { + "execa": "^8.0.1", + "filter-obj": "^5.1.0", + "mem": "^5.1.0", + "p-any": "^4.0.0", + "passwd-user": "^4.0.0", + "rc": "^1.2.8" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/fullname/node_modules/execa": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz", + "integrity": "sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==", + "license": "MIT", + "dependencies": { + "cross-spawn": "^7.0.3", + "get-stream": "^8.0.1", + "human-signals": "^5.0.0", + "is-stream": "^3.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^5.1.0", + "onetime": "^6.0.0", + "signal-exit": "^4.1.0", + "strip-final-newline": "^3.0.0" + }, + "engines": { + "node": ">=16.17" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" + } + }, + "node_modules/fullname/node_modules/get-stream": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz", + "integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==", + "license": "MIT", + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/fullname/node_modules/human-signals": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz", + "integrity": "sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==", + "license": "Apache-2.0", + "engines": { + "node": ">=16.17.0" + } + }, + "node_modules/fullname/node_modules/is-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz", + "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==", + "license": "MIT", + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/fullname/node_modules/mimic-fn": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz", + "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==", + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/fullname/node_modules/npm-run-path": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz", + "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==", + "license": "MIT", + "dependencies": { + "path-key": "^4.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/fullname/node_modules/onetime": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz", + "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==", + "license": "MIT", + "dependencies": { + "mimic-fn": "^4.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/fullname/node_modules/path-key": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz", + "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/fullname/node_modules/strip-final-newline": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", + "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==", + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/function-bind": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", @@ -13831,7 +13991,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", - "dev": true, "license": "Apache-2.0", "engines": { "node": ">=10.17.0" @@ -14057,6 +14216,12 @@ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", "license": "ISC" }, + "node_modules/ini": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", + "license": "ISC" + }, "node_modules/internal-slot": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz", @@ -16894,6 +17059,18 @@ "tmpl": "1.0.5" } }, + "node_modules/map-age-cleaner": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", + "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==", + "license": "MIT", + "dependencies": { + "p-defer": "^1.0.0" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/matcher": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz", @@ -16940,6 +17117,29 @@ "node": ">= 0.6" } }, + "node_modules/mem": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/mem/-/mem-5.1.1.tgz", + "integrity": "sha512-qvwipnozMohxLXG1pOqoLiZKNkC4r4qqRucSoDwXowsNGDSULiqFTRUF05vcZWnwJSG22qTsynQhxbaMtnX9gw==", + "license": "MIT", + "dependencies": { + "map-age-cleaner": "^0.1.3", + "mimic-fn": "^2.1.0", + "p-is-promise": "^2.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/mem/node_modules/mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/memfs": { "version": "3.5.3", "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz", @@ -16976,7 +17176,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true, "license": "MIT" }, "node_modules/merge2": { @@ -17142,7 +17341,6 @@ "version": "1.2.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "dev": true, "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" @@ -17953,7 +18151,6 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", - "dev": true, "license": "MIT", "dependencies": { "path-key": "^3.0.0" @@ -19580,6 +19777,31 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/p-any": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-any/-/p-any-4.0.0.tgz", + "integrity": "sha512-S/B50s+pAVe0wmEZHmBs/9yJXeZ5KhHzOsgKzt0hRdgkoR3DxW9ts46fcsWi/r3VnzsnkKS7q4uimze+zjdryw==", + "license": "MIT", + "dependencies": { + "p-cancelable": "^3.0.0", + "p-some": "^6.0.0" + }, + "engines": { + "node": ">=12.20" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-any/node_modules/p-cancelable": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgz", + "integrity": "sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==", + "license": "MIT", + "engines": { + "node": ">=12.20" + } + }, "node_modules/p-cancelable": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz", @@ -19590,6 +19812,24 @@ "node": ">=8" } }, + "node_modules/p-defer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz", + "integrity": "sha512-wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw==", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/p-is-promise": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz", + "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/p-limit": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", @@ -19663,6 +19903,86 @@ "node": ">= 4" } }, + "node_modules/p-some": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/p-some/-/p-some-6.0.0.tgz", + "integrity": "sha512-CJbQCKdfSX3fIh8/QKgS+9rjm7OBNUTmwWswAFQAhc8j1NR1dsEDETUEuVUtQHZpV+J03LqWBEwvu0g1Yn+TYg==", + "license": "MIT", + "dependencies": { + "aggregate-error": "^4.0.0", + "p-cancelable": "^3.0.0" + }, + "engines": { + "node": ">=12.20" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-some/node_modules/aggregate-error": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-4.0.1.tgz", + "integrity": "sha512-0poP0T7el6Vq3rstR8Mn4V/IQrpBLO6POkUSrN7RhyY+GF/InCFShQzsQ39T25gkHhLgSLByyAz+Kjb+c2L98w==", + "license": "MIT", + "dependencies": { + "clean-stack": "^4.0.0", + "indent-string": "^5.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-some/node_modules/clean-stack": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-4.2.0.tgz", + "integrity": "sha512-LYv6XPxoyODi36Dp976riBtSY27VmFo+MKqEU9QCCWyTrdEPDog+RWA7xQWHi6Vbp61j5c4cdzzX1NidnwtUWg==", + "license": "MIT", + "dependencies": { + "escape-string-regexp": "5.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-some/node_modules/escape-string-regexp": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz", + "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==", + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-some/node_modules/indent-string": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-5.0.0.tgz", + "integrity": "sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==", + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-some/node_modules/p-cancelable": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgz", + "integrity": "sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==", + "license": "MIT", + "engines": { + "node": ">=12.20" + } + }, "node_modules/p-try": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", @@ -19804,6 +20124,21 @@ "node": ">= 0.8" } }, + "node_modules/passwd-user": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/passwd-user/-/passwd-user-4.0.0.tgz", + "integrity": "sha512-Y0hVgYTHsWRkOF/lG2ciRChuD1kiQCGbmg9hQuyxRrszz2B9779U8nUa90NVJ089UTCFIcvfQ6zgmbXj/YoIYg==", + "license": "MIT", + "dependencies": { + "execa": "^5.1.1" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -20680,6 +21015,30 @@ "node": ">=0.10.0" } }, + "node_modules/rc": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", + "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", + "license": "(BSD-2-Clause OR MIT OR Apache-2.0)", + "dependencies": { + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" + }, + "bin": { + "rc": "cli.js" + } + }, + "node_modules/rc/node_modules/strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/react-is": { "version": "18.3.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", @@ -22516,7 +22875,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", - "dev": true, "license": "MIT", "engines": { "node": ">=6" diff --git a/gui-js/package.json b/gui-js/package.json index 59b2ed54d..39d95f548 100644 --- a/gui-js/package.json +++ b/gui-js/package.json @@ -1,6 +1,6 @@ { "name": "ravel", - "version":"3.22.0", + "version": "3.22.0", "author": "High Performance Coders", "description": "Graphical dynamical systems simulator oriented towards economics", "repository": { @@ -147,10 +147,9 @@ "@angular/material": "^20.0.0", "@ngx-translate/core": "^16.0.4", "@ngx-translate/http-loader": "^16.0.1", - "nx": "^21.2.1", - "@nx/workspace": "^21.0.0", "@nx/jest": "21.2.1", "@nx/js": "21.2.1", + "@nx/workspace": "^21.0.0", "@types/jest": "^29.0.0", "electron": "^37.0.0", "electron-builder": "^26.0.12", @@ -162,6 +161,7 @@ "material-design-icons": "^3.0.1", "ngx-color-picker": "^20.0.0", "npm-run-all": "^4.1.5", + "nx": "^21.2.1", "nx-electron": "^21.0.0", "wait-on": "^8.0.3" }, @@ -180,6 +180,7 @@ "electron-log": "^5.4.1", "electron-progressbar": "^2.2.1", "electron-store": "^8.2.0", + "fullname": "^5.0.0", "glob": "^11.1.0", "JSONStream": "^1.3.5", "mathjax": "^3.2.2", diff --git a/model/minsky.cc b/model/minsky.cc index b02203aa4..e025d26d6 100644 --- a/model/minsky.cc +++ b/model/minsky.cc @@ -157,6 +157,7 @@ namespace minsky namedItems.clear(); flags=reset_needed|fullEqnDisplay_needed; fileVersion=minskyVersion; + author=""; if (doClearHistory) clearHistory(); } diff --git a/model/minsky.h b/model/minsky.h index 8473795ae..89aaea4c9 100644 --- a/model/minsky.h +++ b/model/minsky.h @@ -191,6 +191,9 @@ namespace minsky reset(); return reset_flag(); } + + /// author of this model + std::string author; VariableValues variableValues; Dimensions dimensions; diff --git a/schema/schema3.cc b/schema/schema3.cc index d2c204c1b..11c201012 100644 --- a/schema/schema3.cc +++ b/schema/schema3.cc @@ -462,6 +462,7 @@ namespace schema3 m.dimensions=dimensions; m.conversions=conversions; m.fileVersion=minskyVersion; + m.author=author; static_cast(m)=rungeKutta; diff --git a/schema/schema3.h b/schema/schema3.h index 35b461797..cf5e7fc64 100644 --- a/schema/schema3.h +++ b/schema/schema3.h @@ -247,6 +247,7 @@ namespace schema3 static const int version=3; int schemaVersion=Minsky::version; std::string minskyVersion="unknown"; + std::string author; vector wires; vector items; Optional> inVariables, outVariables; @@ -267,6 +268,7 @@ namespace schema3 Minsky(const minsky::Minsky& m, bool packTensorData=true): Minsky(*m.model,packTensorData) { minskyVersion=m.minskyVersion; + author=m.author; rungeKutta=m; zoomFactor=m.model->zoomFactor(); bookmarks.insert(bookmarks.end(), m.model->bookmarks.begin(), m.model->bookmarks.end()); diff --git a/test/Makefile b/test/Makefile index a278f301a..8967ad2ef 100755 --- a/test/Makefile +++ b/test/Makefile @@ -17,13 +17,14 @@ MINSKYOBJS=localMinsky.o ../libminsky.a FLAGS:=-I.. -I../RESTService -I../RavelCAPI/civita -I../RavelCAPI -I../model -I../engine -I../schema $(FLAGS) FLAGS+=-std=c++20 -DJSON_PACK_NO_FALL_THROUGH_TO_STREAMING -DUSE_UNROLLED -DCLASSDESC_ARITIES=0xf \ -Wno-unknown-warning-option -Wno-unused-local-typedefs -Wno-unused-command-line-argument -LIBS+=-L../RavelCAPI -lravelCAPI -L../RavelCAPI/civita -lcivita -lboost_system -lboost_thread \ - -lboost_regex -lboost_date_time -lboost_filesystem -lclipboard -lxcb -lX11 \ +LIBS+=-L../RavelCAPI -lravelCAPI -L../RavelCAPI/civita -lcivita \ + -lboost_filesystem -lboost_system -lboost_thread \ + -lboost_date_time -lclipboard \ -lgsl -lssl -lcrypto -lgslcblas -lxml2 -ltiff -ldl ifdef MXE else -LIBS+=-lxcb +LIBS+=-lxcb -lX11 endif ifdef OPENMP diff --git a/test/rewriteMky.py b/test/rewriteMky.py index c3ac8088c..34d5e455a 100644 --- a/test/rewriteMky.py +++ b/test/rewriteMky.py @@ -1,5 +1,5 @@ import sys -sys.path.append('.') +sys.path.insert(0,'.') from pyminsky import minsky minsky.load(sys.argv[1]) minsky.garbageCollect()