From a512592cad4946cb5f896a06e02ea78793c12673 Mon Sep 17 00:00:00 2001 From: Russell Standish Date: Fri, 12 Apr 2024 16:53:19 +1000 Subject: [PATCH 1/3] createFilelog and compareFileLog python utilities. --- ecolab | 2 +- test/00/compareSimulationWithLogged.sh | 2 +- test/compareFileLog.py | 77 ++++++++++++++++ test/compareFileLog.tcl | 91 ------------------- test/createFileLog.py | 40 ++++++++ test/createFileLog.tcl | 41 --------- test/exampleLogs/1Free.mky.log | 22 ++--- ...netaryMinskyModelLessUnstableStart.mky.log | 22 ++--- test/exampleLogs/BasicGrowthModel.mky.log | 22 ++--- test/exampleLogs/EndogenousMoney.mky.log | 22 ++--- test/exampleLogs/GoodwinLinear.mky.log | 22 ++--- test/exampleLogs/GoodwinLinear02.mky.log | 22 ++--- test/exampleLogs/LoanableFunds.mky.log | 22 ++--- .../MinskyGovernmentNonlinear.mky.log | 22 ++--- test/exampleLogs/MinskyNonLinear.mky.log | 22 ++--- test/exampleLogs/MinskyPricesFinal.mky.log | 22 ++--- .../MonetaryMinskyNeoPrices.mky.log | 22 ++--- test/exampleLogs/PredatorPrey.mky.log | 22 ++--- test/exampleLogs/Solow.mky.log | 22 ++--- test/exampleLogs/Steve.mky.log | 22 ++--- test/exampleLogs/SteveTest028.mky.log | 22 ++--- test/exampleLogs/UDFCallGroup.mky.log | 22 ++--- test/exampleLogs/UWS05.mky.log | 22 ++--- test/exampleLogs/binaryInterpolation.mky.log | 22 ++--- test/exampleLogs/data-example.mky.log | 22 ++--- test/exampleLogs/exponentialGrowth.mky.log | 22 ++--- .../exponentialGrowthWithExtraLabel.mky.log | 22 ++--- test/exampleLogs/fundamentalConstants.mky.log | 22 ++--- test/exampleLogs/gammaAndFriends.mky.log | 22 ++--- test/exampleLogs/inner-outer-example.mky.log | 22 ++--- test/exampleLogs/math-examples.mky.log | 22 ++--- test/exampleLogs/plotWidget.mky.log | 22 ++--- .../rand-gather-interpolation.mky.log | 22 ++--- test/exampleLogs/reductionExample.mky.log | 22 ++--- test/exampleLogs/reductionsTest.mky.log | 22 ++--- test/exampleLogs/scansTest.mky.log | 22 ++--- test/exampleLogs/statistics.mky.log | 22 ++--- test/exampleLogs/switchBlock.mky.log | 22 ++--- test/exampleLogs/tensor-switch.mky.log | 22 ++--- 39 files changed, 482 insertions(+), 497 deletions(-) create mode 100644 test/compareFileLog.py delete mode 100755 test/compareFileLog.tcl create mode 100644 test/createFileLog.py delete mode 100755 test/createFileLog.tcl diff --git a/ecolab b/ecolab index 793c3df6c..7a8f9a1ce 160000 --- a/ecolab +++ b/ecolab @@ -1 +1 @@ -Subproject commit 793c3df6cf255cbde983202e04f9d1481c8d9b7f +Subproject commit 7a8f9a1ceea50fb4f4ad1c05b3c51cec11f7bbd0 diff --git a/test/00/compareSimulationWithLogged.sh b/test/00/compareSimulationWithLogged.sh index 8c32d3f7f..4da40bd39 100755 --- a/test/00/compareSimulationWithLogged.sh +++ b/test/00/compareSimulationWithLogged.sh @@ -11,7 +11,7 @@ for i in *.mky; do if [ $i = "indexing.mky" ]; then continue; fi if [ $i = "importedCSV.mky" ]; then continue; fi if [ $i = "histogram.mky" ]; then continue; fi - $here/gui-tk/minsky ../test/compareFileLog.tcl $i ../test/exampleLogs/$i.log + python3 ../test/compareFileLog.py $i ../test/exampleLogs/$i.log if test $? -ne 0; then echo "for $i" fail diff --git a/test/compareFileLog.py b/test/compareFileLog.py new file mode 100644 index 000000000..ce9c8219b --- /dev/null +++ b/test/compareFileLog.py @@ -0,0 +1,77 @@ +#!/usr/bin/python3 + +# usage python3 compareFileLog.py + +# compares the running of a minsky model , with a previously +# run data log file , created by "createFileLog" + +import sys +import csv +import re + +from pathlib import Path +here=Path(sys.argv[0]).parent.parent +if here=="": here='.' #relative path +sys.path.append(str(here)) + +from pyminsky import minsky + +def fclose(x,y): + if abs(x)>1e-30: + return abs(x-y)/(abs(x)+abs(y)) < 1e-2 + return abs(x-y) <= 1e-30 + +minsky.load(sys.argv[1]) + +ret=0 + +minsky.running(True) +#provide seed to ensure repeatability +minsky.srand(10) +minsky.reset() + +valueDict={} +def testValue(key, value): + # check that any local variable of the same name matches out value + if not any([fclose(value, x) for x in valueDict[key]]): + print(sys.argv[1], "t=",minsky.t(),name," logged ",value) + ret=1 + +with open(sys.argv[2]) as log: + reader=csv.reader(log) + # first line should specify no of steps to run + row=next(reader) + nsteps=int(row[1]) + + step=0 + + while step1: + for i in range(value.size()): + testValue(f"{value.name()}|{i}",value.value()) + else: + testValue(value.name(),value.value()) + +exit(ret) diff --git a/test/compareFileLog.tcl b/test/compareFileLog.tcl deleted file mode 100755 index 3f31e17d5..000000000 --- a/test/compareFileLog.tcl +++ /dev/null @@ -1,91 +0,0 @@ -#!../minsky - -# usage minsky compareFileLog - -# compares the running of a minsky model , with a previously -# run data log file , created by "createFileLog" - -source $minskyHome/library/init.tcl -use_namespace minsky -minsky.load $argv(2) -set log [open $argv(3) r] -# first line should specify no of steps to run -set nsteps [lindex [gets $log] 1] - - -proc fclose {x y} { - if {abs($x)>1e-30} { - return [expr abs($x-$y)/(abs($x)+abs($y)) < 1e-2] - } else { - return abs($x-$y) <= 1e-30 - } -} - -# prepare element accessors for later use -foreach name [variableValues.#keys] { - variableValues.@elem $name -} -use_namespace minsky -set ret 0 - -running 1 -#provide seed to ensure repeatability -srand 10 -reset -#step - -for {set step 0} {$step<$nsteps} {incr step} { - - step - gets $log logbuf - if {![fclose [t] [lindex $logbuf 0]]} { - puts "t=[t], logged [lindex $logbuf 0]" - set ret 1 - } - - array set values [lrange $logbuf 1 end] - - # note - we must use the .@elem form, to prevent '\' embedded in - # variable names from being expanded - foreach name [variableValues.#keys] { - if [regexp "^constant:" $name] continue - getValue $name - if [minsky.value.temp] continue - # local variables can have a rather arbitrary scope - # name. Check against all other variables with same name but - # different scope - - if {[lsearch [array names values] $name]==-1} { - set status 1 - foreach n [concat [array names values *:[regsub "(.*:)" $name ""]] [array names values *:[regsub "(.*:)" $name ""]|*]] { - if [fclose [value.value 0] $values($n)] { - set status 0 - break - } - } - if {$status} { - set ret 1 - puts "unable to find matching var $name" - break - } - continue - } - - if {[value.size]>1} { - for {set i 0} {$i<[value.size]} {incr i} { - if {![fclose [value.value $i] $values($name|$i)]} { - puts "$argv(2) t=[t], $name|$i=[value.value $i], logged $values($name|$i)" - set ret 1 - } - } - - } else { - if {![fclose [value.value] $values($name)]} { - puts "$argv(2) t=[t], $name=[value.value], logged $values($name)" - set ret 1 - } - } - } -} - -tcl_exit $ret diff --git a/test/createFileLog.py b/test/createFileLog.py new file mode 100644 index 000000000..4976007ef --- /dev/null +++ b/test/createFileLog.py @@ -0,0 +1,40 @@ +#!/usr/bin/python3 + +# usage python3 createFileLog.py + +# writes a log file on stdout for system + +import sys +from pathlib import Path +here=Path(sys.argv[0]).parent.parent +if here=="": here='.' #relative path +sys.path.append(str(here)) + +from pyminsky import minsky +import re +minsky.load(sys.argv[1]) + + +nSteps=10 +print("nsteps,",nSteps) +minsky.running(True) +#provide seed to ensure repeatability +minsky.srand(10) +minsky.reset() +#step + +for step in range(nSteps): + minsky.step() + print(minsky.t(),end='') + + for name in minsky.variableValues._keys(): + if re.search("^constant:",name) != None: continue + value=minsky.variableValues[name] + if value.temp(): continue + if value.size()>1: + for i in range(value.size()): + print(f',"{value.name()}|{i}"',value.value(i),sep=',',end='') + else: + print(f',"{value.name()}"',value.value(),sep=',',end="") + print() + diff --git a/test/createFileLog.tcl b/test/createFileLog.tcl deleted file mode 100755 index e63db61ff..000000000 --- a/test/createFileLog.tcl +++ /dev/null @@ -1,41 +0,0 @@ -#!../minsky - -# usage minsky createFileLog - -# writes a log file on stdout for system - -source $minskyHome/library/init.tcl -use_namespace minsky -minsky.load $argv(2) - - -set nsteps 10 -puts "nsteps 10" -running 1 -#provide seed to ensure repeatability -srand 10 -reset -#step - -for {set step 0} {$step<$nsteps} {incr step} { - step - puts -nonewline "[t] " - - # note - we must use the .@elem form, to prevent '\' embedded in - # variable names from being expanded - - foreach name [variableValues.#keys] { - if [regexp "^constant:" $name] continue - getValue "$name" - if [value.temp] continue - if {[value.size]>1} { - for {set i 0} {$i<[value.size]} {incr i} { - puts -nonewline "{$name|$i} [value.value $i] " - } - } else { - puts -nonewline "{$name} [value.value] " - } - } - puts "" -} -tcl_exit diff --git a/test/exampleLogs/1Free.mky.log b/test/exampleLogs/1Free.mky.log index c93e42018..60055a379 100644 --- a/test/exampleLogs/1Free.mky.log +++ b/test/exampleLogs/1Free.mky.log @@ -1,11 +1,11 @@ -nsteps 10 -3 {:FirmInt} 0.858866 {:Firms} 85.8866 {:IntLoan} 4.70502 {:Loan} 2.44978 {:Loans} 94.1004 {:Safe} 8.21384 {:Vault} 4.89956 {:rD} 0.01 {:rL} 0.05 {:τvault} 0.5 -6.02049 {:FirmInt} 0.783437 {:Firms} 78.3437 {:IntLoan} 4.93813 {:Loan} 0.118746 {:Loans} 98.7625 {:Safe} 20.4188 {:Vault} 0.237492 {:rD} 0.01 {:rL} 0.05 {:τvault} 0.5 -9.0989 {:FirmInt} 0.655612 {:Firms} 65.5612 {:IntLoan} 4.94946 {:Loan} 0.00542632 {:Loans} 98.9891 {:Safe} 33.4279 {:Vault} 0.0108526 {:rD} 0.01 {:rL} 0.05 {:τvault} 0.5 -12.597 {:FirmInt} 0.502844 {:Firms} 50.2844 {:IntLoan} 4.94998 {:Loan} 0.000158069 {:Loans} 98.9997 {:Safe} 48.7153 {:Vault} 0.000316138 {:rD} 0.01 {:rL} 0.05 {:τvault} 0.5 -17.2533 {:FirmInt} 0.290882 {:Firms} 29.0882 {:IntLoan} 4.95 {:Loan} -2.36134e-06 {:Loans} 99 {:Safe} 69.9118 {:Vault} -4.72268e-06 {:rD} 0.01 {:rL} 0.05 {:τvault} 0.5 -24.2533 {:FirmInt} -0.0469424 {:Firms} -4.69424 {:IntLoan} 4.95 {:Loan} 1.53463e-06 {:Loans} 99 {:Safe} 103.694 {:Vault} 3.06927e-06 {:rD} 0.01 {:rL} 0.05 {:τvault} 0.5 -31.2533 {:FirmInt} -0.409262 {:Firms} -40.9262 {:IntLoan} 4.95 {:Loan} -9.97358e-07 {:Loans} 99 {:Safe} 139.926 {:Vault} -1.99472e-06 {:rD} 0.01 {:rL} 0.05 {:τvault} 0.5 -38.2533 {:FirmInt} -0.797852 {:Firms} -79.7852 {:IntLoan} 4.95 {:Loan} 6.48183e-07 {:Loans} 99 {:Safe} 178.785 {:Vault} 1.29637e-06 {:rD} 0.01 {:rL} 0.05 {:τvault} 0.5 -45.2533 {:FirmInt} -1.21462 {:Firms} -121.462 {:IntLoan} 4.95 {:Loan} -4.21254e-07 {:Loans} 99 {:Safe} 220.462 {:Vault} -8.42508e-07 {:rD} 0.01 {:rL} 0.05 {:τvault} 0.5 -52.2533 {:FirmInt} -1.6616 {:Firms} -166.16 {:IntLoan} 4.95 {:Loan} 2.73773e-07 {:Loans} 99 {:Safe} 265.16 {:Vault} 5.47546e-07 {:rD} 0.01 {:rL} 0.05 {:τvault} 0.5 +nsteps, 10 +3.0,":FirmInt",0.8588660509119618,":Firms",85.88660509119617,":IntLoan",4.705022218461891,":Loan",2.44977781538109,":Loans",94.10044436923782,":Safe",8.213839278041643,":Vault",4.89955563076218,":rD",0.01,":rL",0.05,":\tau_\mathrm{vault}",0.5 +6.020493780300365,":FirmInt",0.7834374049051636,":Firms",78.34374049051635,":IntLoan",4.938125375996015,":Loan",0.11874624003985976,":Loans",98.76250751992029,":Safe",20.418767029403934,":Vault",0.23749248007971951,":rD",0.01,":rL",0.05,":\tau_\mathrm{vault}",0.5 +9.098903060211793,":FirmInt",0.6556122409453465,":Firms",65.56122409453465,":IntLoan",4.949457367861261,":Loan",0.005426321387397959,":Loans",98.98914735722522,":Safe",33.427923262690555,":Vault",0.010852642774795918,":rD",0.01,":rL",0.05,":\tau_\mathrm{vault}",0.5 +12.597033634549913,":FirmInt",0.5028440931774055,":Firms",50.284409317740554,":IntLoan",4.949984193080265,":Loan",0.00015806919735001588,":Loans",98.9996838616053,":Safe",48.71527454386475,":Vault",0.00031613839470003176,":rD",0.01,":rL",0.05,":\tau_\mathrm{vault}",0.5 +17.253250340525874,":FirmInt",0.2908818721402956,":Firms",29.08818721402956,":IntLoan",4.9500002361337945,":Loan",-2.361337937732855e-06,":Loans",99.00000472267588,":Safe",69.91181750864634,":Vault",-4.72267587546571e-06,":rD",0.01,":rL",0.05,":\tau_\mathrm{vault}",0.5 +24.253250340525874,":FirmInt",-0.046942394056448004,":Firms",-4.6942394056448,":IntLoan",4.949999846536688,":Loan",1.5346331306456168e-06,":Loans",98.99999693073374,":Safe",103.69423633637857,":Vault",3.0692662612912335e-06,":rD",0.01,":rL",0.05,":\tau_\mathrm{vault}",0.5 +31.253250340525874,":FirmInt",-0.40926154384946795,":Firms",-40.92615438494679,":IntLoan",4.950000099735782,":Loan",-9.97357814839633e-07,":Loans",99.00000199471563,":Safe",139.92615637966247,":Vault",-1.994715629679266e-06,":rD",0.01,":rL",0.05,":\tau_\mathrm{vault}",0.5 +38.253250340525874,":FirmInt",-0.7978518868990342,":Firms",-79.78518868990342,":IntLoan",4.949999935181733,":Loan",6.481826769914769e-07,":Loans",98.99999870363465,":Safe",178.78518739353808,":Vault",1.2963653539829538e-06,":rD",0.01,":rL",0.05,":\tau_\mathrm{vault}",0.5 +45.253250340525874,":FirmInt",-1.214618150039562,":Firms",-121.4618150039562,":IntLoan",4.950000042125382,":Loan",-4.212538133261557e-07,":Loans",99.00000084250763,":Safe",220.46181584646382,":Vault",-8.425076266523114e-07,":rD",0.01,":rL",0.05,":\tau_\mathrm{vault}",0.5 +52.253250340525874,":FirmInt",-1.66160341522156,":Firms",-166.160341522156,":IntLoan",4.949999972622723,":Loan",2.7377278279863865e-07,":Loans",98.99999945245445,":Safe",265.1603409746104,":Vault",5.475455655972773e-07,":rD",0.01,":rL",0.05,":\tau_\mathrm{vault}",0.5 diff --git a/test/exampleLogs/4MonetaryMinskyModelLessUnstableStart.mky.log b/test/exampleLogs/4MonetaryMinskyModelLessUnstableStart.mky.log index 52a3619c1..f81c7baff 100644 --- a/test/exampleLogs/4MonetaryMinskyModelLessUnstableStart.mky.log +++ b/test/exampleLogs/4MonetaryMinskyModelLessUnstableStart.mky.log @@ -1,11 +1,11 @@ -nsteps 10 -0.102 {:-33.33333333} -33.3333 {:-τPc} -1 {:0.03} 0.03 {:0.04} 0.04 {:0.5} 0.5 {:1-s} 0.73 {:1.5} 1.5 {:14.285744} 14.2857 {:3} 3 {:50} 50 {:7} 7 {:A} 0.291079 {:B} 0.291079 {:BC} 0.0193101 {:BPL} 0.0114706 {:C} 57.7223 {:D} 304.168 {:E} -0.0502207 {:F} 0.108322 {:FD} -5.02207 {:FL} 5.82158 {:G} 0.0114706 {:H} 281.637 {:I} 0.392897 {:Inv(πr)} 0.151654 {:J} 0.0204981 {:Kr} 904.65 {:L} 301.55 {:N} 300.613 {:PC} 1.26221 {:Ph(λ)} -0.04 {:W} 1.00868 {:WD} 10.8322 {:Yr} 301.55 {:a} 1 {:g} 0.0505512 {:g-(α+β)} 0.0505512 {:min} -0.04 {:odeKr} 45.7312 {:odeN} 6.01225 {:odePC} 0.119547 {:odeW} 0.0853366 {:odea} 0 {:odeλ} 0 {:rD} 0.01 {:rL} 0.05 {:sval} 2 {:v} 3 {:xval} 0.96 {:yval} 0 {:α} 0 {:β} 0 {:β0} 0.02 {:δ} 0 {:λ} 0 {:πr} 0.0666544 {:τB} 1 {:τLC(πr)} 0.942044 {:τRL(πr)} 14.8171 {:τW} 0.0384615 {:ω} 0.1 -0.208 {:-33.33333333} -33.3333 {:-τPc} -1 {:0.03} 0.03 {:0.04} 0.04 {:0.5} 0.5 {:1-s} 0.73 {:1.5} 1.5 {:14.285744} 14.2857 {:3} 3 {:50} 50 {:7} 7 {:A} 0.596907 {:B} 0.596907 {:BC} 0.0776569 {:BPL} 0.0462601 {:C} 58.7845 {:D} 308.556 {:E} 0.00132746 {:F} 0.117591 {:FD} 0.132746 {:FL} 11.9381 {:G} 0.0462601 {:H} 305.738 {:I} 0.805171 {:Inv(πr)} 0.152093 {:J} 0.082509 {:Kr} 909.518 {:L} 303.173 {:N} 301.251 {:PC} 1.27487 {:Ph(λ)} -0.04 {:W} 1.01776 {:WD} 11.7591 {:Yr} 303.173 {:a} 1 {:g} 0.0506975 {:g-(α+β)} 0.0506975 {:min} -0.04 {:odeKr} 46.1103 {:odeN} 6.02501 {:odePC} 0.119318 {:odeW} 0.0858861 {:odea} 0 {:odeλ} 0 {:rD} 0.01 {:rL} 0.05 {:sval} 2 {:v} 3 {:xval} 0.96 {:yval} 0 {:α} 0 {:β} 0 {:β0} 0.02 {:δ} 0 {:λ} 0 {:πr} 0.0667122 {:τB} 1 {:τLC(πr)} 0.941193 {:τRL(πr)} 14.8268 {:τW} 0.0384615 {:ω} 0.1 -0.314 {:-33.33333333} -33.3333 {:-τPc} -1 {:0.03} 0.03 {:0.04} 0.04 {:0.5} 0.5 {:1-s} 0.73 {:1.5} 1.5 {:14.285744} 14.2857 {:3} 3 {:50} 50 {:7} 7 {:A} 0.906526 {:B} 0.906526 {:BC} 0.171354 {:BPL} 0.102359 {:C} 59.8127 {:D} 313.005 {:E} 0.0605043 {:F} 0.119777 {:FD} 6.05043 {:FL} 18.1305 {:G} 0.102359 {:H} 311.422 {:I} 1.22224 {:Inv(πr)} 0.152411 {:J} 0.18218 {:Kr} 914.424 {:L} 304.808 {:N} 301.89 {:PC} 1.28751 {:Ph(λ)} -0.04 {:W} 1.02689 {:WD} 11.9777 {:Yr} 304.808 {:a} 1 {:g} 0.0508037 {:g-(α+β)} 0.0508037 {:min} -0.04 {:odeKr} 46.4561 {:odeN} 6.0378 {:odePC} 0.119195 {:odeW} 0.086542 {:odea} 0 {:odeλ} 0 {:rD} 0.01 {:rL} 0.05 {:sval} 2 {:v} 3 {:xval} 0.96 {:yval} 0 {:α} 0 {:β} 0 {:β0} 0.02 {:δ} 0 {:λ} 0 {:πr} 0.066754 {:τB} 1 {:τLC(πr)} 0.940578 {:τRL(πr)} 14.8339 {:τW} 0.0384615 {:ω} 0.1 -0.42 {:-33.33333333} -33.3333 {:-τPc} -1 {:0.03} 0.03 {:0.04} 0.04 {:0.5} 0.5 {:1-s} 0.73 {:1.5} 1.5 {:14.285744} 14.2857 {:3} 3 {:50} 50 {:7} 7 {:A} 1.21985 {:B} 1.21985 {:BC} 0.29712 {:BPL} 0.177947 {:C} 60.7872 {:D} 317.52 {:E} 0.120655 {:F} 0.121536 {:FD} 12.0655 {:FL} 24.3971 {:G} 0.177947 {:H} 315.994 {:I} 1.64431 {:Inv(πr)} 0.152565 {:J} 0.31599 {:Kr} 919.365 {:L} 306.455 {:N} 302.531 {:PC} 1.30014 {:Ph(λ)} -0.04 {:W} 1.03611 {:WD} 12.1536 {:Yr} 306.455 {:a} 1 {:g} 0.050855 {:g-(α+β)} 0.050855 {:min} -0.04 {:odeKr} 46.7543 {:odeN} 6.05061 {:odePC} 0.119183 {:odeW} 0.0873111 {:odea} 0 {:odeλ} 0 {:rD} 0.01 {:rL} 0.05 {:sval} 2 {:v} 3 {:xval} 0.96 {:yval} 0 {:α} 0 {:β} 0 {:β0} 0.02 {:δ} 0 {:λ} 0 {:πr} 0.0667742 {:τB} 1 {:τLC(πr)} 0.940281 {:τRL(πr)} 14.8373 {:τW} 0.0384615 {:ω} 0.1 -0.526 {:-33.33333333} -33.3333 {:-τPc} -1 {:0.03} 0.03 {:0.04} 0.04 {:0.5} 0.5 {:1-s} 0.73 {:1.5} 1.5 {:14.285744} 14.2857 {:3} 3 {:50} 50 {:7} 7 {:A} 1.53673 {:B} 1.53673 {:BC} 0.452045 {:BPL} 0.271375 {:C} 61.7043 {:D} 322.102 {:E} 0.181342 {:F} 0.123292 {:FD} 18.1342 {:FL} 30.7347 {:G} 0.271375 {:H} 320.558 {:I} 2.07149 {:Inv(πr)} 0.152551 {:J} 0.480741 {:Kr} 924.334 {:L} 308.111 {:N} 303.173 {:PC} 1.31278 {:Ph(λ)} -0.04 {:W} 1.04541 {:WD} 12.3292 {:Yr} 308.111 {:a} 1 {:g} 0.0508504 {:g-(α+β)} 0.0508504 {:min} -0.04 {:odeKr} 47.0028 {:odeN} 6.06345 {:odePC} 0.119286 {:odeW} 0.0882025 {:odea} 0 {:odeλ} 0 {:rD} 0.01 {:rL} 0.05 {:sval} 2 {:v} 3 {:xval} 0.96 {:yval} 0 {:α} 0 {:β} 0 {:β0} 0.02 {:δ} 0 {:λ} 0 {:πr} 0.0667724 {:τB} 1 {:τLC(πr)} 0.940308 {:τRL(πr)} 14.837 {:τW} 0.0384615 {:ω} 0.1 -0.632 {:-33.33333333} -33.3333 {:-τPc} -1 {:0.03} 0.03 {:0.04} 0.04 {:0.5} 0.5 {:1-s} 0.73 {:1.5} 1.5 {:14.285744} 14.2857 {:3} 3 {:50} 50 {:7} 7 {:A} 1.85699 {:B} 1.85699 {:BC} 0.633552 {:BPL} 0.381145 {:C} 62.5607 {:D} 326.755 {:E} 0.242514 {:F} 0.125072 {:FD} 24.2514 {:FL} 37.1398 {:G} 0.381145 {:H} 325.187 {:I} 2.50387 {:Inv(πr)} 0.152369 {:J} 0.67352 {:Kr} 929.327 {:L} 309.776 {:N} 303.816 {:PC} 1.32543 {:Ph(λ)} -0.04 {:W} 1.05481 {:WD} 12.5072 {:Yr} 309.776 {:a} 1 {:g} 0.0507896 {:g-(α+β)} 0.0507896 {:min} -0.04 {:odeKr} 47.2002 {:odeN} 6.07632 {:odePC} 0.119511 {:odeW} 0.0892267 {:odea} 0 {:odeλ} 0 {:rD} 0.01 {:rL} 0.05 {:sval} 2 {:v} 3 {:xval} 0.96 {:yval} 0 {:α} 0 {:β} 0 {:β0} 0.02 {:δ} 0 {:λ} 0 {:πr} 0.0667485 {:τB} 1 {:τLC(πr)} 0.940659 {:τRL(πr)} 14.833 {:τW} 0.0384615 {:ω} 0.1 -0.738 {:-33.33333333} -33.3333 {:-τPc} -1 {:0.03} 0.03 {:0.04} 0.04 {:0.5} 0.5 {:1-s} 0.73 {:1.5} 1.5 {:14.285744} 14.2857 {:3} 3 {:50} 50 {:7} 7 {:A} 2.1804 {:B} 2.1804 {:BC} 0.839368 {:BPL} 0.505891 {:C} 63.3534 {:D} 331.481 {:E} 0.304141 {:F} 0.12688 {:FD} 30.4141 {:FL} 43.608 {:G} 0.505891 {:H} 329.889 {:I} 2.94149 {:Inv(πr)} 0.152017 {:J} 0.891674 {:Kr} 934.339 {:L} 311.446 {:N} 304.461 {:PC} 1.33812 {:Ph(λ)} -0.04 {:W} 1.06433 {:WD} 12.688 {:Yr} 311.446 {:a} 1 {:g} 0.0506723 {:g-(α+β)} 0.0506723 {:min} -0.04 {:odeKr} 47.3451 {:odeN} 6.08922 {:odePC} 0.119865 {:odeW} 0.0903956 {:odea} 0 {:odeλ} 0 {:rD} 0.01 {:rL} 0.05 {:sval} 2 {:v} 3 {:xval} 0.96 {:yval} 0 {:α} 0 {:β} 0 {:β0} 0.02 {:δ} 0 {:λ} 0 {:πr} 0.0667022 {:τB} 1 {:τLC(πr)} 0.941339 {:τRL(πr)} 14.8251 {:τW} 0.0384615 {:ω} 0.1 -0.844 {:-33.33333333} -33.3333 {:-τPc} -1 {:0.03} 0.03 {:0.04} 0.04 {:0.5} 0.5 {:1-s} 0.73 {:1.5} 1.5 {:14.285744} 14.2857 {:3} 3 {:50} 50 {:7} 7 {:A} 2.50672 {:B} 2.50672 {:BC} 1.06749 {:BPL} 0.644366 {:C} 64.0785 {:D} 336.286 {:E} 0.366182 {:F} 0.128718 {:FD} 36.6182 {:FL} 50.1344 {:G} 0.644366 {:H} 334.666 {:I} 3.38437 {:Inv(πr)} 0.151493 {:J} 1.13279 {:Kr} 939.363 {:L} 313.121 {:N} 305.107 {:PC} 1.35085 {:Ph(λ)} -0.04 {:W} 1.07398 {:WD} 12.8718 {:Yr} 313.121 {:a} 1 {:g} 0.0504977 {:g-(α+β)} 0.0504977 {:min} -0.04 {:odeKr} 47.4357 {:odeN} 6.10214 {:odePC} 0.120355 {:odeW} 0.0917227 {:odea} 0 {:odeλ} 0 {:rD} 0.01 {:rL} 0.05 {:sval} 2 {:v} 3 {:xval} 0.96 {:yval} 0 {:α} 0 {:β} 0 {:β0} 0.02 {:δ} 0 {:λ} 0 {:πr} 0.0666332 {:τB} 1 {:τLC(πr)} 0.942356 {:τRL(πr)} 14.8135 {:τW} 0.0384615 {:ω} 0.1 -0.95 {:-33.33333333} -33.3333 {:-τPc} -1 {:0.03} 0.03 {:0.04} 0.04 {:0.5} 0.5 {:1-s} 0.73 {:1.5} 1.5 {:14.285744} 14.2857 {:3} 3 {:50} 50 {:7} 7 {:A} 2.83567 {:B} 2.83567 {:BC} 1.31616 {:BPL} 0.795425 {:C} 64.7322 {:D} 341.172 {:E} 0.428593 {:F} 0.130586 {:FD} 42.8593 {:FL} 56.7133 {:G} 0.795425 {:H} 339.524 {:I} 3.83252 {:Inv(πr)} 0.150796 {:J} 1.39465 {:Kr} 944.393 {:L} 314.798 {:N} 305.754 {:PC} 1.36364 {:Ph(λ)} -0.04 {:W} 1.08378 {:WD} 13.0586 {:Yr} 314.798 {:a} 1 {:g} 0.0502652 {:g-(α+β)} 0.0502652 {:min} -0.04 {:odeKr} 47.4701 {:odeN} 6.11509 {:odePC} 0.12099 {:odeW} 0.0932232 {:odea} 0 {:odeλ} 0 {:rD} 0.01 {:rL} 0.05 {:sval} 2 {:v} 3 {:xval} 0.96 {:yval} 0 {:α} 0 {:β} 0 {:β0} 0.02 {:δ} 0 {:λ} 0 {:πr} 0.0665409 {:τB} 1 {:τLC(πr)} 0.943719 {:τRL(πr)} 14.7979 {:τW} 0.0384615 {:ω} 0.1 -1.056 {:-33.33333333} -33.3333 {:-τPc} -1 {:0.03} 0.03 {:0.04} 0.04 {:0.5} 0.5 {:1-s} 0.73 {:1.5} 1.5 {:14.285744} 14.2857 {:3} 3 {:50} 50 {:7} 7 {:A} 3.16693 {:B} 3.16693 {:BC} 1.58384 {:BPL} 0.958014 {:C} 65.3101 {:D} 346.144 {:E} 0.491318 {:F} 0.132487 {:FD} 49.1318 {:FL} 63.3386 {:G} 0.958014 {:H} 344.467 {:I} 4.28591 {:Inv(πr)} 0.149921 {:J} 1.67524 {:Kr} 949.424 {:L} 316.475 {:N} 306.403 {:PC} 1.37651 {:Ph(λ)} -0.04 {:W} 1.09375 {:WD} 13.2487 {:Yr} 316.475 {:a} 1 {:g} 0.0499738 {:g-(α+β)} 0.0499738 {:min} -0.04 {:odeKr} 47.4463 {:odeN} 6.12807 {:odePC} 0.121782 {:odeW} 0.0949144 {:odea} 0 {:odeλ} 0 {:rD} 0.01 {:rL} 0.05 {:sval} 2 {:v} 3 {:xval} 0.96 {:yval} 0 {:α} 0 {:β} 0 {:β0} 0.02 {:δ} 0 {:λ} 0 {:πr} 0.0664246 {:τB} 1 {:τLC(πr)} 0.945442 {:τRL(πr)} 14.7783 {:τW} 0.0384615 {:ω} 0.1 +nsteps, 10 +0.10200000000000008,":-33.33333333",-33.3333,":-\tau_{Pc}",-1.0,":0.03",0.03,":0.04",0.04,":0.5",0.5,":1-s",0.73,":1.5",1.5,":14.285744",14.2857,":3",3.0,":50",50.0,":7",7.0,":A",0.2910791445675885,":B",0.2910791445675885,":BC",0.019310127565701166,":BPL",0.011470564873992303,":C",57.72229130704952,":D",304.1680320951225,":E",-0.05022074992753032,":F",0.10832187319230809,":FD",-5.022074992753032,":FL",5.8215828913517695,":G",0.011470564873992303,":H",281.6371519371529,":I",0.39289741037286413,":Inv(\pi_r)",0.15165366862254984,":J",0.0204981272667882,":Kr",904.6499765165312,":L",301.54999217217704,":N",300.6126246646997,":PC",1.262209137991727,":Ph(\lambda)",-0.04,":W",1.0086819432628293,":WD",10.832187319230808,":Yr",301.54999217217704,":a",1.0,":g",0.05055122287418328,":g-(\alpha+\beta)",0.05055122287418328,":min",-0.04,":ode_{Kr}",45.73116258601184,":ode_N",6.012252493293994,":ode_{PC}",0.11954694866968296,":ode_W",0.0853365813370687,":ode_a",0.0,":ode_\lambda",0.0,":rD",0.01,":rL",0.05,":sval",2.0,":v",3.0,":xval",0.96,":yval",0.0,":\alpha",0.0,":\beta",0.0,":\beta_0",0.02,":\delta",0.0,":\lambda",0.0,":\pi_r",0.06665439942213099,":\tau_B",1.0,":\tau_{LC}(\pi_r)",0.9420435005781297,":\tau_{RL}(\pi_r)",14.81705589717942,":\tau_W",0.0384615,":\omega",0.1 +0.20800000000000016,":-33.33333333",-33.3333,":-\tau_{Pc}",-1.0,":0.03",0.03,":0.04",0.04,":0.5",0.5,":1-s",0.73,":1.5",1.5,":14.285744",14.2857,":3",3.0,":50",50.0,":7",7.0,":A",0.5969065005402472,":B",0.5969065005402472,":BC",0.07765687192027713,":BPL",0.046260114788590816,":C",58.78454117910911,":D",308.5556293730489,":E",0.0013274604280101691,":F",0.11759123853215334,":FD",0.1327460428010169,":FL",11.938130010804944,":G",0.046260114788590816,":H",305.7375259211246,":I",0.8051714532491446,":Inv(\pi_r)",0.15209257463633083,":J",0.08250900676911471,":Kr",909.5176576735972,":L",303.17255255786574,":N",301.2505994433114,":PC",1.2748680604852973,":Ph(\lambda)",-0.04,":W",1.0177558184926905,":WD",11.759123853215334,":Yr",303.17255255786574,":a",1.0,":g",0.05069752487877694,":g-(\alpha+\beta)",0.05069752487877694,":min",-0.04,":ode_{Kr}",46.110294077594126,":ode_N",6.025011988866228,":ode_{PC}",0.11931799224441564,":ode_W",0.08588611821076741,":ode_a",0.0,":ode_\lambda",0.0,":rD",0.01,":rL",0.05,":sval",2.0,":v",3.0,":xval",0.96,":yval",0.0,":\alpha",0.0,":\beta",0.0,":\beta_0",0.02,":\delta",0.0,":\lambda",0.0,":\pi_r",0.06671219850001184,":\tau_B",1.0,":\tau_{LC}(\pi_r)",0.9411926644273476,":\tau_{RL}(\pi_r)",14.826817273054663,":\tau_W",0.0384615,":\omega",0.1 +0.3140000000000002,":-33.33333333",-33.3333,":-\tau_{Pc}",-1.0,":0.03",0.03,":0.04",0.04,":0.5",0.5,":1-s",0.73,":1.5",1.5,":14.285744",14.2857,":3",3.0,":50",50.0,":7",7.0,":A",0.9065264974662468,":B",0.9065264974662468,":BC",0.17135407594763516,":BPL",0.10235909416889827,":C",59.81266561532748,":D",313.00539645044927,":E",0.06050431030417757,":F",0.11977739824738289,":FD",6.050431030417757,":FL",18.130529949324934,":G",0.10235909416889827,":H",311.4215468647423,":I",1.2222370738925226,":Inv(\pi_r)",0.15241114258885577,":J",0.1821796136309866,":Kr",914.42408225558,":L",304.80802741852665,":N",301.88992816312424,":PC",1.2875083027581895,":Ph(\lambda)",-0.04,":W",1.0268935470674694,":WD",11.977739824738288,":Yr",304.80802741852665,":a",1.0,":g",0.05080371419628526,":g-(\alpha+\beta)",0.05080371419628526,":min",-0.04,":ode_{Kr}",46.45613972911293,":ode_N",6.037798563262485,":ode_{PC}",0.11919518637533022,":ode_W",0.0865420264751547,":ode_a",0.0,":ode_\lambda",0.0,":rD",0.01,":rL",0.05,":sval",2.0,":v",3.0,":xval",0.96,":yval",0.0,":\alpha",0.0,":\beta",0.0,":\beta_0",0.02,":\delta",0.0,":\lambda",0.0,":\pi_r",0.06675404601132015,":\tau_B",1.0,":\tau_{LC}(\pi_r)",0.9405776669102007,":\tau_{RL}(\pi_r)",14.833889706506517,":\tau_W",0.0384615,":\omega",0.1 +0.4200000000000003,":-33.33333333",-33.3333,":-\tau_{Pc}",-1.0,":0.03",0.03,":0.04",0.04,":0.5",0.5,":1-s",0.73,":1.5",1.5,":14.285744",14.2857,":3",3.0,":50",50.0,":7",7.0,":A",1.2198525228378887,":B",1.2198525228378887,":BC",0.29711996858074174,":BPL",0.17794715314585777,":C",60.78719324358229,":D",317.51997159622937,":E",0.12065498311220228,":F",0.12153604992391698,":FD",12.065498311220228,":FL",24.39705045675777,":G",0.17794715314585777,":H",315.9940457962299,":I",1.6443050304141174,":Inv(\pi_r)",0.15256501879084222,":J",0.31599048603043645,":Kr",919.3646680818887,":L",306.4548893606296,":N",302.5306136975384,":PC",1.3001413453767736,":Ph(\lambda)",-0.04,":W",1.0361067244144329,":WD",12.153604992391697,":Yr",306.4548893606296,":a",1.0,":g",0.050855006263614076,":g-(\alpha+\beta)",0.050855006263614076,":min",-0.04,":ode_{Kr}",46.754295953849926,":ode_N",6.050612273950768,":ode_{PC}",0.11918293464299756,":ode_W",0.08731109243846519,":ode_a",0.0,":ode_\lambda",0.0,":rD",0.01,":rL",0.05,":sval",2.0,":v",3.0,":xval",0.96,":yval",0.0,":\alpha",0.0,":\beta",0.0,":\beta_0",0.02,":\delta",0.0,":\lambda",0.0,":\pi_r",0.06677422807595731,":\tau_B",1.0,":\tau_{LC}(\pi_r)",0.9402813746491181,":\tau_{RL}(\pi_r)",14.837302085376086,":\tau_W",0.0384615,":\omega",0.1 +0.5260000000000004,":-33.33333333",-33.3333,":-\tau_{Pc}",-1.0,":0.03",0.03,":0.04",0.04,":0.5",0.5,":1-s",0.73,":1.5",1.5,":14.285744",14.2857,":3",3.0,":50",50.0,":7",7.0,":A",1.5367346753737543,":B",1.5367346753737543,":BC",0.4520447466412852,":BPL",0.271375216542004,":C",61.70425376998217,":D",322.10207991594365,":E",0.18134164146641854,":F",0.12329154144291238,":FD",18.134164146641854,":FL",30.734693507475082,":G",0.271375216542004,":H",320.55832830990045,":I",2.071490335403395,":Inv(\pi_r)",0.15255120497859398,":J",0.4807411711683611,":Kr",924.3342372553175,":L",308.11141241843916,":N",303.1726589260522,":PC",1.3127791703262919,":Ph(\lambda)",-0.04,":W",1.0454078198132566,":WD",12.329154144291238,":Yr",308.11141241843916,":a",1.0,":g",0.05085040165953133,":g-(\alpha+\beta)",0.05085040165953133,":min",-0.04,":ode_{Kr}",47.00276723208942,":ode_N",6.063453178521044,":ode_{PC}",0.1192863362672103,":ode_W",0.08820249669163696,":ode_a",0.0,":ode_\lambda",0.0,":rD",0.01,":rL",0.05,":sval",2.0,":v",3.0,":xval",0.96,":yval",0.0,":\alpha",0.0,":\beta",0.0,":\beta_0",0.02,":\delta",0.0,":\lambda",0.0,":\pi_r",0.06677241711853434,":\tau_B",1.0,":\tau_{LC}(\pi_r)",0.9403079531188601,":\tau_{RL}(\pi_r)",14.836995848928211,":\tau_W",0.0384615,":\omega",0.1 +0.6320000000000005,":-33.33333333",-33.3333,":-\tau_{Pc}",-1.0,":0.03",0.03,":0.04",0.04,":0.5",0.5,":1-s",0.73,":1.5",1.5,":14.285744",14.2857,":3",3.0,":50",50.0,":7",7.0,":A",1.8569890082699272,":B",1.8569890082699272,":BC",0.633552349772909,":BPL",0.3811449957151738,":C",62.56074834947891,":D",326.75473643288746,":E",0.242514431273915,":F",0.12507192042291876,":FD",24.2514431273915,":FL",37.13978016539854,":G",0.3811449957151738,":H",325.187318286907,":I",2.503869857369877,":Inv(\pi_r)",0.15236885514159568,":J",0.6735195524790132,":Kr",929.3274510896398,":L",309.77581702987993,":N",303.81606673427456,":PC",1.325434343958377,":Ph(\lambda)",-0.04,":W",1.0548103449965875,":WD",12.507192042291875,":Yr",309.77581702987993,":a",1.0,":g",0.05078961838053189,":g-(\alpha+\beta)",0.05078961838053189,":min",-0.04,":ode_{Kr}",47.20018659139522,":ode_N",6.076321334685491,":ode_{PC}",0.11951133411914028,":ode_W",0.08922671926197069,":ode_a",0.0,":ode_\lambda",0.0,":rD",0.01,":rL",0.05,":sval",2.0,":v",3.0,":xval",0.96,":yval",0.0,":\alpha",0.0,":\beta",0.0,":\beta_0",0.02,":\delta",0.0,":\lambda",0.0,":\pi_r",0.06674849611331551,":\tau_B",1.0,":\tau_{LC}(\pi_r)",0.9406591797387358,":\tau_{RL}(\pi_r)",14.832951503482303,":\tau_W",0.0384615,":\omega",0.1 +0.7380000000000005,":-33.33333333",-33.3333,":-\tau_{Pc}",-1.0,":0.03",0.03,":0.04",0.04,":0.5",0.5,":1-s",0.73,":1.5",1.5,":14.285744",14.2857,":3",3.0,":50",50.0,":7",7.0,":A",2.180399627259238,":B",2.180399627259238,":BC",0.8393678923800987,":BPL",0.5058913445203358,":C",63.3533704525531,":D",331.48129911472773,":E",0.30414086884547226,":F",0.12688014316117197,":FD",30.414086884547224,":FL",43.60799254518476,":G",0.5058913445203358,":H",329.88870210774917,":I",2.9414908742296233,":Inv(\pi_r)",0.15201676555662946,":J",0.8916740913837784,":Kr",934.3388202500903,":L",311.4462734166968,":N",304.4608400139386,":PC",1.3381201115787937,":Ph(\lambda)",-0.04,":W",1.0643289947837176,":WD",12.688014316117195,":Yr",311.4462734166968,":a",1.0,":g",0.05067225518554316,":g-(\alpha+\beta)",0.05067225518554316,":min",-0.04,":ode_{Kr}",47.345055129471916,":ode_N",6.089216800278772,":ode_{PC}",0.1198648127824633,":ode_W",0.09039563094985428,":ode_a",0.0,":ode_\lambda",0.0,":rD",0.01,":rL",0.05,":sval",2.0,":v",3.0,":xval",0.96,":yval",0.0,":\alpha",0.0,":\beta",0.0,":\beta_0",0.02,":\delta",0.0,":\lambda",0.0,":\pi_r",0.06670222720728883,":\tau_B",1.0,":\tau_{LC}(\pi_r)",0.9413393306936771,":\tau_{RL}(\pi_r)",14.825132699623177,":\tau_W",0.0384615,":\omega",0.1 +0.8440000000000006,":-33.33333333",-33.3333,":-\tau_{Pc}",-1.0,":0.03",0.03,":0.04",0.04,":0.5",0.5,":1-s",0.73,":1.5",1.5,":14.285744",14.2857,":3",3.0,":50",50.0,":7",7.0,":A",2.5067187258646846,":B",2.5067187258646846,":BC",1.0674885322391714,":BPL",0.644366429335607,":C",64.07850927292132,":D",336.2855180526524,":E",0.36618237513947755,":F",0.1287177057401036,":FD",36.618237513947754,":FL",50.134374517293686,":G",0.644366429335607,":H",334.6663695906389,":I",3.3843748951962866,":Inv(\pi_r)",0.15149317255112582,":J",1.132787316321361,":Kr",939.3626863462327,":L",313.12089544874425,":N",305.10698166291456,":PC",1.3508505029531115,":Ph(\lambda)",-0.04,":W",1.0739798044161508,":WD",12.871770574010359,":Yr",313.12089544874425,":a",1.0,":g",0.050497724183708605,":g-(\alpha+\beta)",0.050497724183708605,":min",-0.04,":ode_{Kr}",47.43567784357964,":ode_N",6.102139633258291,":ode_{PC}",0.12035470857586228,":ode_W",0.09172268779444938,":ode_a",0.0,":ode_\lambda",0.0,":rD",0.01,":rL",0.05,":sval",2.0,":v",3.0,":xval",0.96,":yval",0.0,":\alpha",0.0,":\beta",0.0,":\beta_0",0.02,":\delta",0.0,":\lambda",0.0,":\pi_r",0.06663322208301727,":\tau_B",1.0,":\tau_{LC}(\pi_r)",0.9423556539331298,":\tau_{RL}(\pi_r)",14.813481387198978,":\tau_W",0.0384615,":\omega",0.1 +0.9500000000000007,":-33.33333333",-33.3333,":-\tau_{Pc}",-1.0,":0.03",0.03,":0.04",0.04,":0.5",0.5,":1-s",0.73,":1.5",1.5,":14.285744",14.2857,":3",3.0,":50",50.0,":7",7.0,":A",2.8356661583233986,":B",2.8356661583233986,":BC",1.3161574658456732,":BPL",0.7954254582265208,":C",64.73220773106024,":D",341.1715912160174,":E",0.42859281050028913,":F",0.13058616658212568,":FD",42.85928105002891,":FL",56.713323166467966,":G",0.7954254582265208,":H",339.5243726378994,":I",3.8325209669164986,":Inv(\pi_r)",0.1507956963326723,":J",1.3946503049458656,":Kr",944.393200008768,":L",314.797733336256,":N",305.75449458522263,":PC",1.363640450426876,":Ph(\lambda)",-0.04,":W",1.083780329674705,":WD",13.058616658212568,":Yr",314.797733336256,":a",1.0,":g",0.05026523211089077,":g-(\alpha+\beta)",0.05026523211089077,":min",-0.04,":ode_{Kr}",47.47014340238761,":ode_N",6.115089891704453,":ode_{PC}",0.12099013816861048,":ode_W",0.09322316562760825,":ode_a",0.0,":ode_\lambda",0.0,":rD",0.01,":rL",0.05,":sval",2.0,":v",3.0,":xval",0.96,":yval",0.0,":\alpha",0.0,":\beta",0.0,":\beta_0",0.02,":\delta",0.0,":\lambda",0.0,":\pi_r",0.06654092924289337,":\tau_B",1.0,":\tau_{LC}(\pi_r)",0.9437186233553799,":\tau_{RL}(\pi_r)",14.797915955590286,":\tau_W",0.0384615,":\omega",0.1 +1.0559999999999945,":-33.33333333",-33.3333,":-\tau_{Pc}",-1.0,":0.03",0.03,":0.04",0.04,":0.5",0.5,":1-s",0.73,":1.5",1.5,":14.285744",14.2857,":3",3.0,":50",50.0,":7",7.0,":A",3.166928648544806,":B",3.166928648544806,":BC",1.5838409207025428,":BPL",0.9580137824202816,":C",65.31012218808034,":D",346.1442287775764,":E",0.4913183263609573,":F",0.13248726552380155,":FD",49.13183263609573,":FL",63.33857297089611,":G",0.9580137824202816,":H",344.4672348291188,":I",4.285908890372576,":Inv(\pi_r)",0.14992129509102714,":J",1.675238152129628,":Kr",949.4242970309509,":L",316.4747656769836,":N",306.40338169104547,":PC",1.3765059218273252,":Ph(\lambda)",-0.04,":W",1.0937498540748603,":WD",13.248726552380154,":Yr",316.4747656769836,":a",1.0,":g",0.04997376503034238,":g-(\alpha+\beta)",0.04997376503034238,":min",-0.04,":ode_{Kr}",47.44630673392273,":ode_N",6.128067633820909,":ode_{PC}",0.12178154950809983,":ode_W",0.09491443766145098,":ode_a",0.0,":ode_\lambda",0.0,":rD",0.01,":rL",0.05,":sval",2.0,":v",3.0,":xval",0.96,":yval",0.0,":\alpha",0.0,":\beta",0.0,":\beta_0",0.02,":\delta",0.0,":\lambda",0.0,":\pi_r",0.0664246200577254,":\tau_B",1.0,":\tau_{LC}(\pi_r)",0.9454422457422561,":\tau_{RL}(\pi_r)",14.778329309139856,":\tau_W",0.0384615,":\omega",0.1 diff --git a/test/exampleLogs/BasicGrowthModel.mky.log b/test/exampleLogs/BasicGrowthModel.mky.log index 6ff7299c6..b32821fb3 100644 --- a/test/exampleLogs/BasicGrowthModel.mky.log +++ b/test/exampleLogs/BasicGrowthModel.mky.log @@ -1,11 +1,11 @@ -nsteps 10 -0.3 {:I(t)␣-␣Investment␣at␣time␣t} 7.10417 {:L(t)␣-␣Labor␣at␣time␣t} 100 {:M(t)␣-␣Machines␣at␣time␣t} 5.60769 {:O(t)␣-␣Output␣at␣time␣t} 23.6806 {:d␣-␣Depreciation␣Rate} 0.25 {:s␣-␣Savings␣Rate} 0.3 -1 {:I(t)␣-␣Investment␣at␣time␣t} 9.52509 {:L(t)␣-␣Labor␣at␣time␣t} 100 {:M(t)␣-␣Machines␣at␣time␣t} 10.0808 {:O(t)␣-␣Output␣at␣time␣t} 31.7503 {:d␣-␣Depreciation␣Rate} 0.25 {:s␣-␣Savings␣Rate} 0.3 -1.7 {:I(t)␣-␣Investment␣at␣time␣t} 11.7432 {:L(t)␣-␣Labor␣at␣time␣t} 100 {:M(t)␣-␣Machines␣at␣time␣t} 15.3225 {:O(t)␣-␣Output␣at␣time␣t} 39.144 {:d␣-␣Depreciation␣Rate} 0.25 {:s␣-␣Savings␣Rate} 0.3 -2.4 {:I(t)␣-␣Investment␣at␣time␣t} 13.7755 {:L(t)␣-␣Labor␣at␣time␣t} 100 {:M(t)␣-␣Machines␣at␣time␣t} 21.0848 {:O(t)␣-␣Output␣at␣time␣t} 45.9182 {:d␣-␣Depreciation␣Rate} 0.25 {:s␣-␣Savings␣Rate} 0.3 -3.1 {:I(t)␣-␣Investment␣at␣time␣t} 15.6374 {:L(t)␣-␣Labor␣at␣time␣t} 100 {:M(t)␣-␣Machines␣at␣time␣t} 27.17 {:O(t)␣-␣Output␣at␣time␣t} 52.1248 {:d␣-␣Depreciation␣Rate} 0.25 {:s␣-␣Savings␣Rate} 0.3 -3.8 {:I(t)␣-␣Investment␣at␣time␣t} 17.3434 {:L(t)␣-␣Labor␣at␣time␣t} 100 {:M(t)␣-␣Machines␣at␣time␣t} 33.4217 {:O(t)␣-␣Output␣at␣time␣t} 57.8115 {:d␣-␣Depreciation␣Rate} 0.25 {:s␣-␣Savings␣Rate} 0.3 -4.5 {:I(t)␣-␣Investment␣at␣time␣t} 18.9065 {:L(t)␣-␣Labor␣at␣time␣t} 100 {:M(t)␣-␣Machines␣at␣time␣t} 39.7174 {:O(t)␣-␣Output␣at␣time␣t} 63.0217 {:d␣-␣Depreciation␣Rate} 0.25 {:s␣-␣Savings␣Rate} 0.3 -5.2 {:I(t)␣-␣Investment␣at␣time␣t} 20.3386 {:L(t)␣-␣Labor␣at␣time␣t} 100 {:M(t)␣-␣Machines␣at␣time␣t} 45.9622 {:O(t)␣-␣Output␣at␣time␣t} 67.7954 {:d␣-␣Depreciation␣Rate} 0.25 {:s␣-␣Savings␣Rate} 0.3 -5.9 {:I(t)␣-␣Investment␣at␣time␣t} 21.6508 {:L(t)␣-␣Labor␣at␣time␣t} 100 {:M(t)␣-␣Machines␣at␣time␣t} 52.0839 {:O(t)␣-␣Output␣at␣time␣t} 72.1692 {:d␣-␣Depreciation␣Rate} 0.25 {:s␣-␣Savings␣Rate} 0.3 -6.6 {:I(t)␣-␣Investment␣at␣time␣t} 22.8529 {:L(t)␣-␣Labor␣at␣time␣t} 100 {:M(t)␣-␣Machines␣at␣time␣t} 58.0286 {:O(t)␣-␣Output␣at␣time␣t} 76.1765 {:d␣-␣Depreciation␣Rate} 0.25 {:s␣-␣Savings␣Rate} 0.3 +nsteps, 10 +0.30000000000000004,":I(t) - Investment at time t",7.104167466172268,":L(t) - Labor at time t",100.0,"M(t) - Machines at time t",5.607688376380056,":O(t) - Output at time t",23.680558220574227,":d - Depreciation Rate",0.25,":s - Savings Rate",0.3 +1.0,":I(t) - Investment at time t",9.525090599324303,":L(t) - Labor at time t",100.0,"M(t) - Machines at time t",10.080816769481803,":O(t) - Output at time t",31.750301997747677,":d - Depreciation Rate",0.25,":s - Savings Rate",0.3 +1.7000000000000002,":I(t) - Investment at time t",11.743188033358388,":L(t) - Labor at time t",100.0,"M(t) - Machines at time t",15.322496131867965,":O(t) - Output at time t",39.14396011119463,":d - Depreciation Rate",0.25,":s - Savings Rate",0.3 +2.4000000000000004,":I(t) - Investment at time t",13.775451034964933,":L(t) - Labor at time t",100.0,"M(t) - Machines at time t",21.084783468524048,":O(t) - Output at time t",45.918170116549774,":d - Depreciation Rate",0.25,":s - Savings Rate",0.3 +3.1000000000000005,":I(t) - Investment at time t",15.637448802212152,":L(t) - Labor at time t",100.0,"M(t) - Machines at time t",27.16997833797847,":O(t) - Output at time t",52.12482934070717,":d - Depreciation Rate",0.25,":s - Savings Rate",0.3 +3.8000000000000007,":I(t) - Investment at time t",17.343446308862408,":L(t) - Labor at time t",100.0,"M(t) - Machines at time t",33.421681096488115,":O(t) - Output at time t",57.811487696208026,":d - Depreciation Rate",0.25,":s - Savings Rate",0.3 +4.5,":I(t) - Investment at time t",18.90651342376496,":L(t) - Labor at time t",100.0,"M(t) - Machines at time t",39.717361093667186,":O(t) - Output at time t",63.02171141254987,":d - Depreciation Rate",0.25,":s - Savings Rate",0.3 +5.199999999999999,":I(t) - Investment at time t",20.338625013910285,":L(t) - Labor at time t",100.0,"M(t) - Machines at time t",45.96218527293968,":O(t) - Output at time t",67.79541671303429,":d - Depreciation Rate",0.25,":s - Savings Rate",0.3 +5.899999999999999,":I(t) - Investment at time t",21.65075268006212,":L(t) - Labor at time t",100.0,"M(t) - Machines at time t",52.08389906813524,":O(t) - Output at time t",72.16917560020707,":d - Depreciation Rate",0.25,":s - Savings Rate",0.3 +6.599999999999998,":I(t) - Investment at time t",22.852948810383328,":L(t) - Labor at time t",100.0,"M(t) - Machines at time t",58.02858548111121,":O(t) - Output at time t",76.17649603461109,":d - Depreciation Rate",0.25,":s - Savings Rate",0.3 diff --git a/test/exampleLogs/EndogenousMoney.mky.log b/test/exampleLogs/EndogenousMoney.mky.log index 18d561bcb..5006219d3 100644 --- a/test/exampleLogs/EndogenousMoney.mky.log +++ b/test/exampleLogs/EndogenousMoney.mky.log @@ -1,11 +1,11 @@ -nsteps 10 -0.03 {:BC} 0.0147843 {:ConsBI} 0.00739215 {:ConsBP} 0.00739215 {:ConsI} 17.121 {:ConsP} 42.2165 {:ConsWI} 136.047 {:ConsWP} 68.0236 {:GDP} 324.246 {:Impatient} 12.8407 {:Int} 0.500476 {:Lend} 1.42993 {:Loans} 10.0095 {:Money} 100.01 {:NWBank} 0.0147843 {:NWI} 2.83119 {:NWP} 84.4331 {:NWWorkers} 2.72095 {:PS} 0.5 {:Patient} 84.4331 {:Repay} 1.11217 {:Reserves} 90 {:WC} 136.047 {:WagesI} 29.9617 {:WagesP} 197.011 {:Workers} 2.72095 {:YI} 42.8024 {:YP} 281.444 {:dr} 0.0308702 {:rL} 0.05 {:ws} 0.7 {:τBC} 1 {:τIC} 0.75 {:τL} 7 {:τM→M+} 0.3 {:τPC} 2 {:τR} 9 {:τWC} 0.02 -0.0692599 {:BC} 0.0334951 {:ConsBI} 0.0167476 {:ConsBP} 0.0167476 {:ConsI} 23.9406 {:ConsP} 39.5149 {:ConsWI} 150.16 {:ConsWP} 75.0799 {:GDP} 323.284 {:Impatient} 17.9554 {:Int} 0.501101 {:Lend} 1.43172 {:Loans} 10.022 {:Money} 100.022 {:NWBank} 0.0334951 {:NWI} 7.93343 {:NWP} 79.0299 {:NWWorkers} 3.0032 {:PS} 0.5 {:Patient} 79.0299 {:Repay} 1.11356 {:Reserves} 90 {:WC} 150.16 {:WagesI} 41.896 {:WagesP} 184.403 {:Workers} 3.0032 {:YI} 59.8515 {:YP} 263.433 {:dr} 0.0310006 {:rL} 0.05 {:ws} 0.7 {:τBC} 1 {:τIC} 0.75 {:τL} 7 {:τM→M+} 0.3 {:τPC} 2 {:τR} 9 {:τWC} 0.02 -0.121897 {:BC} 0.0574938 {:ConsBI} 0.0287469 {:ConsBP} 0.0287469 {:ConsI} 31.7671 {:ConsP} 36.5695 {:ConsWI} 150.845 {:ConsWP} 75.4224 {:GDP} 323.215 {:Impatient} 23.8253 {:Int} 0.501939 {:Lend} 1.43411 {:Loans} 10.0388 {:Money} 100.039 {:NWBank} 0.0574938 {:NWI} 13.7865 {:NWP} 73.1391 {:NWWorkers} 3.01689 {:PS} 0.5 {:Patient} 73.1391 {:Repay} 1.11542 {:Reserves} 90 {:WC} 150.845 {:WagesI} 55.5924 {:WagesP} 170.658 {:Workers} 3.01689 {:YI} 79.4177 {:YP} 243.797 {:dr} 0.0310592 {:rL} 0.05 {:ws} 0.7 {:τBC} 1 {:τIC} 0.75 {:τL} 7 {:τM→M+} 0.3 {:τPC} 2 {:τR} 9 {:τWC} 0.02 -0.191897 {:BC} 0.0875792 {:ConsBI} 0.0437896 {:ConsBP} 0.0437896 {:ConsI} 39.8539 {:ConsP} 33.5333 {:ConsWI} 150.822 {:ConsWP} 75.4109 {:GDP} 323.19 {:Impatient} 29.8904 {:Int} 0.503055 {:Lend} 1.4373 {:Loans} 10.0611 {:Money} 100.061 {:NWBank} 0.0875792 {:NWI} 19.8293 {:NWP} 67.0667 {:NWWorkers} 3.01644 {:PS} 0.5 {:Patient} 67.0667 {:Repay} 1.1179 {:Reserves} 90 {:WC} 150.822 {:WagesI} 69.7443 {:WagesP} 156.489 {:Workers} 3.01644 {:YI} 99.6347 {:YP} 223.556 {:dr} 0.0311306 {:rL} 0.05 {:ws} 0.7 {:τBC} 1 {:τIC} 0.75 {:τL} 7 {:τM→M+} 0.3 {:τPC} 2 {:τR} 9 {:τWC} 0.02 -0.261897 {:BC} 0.115706 {:ConsBI} 0.0578531 {:ConsBP} 0.0578531 {:ConsI} 45.8946 {:ConsP} 31.2652 {:ConsWI} 150.816 {:ConsWP} 75.4078 {:GDP} 323.172 {:Impatient} 34.421 {:Int} 0.504174 {:Lend} 1.4405 {:Loans} 10.0835 {:Money} 100.083 {:NWBank} 0.115706 {:NWI} 24.3375 {:NWP} 62.5305 {:NWWorkers} 3.01631 {:PS} 0.5 {:Patient} 62.5305 {:Repay} 1.12039 {:Reserves} 90 {:WC} 150.816 {:WagesI} 80.3156 {:WagesP} 145.904 {:Workers} 3.01631 {:YI} 114.737 {:YP} 208.435 {:dr} 0.0312017 {:rL} 0.05 {:ws} 0.7 {:τBC} 1 {:τIC} 0.75 {:τL} 7 {:τM→M+} 0.3 {:τPC} 2 {:τR} 9 {:τWC} 0.02 -0.331897 {:BC} 0.142007 {:ConsBI} 0.0710037 {:ConsBP} 0.0710037 {:ConsI} 50.4075 {:ConsP} 29.5711 {:ConsWI} 150.808 {:ConsWP} 75.4042 {:GDP} 323.159 {:Impatient} 37.8056 {:Int} 0.505296 {:Lend} 1.4437 {:Loans} 10.1059 {:Money} 100.106 {:NWBank} 0.142007 {:NWI} 27.6997 {:NWP} 59.1421 {:NWWorkers} 3.01617 {:PS} 0.5 {:Patient} 59.1421 {:Repay} 1.12288 {:Reserves} 90 {:WC} 150.808 {:WagesI} 88.2132 {:WagesP} 137.998 {:Workers} 3.01617 {:YI} 126.019 {:YP} 197.14 {:dr} 0.0312723 {:rL} 0.05 {:ws} 0.7 {:τBC} 1 {:τIC} 0.75 {:τL} 7 {:τM→M+} 0.3 {:τPC} 2 {:τR} 9 {:τWC} 0.02 -0.401897 {:BC} 0.166606 {:ConsBI} 0.0833032 {:ConsBP} 0.0833032 {:ConsI} 53.7792 {:ConsP} 28.3057 {:ConsWI} 150.805 {:ConsWP} 75.4025 {:GDP} 323.152 {:Impatient} 40.3344 {:Int} 0.50642 {:Lend} 1.44691 {:Loans} 10.1284 {:Money} 100.128 {:NWBank} 0.166606 {:NWI} 30.206 {:NWP} 56.6113 {:NWWorkers} 3.0161 {:PS} 0.5 {:Patient} 56.6113 {:Repay} 1.12538 {:Reserves} 90 {:WC} 150.805 {:WagesI} 94.1136 {:WagesP} 132.093 {:Workers} 3.0161 {:YI} 134.448 {:YP} 188.704 {:dr} 0.0313425 {:rL} 0.05 {:ws} 0.7 {:τBC} 1 {:τIC} 0.75 {:τL} 7 {:τM→M+} 0.3 {:τPC} 2 {:τR} 9 {:τWC} 0.02 -0.471897 {:BC} 0.189618 {:ConsBI} 0.0948092 {:ConsBP} 0.0948092 {:ConsI} 56.2986 {:ConsP} 27.3607 {:ConsWI} 150.804 {:ConsWP} 75.4018 {:GDP} 323.151 {:Impatient} 42.2239 {:Int} 0.507547 {:Lend} 1.45013 {:Loans} 10.1509 {:Money} 100.151 {:NWBank} 0.189618 {:NWI} 32.073 {:NWP} 54.7213 {:NWWorkers} 3.01607 {:PS} 0.5 {:Patient} 54.7213 {:Repay} 1.12788 {:Reserves} 90 {:WC} 150.804 {:WagesI} 98.5225 {:WagesP} 127.683 {:Workers} 3.01607 {:YI} 140.746 {:YP} 182.404 {:dr} 0.0314124 {:rL} 0.05 {:ws} 0.7 {:τBC} 1 {:τIC} 0.75 {:τL} 7 {:τM→M+} 0.3 {:τPC} 2 {:τR} 9 {:τWC} 0.02 -0.541897 {:BC} 0.211151 {:ConsBI} 0.105575 {:ConsBP} 0.105575 {:ConsI} 58.1815 {:ConsP} 26.6551 {:ConsWI} 150.805 {:ConsWP} 75.4024 {:GDP} 323.154 {:Impatient} 43.6361 {:Int} 0.508676 {:Lend} 1.45336 {:Loans} 10.1735 {:Money} 100.174 {:NWBank} 0.211151 {:NWI} 33.4626 {:NWP} 53.3102 {:NWWorkers} 3.0161 {:PS} 0.5 {:Patient} 53.3102 {:Repay} 1.13039 {:Reserves} 90 {:WC} 150.805 {:WagesI} 101.818 {:WagesP} 124.39 {:Workers} 3.0161 {:YI} 145.454 {:YP} 177.701 {:dr} 0.0314819 {:rL} 0.05 {:ws} 0.7 {:τBC} 1 {:τIC} 0.75 {:τL} 7 {:τM→M+} 0.3 {:τPC} 2 {:τR} 9 {:τWC} 0.02 -0.611897 {:BC} 0.231304 {:ConsBI} 0.115652 {:ConsBP} 0.115652 {:ConsI} 59.5891 {:ConsP} 26.1284 {:ConsWI} 150.808 {:ConsWP} 75.4041 {:GDP} 323.162 {:Impatient} 44.6918 {:Int} 0.509808 {:Lend} 1.45659 {:Loans} 10.1962 {:Money} 100.196 {:NWBank} 0.231304 {:NWI} 34.4957 {:NWP} 52.2568 {:NWWorkers} 3.01616 {:PS} 0.5 {:Patient} 52.2568 {:Repay} 1.13291 {:Reserves} 90 {:WC} 150.808 {:WagesI} 104.281 {:WagesP} 121.933 {:Workers} 3.01616 {:YI} 148.973 {:YP} 174.189 {:dr} 0.0315512 {:rL} 0.05 {:ws} 0.7 {:τBC} 1 {:τIC} 0.75 {:τL} 7 {:τM→M+} 0.3 {:τPC} 2 {:τR} 9 {:τWC} 0.02 +nsteps, 10 +0.03,":B_C",0.014784307438039839,":Cons_{BI}",0.007392153719019919,":Cons_{BP}",0.007392153719019919,":Cons_I",17.120955333488897,":Cons_P",42.21654123214774,":Cons_{WI}",136.04725371305344,":Cons_{WP}",68.02362685652672,":GDP",324.2459965480405,":Impatient",12.840716500116672,":Int",0.5004764173055637,":Lend",1.4299326208730392,":Loans",10.009528346111274,":Money",100.00952834611127,":NW_{Bank}",0.014784307438039839,":NW_I",2.831188154005398,":NW_P",84.43308246429548,":NW_{Workers}",2.720945074261069,":P_S",0.5,":Patient",84.43308246429548,":Repay",1.112169816234586,":Reserves",90.0,":W_C",136.04725371305344,":Wages_I",29.961671833605568,":Wages_P",197.01052575002277,":Workers",2.720945074261069,":Y_I",42.80238833372224,":Y_P",281.44360821431826,":d_r",0.0308701678746194,":r_L",0.05,":w_s",0.7,":\tau_{BC}",1.0,":\tau_{IC}",0.75,":\tau_L",7.0,":\tau_{M\rightarrow M+}",0.3,":\tau_{PC}",2.0,":\tau_R",9.0,":\tau_{WC}",0.02 +0.06925985766094724,":B_C",0.03349514463045305,":Cons_{BI}",0.016747572315226524,":Cons_{BP}",0.016747572315226524,":Cons_I",23.940593735571507,":Cons_P",39.51493786073211,":Cons_{WI}",150.15976391623798,":Cons_{WP}",75.07988195811899,":GDP",323.2844034104762,":Impatient",17.95544530167863,":Int",0.5011005723049043,":Lend",1.4317159208711554,":Loans",10.022011446098087,":Money",100.02201144609808,":NW_{Bank}",0.03349514463045305,":NW_I",7.933433855580539,":NW_P",79.02987572146422,":NW_{Workers}",3.0031952783247595,":P_S",0.5,":Patient",79.02987572146422,":Repay",1.113556827344232,":Reserves",90.0,":W_C",150.15976391623798,":Wages_I",41.896039037250134,":Wages_P",184.40304335008318,":Workers",3.0031952783247595,":Y_I",59.85148433892877,":Y_P",263.4329190715474,":d_r",0.031000602999622835,":r_L",0.05,":w_s",0.7,":\tau_{BC}",1.0,":\tau_{IC}",0.75,":\tau_L",7.0,":\tau_{M\rightarrow M+}",0.3,":\tau_{PC}",2.0,":\tau_R",9.0,":\tau_{WC}",0.02 +0.12189733012073663,":B_C",0.057493801184419546,":Cons_{BI}",0.028746900592209773,":Cons_{BP}",0.028746900592209773,":Cons_I",31.767089992286955,":Cons_P",36.56953340381802,":Cons_{WI}",150.84472169177874,":Cons_{WP}",75.42236084588937,":GDP",323.21461433950424,":Impatient",23.825317494215216,":Int",0.5019386268435639,":Lend",1.4341103624101825,":Loans",10.038772536871278,":Money",100.03877253687125,":NW_{Bank}",0.057493801184419546,":NW_I",13.786544957343933,":NW_P",73.13906680763604,":NW_{Workers}",3.016894433835575,":P_S",0.5,":Patient",73.13906680763604,":Repay",1.1154191707634753,":Reserves",90.0,":W_C",150.84472169177874,":Wages_I",55.592407486502175,":Wages_P",170.65782255115076,":Workers",3.016894433835575,":Y_I",79.4177249807174,":Y_P",243.7968893587868,":d_r",0.03105915417032029,":r_L",0.05,":w_s",0.7,":\tau_{BC}",1.0,":\tau_{IC}",0.75,":\tau_L",7.0,":\tau_{M\rightarrow M+}",0.3,":\tau_{PC}",2.0,":\tau_R",9.0,":\tau_{WC}",0.02 +0.19189733012073665,":B_C",0.08757919101668304,":Cons_{BI}",0.04378959550834152,":Cons_{BP}",0.04378959550834152,":Cons_I",39.853863163862734,":Cons_P",33.53334668052719,":Cons_{WI}",150.8217900391057,":Cons_{WP}",75.41089501955285,":GDP",323.19030244650475,":Impatient",29.890397372897052,":Int",0.5030552862875123,":Lend",1.4373008179643207,":Loans",10.061105725750245,":Money",100.06110572575022,":NW_{Bank}",0.08757919101668304,":NW_I",19.829291647146796,":NW_P",67.06669336105438,":NW_{Workers}",3.016435800782114,":P_S",0.5,":Patient",67.06669336105438,":Repay",1.1179006361944717,":Reserves",90.0,":W_C",150.8217900391057,":Wages_I",69.74426053675978,":Wages_P",156.48895117579355,":Workers",3.016435800782114,":Y_I",99.63465790965684,":Y_P",223.55564453684792,":d_r",0.031130592872338998,":r_L",0.05,":w_s",0.7,":\tau_{BC}",1.0,":\tau_{IC}",0.75,":\tau_L",7.0,":\tau_{M\rightarrow M+}",0.3,":\tau_{PC}",2.0,":\tau_R",9.0,":\tau_{WC}",0.02 +0.2618973301207367,":B_C",0.11570620056781182,":Cons_{BI}",0.05785310028390591,":Cons_{BP}",0.05785310028390591,":Cons_I",45.894644701796075,":Cons_P",31.265244017486367,":Cons_{WI}",150.8155418617381,":Cons_{WP}",75.40777093086905,":GDP",323.17157187106596,":Impatient",34.42098352634706,":Int",0.5041744299561189,":Lend",1.4404983713031971,":Loans",10.08348859912238,":Money",100.08348859912236,":NW_{Bank}",0.11570620056781182,":NW_I",24.337494927224668,":NW_P",62.530488034972734,":NW_{Workers}",3.016310837234762,":P_S",0.5,":Patient",62.530488034972734,":Repay",1.1203876221247089,":Reserves",90.0,":W_C",150.8155418617381,":Wages_I",80.31562822814314,":Wages_P",145.90447208160305,":Workers",3.016310837234762,":Y_I",114.7366117544902,":Y_P",208.43496011657578,":d_r",0.031201657190148318,":r_L",0.05,":w_s",0.7,":\tau_{BC}",1.0,":\tau_{IC}",0.75,":\tau_L",7.0,":\tau_{M\rightarrow M+}",0.3,":\tau_{PC}",2.0,":\tau_R",9.0,":\tau_{WC}",0.02 +0.3318973301207367,":B_C",0.1420073965856791,":Cons_{BI}",0.07100369829283955,":Cons_{BP}",0.07100369829283955,":Cons_I",50.40752593352331,":Cons_P",29.571051024096686,":Cons_{WI}",150.80836862994408,":Cons_{WP}",75.40418431497204,":GDP",323.1591549944528,":Impatient",37.80564445014248,":Int",0.5052960633760217,":Lend",1.443703038217205,":Loans",10.105921267520435,":Money",100.1059212675204,":NW_{Bank}",0.1420073965856791,":NW_I",27.69972318262204,":NW_P",59.14210204819337,":NW_{Workers}",3.016167372598882,":P_S",0.5,":Patient",59.14210204819337,":Repay",1.122880140835604,":Reserves",90.0,":W_C",150.80836862994408,":Wages_I",88.21317038366578,":Wages_P",137.9982381124512,":Workers",3.016167372598882,":Y_I",126.01881483380828,":Y_P",197.14034016064457,":d_r",0.031272272845539247,":r_L",0.05,":w_s",0.7,":\tau_{BC}",1.0,":\tau_{IC}",0.75,":\tau_L",7.0,":\tau_{M\rightarrow M+}",0.3,":\tau_{PC}",2.0,":\tau_R",9.0,":\tau_{WC}",0.02 +0.4018973301207367,":B_C",0.1666063838607803,":Cons_{BI}",0.08330319193039015,":Cons_{BP}",0.08330319193039015,":Cons_I",53.779192464698376,":Cons_P",28.305652277272166,":Cons_{WI}",150.80492773970735,":Cons_{WP}",75.40246386985368,":GDP",323.1523296768937,":Impatient",40.33439434852378,":Int",0.5064201920861531,":Lend",1.4469148345318659,":Loans",10.128403841723062,":Money",100.12840384172304,":NW_{Bank}",0.1666063838607803,":NW_I",30.205990506800713,":NW_P",56.61130455454433,":NW_{Workers}",3.016098554794147,":P_S",0.5,":Patient",56.61130455454433,":Repay",1.1253782046358958,":Reserves",90.0,":W_C",150.80492773970735,":Wages_I",94.11358681322214,":Wages_P",132.09304396060344,":Workers",3.016098554794147,":Y_I",134.44798116174593,":Y_P",188.70434851514779,":d_r",0.031342506030669876,":r_L",0.05,":w_s",0.7,":\tau_{BC}",1.0,":\tau_{IC}",0.75,":\tau_L",7.0,":\tau_{M\rightarrow M+}",0.3,":\tau_{PC}",2.0,":\tau_R",9.0,":\tau_{WC}",0.02 +0.4718973301207367,":B_C",0.18961841111076974,":Cons_{BI}",0.09480920555538487,":Cons_{BP}",0.09480920555538487,":Cons_I",56.298580257305446,":Cons_P",27.360654474666052,":Cons_{WI}",150.80369396666933,":Cons_{WP}",75.40184698333466,":GDP",323.15081380770397,":Impatient",42.223935192979084,":Int",0.5075468216377684,":Lend",1.4501337761079096,":Loans",10.150936432755367,":Money",100.15093643275536,":NW_{Bank}",0.18961841111076974,":NW_I",32.07299876022371,":NW_P",54.721308949332105,":NW_{Workers}",3.0160738793333866,":P_S",0.5,":Patient",54.721308949332105,":Repay",1.1278818258617074,":Reserves",90.0,":W_C",150.80369396666933,":Wages_I",98.52251545028453,":Wages_P",127.68305421510824,":Workers",3.0160738793333866,":Y_I",140.7464506432636,":Y_P",182.40436316444035,":d_r",0.03141238084207903,":r_L",0.05,":w_s",0.7,":\tau_{BC}",1.0,":\tau_{IC}",0.75,":\tau_L",7.0,":\tau_{M\rightarrow M+}",0.3,":\tau_{PC}",2.0,":\tau_R",9.0,":\tau_{WC}",0.02 +0.5418973301207367,":B_C",0.21115093590346012,":Cons_{BI}",0.10557546795173006,":Cons_{BP}",0.10557546795173006,":Cons_I",58.18149095826905,":Cons_P",26.655076209688666,":Cons_{WI}",150.8048788953425,":Cons_{WP}",75.40243944767126,":GDP",323.15423546026375,":Impatient",43.63611821870179,":Int",0.5086759575944726,":Lend",1.4533598788413502,":Loans",10.173519151889451,":Money",100.17351915188942,":NW_{Bank}",0.21115093590346012,":NW_I",33.46259906681233,":NW_P",53.31015241937733,":NW_{Workers}",3.01609757790685,":P_S",0.5,":Patient",53.31015241937733,":Repay",1.1303910168766056,":Reserves",90.0,":W_C",150.8048788953425,":Wages_I",101.81760917697085,":Wages_P",124.39035564521376,":Workers",3.01609757790685,":Y_I",145.45372739567264,":Y_P",177.7005080645911,":d_r",0.03148193040824441,":r_L",0.05,":w_s",0.7,":\tau_{BC}",1.0,":\tau_{IC}",0.75,":\tau_L",7.0,":\tau_{M\rightarrow M+}",0.3,":\tau_{PC}",2.0,":\tau_R",9.0,":\tau_{WC}",0.02 +0.6118973301207368,":B_C",0.23130415138753785,":Cons_{BI}",0.11565207569376892,":Cons_{BP}",0.11565207569376892,":Cons_I",59.58912643667805,":Cons_P",26.128419316151554,":Cons_{WI}",150.80822497228797,":Cons_{WP}",75.40411248614399,":GDP",323.16227819937217,":Impatient",44.69184482750854,":Int",0.509807605532248,":Lend",1.4565931586635656,":Loans",10.19615211064496,":Money",100.19615211064495,":NW_{Bank}",0.23130415138753785,":NW_I",34.49569271686357,":NW_P",52.25683863230311,":NW_{Workers}",3.0161644994457593,":P_S",0.5,":Patient",52.25683863230311,":Repay",1.1329057900716621,":Reserves",90.0,":W_C",150.80822497228797,":Wages_I",104.28097126418659,":Wages_P",121.93262347537392,":Workers",3.0161644994457593,":Y_I",148.97281609169514,":Y_P",174.18946210767703,":d_r",0.03155118279106366,":r_L",0.05,":w_s",0.7,":\tau_{BC}",1.0,":\tau_{IC}",0.75,":\tau_L",7.0,":\tau_{M\rightarrow M+}",0.3,":\tau_{PC}",2.0,":\tau_R",9.0,":\tau_{WC}",0.02 diff --git a/test/exampleLogs/GoodwinLinear.mky.log b/test/exampleLogs/GoodwinLinear.mky.log index fdf84364e..7e54bdf82 100644 --- a/test/exampleLogs/GoodwinLinear.mky.log +++ b/test/exampleLogs/GoodwinLinear.mky.log @@ -1,11 +1,11 @@ -nsteps 10 -0.003 {:Investment} 0.152727 {:K} 300 {:L} 100 {:N} 110 {:NAIRU} 0.96 {:PhillipsSlope} 10 {:Profit} 0.152727 {:WageBill} 99.8473 {:WageRate} 0.998473 {:Y} 100 {:emprate} 0.909092 {:v} 3 -0.01 {:Investment} 0.50907 {:K} 300.003 {:L} 100.001 {:N} 110 {:NAIRU} 0.96 {:PhillipsSlope} 10 {:Profit} 0.50907 {:WageBill} 99.4918 {:WageRate} 0.994909 {:Y} 100.001 {:emprate} 0.909099 {:v} 3 -0.017 {:Investment} 0.865349 {:K} 300.007 {:L} 100.002 {:N} 110 {:NAIRU} 0.96 {:PhillipsSlope} 10 {:Profit} 0.865349 {:WageBill} 99.1371 {:WageRate} 0.991347 {:Y} 100.002 {:emprate} 0.909113 {:v} 3 -0.024 {:Investment} 1.22152 {:K} 300.015 {:L} 100.005 {:N} 110 {:NAIRU} 0.96 {:PhillipsSlope} 10 {:Profit} 1.22152 {:WageBill} 98.7834 {:WageRate} 0.987785 {:Y} 100.005 {:emprate} 0.909135 {:v} 3 -0.031 {:Investment} 1.57754 {:K} 300.024 {:L} 100.008 {:N} 110 {:NAIRU} 0.96 {:PhillipsSlope} 10 {:Profit} 1.57754 {:WageBill} 98.4306 {:WageRate} 0.984226 {:Y} 100.008 {:emprate} 0.909165 {:v} 3 -0.038 {:Investment} 1.93337 {:K} 300.037 {:L} 100.012 {:N} 110 {:NAIRU} 0.96 {:PhillipsSlope} 10 {:Profit} 1.93337 {:WageBill} 98.0789 {:WageRate} 0.980669 {:Y} 100.012 {:emprate} 0.909202 {:v} 3 -0.045 {:Investment} 2.28896 {:K} 300.052 {:L} 100.017 {:N} 110 {:NAIRU} 0.96 {:PhillipsSlope} 10 {:Profit} 2.28896 {:WageBill} 97.7282 {:WageRate} 0.977114 {:Y} 100.017 {:emprate} 0.909247 {:v} 3 -0.052 {:Investment} 2.64426 {:K} 300.069 {:L} 100.023 {:N} 110 {:NAIRU} 0.96 {:PhillipsSlope} 10 {:Profit} 2.64426 {:WageBill} 97.3787 {:WageRate} 0.973563 {:Y} 100.023 {:emprate} 0.909299 {:v} 3 -0.059 {:Investment} 2.99924 {:K} 300.089 {:L} 100.03 {:N} 110 {:NAIRU} 0.96 {:PhillipsSlope} 10 {:Profit} 2.99924 {:WageBill} 97.0303 {:WageRate} 0.970016 {:Y} 100.03 {:emprate} 0.909359 {:v} 3 -0.066 {:Investment} 3.35385 {:K} 300.111 {:L} 100.037 {:N} 110 {:NAIRU} 0.96 {:PhillipsSlope} 10 {:Profit} 3.35385 {:WageBill} 96.6831 {:WageRate} 0.966474 {:Y} 100.037 {:emprate} 0.909427 {:v} 3 +nsteps, 10 +0.003,":Investment",0.1527266951405437,"K",300.0002290904759,":L",100.00007636349197,":N",110.0,":NAIRU",0.96,":PhillipsSlope",10.0,":Profit",0.1527266951405437,":WageBill",99.84734966835143,"WageRate",0.998472734214868,":Y",100.00007636349197,":emprate",0.9090916033044725,":v",3.0 +0.010000000000000002,":Investment",0.5090695170032831,"K",300.0025454010652,":L",100.00084846702174,":N",110.0,":NAIRU",0.96,":PhillipsSlope",10.0,":Profit",0.5090695170032831,":WageBill",99.49177895001846,"WageRate",0.9949093480224703,":Y",100.00084846702174,":emprate",0.9090986224274704,":v",3.0 +0.017000000000000005,":Investment",0.8653494462695193,"K",300.00735591696457,":L",100.00245197232152,":N",110.0,":NAIRU",0.96,":PhillipsSlope",10.0,":Profit",0.8653494462695193,":WageBill",99.137102526052,"WageRate",0.9913467177133914,":Y",100.00245197232152,":emprate",0.9091131997483775,":v",3.0 +0.024000000000000007,":Investment",1.2215224586027915,"K",300.01466004384014,":L",100.00488668128004,":N",110.0,":NAIRU",0.96,":PhillipsSlope",10.0,":Profit",1.2215224586027915,":WageBill",98.78336422267725,"WageRate",0.9877853723038972,":Y",100.00488668128004,":emprate",0.9091353334661821,":v",3.0 +0.03100000000000001,":Investment",1.5775445304200701,"K",300.0244568791903,":L",100.00815229306345,":N",110.0,":NAIRU",0.96,":PhillipsSlope",10.0,":Profit",1.5775445304200701,":WageBill",98.43060776264338,"WageRate",0.9842258406514977,":Y",100.00815229306345,":emprate",0.9091650208460313,":v",3.0 +0.03800000000000001,":Investment",1.9333716392119413,"K",300.0367452123521,":L",100.01224840411737,":N",110.0,":NAIRU",0.96,":PhillipsSlope",10.0,":Profit",1.9333716392119413,":WageBill",98.07887676490543,"WageRate",0.9806686513895797,":Y",100.01224840411737,":emprate",0.9092022582192488,":v",3.0 +0.04500000000000001,":Investment",2.2889597638732653,"K",300.0515235245095,":L",100.01717450816983,":N",110.0,":NAIRU",0.96,":PhillipsSlope",10.0,":Profit",2.2889597638732653,":WageBill",97.72821474429657,"WageRate",0.9771143328620396,":Y",100.01717450816983,":emprate",0.9092470409833621,":v",3.0 +0.05200000000000001,":Investment",2.6442648850471784,"K",300.0687899887047,":L",100.0229299962349,":N",110.0,":NAIRU",0.96,":PhillipsSlope",10.0,":Profit",2.6442648850471784,":WageBill",97.37866511118771,"WageRate",0.9735634130579186,":Y",100.0229299962349,":emprate",0.9092993636021354,":v",3.0 +0.05900000000000001,":Investment",2.999242985485367,"K",300.0885424698515,":L",100.02951415661717,":N",110.0,":NAIRU",0.96,":PhillipsSlope",10.0,":Profit",2.999242985485367,":WageBill",97.0302711711318,"WageRate",0.970016419546041,":Y",100.02951415661717,":emprate",0.9093592196056106,":v",3.0 +0.06600000000000002,":Investment",3.3538500504277096,"K",300.1107785247517,":L",100.03692617491724,":N",110.0,":NAIRU",0.96,":PhillipsSlope",10.0,":Profit",3.3538500504277096,":WageBill",96.68307612448953,"WageRate",0.9664738794096551,":Y",100.03692617491724,":emprate",0.9094266015901568,":v",3.0 diff --git a/test/exampleLogs/GoodwinLinear02.mky.log b/test/exampleLogs/GoodwinLinear02.mky.log index 637179ef8..1d02a422c 100644 --- a/test/exampleLogs/GoodwinLinear02.mky.log +++ b/test/exampleLogs/GoodwinLinear02.mky.log @@ -1,11 +1,11 @@ -nsteps 10 -0.03 {23885248:0} 0.909147 {23885248:w} 1.01234 {:Investment} 1.23434 {:K} 300.018 {:L} 100.006 {:N} 110 {:NAIRU} 0.95 {:PhSlope} 10 {:Profit} 1.23434 {:Y} 100.006 {:a} 1 {:emprate} 0.909147 {:v} 3 -0.1 {23885248:0} 0.909718 {23885248:w} 1.04154 {:Investment} 4.15689 {:K} 300.207 {:L} 100.069 {:N} 110 {:NAIRU} 0.95 {:PhSlope} 10 {:Profit} 4.15689 {:Y} 100.069 {:a} 1 {:emprate} 0.909718 {:v} 3 -0.17 {23885248:0} 0.910912 {23885248:w} 1.07092 {:Investment} 7.10604 {:K} 300.601 {:L} 100.2 {:N} 110 {:NAIRU} 0.95 {:PhSlope} 10 {:Profit} 7.10604 {:Y} 100.2 {:a} 1 {:emprate} 0.910912 {:v} 3 -0.24 {23885248:0} 0.912731 {23885248:w} 1.09996 {:Investment} 10.0364 {:K} 301.201 {:L} 100.4 {:N} 110 {:NAIRU} 0.95 {:PhSlope} 10 {:Profit} 10.0364 {:Y} 100.4 {:a} 1 {:emprate} 0.912731 {:v} 3 -0.31 {23885248:0} 0.915165 {23885248:w} 1.12812 {:Investment} 12.8972 {:K} 302.005 {:L} 100.668 {:N} 110 {:NAIRU} 0.95 {:PhSlope} 10 {:Profit} 12.8972 {:Y} 100.668 {:a} 1 {:emprate} 0.915165 {:v} 3 -0.38 {23885248:0} 0.918194 {23885248:w} 1.15478 {:Investment} 15.6327 {:K} 303.004 {:L} 101.001 {:N} 110 {:NAIRU} 0.95 {:PhSlope} 10 {:Profit} 15.6327 {:Y} 101.001 {:a} 1 {:emprate} 0.918194 {:v} 3 -0.45 {23885248:0} 0.921784 {23885248:w} 1.17933 {:Investment} 18.1834 {:K} 304.189 {:L} 101.396 {:N} 110 {:NAIRU} 0.95 {:PhSlope} 10 {:Profit} 18.1834 {:Y} 101.396 {:a} 1 {:emprate} 0.921784 {:v} 3 -0.52 {23885248:0} 0.925891 {23885248:w} 1.20116 {:Investment} 20.4879 {:K} 305.544 {:L} 101.848 {:N} 110 {:NAIRU} 0.95 {:PhSlope} 10 {:Profit} 20.4879 {:Y} 101.848 {:a} 1 {:emprate} 0.925891 {:v} 3 -0.59 {23885248:0} 0.930454 {23885248:w} 1.21969 {:Investment} 22.4848 {:K} 307.05 {:L} 102.35 {:N} 110 {:NAIRU} 0.95 {:PhSlope} 10 {:Profit} 22.4848 {:Y} 102.35 {:a} 1 {:emprate} 0.930454 {:v} 3 -0.66 {23885248:0} 0.935404 {23885248:w} 1.23437 {:Investment} 24.1156 {:K} 308.683 {:L} 102.894 {:N} 110 {:NAIRU} 0.95 {:PhSlope} 10 {:Profit} 24.1156 {:Y} 102.894 {:a} 1 {:emprate} 0.935404 {:v} 3 +nsteps, 10 +0.03,"0",0.909146912019549,"w",1.0123426821452017,":Investment",1.2343442494183847,"K",300.0184809664512,":L",100.0061603221504,":N",110.0,":NAIRU",0.95,":PhSlope",10.0,":Profit",1.2343442494183847,":Y",100.0061603221504,":a",1.0,":emprate",0.909146912019549,":v",3.0 +0.09999999999999999,"0",0.9097178701956526,"w",1.0415402523539712,":Investment",4.156890088872913,"K",300.20689716456536,":L",100.06896572152179,":N",110.0,":NAIRU",0.95,":PhSlope",10.0,":Profit",4.156890088872913,":Y",100.06896572152179,":a",1.0,":emprate",0.9097178701956526,":v",3.0 +0.17,"0",0.9109123360821147,"w",1.0709183577031058,":Investment",7.106044757508755,"K",300.6010709070979,":L",100.20035696903263,":N",110.0,":NAIRU",0.95,":PhSlope",10.0,":Profit",7.106044757508755,":Y",100.20035696903263,":a",1.0,":emprate",0.9109123360821147,":v",3.0 +0.24000000000000005,"0",0.9127312426696516,"w",1.099964136921976,":Investment",10.036443000671369,"K",301.201310080985,":L",100.40043669366167,":N",110.0,":NAIRU",0.95,":PhSlope",10.0,":Profit",10.036443000671369,":Y",100.40043669366167,":a",1.0,":emprate",0.9127312426696516,":v",3.0 +0.31000000000000005,"0",0.915165310449346,"w",1.1281162350220963,":Investment",12.897228739735795,"K",302.0045524482842,":L",100.66818414942806,":N",110.0,":NAIRU",0.95,":PhSlope",10.0,":Profit",12.897228739735795,":Y",100.66818414942806,":a",1.0,":emprate",0.915165310449346,":v",3.0 +0.38000000000000006,"0",0.9181939418792262,"w",1.154777072919527,":Investment",15.632690776615988,"K",303.00400082014465,":L",101.00133360671488,":N",110.0,":NAIRU",0.95,":PhSlope",10.0,":Profit",15.632690776615988,":Y",101.00133360671488,":a",1.0,":emprate",0.9181939418792262,":v",3.0 +0.45000000000000007,"0",0.9217843024541186,"w",1.179330027476638,":Investment",18.183396471529377,"K",304.1888198098591,":L",101.39627326995304,":N",110.0,":NAIRU",0.95,":PhSlope",10.0,":Profit",18.183396471529377,":Y",101.39627326995304,":a",1.0,":emprate",0.9217843024541186,":v",3.0 +0.5200000000000001,"0",0.9258906990651201,"w",1.2011612305948531,":Investment",20.487864366229516,"K",305.5439306914896,":L",101.8479768971632,":N",110.0,":NAIRU",0.95,":PhSlope",10.0,":Profit",20.487864366229516,":Y",101.8479768971632,":a",1.0,":emprate",0.9258906990651201,":v",3.0 +0.5900000000000002,"0",0.9304543701518918,"w",1.2196851214034483,":Investment",22.484767939390608,"K",307.0499421501243,":L",102.3499807167081,":N",110.0,":NAIRU",0.95,":PhSlope",10.0,":Profit",22.484767939390608,":Y",102.3499807167081,":a",1.0,":emprate",0.9304543701518918,":v",3.0 +0.6600000000000003,"0",0.9354037939314113,"w",1.234372274792775,":Investment",24.11559865368467,"K",308.6832519973657,":L",102.89441733245523,":N",110.0,":NAIRU",0.95,":PhSlope",10.0,":Profit",24.11559865368467,":Y",102.89441733245523,":a",1.0,":emprate",0.9354037939314113,":v",3.0 diff --git a/test/exampleLogs/LoanableFunds.mky.log b/test/exampleLogs/LoanableFunds.mky.log index b2bbcf19c..b80435876 100644 --- a/test/exampleLogs/LoanableFunds.mky.log +++ b/test/exampleLogs/LoanableFunds.mky.log @@ -1,11 +1,11 @@ -nsteps 10 -0.03 {:BE} 4.89176 {:BuyC} 0 {:C} 261.835 {:CB} 2.44588 {:CD} 64.4923 {:CI} 4.08072 {:CNW} 74.7268 {:CW} 255.309 {:D} 10.2344 {:Fee} 0.102344 {:I} 33.4691 {:IB} 1.22294 {:IC} 32.2462 {:ID} 20.4036 {:INW} 10.1691 {:InvB} 0 {:Lend} 9.21319 {:M} 100 {:Repay} 1.13716 {:Reserves} 100 {:V} 2.95304 {:W} 151.655 {:WC} 128.985 {:WD} 10.2123 {:WI} 22.6707 {:WNW} 10.2123 {:Y} 295.304 {:bf} 0.25 {:dr} 0.0346573 {:int} 0.409378 {:rL} 0.04 {:Π} 143.547 {:ΠC} 133.158 {:ΠI} 10.3891 {:τCB} 2 {:τCI} 5 {:τCW} 0.04 {:τIB} 4 {:τIC} 2 {:τL} 7 {:τR} 9 {:τWC} 0.5 {:τWI} 0.9 -0.0918555 {:BE} 4.67635 {:BuyC} 0 {:C} 183.737 {:CB} 2.33817 {:CD} 66.9213 {:CI} 4.26339 {:CNW} 77.6679 {:CW} 177.136 {:D} 10.7466 {:Fee} 0.107466 {:I} 34.6297 {:IB} 1.16909 {:IC} 33.4606 {:ID} 21.317 {:INW} 10.5703 {:InvB} 0 {:Lend} 9.56018 {:M} 100 {:Repay} 1.19407 {:Reserves} 100 {:V} 2.18367 {:W} 157.528 {:WC} 133.843 {:WD} 7.08543 {:WI} 23.6855 {:WNW} 7.08543 {:Y} 218.367 {:bf} 0.25 {:dr} 0.0492135 {:int} 0.429864 {:rL} 0.04 {:Π} 60.7314 {:ΠC} 50.217 {:ΠI} 10.5144 {:τCB} 2 {:τCI} 5 {:τCW} 0.04 {:τIB} 4 {:τIC} 2 {:τL} 7 {:τR} 9 {:τWC} 0.5 {:τWI} 0.9 -0.161856 {:BE} 4.4447 {:BuyC} 0 {:C} 168.151 {:CB} 2.22235 {:CD} 66.8059 {:CI} 4.45811 {:CNW} 78.1361 {:CW} 161.471 {:D} 11.3302 {:Fee} 0.113302 {:I} 34.5141 {:IB} 1.11117 {:IC} 33.4029 {:ID} 22.2906 {:INW} 10.9604 {:InvB} 0 {:Lend} 9.5437 {:M} 100 {:Repay} 1.25891 {:Reserves} 100 {:V} 2.02665 {:W} 158.379 {:WC} 133.612 {:WD} 6.45883 {:WI} 24.7673 {:WNW} 6.45883 {:Y} 202.665 {:bf} 0.25 {:dr} 0.055906 {:int} 0.453208 {:rL} 0.04 {:Π} 44.1728 {:ΠC} 34.8792 {:ΠI} 9.29361 {:τCB} 2 {:τCI} 5 {:τCW} 0.04 {:τIB} 4 {:τIC} 2 {:τL} 7 {:τR} 9 {:τWC} 0.5 {:τWI} 0.9 -0.231856 {:BE} 4.2253 {:BuyC} 0 {:C} 165.606 {:CB} 2.11265 {:CD} 66.2684 {:CI} 4.63035 {:CNW} 78.1737 {:CW} 158.863 {:D} 11.9053 {:Fee} 0.119053 {:I} 34.1905 {:IB} 1.05632 {:IC} 33.1342 {:ID} 23.1518 {:INW} 11.2465 {:InvB} 0 {:Lend} 9.46692 {:M} 100 {:Repay} 1.32281 {:Reserves} 100 {:V} 1.99796 {:W} 158.261 {:WC} 132.537 {:WD} 6.35451 {:WI} 25.7242 {:WNW} 6.35451 {:Y} 199.796 {:bf} 0.25 {:dr} 0.0595869 {:int} 0.47621 {:rL} 0.04 {:Π} 41.4162 {:ΠC} 33.4261 {:ΠI} 7.99016 {:τCB} 2 {:τCI} 5 {:τCW} 0.04 {:τIB} 4 {:τIC} 2 {:τL} 7 {:τR} 9 {:τWC} 0.5 {:τWI} 0.9 -0.301856 {:BE} 4.01751 {:BuyC} 0 {:C} 165.045 {:CB} 2.00875 {:CD} 65.7474 {:CI} 4.78098 {:CNW} 78.2179 {:CW} 158.255 {:D} 12.4705 {:Fee} 0.124705 {:I} 33.8781 {:IB} 1.00438 {:IC} 32.8737 {:ID} 23.9049 {:INW} 11.4344 {:InvB} 0 {:Lend} 9.39249 {:M} 100 {:Repay} 1.38561 {:Reserves} 100 {:V} 1.98923 {:W} 158.056 {:WC} 131.495 {:WD} 6.33021 {:WI} 26.561 {:WNW} 6.33021 {:Y} 198.923 {:bf} 0.25 {:dr} 0.06269 {:int} 0.498819 {:rL} 0.04 {:Π} 40.7425 {:ΠC} 33.9242 {:ΠI} 6.81827 {:τCB} 2 {:τCI} 5 {:τCW} 0.04 {:τIB} 4 {:τIC} 2 {:τL} 7 {:τR} 9 {:τWC} 0.5 {:τWI} 0.9 -0.371856 {:BE} 3.82072 {:BuyC} 0 {:C} 164.82 {:CB} 1.91036 {:CD} 65.2973 {:CI} 4.91241 {:CNW} 78.3238 {:CW} 157.998 {:D} 13.0265 {:Fee} 0.130265 {:I} 33.6038 {:IB} 0.955181 {:IC} 32.6487 {:ID} 24.562 {:INW} 11.5356 {:InvB} 0 {:Lend} 9.32819 {:M} 100 {:Repay} 1.44739 {:Reserves} 100 {:V} 1.98424 {:W} 157.886 {:WC} 130.595 {:WD} 6.3199 {:WI} 27.2912 {:WNW} 6.3199 {:Y} 198.424 {:bf} 0.25 {:dr} 0.0656497 {:int} 0.521059 {:rL} 0.04 {:Π} 40.408 {:ΠC} 34.6164 {:ΠI} 5.79162 {:τCB} 2 {:τCI} 5 {:τCW} 0.04 {:τIB} 4 {:τIC} 2 {:τL} 7 {:τR} 9 {:τWC} 0.5 {:τWI} 0.9 -0.441856 {:BE} 3.63438 {:BuyC} 0 {:C} 164.681 {:CB} 1.81719 {:CD} 64.9171 {:CI} 5.027 {:CNW} 78.4912 {:CW} 157.837 {:D} 13.574 {:Fee} 0.13574 {:I} 33.3672 {:IB} 0.908596 {:IC} 32.4586 {:ID} 25.135 {:INW} 11.561 {:InvB} 0 {:Lend} 9.27388 {:M} 100 {:Repay} 1.50823 {:Reserves} 100 {:V} 1.98048 {:W} 157.762 {:WC} 129.834 {:WD} 6.31348 {:WI} 27.9278 {:WNW} 6.31348 {:Y} 198.048 {:bf} 0.25 {:dr} 0.0685391 {:int} 0.542962 {:rL} 0.04 {:Π} 40.1505 {:ΠC} 35.2541 {:ΠI} 4.89642 {:τCB} 2 {:τCI} 5 {:τCW} 0.04 {:τIB} 4 {:τIC} 2 {:τL} 7 {:τR} 9 {:τWC} 0.5 {:τWI} 0.9 -0.511856 {:BE} 3.45794 {:BuyC} 0 {:C} 164.585 {:CB} 1.72897 {:CD} 64.5987 {:CI} 5.12684 {:CNW} 78.7126 {:CW} 157.729 {:D} 14.1139 {:Fee} 0.141139 {:I} 33.1638 {:IB} 0.864485 {:IC} 32.2993 {:ID} 25.6342 {:INW} 11.5203 {:InvB} 0 {:Lend} 9.22838 {:M} 100 {:Repay} 1.56821 {:Reserves} 100 {:V} 1.97749 {:W} 157.68 {:WC} 129.197 {:WD} 6.30917 {:WI} 28.4825 {:WNW} 6.30917 {:Y} 197.749 {:bf} 0.25 {:dr} 0.0713729 {:int} 0.564556 {:rL} 0.04 {:Π} 39.9278 {:ΠC} 35.811 {:ΠI} 4.1168 {:τCB} 2 {:τCI} 5 {:τCW} 0.04 {:τIB} 4 {:τIC} 2 {:τL} 7 {:τR} 9 {:τWC} 0.5 {:τWI} 0.9 -0.581856 {:BE} 3.29089 {:BuyC} 0 {:C} 164.521 {:CB} 1.64545 {:CD} 64.3338 {:CI} 5.21378 {:CNW} 78.9804 {:CW} 157.662 {:D} 14.6467 {:Fee} 0.146467 {:I} 32.9896 {:IB} 0.822723 {:IC} 32.1669 {:ID} 26.0689 {:INW} 11.4222 {:InvB} 0 {:Lend} 9.19054 {:M} 100 {:Repay} 1.62741 {:Reserves} 100 {:V} 1.9751 {:W} 157.633 {:WC} 128.668 {:WD} 6.30646 {:WI} 28.9654 {:WNW} 6.30646 {:Y} 197.51 {:bf} 0.25 {:dr} 0.0741564 {:int} 0.585867 {:rL} 0.04 {:Π} 39.7309 {:ΠC} 36.2926 {:ΠI} 3.43832 {:τCB} 2 {:τCI} 5 {:τCW} 0.04 {:τIB} 4 {:τIC} 2 {:τL} 7 {:τR} 9 {:τWC} 0.5 {:τWI} 0.9 -0.651856 {:BE} 3.13275 {:BuyC} 0 {:C} 164.483 {:CB} 1.56637 {:CD} 64.1152 {:CI} 5.2894 {:CNW} 79.2881 {:CW} 157.627 {:D} 15.1729 {:Fee} 0.151729 {:I} 32.8408 {:IB} 0.783187 {:IC} 32.0576 {:ID} 26.447 {:INW} 11.2741 {:InvB} 0 {:Lend} 9.15931 {:M} 100 {:Repay} 1.68588 {:Reserves} 100 {:V} 1.97324 {:W} 157.616 {:WC} 128.23 {:WD} 6.30509 {:WI} 29.3855 {:WNW} 6.30509 {:Y} 197.324 {:bf} 0.25 {:dr} 0.0768935 {:int} 0.606916 {:rL} 0.04 {:Π} 39.5561 {:ΠC} 36.7078 {:ΠI} 2.84831 {:τCB} 2 {:τCI} 5 {:τCW} 0.04 {:τIB} 4 {:τIC} 2 {:τL} 7 {:τR} 9 {:τWC} 0.5 {:τWI} 0.9 +nsteps, 10 +0.03,":B_E",4.891757141148437,":Buy_C",0.0,":C",261.83524851953695,":C_B",2.4458785705742185,":C_D",64.49231072734075,":C_I",4.080717204345222,":C_{NW}",74.72675459350039,":C_W",255.30865274461752,":D",10.234443866159626,":Fee",0.10234443866159626,":I",33.46909464895749,":I_B",1.2229392852871093,":I_C",32.246155363670375,":I_D",20.403586021726106,":I_{NW}",10.169142155566481,":Inv_B",0.0,":Lend",9.213187246762965,":M",99.99999999999999,":Repay",1.1371604295732918,":Reserves",100.0,":V",2.9530434316849448,":W",151.65527258993274,":W_C",128.9846214546815,":W_D",10.2123461097847,":W_I",22.67065113525123,":W_{NW}",10.2123461097847,":Y",295.3043431684944,":b_f",0.25,":d_r",0.034657275122838505,":int",0.40937775464638504,":r_L",0.04,":\Pi",143.54672613990007,":\Pi_C",133.1576603808402,":\Pi_I",10.389065759059871,":\tau_{CB}",2.0,":\tau_{CI}",5.0,":\tau_{CW}",0.04,":\tau_{IB}",4.0,":\tau_{IC}",2.0,":\tau_L",7.0,":\tau_R",9.0,":\tau_{WC}",0.5,":\tau_{WI}",0.9 +0.09185552232662622,":B_E",4.676345136564178,":Buy_C",0.0,":C",183.73719318068393,":C_B",2.338172568282089,":C_D",66.92127366153845,":C_I",4.263391205121229,":C_{NW}",77.66788354788878,":C_W",177.13562940728062,":D",10.746609886350324,":Fee",0.10746609886350324,":I",34.62972311491027,":I_B",1.1690862841410445,":I_C",33.460636830769225,":I_D",21.316956025606142,":I_{NW}",10.570346139255822,":Inv_B",0.0,":Lend",9.56018195164835,":M",100.0,":Repay",1.194067765150036,":Reserves",100.0,":V",2.183669162955942,":W",157.52805401819484,":W_C",133.8425473230769,":W_D",7.085425176291225,":W_I",23.685506695117937,":W_{NW}",7.085425176291225,":Y",218.3669162955942,":b_f",0.25,":d_r",0.04921354419734117,":int",0.42986439545401295,":r_L",0.04,":\Pi",60.73139617853586,":\Pi_C",50.21704415419754,":\Pi_I",10.514352024338319,":\tau_{CB}",2.0,":\tau_{CI}",5.0,":\tau_{CW}",0.04,":\tau_{IB}",4.0,":\tau_{IC}",2.0,":\tau_L",7.0,":\tau_R",9.0,":\tau_{WC}",0.5,":\tau_{WI}",0.9 +0.16185552232662626,":B_E",4.444699937698033,":Buy_C",0.0,":C",168.15112169890236,":C_B",2.2223499688490165,":C_D",66.80589955455658,":C_I",4.4581148464804965,":C_{NW}",78.13609873554282,":C_W",161.47065688357284,":D",11.330199180986236,":Fee",0.11330199180986236,":I",34.514124761702796,":I_B",1.1111749844245082,":I_C",33.40294977727829,":I_D",22.29057423240248,":I_{NW}",10.960375051416248,":Inv_B",0.0,":Lend",9.543699936365226,":M",100.0,":Repay",1.258911020109582,":Reserves",100.0,":V",2.0266524646060513,":W",158.37910381178256,":W_C",133.61179910911315,":W_D",6.458826275342914,":W_I",24.76730470266942,":W_{NW}",6.458826275342914,":Y",202.66524646060515,":b_f",0.25,":d_r",0.05590597983058059,":int",0.45320796723944945,":r_L",0.04,":\Pi",44.17284065701272,":\Pi_C",34.879228565218796,":\Pi_I",9.293612091793925,":\tau_{CB}",2.0,":\tau_{CI}",5.0,":\tau_{CW}",0.04,":\tau_{IB}",4.0,":\tau_{IC}",2.0,":\tau_L",7.0,":\tau_R",9.0,":\tau_{WC}",0.5,":\tau_{WI}",0.9 +0.23185552232662626,":B_E",4.225297641018805,":Buy_C",0.0,":C",165.60579300879508,":C_B",2.1126488205094023,":C_D",66.26843858172256,":C_I",4.630350405186934,":C_{NW}",78.17369272041525,":C_W",158.86279378309874,":D",11.905254138692662,":Fee",0.11905254138692663,":I",34.190543701115985,":I_B",1.0563244102547011,":I_C",33.13421929086128,":I_D",23.15175202593467,":I_{NW}",11.246497887242011,":Inv_B",0.0,":Lend",9.466919797388938,":M",99.99999999999999,":Repay",1.3228060154102959,":Reserves",100.0,":V",1.9979633670991108,":W",158.2610460811503,":W_C",132.53687716344513,":W_D",6.35451175132395,":W_I",25.72416891770519,":W_{NW}",6.35451175132395,":Y",199.79633670991106,":b_f",0.25,":d_r",0.05958694906392692,":int",0.4762101655477065,":r_L",0.04,":\Pi",41.41623808737381,":\Pi_C",33.426073469510726,":\Pi_I",7.9901646178630905,":\tau_{CB}",2.0,":\tau_{CI}",5.0,":\tau_{CW}",0.04,":\tau_{IB}",4.0,":\tau_{IC}",2.0,":\tau_L",7.0,":\tau_R",9.0,":\tau_{WC}",0.5,":\tau_{WI}",0.9 +0.30185552232662627,":B_E",4.017505579731389,":Buy_C",0.0,":C",165.04488906060703,":C_B",2.0087527898656945,":C_D",65.74740159854873,":C_I",4.7809772925181875,":C_{NW}",78.21788030361779,":C_W",158.25515897822314,":D",12.470478705069034,":Fee",0.12470478705069034,":I",33.878077194207215,":I_B",1.0043763949328472,":I_C",32.87370079927437,":I_D",23.904886462590937,":I_{NW}",11.43440775752191,":Inv_B",0.0,":Lend",9.392485942649818,":M",99.99999999999999,":Repay",1.3856087450076704,":Reserves",100.0,":V",1.9892296625481427,":W",158.05578815553184,":W_C",131.49480319709747,":W_D",6.330206359128925,":W_I",26.560984958434375,":W_{NW}",6.330206359128925,":Y",198.92296625481424,":b_f",0.25,":d_r",0.06268998969729182,":int",0.49881914820276135,":r_L",0.04,":\Pi",40.74247331223171,":\Pi_C",33.92420022466163,":\Pi_I",6.818273087570077,":\tau_{CB}",2.0,":\tau_{CI}",5.0,":\tau_{CW}",0.04,":\tau_{IB}",4.0,":\tau_{IC}",2.0,":\tau_L",7.0,":\tau_R",9.0,":\tau_{WC}",0.5,":\tau_{WI}",0.9 +0.3718555223266263,":B_E",3.820723418043982,":Buy_C",0.0,":C",164.8202737955044,":C_B",1.910361709021991,":C_D",65.29732903877007,":C_I",4.912409487848114,":C_{NW}",78.3238097512284,":C_W",157.99750259863427,":D",13.026480712458309,":Fee",0.13026480712458308,":I",33.60384537389603,":I_B",0.9551808545109955,":I_C",32.648664519385036,":I_D",24.562047439240573,":I_{NW}",11.53556672678227,":Inv_B",0.0,":Lend",9.32818986268144,":M",100.0,":Repay",1.4473867458287009,":Reserves",100.0,":V",1.9842411916940044,":W",157.88582189891855,":W_C",130.59465807754015,":W_D",6.319900103945371,":W_I",27.29116382137841,":W_{NW}",6.319900103945371,":Y",198.42411916940043,":b_f",0.25,":d_r",0.06564968395468711,":int",0.5210592284983323,":r_L",0.04,":\Pi",40.40803246335729,":\Pi_C",34.616410139338,":\Pi_I",5.791622324019286,":\tau_{CB}",2.0,":\tau_{CI}",5.0,":\tau_{CW}",0.04,":\tau_{IB}",4.0,":\tau_{IC}",2.0,":\tau_L",7.0,":\tau_R",9.0,":\tau_{WC}",0.5,":\tau_{WI}",0.9 +0.4418555223266263,":B_E",3.634382029714014,":Buy_C",0.0,":C",164.68115361144444,":C_B",1.817191014857007,":C_D",64.91713574019154,":C_I",5.02700075125624,":C_{NW}",78.49118203635446,":C_W",157.8369618453312,":D",13.574046296162907,":Fee",0.13574046296162906,":I",33.36716337752427,":I_B",0.9085955074285035,":I_C",32.45856787009577,":I_D",25.135003756281197,":I_{NW}",11.560957460118296,":Inv_B",0.0,":Lend",9.273876534313077,":M",100.0,":Repay",1.508227366240323,":Reserves",100.0,":V",1.980483169889687,":W",157.76205343180663,":W_C",129.83427148038308,":W_D",6.313478473813248,":W_I",27.92778195142355,":W_{NW}",6.313478473813248,":Y",198.0483169889687,":b_f",0.25,":d_r",0.06853906411594995,":int",0.5429618518465162,":r_L",0.04,":\Pi",40.15052309420046,":\Pi_C",35.254103519946256,":\Pi_I",4.896419574254203,":\tau_{CB}",2.0,":\tau_{CI}",5.0,":\tau_{CW}",0.04,":\tau_{IB}",4.0,":\tau_{IC}",2.0,":\tau_L",7.0,":\tau_R",9.0,":\tau_{WC}",0.5,":\tau_{WI}",0.9 +0.5118555223266262,":B_E",3.457941914436153,":Buy_C",0.0,":C",164.58496092378363,":C_B",1.7289709572180765,":C_D",64.59867020970444,":C_I",5.126844410725156,":C_{NW}",78.71256749648347,":C_W",157.72914555584038,":D",14.113897286779011,":Fee",0.14113897286779012,":I",33.16382058346126,":I_B",0.8644854786090382,":I_C",32.29933510485222,":I_D",25.63422205362578,":I_{NW}",11.520324766846775,":Inv_B",0.0,":Lend",9.228381458529205,":M",99.99999999999999,":Repay",1.5682108096421123,":Reserves",100.0,":V",1.977487815072449,":W",157.67980936788197,":W_C",129.19734041940887,":W_D",6.309165822233615,":W_I",28.482468948473088,":W_{NW}",6.309165822233615,":Y",197.74878150724487,":b_f",0.25,":d_r",0.07137286601314367,":int",0.5645558914711605,":r_L",0.04,":\Pi",39.92783316649514,":\Pi_C",35.81103742297813,":\Pi_I",4.1167957435170095,":\tau_{CB}",2.0,":\tau_{CI}",5.0,":\tau_{CW}",0.04,":\tau_{IB}",4.0,":\tau_{IC}",2.0,":\tau_L",7.0,":\tau_R",9.0,":\tau_{WC}",0.5,":\tau_{WI}",0.9 +0.5818555223266263,":B_E",3.290891626720515,":Buy_C",0.0,":C",164.52075438588173,":C_B",1.6454458133602574,":C_D",64.33376953233223,":C_I",5.213775503638383,":C_{NW}",78.98043651164517,":C_W",157.6615330688831,":D",14.646666979312904,":Fee",0.14646666979312906,":I",32.98960767284624,":I_B",0.8227229066801287,":I_C",32.16688476616611,":I_D",26.068877518191915,":I_{NW}",11.422210538879016,":Inv_B",0.0,":Lend",9.190538504618889,":M",99.99999999999997,":Repay",1.6274074421458782,":Reserves",100.0,":V",1.9751036205872803,":W",157.63295852932214,":W_C",128.66753906466445,":W_D",6.306461322755324,":W_I",28.965419464657682,":W_{NW}",6.306461322755324,":Y",197.51036205872796,":b_f",0.25,":d_r",0.0741564484346287,":int",0.5858666791725162,":r_L",0.04,":\Pi",39.73093685961269,":\Pi_C",36.29261533059665,":\Pi_I",3.4383215290160436,":\tau_{CB}",2.0,":\tau_{CI}",5.0,":\tau_{CW}",0.04,":\tau_{IB}",4.0,":\tau_{IC}",2.0,":\tau_L",7.0,":\tau_R",9.0,":\tau_{WC}",0.5,":\tau_{WI}",0.9 +0.6518555223266264,":B_E",3.1327462824598125,":Buy_C",0.0,":C",164.48291368821998,":C_B",1.5663731412299062,":C_D",64.11517351080617,":C_I",5.289398908236775,":C_{NW}",79.28808031497515,":C_W",157.6271416387533,":D",15.172906804168948,":Fee",0.15172906804168948,":I",32.84077332601804,":I_B",0.7831865706149531,":I_C",32.057586755403086,":I_D",26.446994541183873,":I_{NW}",11.274087737014929,":Inv_B",0.0,":Lend",9.15931050154374,":M",99.99999999999999,":Repay",1.6858785337965498,":Reserves",100.0,":V",1.9732368701423806,":W",157.61589651181666,":W_C",128.23034702161235,":W_D",6.305085665550132,":W_I",29.3855494902043,":W_{NW}",6.305085665550132,":Y",197.32368701423803,":b_f",0.25,":d_r",0.07689348923970864,":int",0.6069162721667579,":r_L",0.04,":\Pi",39.55606143437967,":\Pi_C",36.70775387073269,":\Pi_I",2.84830756364698,":\tau_{CB}",2.0,":\tau_{CI}",5.0,":\tau_{CW}",0.04,":\tau_{IB}",4.0,":\tau_{IC}",2.0,":\tau_L",7.0,":\tau_R",9.0,":\tau_{WC}",0.5,":\tau_{WI}",0.9 diff --git a/test/exampleLogs/MinskyGovernmentNonlinear.mky.log b/test/exampleLogs/MinskyGovernmentNonlinear.mky.log index 44993049f..b9caec52b 100644 --- a/test/exampleLogs/MinskyGovernmentNonlinear.mky.log +++ b/test/exampleLogs/MinskyGovernmentNonlinear.mky.log @@ -1,11 +1,11 @@ -nsteps 10 -0.12 {:Capital} 299.345 {:Debt} 0.229736 {:ERate} 0.994231 {:Employment} 99.5425 {:GFn} -0.0178724 {:GovSpend} -0.225171 {:IntRate} 0.02 {:Interest} 0.00459472 {:InvFn} 0.00381772 {:Investment} 0.380938 {:Output} 99.7816 {:Popgr} 0.01 {:Population} 100.12 {:Prodgr} 0.02 {:Productivity} 1.0024 {:Profit} -2.61499 {:ProfitRate} -0.00873572 {:Wage} 1.02636 {:WageFn} 0.181499 {:WageShare} 1.0239 {:Wages} 102.167 {:mine} -0.04 {:ming} -0.05 {:mini} -0.01 {:se} 2 {:sg} -0.5 {:si} 1.5 {:v} 3 {:xe} 0.96 {:xg} 0.95 {:xi} 0.05 {:ye} 0 {:yg} 0 {:yi} 0.05 {:γ} 0.02 -0.28 {:Capital} 298.428 {:Debt} 0.887394 {:ERate} 0.986438 {:Employment} 98.9204 {:GFn} -0.0152687 {:GovSpend} -0.489627 {:IntRate} 0.02 {:Interest} 0.0177479 {:InvFn} 0.00138574 {:Investment} 0.137848 {:Output} 99.4759 {:Popgr} 0.01 {:Population} 100.28 {:Prodgr} 0.02 {:Productivity} 1.00562 {:Profit} -4.91788 {:ProfitRate} -0.0164793 {:Wage} 1.0502 {:WageFn} 0.110022 {:WageShare} 1.04434 {:Wages} 103.886 {:mine} -0.04 {:ming} -0.05 {:mini} -0.01 {:se} 2 {:sg} -0.5 {:si} 1.5 {:v} 3 {:xe} 0.96 {:xg} 0.95 {:xi} 0.05 {:ye} 0 {:yg} 0 {:yi} 0.05 {:γ} 0.02 -0.44 {:Capital} 297.486 {:Debt} 1.80044 {:ERate} 0.978616 {:Employment} 98.2931 {:GFn} -0.0124427 {:GovSpend} -0.710113 {:IntRate} 0.02 {:Interest} 0.0360088 {:InvFn} 0.000199732 {:Investment} 0.0198058 {:Output} 99.1619 {:Popgr} 0.01 {:Population} 100.441 {:Prodgr} 0.02 {:Productivity} 1.00884 {:Profit} -6.2113 {:ProfitRate} -0.0208793 {:Wage} 1.06444 {:WageFn} 0.0614593 {:WageShare} 1.05511 {:Wages} 104.627 {:mine} -0.04 {:ming} -0.05 {:mini} -0.01 {:se} 2 {:sg} -0.5 {:si} 1.5 {:v} 3 {:xe} 0.96 {:xg} 0.95 {:xi} 0.05 {:ye} 0 {:yg} 0 {:yi} 0.05 {:γ} 0.02 -0.6 {:Capital} 296.534 {:Debt} 2.84694 {:ERate} 0.970813 {:Employment} 97.6655 {:GFn} -0.00939493 {:GovSpend} -0.883381 {:IntRate} 0.02 {:Interest} 0.0569387 {:InvFn} -0.000301569 {:Investment} -0.0298085 {:Output} 98.8446 {:Popgr} 0.01 {:Population} 100.602 {:Prodgr} 0.02 {:Productivity} 1.01207 {:Profit} -6.7892 {:ProfitRate} -0.0228952 {:Wage} 1.07196 {:WageFn} 0.0286849 {:WageShare} 1.05917 {:Wages} 104.693 {:mine} -0.04 {:ming} -0.05 {:mini} -0.01 {:se} 2 {:sg} -0.5 {:si} 1.5 {:v} 3 {:xe} 0.96 {:xg} 0.95 {:xi} 0.05 {:ye} 0 {:yg} 0 {:yi} 0.05 {:γ} 0.02 -0.76 {:Capital} 295.581 {:Debt} 3.93893 {:ERate} 0.963059 {:Employment} 97.0406 {:GFn} -0.00612091 {:GovSpend} -1.00619 {:IntRate} 0.02 {:Interest} 0.0787786 {:InvFn} -0.000380235 {:Investment} -0.0374634 {:Output} 98.5268 {:Popgr} 0.01 {:Population} 100.763 {:Prodgr} 0.02 {:Productivity} 1.01532 {:Profit} -6.86367 {:ProfitRate} -0.023221 {:Wage} 1.07487 {:WageFn} 0.00660951 {:WageShare} 1.05865 {:Wages} 104.306 {:mine} -0.04 {:ming} -0.05 {:mini} -0.01 {:se} 2 {:sg} -0.5 {:si} 1.5 {:v} 3 {:xe} 0.96 {:xg} 0.95 {:xi} 0.05 {:ye} 0 {:yg} 0 {:yi} 0.05 {:γ} 0.02 -0.92 {:Capital} 294.632 {:Debt} 5.01392 {:ERate} 0.95537 {:Employment} 96.42 {:GFn} -0.00261408 {:GovSpend} -1.07526 {:IntRate} 0.02 {:Interest} 0.100278 {:InvFn} -0.000165701 {:Investment} -0.0162735 {:Output} 98.2105 {:Popgr} 0.01 {:Population} 100.924 {:Prodgr} 0.02 {:Productivity} 1.01857 {:Profit} -6.5817 {:ProfitRate} -0.0223387 {:Wage} 1.07464 {:WageFn} -0.00826662 {:WageShare} 1.05505 {:Wages} 103.617 {:mine} -0.04 {:ming} -0.05 {:mini} -0.01 {:se} 2 {:sg} -0.5 {:si} 1.5 {:v} 3 {:xe} 0.96 {:xg} 0.95 {:xi} 0.05 {:ye} 0 {:yg} 0 {:yi} 0.05 {:γ} 0.02 -1.08 {:Capital} 293.691 {:Debt} 6.02739 {:ERate} 0.947759 {:Employment} 95.8051 {:GFn} 0.00113301 {:GovSpend} -1.08721 {:IntRate} 0.02 {:Interest} 0.120548 {:InvFn} 0.000277679 {:Investment} 0.027184 {:Output} 97.897 {:Popgr} 0.01 {:Population} 101.086 {:Prodgr} 0.02 {:Productivity} 1.02183 {:Profit} -6.04263 {:ProfitRate} -0.0205748 {:Wage} 1.0723 {:WageFn} -0.0183102 {:WageShare} 1.04939 {:Wages} 102.732 {:mine} -0.04 {:ming} -0.05 {:mini} -0.01 {:se} 2 {:sg} -0.5 {:si} 1.5 {:v} 3 {:xe} 0.96 {:xg} 0.95 {:xi} 0.05 {:ye} 0 {:yg} 0 {:yi} 0.05 {:γ} 0.02 -1.24 {:Capital} 292.762 {:Debt} 6.94713 {:ERate} 0.940237 {:Employment} 95.1968 {:GFn} 0.00512791 {:GovSpend} -1.0386 {:IntRate} 0.02 {:Interest} 0.138943 {:InvFn} 0.000921127 {:Investment} 0.0898902 {:Output} 97.5872 {:Popgr} 0.01 {:Population} 101.248 {:Prodgr} 0.02 {:Productivity} 1.02511 {:Profit} -5.3124 {:ProfitRate} -0.0181458 {:Wage} 1.06854 {:WageFn} -0.0251096 {:WageShare} 1.04237 {:Wages} 101.722 {:mine} -0.04 {:ming} -0.05 {:mini} -0.01 {:se} 2 {:sg} -0.5 {:si} 1.5 {:v} 3 {:xe} 0.96 {:xg} 0.95 {:xi} 0.05 {:ye} 0 {:yg} 0 {:yi} 0.05 {:γ} 0.02 -1.4 {:Capital} 291.847 {:Debt} 7.74923 {:ERate} 0.932811 {:Employment} 94.5962 {:GFn} 0.00937758 {:GovSpend} -0.925883 {:IntRate} 0.02 {:Interest} 0.154985 {:InvFn} 0.00175788 {:Investment} 0.171011 {:Output} 97.2823 {:Popgr} 0.01 {:Population} 101.41 {:Prodgr} 0.02 {:Productivity} 1.0284 {:Profit} -4.43398 {:ProfitRate} -0.0151928 {:Wage} 1.06384 {:WageFn} -0.0297281 {:WageShare} 1.03447 {:Wages} 100.635 {:mine} -0.04 {:ming} -0.05 {:mini} -0.01 {:se} 2 {:sg} -0.5 {:si} 1.5 {:v} 3 {:xe} 0.96 {:xg} 0.95 {:xi} 0.05 {:ye} 0 {:yg} 0 {:yi} 0.05 {:γ} 0.02 -1.56 {:Capital} 290.95 {:Debt} 8.41533 {:ERate} 0.925489 {:Employment} 94.004 {:GFn} 0.0138878 {:GovSpend} -0.745456 {:IntRate} 0.02 {:Interest} 0.168307 {:InvFn} 0.00279692 {:Investment} 0.271254 {:Output} 96.9832 {:Popgr} 0.01 {:Population} 101.572 {:Prodgr} 0.02 {:Productivity} 1.03169 {:Profit} -3.43484 {:ProfitRate} -0.0118056 {:Wage} 1.05851 {:WageFn} -0.0328768 {:WageShare} 1.02599 {:Wages} 99.5043 {:mine} -0.04 {:ming} -0.05 {:mini} -0.01 {:se} 2 {:sg} -0.5 {:si} 1.5 {:v} 3 {:xe} 0.96 {:xg} 0.95 {:xi} 0.05 {:ye} 0 {:yg} 0 {:yi} 0.05 {:γ} 0.02 +nsteps, 10 +0.11999999999999998,"Capital",299.34492818935314,"Debt",0.22973596417646455,":E_\mathrm{Rate}",0.9942307462579779,":Employment",99.54245392860491,":G_{Fn}",-0.017872397781402483,"GovSpend",-0.2251706731391984,":Int_{Rate}",0.02,":Interest",0.004594719283529291,":Inv_{Fn}",0.0038177176038502406,":Investment",0.38093813399059323,":Output",99.78164272978438,":Pop_{gr}",0.01,"Population",100.12007202880864,":Prod_{gr}",0.02,"Productivity",1.0024028823053832,":Profit",-2.6149923888220954,":Profit_\mathrm{Rate}",-0.008735716367868308,"Wage",1.026364789032237,":Wage_\mathrm{Fn}",0.18149871032612758,":WageShare",1.0239044671058255,":Wages",102.16686972618375,":min_e",-0.04,":min_g",-0.05,":min_i",-0.01,":s_e",2.0,":s_g",-0.5,":s_i",1.5,":v",3.0,":x_e",0.96,":x_g",0.95,":x_i",0.05,":y_e",0.0,":y_g",0.0,":y_i",0.05,":\gamma",0.02 +0.2800000000000001,"Capital",298.42771506855115,"Debt",0.8873935603140679,":E_\mathrm{Rate}",0.9864380712456113,":Employment",98.92039682939142,":G_{Fn}",-0.015268665431875564,"GovSpend",-0.48962698305682106,":Int_{Rate}",0.02,":Interest",0.01774787120628136,":Inv_{Fn}",0.0013857436190136806,":Investment",0.13784810063102587,":Output",99.47590502285038,":Pop_{gr}",0.01,"Population",100.28039236612292,":Prod_{gr}",0.02,"Productivity",1.0056157093103564,":Profit",-4.91788043175323,":Profit_\mathrm{Rate}",-0.016479301966385914,"Wage",1.05020212140388,":Wage_\mathrm{Fn}",0.11002215998145876,":WageShare",1.044337425997552,":Wages",103.88641060034051,":min_e",-0.04,":min_g",-0.05,":min_i",-0.01,":s_e",2.0,":s_g",-0.5,":s_i",1.5,":v",3.0,":x_e",0.96,":x_g",0.95,":x_i",0.05,":y_e",0.0,":y_g",0.0,":y_i",0.05,":\gamma",0.02 +0.44000000000000017,"Capital",297.48567868368656,"Debt",1.8004409348988974,":E_\mathrm{Rate}",0.9786155700604046,":Employment",98.29309654764167,":G_{Fn}",-0.012442717349518892,"GovSpend",-0.7101133123644299,":Int_{Rate}",0.02,":Interest",0.03600881869797795,":Inv_{Fn}",0.00019973188505822102,":Investment",0.01980579179377232,":Output",99.16189289456219,":Pop_{gr}",0.01,"Population",100.44096942129643,":Prod_{gr}",0.02,"Productivity",1.0088388338289802,":Profit",-6.211300204446418,":Profit_\mathrm{Rate}",-0.020879325122238335,"Wage",1.0644396671055583,":Wage_\mathrm{Fn}",0.06145932275631614,":WageShare",1.0551136925068088,":Wages",104.6270709679462,":min_e",-0.04,":min_g",-0.05,":min_i",-0.01,":s_e",2.0,":s_g",-0.5,":s_i",1.5,":v",3.0,":x_e",0.96,":x_g",0.95,":x_i",0.05,":y_e",0.0,":y_g",0.0,":y_i",0.05,":\gamma",0.02 +0.6000000000000002,"Capital",296.5337557800476,"Debt",2.846935371730236,":E_\mathrm{Rate}",0.9708129990200525,":Employment",97.66553866499102,":G_{Fn}",-0.009394926769090685,"GovSpend",-0.8833812319521359,":Int_{Rate}",0.02,":Interest",0.056938707434604725,":Inv_{Fn}",-0.00030156887494489984,":Investment",-0.02980845037125822,":Output",98.84458526001588,":Pop_{gr}",0.01,"Population",100.6018036054065,":Prod_{gr}",0.02,"Productivity",1.0120722888660778,":Profit",-6.789204739537113,":Profit_\mathrm{Rate}",-0.022895217179163138,"Wage",1.0719591730229656,":Wage_\mathrm{Fn}",0.02868490180383141,":WageShare",1.0591725362068602,":Wages",104.69347006016625,":min_e",-0.04,":min_g",-0.05,":min_i",-0.01,":s_e",2.0,":s_g",-0.5,":s_i",1.5,":v",3.0,":x_e",0.96,":x_g",0.95,":x_i",0.05,":y_e",0.0,":y_g",0.0,":y_i",0.05,":\gamma",0.02 +0.7600000000000003,"Capital",295.5805411111746,"Debt",3.9389292617181453,":E_\mathrm{Rate}",0.9630585049789618,":Employment",97.04056333404318,":G_{Fn}",-0.006120907418859241,"GovSpend",-1.0061920021734418,":Int_{Rate}",0.02,":Interest",0.0787785852343629,":Inv_{Fn}",-0.00038023499354333627,":Investment",-0.0374633550469811,":Output",98.5268470370582,":Pop_{gr}",0.01,"Population",100.76289533018874,":Prod_{gr}",0.02,"Productivity",1.0153161075322572,":Profit",-6.863672499030992,":Profit_\mathrm{Rate}",-0.023220989017844064,"Wage",1.0748654517763867,":Wage_\mathrm{Fn}",0.00660951491721691,":WageShare",1.0586510386296,":Wages",104.30554894868139,":min_e",-0.04,":min_g",-0.05,":min_i",-0.01,":s_e",2.0,":s_g",-0.5,":s_i",1.5,":v",3.0,":x_e",0.96,":x_g",0.95,":x_i",0.05,":y_e",0.0,":y_g",0.0,":y_i",0.05,":\gamma",0.02 +0.9200000000000005,"Capital",294.6315749313378,"Debt",5.013923338619497,":E_\mathrm{Rate}",0.9553697913490217,":Employment",96.41997489538683,":G_{Fn}",-0.0026140821902991968,"GovSpend",-1.0752567598138514,":Int_{Rate}",0.02,":Interest",0.10027846677238994,":Inv_{Fn}",-0.00016570063280971735,":Investment",-0.01627354613728211,":Output",98.2105249771126,":Pop_{gr}",0.01,"Population",100.92424500803803,":Prod_{gr}",0.02,"Productivity",1.0185703230442495,":Profit",-6.581696399702686,":Profit_\mathrm{Rate}",-0.022338734065541047,"Wage",1.0746392151901145,":Wage_\mathrm{Fn}",-0.0082666232416072,":WageShare",1.0550466579256788,":Wages",103.61668615022904,":min_e",-0.04,":min_g",-0.05,":min_i",-0.01,":s_e",2.0,":s_g",-0.5,":s_i",1.5,":v",3.0,":x_e",0.96,":x_g",0.95,":x_i",0.05,":y_e",0.0,":y_g",0.0,":y_i",0.05,":\gamma",0.02 +1.0800000000000005,"Capital",293.6908642530502,"Debt",6.027393403582557,":E_\mathrm{Rate}",0.9477592708794872,":Employment",95.80505438480368,":G_{Fn}",0.001133011008644616,"GovSpend",-1.08720946884215,":Int_{Rate}",0.02,":Interest",0.12054786807165113,":Inv_{Fn}",0.0002776792344554961,":Investment",0.02718395145078667,":Output",97.89695475101674,":Pop_{gr}",0.01,"Population",101.08585305200968,":Prod_{gr}",0.02,"Productivity",1.02183496872525,":Profit",-6.042631769883883,":Profit_\mathrm{Rate}",-0.020574803323393214,"Wage",1.0723007240449085,":Wage_\mathrm{Fn}",-0.018310180606466095,":WageShare",1.0493873833488152,":Wages",102.73182918398682,":min_e",-0.04,":min_g",-0.05,":min_i",-0.01,":s_e",2.0,":s_g",-0.5,":s_i",1.5,":v",3.0,":x_e",0.96,":x_g",0.95,":x_i",0.05,":y_e",0.0,":y_g",0.0,":y_i",0.05,":\gamma",0.02 +1.2400000000000007,"Capital",292.76166283854394,"Debt",6.9471317084874356,":E_\mathrm{Rate}",0.9402366932640618,":Employment",95.19682133656738,":G_{Fn}",0.005127907315169843,"GovSpend",-1.038597421332282,":Int_{Rate}",0.02,":Interest",0.13894263416974872,":Inv_{Fn}",0.0009211272198951462,":Investment",0.08989024552744938,":Output",97.58722094618132,":Pop_{gr}",0.01,"Population",101.24771987582038,":Prod_{gr}",0.02,"Productivity",1.0251100780052593,":Profit",-5.312398937449539,":Profit_\mathrm{Rate}",-0.018145814878703197,"Wage",1.0685449198822665,":Wage_\mathrm{Fn}",-0.02510963860606607,":WageShare",1.0423709051436956,":Wages",101.72207982812883,":min_e",-0.04,":min_g",-0.05,":min_i",-0.01,":s_e",2.0,":s_g",-0.5,":s_i",1.5,":v",3.0,":x_e",0.96,":x_g",0.95,":x_i",0.05,":y_e",0.0,":y_g",0.0,":y_i",0.05,":\gamma",0.02 +1.4000000000000008,"Capital",291.8469184785743,"Debt",7.749229376197631,":E_\mathrm{Rate}",0.9328106356076877,":Employment",94.59618280511917,":G_{Fn}",0.009377576158800485,"GovSpend",-0.9258832406895685,":Int_{Rate}",0.02,":Interest",0.1549845875239526,":Inv_{Fn}",0.0017578795930989193,":Investment",0.1710105807674299,":Output",97.28230615952477,":Pop_{gr}",0.01,"Population",101.40984589384924,":Prod_{gr}",0.02,"Productivity",1.028395684421425,":Profit",-4.433982868236236,":Profit_\mathrm{Rate}",-0.015192837708724182,"Wage",1.0638423054223018,":Wage_\mathrm{Fn}",-0.029728107983311425,":WageShare",1.0344678819036652,":Wages",100.63542119954748,":min_e",-0.04,":min_g",-0.05,":min_i",-0.01,":s_e",2.0,":s_g",-0.5,":s_i",1.5,":v",3.0,":x_e",0.96,":x_g",0.95,":x_i",0.05,":y_e",0.0,":y_g",0.0,":y_i",0.05,":\gamma",0.02 +1.560000000000001,"Capital",290.9495650853421,"Debt",8.415326505536092,":E_\mathrm{Rate}",0.925489457323991,":Employment",94.00402942968567,":G_{Fn}",0.01388780078905312,"GovSpend",-0.7454563173870188,":Int_{Rate}",0.02,":Interest",0.16830653011072183,":Inv_{Fn}",0.0027969194188930645,":Investment",0.2712541628352283,":Output",96.9831883617807,":Pop_{gr}",0.01,"Population",101.57223152113896,":Prod_{gr}",0.02,"Productivity",1.0316918216183852,":Profit",-3.4348352406858753,":Profit_\mathrm{Rate}",-0.011805603626451066,"Wage",1.058510591074155,":Wage_\mathrm{Fn}",-0.032876833780595686,":WageShare",1.025994942378917,":Wages",99.50426075496884,":min_e",-0.04,":min_g",-0.05,":min_i",-0.01,":s_e",2.0,":s_g",-0.5,":s_i",1.5,":v",3.0,":x_e",0.96,":x_g",0.95,":x_i",0.05,":y_e",0.0,":y_g",0.0,":y_i",0.05,":\gamma",0.02 diff --git a/test/exampleLogs/MinskyNonLinear.mky.log b/test/exampleLogs/MinskyNonLinear.mky.log index 9451cb273..b0351abc0 100644 --- a/test/exampleLogs/MinskyNonLinear.mky.log +++ b/test/exampleLogs/MinskyNonLinear.mky.log @@ -1,11 +1,11 @@ -nsteps 10 -0.006 {:0} 0 {:A} 6.41e-05 {:B} 1 {:C} 1 {:D} 0.0400641 {:Debt} 24.9919 {:Depn} 14.9977 {:E} 0.0175 {:F} 0.53 {:G} 6 {:H} 0.065 {:Ifn} 0.0741781 {:Ig} 7.41669 {:In} -7.58103 {:Int} 1.24959 {:K} 299.954 {:L} 99.9698 {:Linear} 0 {:N} 105.013 {:Stable} 1.3 {:W} 89.9663 {:Y} 99.9848 {:a} 1.00015 {:dr} 0.249956 {:dK/dt} -7.58103 {:dY/dt} -2.52701 {:dv/dt} 0 {:gr} -0.025274 {:r} 0.05 {:v} 3 {:wfn} -0.0122671 {:wr} 0.899935 {:ws} 0.8998 {:Π} 8.76888 {:α} 0.025 {:β} 0.02 {:δ} 0.05 {:λ} 0.951979 {:λE} 0.95 {:λS} 10 {:πE} 0.03 {:πS} 10 {:πr} 0.029234 {:πs} 0.0877021 -0.02 {:0} 0 {:A} 6.41e-05 {:B} 1 {:C} 1 {:D} 0.0400641 {:Debt} 24.9731 {:Depn} 14.9924 {:E} 0.0175 {:F} 0.53 {:G} 6 {:H} 0.065 {:Ifn} 0.0749364 {:Ig} 7.48986 {:In} -7.50258 {:Int} 1.24866 {:K} 299.849 {:L} 99.8996 {:Linear} 0 {:N} 105.042 {:Stable} 1.3 {:W} 89.8871 {:Y} 99.9496 {:a} 1.0005 {:dr} 0.249857 {:dK/dt} -7.50258 {:dY/dt} -2.50086 {:dv/dt} 0 {:gr} -0.0250212 {:r} 0.05 {:v} 3 {:wfn} -0.0133181 {:wr} 0.899774 {:ws} 0.899324 {:Π} 8.81387 {:α} 0.025 {:β} 0.02 {:δ} 0.05 {:λ} 0.951045 {:λE} 0.95 {:λS} 10 {:πE} 0.03 {:πS} 10 {:πr} 0.0293944 {:πs} 0.0881831 -0.034 {:0} 0 {:A} 6.41e-05 {:B} 1 {:C} 1 {:D} 0.0400641 {:Debt} 24.9548 {:Depn} 14.9872 {:E} 0.0175 {:F} 0.53 {:G} 6 {:H} 0.065 {:Ifn} 0.0757207 {:Ig} 7.56561 {:In} -7.4216 {:Int} 1.24774 {:K} 299.744 {:L} 99.8299 {:Linear} 0 {:N} 105.071 {:Stable} 1.3 {:W} 89.8069 {:Y} 99.9148 {:a} 1.00085 {:dr} 0.249761 {:dK/dt} -7.4216 {:dY/dt} -2.47387 {:dv/dt} 0 {:gr} -0.0247598 {:r} 0.05 {:v} 3 {:wfn} -0.0143062 {:wr} 0.8996 {:ws} 0.898835 {:Π} 8.8601 {:α} 0.025 {:β} 0.02 {:δ} 0.05 {:λ} 0.950115 {:λE} 0.95 {:λS} 10 {:πE} 0.03 {:πS} 10 {:πr} 0.0295588 {:πs} 0.0886765 -0.048 {:0} 0 {:A} 6.41e-05 {:B} 1 {:C} 1 {:D} 0.0400641 {:Debt} 24.9369 {:Depn} 14.9821 {:E} 0.0175 {:F} 0.53 {:G} 6 {:H} 0.065 {:Ifn} 0.0765303 {:Ig} 7.64387 {:In} -7.33818 {:Int} 1.24684 {:K} 299.641 {:L} 99.7606 {:Linear} 0 {:N} 105.101 {:Stable} 1.3 {:W} 89.726 {:Y} 99.8803 {:a} 1.0012 {:dr} 0.249668 {:dK/dt} -7.33818 {:dY/dt} -2.44606 {:dv/dt} 0 {:gr} -0.0244899 {:r} 0.05 {:v} 3 {:wfn} -0.0152361 {:wr} 0.899414 {:ws} 0.898335 {:Π} 8.90749 {:α} 0.025 {:β} 0.02 {:δ} 0.05 {:λ} 0.949189 {:λE} 0.95 {:λS} 10 {:πE} 0.03 {:πS} 10 {:πr} 0.0297272 {:πs} 0.0891816 -0.062 {:0} 0 {:A} 6.41e-05 {:B} 1 {:C} 1 {:D} 0.0400641 {:Debt} 24.9194 {:Depn} 14.9769 {:E} 0.0175 {:F} 0.53 {:G} 6 {:H} 0.065 {:Ifn} 0.0773646 {:Ig} 7.72457 {:In} -7.25238 {:Int} 1.24597 {:K} 299.539 {:L} 99.6917 {:Linear} 0 {:N} 105.13 {:Stable} 1.3 {:W} 89.6444 {:Y} 99.8463 {:a} 1.00155 {:dr} 0.249578 {:dK/dt} -7.25238 {:dY/dt} -2.41746 {:dv/dt} 0 {:gr} -0.0242118 {:r} 0.05 {:v} 3 {:wfn} -0.0161124 {:wr} 0.899216 {:ws} 0.897824 {:Π} 8.95597 {:α} 0.025 {:β} 0.02 {:δ} 0.05 {:λ} 0.948268 {:λE} 0.95 {:λS} 10 {:πE} 0.03 {:πS} 10 {:πr} 0.0298992 {:πs} 0.0896975 -0.076 {:0} 0 {:A} 6.41e-05 {:B} 1 {:C} 1 {:D} 0.0400641 {:Debt} 24.9024 {:Depn} 14.9719 {:E} 0.0175 {:F} 0.53 {:G} 6 {:H} 0.065 {:Ifn} 0.0782231 {:Ig} 7.80765 {:In} -7.16425 {:Int} 1.24512 {:K} 299.438 {:L} 99.6232 {:Linear} 0 {:N} 105.16 {:Stable} 1.3 {:W} 89.5621 {:Y} 99.8127 {:a} 1.0019 {:dr} 0.249491 {:dK/dt} -7.16425 {:dY/dt} -2.38808 {:dv/dt} 0 {:gr} -0.0239256 {:r} 0.05 {:v} 3 {:wfn} -0.0169391 {:wr} 0.899008 {:ws} 0.897302 {:Π} 9.00547 {:α} 0.025 {:β} 0.02 {:δ} 0.05 {:λ} 0.947351 {:λE} 0.95 {:λS} 10 {:πE} 0.03 {:πS} 10 {:πr} 0.0300746 {:πs} 0.0902237 -0.09 {:0} 0 {:A} 6.41e-05 {:B} 1 {:C} 1 {:D} 0.0400641 {:Debt} 24.8859 {:Depn} 14.9669 {:E} 0.0175 {:F} 0.53 {:G} 6 {:H} 0.065 {:Ifn} 0.0791052 {:Ig} 7.89307 {:In} -7.07384 {:Int} 1.24429 {:K} 299.338 {:L} 99.5552 {:Linear} 0 {:N} 105.189 {:Stable} 1.3 {:W} 89.4792 {:Y} 99.7794 {:a} 1.00225 {:dr} 0.249409 {:dK/dt} -7.07384 {:dY/dt} -2.35795 {:dv/dt} 0 {:gr} -0.0236316 {:r} 0.05 {:v} 3 {:wfn} -0.0177197 {:wr} 0.89879 {:ws} 0.89677 {:Π} 9.05593 {:α} 0.025 {:β} 0.02 {:δ} 0.05 {:λ} 0.946439 {:λE} 0.95 {:λS} 10 {:πE} 0.03 {:πS} 10 {:πr} 0.0302532 {:πs} 0.0907595 -0.104 {:0} 0 {:A} 6.41e-05 {:B} 1 {:C} 1 {:D} 0.0400641 {:Debt} 24.8699 {:Depn} 14.962 {:E} 0.0175 {:F} 0.53 {:G} 6 {:H} 0.065 {:Ifn} 0.0800106 {:Ig} 7.98079 {:In} -6.98121 {:Int} 1.24349 {:K} 299.24 {:L} 99.4876 {:Linear} 0 {:N} 105.219 {:Stable} 1.3 {:W} 89.3959 {:Y} 99.7466 {:a} 1.0026 {:dr} 0.24933 {:dK/dt} -6.98121 {:dY/dt} -2.32707 {:dv/dt} 0 {:gr} -0.0233298 {:r} 0.05 {:v} 3 {:wfn} -0.0184576 {:wr} 0.898562 {:ws} 0.896229 {:Π} 9.10729 {:α} 0.025 {:β} 0.02 {:δ} 0.05 {:λ} 0.945533 {:λE} 0.95 {:λS} 10 {:πE} 0.03 {:πS} 10 {:πr} 0.0304348 {:πs} 0.0913043 -0.118 {:0} 0 {:A} 6.41e-05 {:B} 1 {:C} 1 {:D} 0.0400641 {:Debt} 24.8543 {:Depn} 14.9571 {:E} 0.0175 {:F} 0.53 {:G} 6 {:H} 0.065 {:Ifn} 0.0809388 {:Ig} 8.07075 {:In} -6.88639 {:Int} 1.24272 {:K} 299.143 {:L} 99.4206 {:Linear} 0 {:N} 105.248 {:Stable} 1.3 {:W} 89.3121 {:Y} 99.7143 {:a} 1.00295 {:dr} 0.249256 {:dK/dt} -6.88639 {:dY/dt} -2.29546 {:dv/dt} 0 {:gr} -0.0230204 {:r} 0.05 {:v} 3 {:wfn} -0.0191559 {:wr} 0.898326 {:ws} 0.89568 {:Π} 9.15951 {:α} 0.025 {:β} 0.02 {:δ} 0.05 {:λ} 0.94463 {:λE} 0.95 {:λS} 10 {:πE} 0.03 {:πS} 10 {:πr} 0.0306192 {:πs} 0.0918575 -0.132 {:0} 0 {:A} 6.41e-05 {:B} 1 {:C} 1 {:D} 0.0400641 {:Debt} 24.8394 {:Depn} 14.9524 {:E} 0.0175 {:F} 0.53 {:G} 6 {:H} 0.065 {:Ifn} 0.0818895 {:Ig} 8.16294 {:In} -6.78942 {:Int} 1.24197 {:K} 299.047 {:L} 99.354 {:Linear} 0 {:N} 105.278 {:Stable} 1.3 {:W} 89.2279 {:Y} 99.6824 {:a} 1.00331 {:dr} 0.249185 {:dK/dt} -6.78942 {:dY/dt} -2.26314 {:dv/dt} 0 {:gr} -0.0227035 {:r} 0.05 {:v} 3 {:wfn} -0.0198172 {:wr} 0.898081 {:ws} 0.895122 {:Π} 9.21252 {:α} 0.025 {:β} 0.02 {:δ} 0.05 {:λ} 0.943733 {:λE} 0.95 {:λS} 10 {:πE} 0.03 {:πS} 10 {:πr} 0.0308062 {:πs} 0.0924187 +nsteps, 10 +0.006,":0",0.0,":A",6.41e-05,":B",1.0,":C",1.0,":D",0.0400641,"Debt",24.991851697633674,":Dep_n",14.997720752881705,":E",0.0175,":F",0.53,":G",6.0,":H",0.065,":I_{fn}",0.0741781359482021,":I_g",7.416686459469541,":I_n",-7.581034293412164,":Int",1.2495925848816838,"K",299.9544150576341,":L",99.9698084232313,":Linear",0.0,"N",105.01260075603024,":Stable",1.3,":W",89.96633217823162,":Y",99.98480501921136,"a",1.0001500112505626,":d_r",0.24995649781816015,":g_r",-0.02527395468393263,":r",0.05,":v",3.0,":w_{fn}",-0.012267051128433383,"w_r",0.8999350263566671,":w_s",0.8998000462264765,":\Pi",8.768880256098058,":\alpha",0.025,":\beta",0.02,":\delta",0.05,":\lambda",0.9519791691997557,":\lambda_E",0.95,":\lambda_S",10.0,":\pi_E",0.03,":\pi_S",10.0,":\pi_r",0.02923404296087184,":\pi_s",0.08770212888261551 +0.020000000000000004,":0",0.0,":A",6.41e-05,":B",1.0,":C",1.0,":D",0.0400641,"Debt",24.97311673679382,":Dep_n",14.992441338701529,":E",0.0175,":F",0.53,":G",6.0,":H",0.065,":I_{fn}",0.0749363782010499,":I_g",7.489861695426617,":I_n",-7.5025796432749114,":Int",1.2486558368396912,"K",299.84882677403056,":L",99.89964661183359,":Linear",0.0,"N",105.04200840112011,":Stable",1.3,":W",89.8870843621056,":Y",99.94960892467685,"a",1.000500125020836,":d_r",0.24985707303381088,":g_r",-0.0250212072663167,":r",0.05,":v",3.0,":w_{fn}",-0.013318102038448517,"w_r",0.8997737971122917,":w_s",0.8993240226667171,":\Pi",8.813868725731567,":\alpha",0.025,":\beta",0.02,":\delta",0.05,":\lambda",0.9510447118485247,":\lambda_E",0.95,":\lambda_S",10.0,":\pi_E",0.03,":\pi_S",10.0,":\pi_r",0.029394374560530786,":\pi_s",0.08818312368159237 +0.03400000000000001,":0",0.0,":A",6.41e-05,":B",1.0,":C",1.0,":D",0.0400641,"Debt",24.954785735544437,":Dep_n",14.987217729407611,":E",0.0175,":F",0.53,":G",6.0,":H",0.065,":I_{fn}",0.07572065687285895,":I_g",7.565613141115345,":I_n",-7.421604588292266,":Int",1.247739286777222,"K",299.7443545881522,":L",99.82989337957561,":Linear",0.0,"N",105.0714242815035,":Stable",1.3,":W",89.80694825676194,":Y",99.9147848627174,"a",1.0008503613523758,":d_r",0.24976069127138925,":g_r",-0.024759781042380358,":r",0.05,":v",3.0,":w_{fn}",-0.01430616950144965,"w_r",0.8995997613189449,":w_s",0.8988354264101795,":\Pi",8.860097319178237,":\alpha",0.025,":\beta",0.02,":\delta",0.05,":\lambda",0.9501145916906487,":\lambda_E",0.95,":\lambda_S",10.0,":\pi_E",0.03,":\pi_S",10.0,":\pi_r",0.029558846342083684,":\pi_s",0.08867653902625106 +0.048000000000000015,":0",0.0,":A",6.41e-05,":B",1.0,":C",1.0,":D",0.0400641,"Debt",24.936877449979132,":Dep_n",14.982051663334557,":E",0.0175,":F",0.53,":G",6.0,":H",0.065,":I_{fn}",0.07653027051512451,":I_g",7.643869777777098,":I_n",-7.338181885557459,":Int",1.2468438724989568,"K",299.6410332666911,":L",99.76055989401478,":Linear",0.0,"N",105.1008483994866,":Stable",1.3,":W",89.72601311244841,":Y",99.88034442223038,"a",1.0012007202880864,":d_r",0.24966751560809525,":g_r",-0.02448990982829183,":r",0.05,":v",3.0,":w_{fn}",-0.015236140241216365,"w_r",0.8994136882127864,":w_s",0.8983350391058331,":\Pi",8.90748743728301,":\alpha",0.025,":\beta",0.02,":\delta",0.05,":\lambda",0.9491889115378643,":\lambda_E",0.95,":\lambda_S",10.0,":\pi_E",0.03,":\pi_S",10.0,":\pi_r",0.029727195037920692,":\pi_s",0.08918158511376208 +0.06200000000000002,":0",0.0,":A",6.41e-05,":B",1.0,":C",1.0,":D",0.0400641,"Debt",24.9194107548271,":Dep_n",14.976944830691686,":E",0.0175,":F",0.53,":G",6.0,":H",0.065,":I_{fn}",0.0773645944074835,":I_g",7.724568415264792,":I_n",-7.252376415426894,":Int",1.2459705377413552,"K",299.5388966138337,":L",99.69165698644873,":Linear",0.0,"N",105.13028075737627,":Stable",1.3,":W",89.64436177510862,":Y",99.8462988712779,"a",1.0015512018708865,":d_r",0.24957771130758957,":g_r",-0.02421180186417217,":r",0.05,":v",3.0,":w_{fn}",-0.016112438524908484,"w_r",0.8992162883529374,":w_s",0.8978235827316781,":\Pi",8.955966558427917,":\alpha",0.025,":\beta",0.02,":\delta",0.05,":\lambda",0.9482677708863063,":\lambda_E",0.95,":\lambda_S",10.0,":\pi_E",0.03,":\pi_S",10.0,":\pi_r",0.029899177234314154,":\pi_s",0.08969753170294247 +0.07600000000000003,":0",0.0,":A",6.41e-05,":B",1.0,":C",1.0,":D",0.0400641,"Debt",24.90240466653416,":Dep_n",14.971898878801793,":E",0.0175,":F",0.53,":G",6.0,":H",0.065,":I_{fn}",0.07822307302013148,":I_g",7.807652928310248,":I_n",-7.164245950491545,":Int",1.2451202333267082,"K",299.43797757603585,":L",99.62319518734864,":Linear",0.0,"N",105.15972135748,":Stable",1.3,":W",89.56207128462022,":Y",99.81265919201195,"a",1.00190180614371,":d_r",0.24949144595605674,":g_r",-0.023925642326622847,":r",0.05,":v",3.0,":w_{fn}",-0.016939077247348732,"w_r",0.8990082190818338,":w_s",0.8973017251481855,":\Pi",9.00546767406503,":\alpha",0.025,":\beta",0.02,":\delta",0.05,":\lambda",0.9473512662580145,":\lambda_E",0.95,":\lambda_S",10.0,":\pi_E",0.03,":\pi_S",10.0,":\pi_r",0.03007456751800391,":\pi_s",0.09022370255401173 +0.09000000000000002,":0",0.0,":A",6.41e-05,":B",1.0,":C",1.0,":D",0.0400641,"Debt",24.88587836377573,":Dep_n",14.966915416834851,":E",0.0175,":F",0.53,":G",6.0,":H",0.065,":I_{fn}",0.07910521338313886,":I_g",7.893073584907412,":I_n",-7.07384183192744,":Int",1.2442939181887867,"K",299.338308336697,":L",99.55518475835895,":Linear",0.0,"N",105.18917020210594,":Stable",1.3,":W",89.47921340843604,":Y",99.77943611223235,"a",1.002252533149506,":d_r",0.24940888958105542,":g_r",-0.02363159553895371,":r",0.05,":v",3.0,":w_{fn}",-0.017719702608338283,"w_r",0.8987900893923367,":w_s",0.8967700850482802,":\Pi",9.05592878560752,":\alpha",0.025,":\beta",0.02,":\delta",0.05,":\lambda",0.9464394915092296,":\lambda_E",0.95,":\lambda_S",10.0,":\pi_E",0.03,":\pi_S",10.0,":\pi_r",0.030253156824222353,":\pi_s",0.09075947047266705 +0.10400000000000002,":0",0.0,":A",6.41e-05,":B",1.0,":C",1.0,":D",0.0400641,"Debt",24.86985120579658,":Dep_n",14.961996020096956,":E",0.0175,":F",0.53,":G",6.0,":H",0.065,":I_{fn}",0.08001057923925087,":I_g",7.9807864542888245,":I_n",-6.981209565808132,":Int",1.243492560289829,"K",299.2399204019391,":L",99.48763572127368,":Linear",0.0,"N",105.21862729356289,":Stable",1.3,":W",89.39585511857979,":Y",99.74664013397971,"a",1.0026033829312384,":d_r",0.24933021475601974,":g_r",-0.023329806920249708,":r",0.05,":v",3.0,":w_{fn}",-0.01845763327675769,"w_r",0.8985624642747848,":w_s",0.8962292363783206,":\Pi",9.107292455110098,":\alpha",0.025,":\beta",0.02,":\delta",0.05,":\lambda",0.9455325381094396,":\lambda_E",0.95,":\lambda_S",10.0,":\pi_E",0.03,":\pi_S",10.0,":\pi_r",0.030434750961292802,":\pi_s",0.0913042528838784 +0.11800000000000002,":0",0.0,":A",6.41e-05,":B",1.0,":C",1.0,":D",0.0400641,"Debt",24.854342748908994,":Dep_n",14.957142233926692,":E",0.0175,":F",0.53,":G",6.0,":H",0.065,":I_{fn}",0.08093878587548328,":I_g",8.070752883872935,":I_n",-6.886389350053758,":Int",1.2427171374454498,"K",299.14284467853383,":L",99.4205578843424,":Linear",0.0,"N",105.24809263416027,":Stable",1.3,":W",89.31205901885735,":Y",99.71428155951128,"a",1.0029543555318867,":d_r",0.24925559669279146,":g_r",-0.02302040470817224,":r",0.05,":v",3.0,":w_{fn}",-0.01915589479869309,"w_r",0.8983258686071302,":w_s",0.8956797122943148,":\Pi",9.15950540320847,":\alpha",0.025,":\beta",0.02,":\delta",0.05,":\lambda",0.9446304953945889,":\lambda_E",0.95,":\lambda_S",10.0,":\pi_E",0.03,":\pi_S",10.0,":\pi_r",0.030619169290348552,":\pi_s",0.09185750787104566 +0.13200000000000003,":0",0.0,":A",6.41e-05,":B",1.0,":C",1.0,":D",0.0400641,"Debt",24.83937276142896,":Dep_n",14.952355577244234,":E",0.0175,":F",0.53,":G",6.0,":H",0.065,":I_{fn}",0.08188949554442226,":I_g",8.162939036142394,":I_n",-6.78941654110184,":Int",1.241968638071448,"K",299.0471115448847,":L",99.35396086621432,":Linear",0.0,"N",105.27756622620818,":Stable",1.3,":W",89.22788372822045,":Y",99.68237051496156,"a",1.0033054509944446,":d_r",0.2491852133241631,":g_r",-0.022703501485192578,":r",0.05,":v",3.0,":w_{fn}",-0.019817249892839076,"w_r",0.8980807906427686,":w_s",0.8951220087089324,":\Pi",9.212518148669673,":\alpha",0.025,":\beta",0.02,":\delta",0.05,":\lambda",0.9437334507974291,":\lambda_E",0.95,":\lambda_S",10.0,":\pi_E",0.03,":\pi_S",10.0,":\pi_r",0.030806243541619847,":\pi_s",0.09241873062485953 diff --git a/test/exampleLogs/MinskyPricesFinal.mky.log b/test/exampleLogs/MinskyPricesFinal.mky.log index b75d977bf..338b0fd4c 100644 --- a/test/exampleLogs/MinskyPricesFinal.mky.log +++ b/test/exampleLogs/MinskyPricesFinal.mky.log @@ -1,11 +1,11 @@ -nsteps 10 -0.0777655 {:1-s} 0.7 {:ConsB} 8.19486e-05 {:ConsW} 100.108 {:DF} -1.94745 {:DW} 2.00216 {:EB} 8.19486e-05 {:IR} 0.717299 {:Ifn} 0.00718286 {:IntDF} -0.0194745 {:IntDW} 0.0200216 {:IntL} 0.00273957 {:Invest} 0.741415 {:K} 309.66 {:KR} 299.588 {:L} 99.7074 {:LF} 0.0547914 {:N} 120.14 {:P} 1.03362 {:PK} 1.03362 {:Repay} 0.00715451 {:W} 1.03037 {:Wfn} -0.0399401 {:Wages} 102.736 {:Y} 103.22 {:YR} 99.8626 {:a} 1.00156 {:dr} 0.000530822 {:infr} 0.42187 {:mi} 0 {:mr} 3 {:mw} -0.04 {:rD} 0.01 {:rL} 0.05 {:si} 2 {:sr} 100 {:sw} 2 {:v} 3 {:xi} 0.05 {:xr} 0.03 {:xw} 0.96 {:yi} 0.05 {:yr} 10 {:yw} 0 {:Π} 0.461968 {:α} 0.02 {:β} 0.015 {:δ} 0.02 {:λ} 0.829927 {:λw} 0.01 {:πr} 0.00149186 {:τCB} 1 {:τCW} 0.02 {:τP} 1 {:τR} 7.6583 {:ω} 0.995309 {:∖dλ} -0.0526057 -0.238326 {:1-s} 0.7 {:ConsB} 0.00077669 {:ConsW} 107.745 {:DF} -1.97208 {:DW} 2.15491 {:EB} 0.00077669 {:IR} 0.812642 {:Ifn} 0.00816042 {:IntDF} -0.0197208 {:IntDW} 0.0215491 {:IntL} 0.00918028 {:Invest} 0.897837 {:K} 330.07 {:KR} 298.75 {:L} 99.1098 {:LF} 0.183606 {:N} 120.43 {:P} 1.10484 {:PK} 1.10484 {:Repay} 0.0233135 {:W} 1.09423 {:Wfn} -0.0399577 {:Wages} 108.449 {:Y} 110.023 {:YR} 99.5833 {:a} 1.00478 {:dr} 0.00166879 {:infr} 0.408131 {:mi} 0 {:mr} 3 {:mw} -0.04 {:rD} 0.01 {:rL} 0.05 {:si} 2 {:sr} 100 {:sw} 2 {:v} 3 {:xi} 0.05 {:xr} 0.03 {:xw} 0.96 {:yi} 0.05 {:yr} 10 {:yw} 0 {:Π} 1.54533 {:α} 0.02 {:β} 0.015 {:δ} 0.02 {:λ} 0.822967 {:λw} 0.01 {:πr} 0.00468183 {:τCB} 1 {:τCW} 0.02 {:τP} 1 {:τR} 7.8755 {:ω} 0.985692 {:∖dλ} -0.0522799 -0.523384 {:1-s} 0.7 {:ConsB} 0.00385536 {:ConsW} 118.425 {:DF} -1.89633 {:DW} 2.36849 {:EB} 0.00385536 {:IR} 1.01129 {:Ifn} 0.0102044 {:IntDF} -0.0189633 {:IntDW} 0.0236849 {:IntL} 0.0238009 {:Invest} 1.25085 {:K} 367.739 {:KR} 297.31 {:L} 98.0713 {:LF} 0.476018 {:N} 120.946 {:P} 1.23689 {:PK} 1.23689 {:Repay} 0.0574855 {:W} 1.21096 {:Wfn} -0.0399769 {:Wages} 118.76 {:Y} 122.58 {:YR} 99.1033 {:a} 1.01052 {:dr} 0.00388333 {:infr} 0.38406 {:mi} 0 {:mr} 3 {:mw} -0.04 {:rD} 0.01 {:rL} 0.05 {:si} 2 {:sr} 100 {:sw} 2 {:v} 3 {:xi} 0.05 {:xr} 0.03 {:xw} 0.96 {:yi} 0.05 {:yr} 10 {:yw} 0 {:Π} 3.77662 {:α} 0.02 {:β} 0.015 {:δ} 0.02 {:λ} 0.81087 {:λw} 0.01 {:πr} 0.0102698 {:τCB} 1 {:τCW} 0.02 {:τP} 1 {:τR} 8.28066 {:ω} 0.968842 {:∖dλ} -0.0515985 -0.734064 {:1-s} 0.7 {:ConsB} 0.00782107 {:ConsW} 125.591 {:DF} -1.76116 {:DW} 2.51182 {:EB} 0.00782107 {:IR} 1.18582 {:Ifn} 0.0120066 {:IntDF} -0.0176116 {:IntDW} 0.0251182 {:IntL} 0.0379238 {:Invest} 1.58739 {:K} 396.629 {:KR} 296.29 {:L} 97.324 {:LF} 0.758475 {:N} 121.329 {:P} 1.33865 {:PK} 1.33865 {:Repay} 0.0882309 {:W} 1.29945 {:Wfn} -0.0399851 {:Wages} 126.468 {:Y} 132.21 {:YR} 98.7634 {:a} 1.01479 {:dr} 0.00573691 {:infr} 0.366532 {:mi} 0 {:mr} 3 {:mw} -0.04 {:rD} 0.01 {:rL} 0.05 {:si} 2 {:sr} 100 {:sw} 2 {:v} 3 {:xi} 0.05 {:xr} 0.03 {:xw} 0.96 {:yi} 0.05 {:yr} 10 {:yw} 0 {:Π} 5.68604 {:α} 0.02 {:β} 0.015 {:δ} 0.02 {:λ} 0.802152 {:λw} 0.01 {:πr} 0.0143359 {:τCB} 1 {:τCW} 0.02 {:τP} 1 {:τR} 8.59648 {:ω} 0.956572 {:∖dλ} -0.0509978 -0.965606 {:1-s} 0.7 {:ConsB} 0.0141222 {:ConsW} 134.627 {:DF} -1.5542 {:DW} 2.69255 {:EB} 0.0141222 {:IR} 1.40917 {:Ifn} 0.0143198 {:IntDF} -0.015542 {:IntDW} 0.0269255 {:IntL} 0.0576235 {:Invest} 2.04894 {:K} 429.253 {:KR} 295.22 {:L} 96.5246 {:LF} 1.15247 {:N} 121.751 {:P} 1.45401 {:PK} 1.45401 {:Repay} 0.128625 {:W} 1.39826 {:Wfn} -0.0399906 {:Wages} 134.967 {:Y} 143.084 {:YR} 98.4068 {:a} 1.0195 {:dr} 0.00805448 {:infr} 0.347524 {:mi} 0 {:mr} 3 {:mw} -0.04 {:rD} 0.01 {:rL} 0.05 {:si} 2 {:sr} 100 {:sw} 2 {:v} 3 {:xi} 0.05 {:xr} 0.03 {:xw} 0.96 {:yi} 0.05 {:yr} 10 {:yw} 0 {:Π} 8.04445 {:α} 0.02 {:β} 0.015 {:δ} 0.02 {:λ} 0.792805 {:λw} 0.01 {:πr} 0.0187406 {:τCB} 1 {:τCW} 0.02 {:τP} 1 {:τR} 8.95995 {:ω} 0.943267 {:∖dλ} -0.0502267 -1.17022 {:1-s} 0.7 {:ConsB} 0.0216923 {:ConsW} 141.652 {:DF} -1.26371 {:DW} 2.83304 {:EB} 0.0216923 {:IR} 1.63796 {:Ifn} 0.0166954 {:IntDF} -0.0126371 {:IntDW} 0.0283304 {:IntL} 0.0795514 {:Invest} 2.55278 {:K} 458.71 {:KR} 294.325 {:L} 95.8389 {:LF} 1.59103 {:N} 122.125 {:P} 1.55851 {:PK} 1.55851 {:Repay} 0.171156 {:W} 1.4864 {:Wfn} -0.0399937 {:Wages} 142.455 {:Y} 152.903 {:YR} 98.1084 {:a} 1.02368 {:dr} 0.0104054 {:infr} 0.330948 {:mi} 0 {:mr} 3 {:mw} -0.04 {:rD} 0.01 {:rL} 0.05 {:si} 2 {:sr} 100 {:sw} 2 {:v} 3 {:xi} 0.05 {:xr} 0.03 {:xw} 0.96 {:yi} 0.05 {:yr} 10 {:yw} 0 {:Π} 10.3566 {:α} 0.02 {:β} 0.015 {:δ} 0.02 {:λ} 0.784761 {:λw} 0.01 {:πr} 0.0225777 {:τCB} 1 {:τCW} 0.02 {:τP} 1 {:τR} 9.29577 {:ω} 0.931664 {:∖dλ} -0.0494349 -1.39426 {:1-s} 0.7 {:ConsB} 0.0325748 {:ConsW} 150.003 {:DF} -0.841013 {:DW} 3.00006 {:EB} 0.0325748 {:IR} 1.927 {:Ifn} 0.019703 {:IntDF} -0.00841013 {:IntDW} 0.0300006 {:IntL} 0.109581 {:Invest} 3.2279 {:K} 491.484 {:KR} 293.407 {:L} 95.1128 {:LF} 2.19162 {:N} 122.536 {:P} 1.67509 {:PK} 1.67509 {:Repay} 0.22642 {:W} 1.58315 {:Wfn} -0.0399959 {:Wages} 150.578 {:Y} 163.828 {:YR} 97.8024 {:a} 1.02828 {:dr} 0.0133776 {:infr} 0.313034 {:mi} 0 {:mr} 3 {:mw} -0.04 {:rD} 0.01 {:rL} 0.05 {:si} 2 {:sr} 100 {:sw} 2 {:v} 3 {:xi} 0.05 {:xr} 0.03 {:xw} 0.96 {:yi} 0.05 {:yr} 10 {:yw} 0 {:Π} 13.1318 {:α} 0.02 {:β} 0.015 {:δ} 0.02 {:λ} 0.776202 {:λw} 0.01 {:πr} 0.0267186 {:τCB} 1 {:τCW} 0.02 {:τP} 1 {:τR} 9.67944 {:ω} 0.919124 {:∖dλ} -0.0484323 -1.60787 {:1-s} 0.7 {:ConsB} 0.0459985 {:ConsW} 157.462 {:DF} -0.287757 {:DW} 3.14925 {:EB} 0.0459985 {:IR} 2.24513 {:Ifn} 0.0230191 {:IntDF} -0.00287757 {:IntDW} 0.0314925 {:IntL} 0.145374 {:Invest} 4.01362 {:K} 523.081 {:KR} 292.6 {:L} 94.4469 {:LF} 2.90749 {:N} 122.929 {:P} 1.7877 {:PK} 1.7877 {:Repay} 0.288986 {:W} 1.67504 {:Wfn} -0.0399972 {:Wages} 158.202 {:Y} 174.36 {:YR} 97.5334 {:a} 1.03268 {:dr} 0.0166752 {:infr} 0.296182 {:mi} 0 {:mr} 3 {:mw} -0.04 {:rD} 0.01 {:rL} 0.05 {:si} 2 {:sr} 100 {:sw} 2 {:v} 3 {:xi} 0.05 {:xr} 0.03 {:xw} 0.96 {:yi} 0.05 {:yr} 10 {:yw} 0 {:Π} 16.0102 {:α} 0.02 {:β} 0.015 {:δ} 0.02 {:λ} 0.768302 {:λw} 0.01 {:πr} 0.0306075 {:τCB} 1 {:τCW} 0.02 {:τP} 1 {:τR} 10.061 {:ω} 0.907327 {:∖dλ} -0.047327 -1.80825 {:1-s} 0.7 {:ConsB} 0.0618614 {:ConsW} 164.556 {:DF} 0.380207 {:DW} 3.29112 {:EB} 0.0618614 {:IR} 2.58625 {:Ifn} 0.026579 {:IntDF} 0.00380207 {:IntDW} 0.0329112 {:IntL} 0.186659 {:Invest} 4.89846 {:K} 552.893 {:KR} 291.912 {:L} 93.848 {:LF} 3.73319 {:N} 123.299 {:P} 1.89404 {:PK} 1.89404 {:Repay} 0.357821 {:W} 1.76034 {:Wfn} -0.0399981 {:Wages} 165.205 {:Y} 184.298 {:YR} 97.3041 {:a} 1.03683 {:dr} 0.0202563 {:infr} 0.280572 {:mi} 0 {:mr} 3 {:mw} -0.04 {:rD} 0.01 {:rL} 0.05 {:si} 2 {:sr} 100 {:sw} 2 {:v} 3 {:xi} 0.05 {:xr} 0.03 {:xw} 0.96 {:yi} 0.05 {:yr} 10 {:yw} 0 {:Π} 18.9103 {:α} 0.02 {:β} 0.015 {:δ} 0.02 {:λ} 0.761139 {:λw} 0.01 {:πr} 0.0342025 {:τCB} 1 {:τCW} 0.02 {:τP} 1 {:τR} 10.4331 {:ω} 0.8964 {:∖dλ} -0.0461403 -2.0834 {:1-s} 0.7 {:ConsB} 0.0899818 {:ConsW} 173.669 {:DF} 1.60125 {:DW} 3.47338 {:EB} 0.0899818 {:IR} 3.13136 {:Ifn} 0.0322718 {:IntDF} 0.0160125 {:IntDW} 0.0347338 {:IntL} 0.258231 {:Invest} 6.38828 {:K} 593.857 {:KR} 291.093 {:L} 93.0709 {:LF} 5.16461 {:N} 123.809 {:P} 2.0401 {:PK} 2.0401 {:Repay} 0.470941 {:W} 1.8751 {:Wfn} -0.0399988 {:Wages} 174.518 {:Y} 197.952 {:YR} 97.0309 {:a} 1.04255 {:dr} 0.0260902 {:infr} 0.259448 {:mi} 0 {:mr} 3 {:mw} -0.04 {:rD} 0.01 {:rL} 0.05 {:si} 2 {:sr} 100 {:sw} 2 {:v} 3 {:xi} 0.05 {:xr} 0.03 {:xw} 0.96 {:yi} 0.05 {:yr} 10 {:yw} 0 {:Π} 23.1927 {:α} 0.02 {:β} 0.015 {:δ} 0.02 {:λ} 0.751727 {:λw} 0.01 {:πr} 0.0390542 {:τCB} 1 {:τCW} 0.02 {:τP} 1 {:τR} 10.9666 {:ω} 0.881614 {:∖dλ} -0.0442427 +nsteps, 10 +0.07776548076390234,":1-s",0.7,":ConsB",8.19486239467241e-05,":ConsW",100.10795450500214,":DF",-1.9474496105482495,":DW",2.002159090100043,":EB",8.19486239467241e-05,":I_R",0.7172989773242059,"I_{fn}",0.007182857138292487,":IntDF",-0.019474496105482495,":IntDW",0.02002159090100043,":IntL",0.0027395714087870005,":Invest",0.7414146465727466,":K",309.660055447934,"K_R",299.58787854775125,":L",99.70742960052812,":LF",0.05479142817574001,"N",120.14005953797346,"P",1.0336201082266996,":P_K",1.0336201082266996,":Repay",0.00715451416572077,"W",1.030372929111544,":W_{fn}",-0.03994008277094882,":Wages",102.73583629167922,":Y",103.22001848264466,":Y_R",99.86262618258375,"a",1.0015565197365675,":d_r",0.0005308217241305048,":inf_r",0.4218703171552101,":m_i",0.0,":m_r",3.0,":m_w",-0.04,":r_D",0.01,":r_L",0.05,":s_i",2.0,":s_r",100.0,":s_w",2.0,":v",3.0,":x_i",0.05,":x_r",0.03,":x_w",0.96,":y_i",0.05,":y_r",10.0,":y_w",0.0,":\Pi",0.46196812345117166,":\alpha",0.02,":\beta",0.015,":\delta",0.02,":\lambda",0.8299265872180872,":\lambda_w",0.01,":\pi_r",0.0014918557150773574,":\tau_\mathrm{CB}",1.0,":\tau_\mathrm{CW}",0.02,":\tau_P",1.0,":\tau_R",7.658301724841177,":\omega",0.995309222008647,":\d\lambda",-0.052605714287235844 +0.23832573278945463,":1-s",0.7,":ConsB",0.0007766901742935053,":ConsW",107.74529270594539,":DF",-1.9720769371201234,":DW",2.154905854118908,":EB",0.0007766901742935053,":I_R",0.8126418703744632,"I_{fn}",0.008160424132624494,":IntDF",-0.019720769371201236,":IntDW",0.02154905854118908,":IntL",0.009180280358653923,":Invest",0.8978371471828209,":K",330.07003040198543,"K_R",298.749865387122,":L",99.10975271253957,":LF",0.18360560717307844,"N",120.42975402215676,"P",1.104837419673072,":P_K",1.104837419673072,":Repay",0.023313527309830044,"W",1.0942324865155564,":W_{fn}",-0.03995769094777046,":Wages",108.44911114858408,":Y",110.02334346732849,":Y_R",99.583288462374,"a",1.0047778925572328,":d_r",0.001668787744371723,":inf_r",0.40813119069445664,":m_i",0.0,":m_r",3.0,":m_w",-0.04,":r_D",0.01,":r_L",0.05,":s_i",2.0,":s_r",100.0,":s_w",2.0,":v",3.0,":x_i",0.05,":x_r",0.03,":x_w",0.96,":y_i",0.05,":y_r",10.0,":y_w",0.0,":\Pi",1.5453312690145538,":\alpha",0.02,":\beta",0.015,":\delta",0.02,":\lambda",0.8229673266151926,":\lambda_w",0.01,":\pi_r",0.004681828480860643,":\tau_\mathrm{CB}",1.0,":\tau_\mathrm{CW}",0.02,":\tau_P",1.0,":\tau_R",7.875496690527047,":\omega",0.9856918334861194,":\d\lambda",-0.05227985862245851 +0.5233843566187166,":1-s",0.7,":ConsB",0.003855356965731384,":ConsW",118.4246538045813,":DF",-1.8963308786184028,":DW",2.368493076091626,":EB",0.003855356965731384,":I_R",1.011286275793329,"I_{fn}",0.01020436901537058,":IntDF",-0.01896330878618403,":IntDW",0.02368493076091626,":IntL",0.02380087772194775,":Invest",1.2508482310545699,":K",367.73902310974324,"K_R",297.3097917970394,":L",98.07129257132793,":LF",0.476017554438955,"N",120.94579960949433,"P",1.2368883678099067,":P_K",1.2368883678099067,":Repay",0.05748548258040551,"W",1.2109588039763217,":W_{fn}",-0.03997689328714681,":Wages",118.76029515658719,":Y",122.57967436991441,":Y_R",99.10326393234647,"a",1.0105226650323587,":d_r",0.0038833318564907796,":inf_r",0.38405951379367126,":m_i",0.0,":m_r",3.0,":m_w",-0.04,":r_D",0.01,":r_L",0.05,":s_i",2.0,":s_r",100.0,":s_w",2.0,":v",3.0,":x_i",0.05,":x_r",0.03,":x_w",0.96,":y_i",0.05,":y_r",10.0,":y_w",0.0,":\Pi",3.776615026819087,":\alpha",0.02,":\beta",0.015,":\delta",0.02,":\lambda",0.810869768838415,":\lambda_w",0.01,":\pi_r",0.010269823949828798,":\tau_\mathrm{CB}",1.0,":\tau_\mathrm{CW}",0.02,":\tau_P",1.0,":\tau_R",8.280656838413847,":\omega",0.9688416596555698,":\d\lambda",-0.05159854366154315 +0.7340636703556068,":1-s",0.7,":ConsB",0.00782107137358459,":ConsW",125.59081747684313,":DF",-1.7611622388924526,":DW",2.5118163495368626,":EB",0.00782107137358459,":I_R",1.1858160995641445,"I_{fn}",0.012006634710892666,":IntDF",-0.017611622388924525,":IntDW",0.025118163495368627,":IntL",0.03792375910089975,":Invest",1.5873932221477325,":K",396.62901230124453,"K_R",296.2902082350388,":L",97.32402205100749,":LF",0.7584751820179949,"N",121.32861584778607,"P",1.3386504220436801,":P_K",1.3386504220436801,":Repay",0.08823092467142081,"W",1.2994540818789788,":W_{fn}",-0.03998505693705454,":Wages",126.46809771906143,":Y",132.20967076708152,":Y_R",98.76340274501293,"a",1.0147895726427238,":d_r",0.005736911510461498,":inf_r",0.36653173689178253,":m_i",0.0,":m_r",3.0,":m_w",-0.04,":r_D",0.01,":r_L",0.05,":s_i",2.0,":s_r",100.0,":s_w",2.0,":v",3.0,":x_i",0.05,":x_r",0.03,":x_w",0.96,":y_i",0.05,":y_r",10.0,":y_w",0.0,":\Pi",5.686037666530254,":\alpha",0.02,":\beta",0.015,":\delta",0.02,":\lambda",0.8021522488405063,":\lambda_w",0.01,":\pi_r",0.014335909603636458,":\tau_\mathrm{CB}",1.0,":\tau_\mathrm{CW}",0.02,":\tau_P",1.0,":\tau_R",8.596477763806949,":\omega",0.9565722158242477,":\d\lambda",-0.05099778842970245 +0.9656063726359331,":1-s",0.7,":ConsB",0.014122240673245575,":ConsW",134.62742359428375,":DF",-1.5542009719228782,":DW",2.692548471885675,":EB",0.014122240673245575,":I_R",1.4091701510742622,"I_{fn}",0.01431984648833718,":IntDF",-0.015542009719228783,":IntDW",0.02692548471885675,":IntL",0.057623487031802194,":Invest",2.0489449616125097,":K",429.2528477762543,"K_R",295.2203752090422,":L",96.52458048242652,":LF",1.1524697406360438,"N",121.75073980502953,"P",1.4540082047938097,":P_K",1.4540082047938097,":Repay",0.12862463397785098,"W",1.398262147886555,":W_{fn}",-0.039990635942784694,":Wages",134.96666722920634,":Y",143.08428259208478,":Y_R",98.40679173634739,"a",1.01949981284056,":d_r",0.00805448173452838,":inf_r",0.34752413836275453,":m_i",0.0,":m_r",3.0,":m_w",-0.04,":r_D",0.01,":r_L",0.05,":s_i",2.0,":s_r",100.0,":s_w",2.0,":v",3.0,":x_i",0.05,":x_r",0.03,":x_w",0.96,":y_i",0.05,":y_r",10.0,":y_w",0.0,":\Pi",8.044449866127394,":\alpha",0.02,":\beta",0.015,":\delta",0.02,":\lambda",0.792804878532977,":\lambda_w",0.01,":\pi_r",0.018740585898967686,":\tau_\mathrm{CB}",1.0,":\tau_\mathrm{CW}",0.02,":\tau_P",1.0,":\tau_R",8.959945735079781,":\omega",0.9432668968539282,":\d\lambda",-0.05022671783722095 +1.170219514722621,":1-s",0.7,":ConsB",0.021692275815914683,":ConsW",141.6521804577969,":DF",-1.2637083950147316,":DW",2.833043609155938,":EB",0.021692275815914683,":I_R",1.6379586473668049,"I_{fn}",0.0166953903720477,":IntDF",-0.012637083950147317,":IntDW",0.028330436091559382,":IntL",0.07955137449785626,":Invest",2.552781211652566,":K",458.7100669283959,"K_R",294.3253097170752,":L",95.83893023320003,":LF",1.591027489957125,"N",122.12499085771533,"P",1.5585138341291076,":P_K",1.5585138341291076,":Repay",0.17115608449685485,"W",1.4863952428808052,":W_{fn}",-0.03999373684000775,":Wages",142.4545299814139,":Y",152.90335564279866,":Y_R",98.1084365723584,"a",1.0236804222838891,":d_r",0.01040544521255612,":inf_r",0.3309483663487178,":m_i",0.0,":m_r",3.0,":m_w",-0.04,":r_D",0.01,":r_L",0.05,":s_i",2.0,":s_r",100.0,":s_w",2.0,":v",3.0,":x_i",0.05,":x_r",0.03,":x_w",0.96,":y_i",0.05,":y_r",10.0,":y_w",0.0,":\Pi",10.356637202936724,":\alpha",0.02,":\beta",0.015,":\delta",0.02,":\lambda",0.7847610023149111,":\lambda_w",0.01,":\pi_r",0.022577741256664816,":\tau_\mathrm{CB}",1.0,":\tau_\mathrm{CW}",0.02,":\tau_P",1.0,":\tau_R",9.295769382866208,":\omega",0.9316638564441024,":\d\lambda",-0.04943486987598411 +1.394263993067628,":1-s",0.7,":ConsB",0.032574766444541894,":ConsW",150.0030532224676,":DF",-0.8410134994337599,":DW",3.000061064449352,":EB",0.032574766444541894,":I_R",1.9269957766324217,"I_{fn}",0.019702955985830585,":IntDF",-0.0084101349943376,":IntDW",0.03000061064449352,":IntL",0.10958111657300709,":Invest",3.2278964625238507,":K",491.4840897241811,"K_R",293.4071077484349,":L",95.11279683118023,":LF",2.1916223314601417,"N",122.53610272390885,"P",1.6750926502625014,":P_K",1.6750926502625014,":Repay",0.22642045018526302,"W",1.5831544898804164,":W_{fn}",-0.039995917349153164,":Wages",150.57825134836682,":Y",163.8280299080604,":Y_R",97.8023692494783,"a",1.0282777134928742,":d_r",0.013377578505278194,":inf_r",0.3130340867874925,":m_i",0.0,":m_r",3.0,":m_w",-0.04,":r_D",0.01,":r_L",0.05,":s_i",2.0,":s_r",100.0,":s_w",2.0,":v",3.0,":x_i",0.05,":x_r",0.03,":x_w",0.96,":y_i",0.05,":y_r",10.0,":y_w",0.0,":\Pi",13.131787308126235,":\alpha",0.02,":\beta",0.015,":\delta",0.02,":\lambda",0.7762022352341562,":\lambda_w",0.01,":\pi_r",0.026718641727539422,":\tau_\mathrm{CB}",1.0,":\tau_\mathrm{CW}",0.02,":\tau_P",1.0,":\tau_R",9.679436330361945,":\omega",0.9191238607512445,":\d\lambda",-0.048432348004723146 +1.607867977266495,":1-s",0.7,":ConsB",0.04599851527323075,":ConsW",157.46241201122325,":DF",-0.2877568744592611,":DW",3.149248240224465,":EB",0.04599851527323075,":I_R",2.2451310558048383,"I_{fn}",0.023019099507615243,":IntDF",-0.002877568744592611,":IntDW",0.03149248240224465,":IntL",0.14537449405192202,":Invest",4.013621306080455,":K",523.0814487012392,"K_R",292.6002020707323,":L",94.44687725399722,":LF",2.9074898810384404,"N",122.92934537021034,"P",1.7877002305514167,":P_K",1.7877002305514167,":Repay",0.2889856668658376,"W",1.6750368383481573,":W_{fn}",-0.03999724961479765,":Wages",158.201998667392,":Y",174.36048290041307,":Y_R",97.5334006902441,"a",1.0326799945745824,":d_r",0.016675165339494206,":inf_r",0.296181631753189,":m_i",0.0,":m_r",3.0,":m_w",-0.04,":r_D",0.01,":r_L",0.05,":s_i",2.0,":s_r",100.0,":s_w",2.0,":v",3.0,":x_i",0.05,":x_r",0.03,":x_w",0.96,":y_i",0.05,":y_r",10.0,":y_w",0.0,":\Pi",16.010232170224555,":\alpha",0.02,":\beta",0.015,":\delta",0.02,":\lambda",0.768302124847113,":\lambda_w",0.01,":\pi_r",0.03060753198182887,":\tau_\mathrm{CB}",1.0,":\tau_\mathrm{CW}",0.02,":\tau_P",1.0,":\tau_R",10.06101760191536,":\omega",0.9073271422272322,":\d\lambda",-0.047326966830794924 +1.8082473176661251,":1-s",0.7,":ConsB",0.06186140272110595,":ConsW",164.5558616035263,":DF",0.3802072610428894,":DW",3.2911172320705258,":EB",0.06186140272110595,":I_R",2.5862495412178363,"I_{fn}",0.026579039198365212,":IntDF",0.0038020726104288937,":IntDW",0.032911172320705256,":IntL",0.18665929479172635,":Invest",4.898457299333432,":K",552.8932700811908,"K_R",291.9123059997866,":L",93.84797635211191,":LF",3.7331858958345268,"N",123.29938872656719,"P",1.8940389244213467,":P_K",1.8940389244213467,":Repay",0.35782062601270415,"W",1.7603423665594404,":W_{fn}",-0.039998077577872646,":Wages",165.2045687884911,":Y",184.2977566937303,":Y_R",97.30410199992887,"a",1.0368268531955318,":d_r",0.02025627420977462,":inf_r",0.2805718912406619,":m_i",0.0,":m_r",3.0,":m_w",-0.04,":r_D",0.01,":r_L",0.05,":s_i",2.0,":s_r",100.0,":s_w",2.0,":v",3.0,":x_i",0.05,":x_r",0.03,":x_w",0.96,":y_i",0.05,":y_r",10.0,":y_w",0.0,":\Pi",18.910330683057907,":\alpha",0.02,":\beta",0.015,":\delta",0.02,":\lambda",0.7611390236510605,":\lambda_w",0.01,":\pi_r",0.034202497491570075,":\tau_\mathrm{CB}",1.0,":\tau_\mathrm{CW}",0.02,":\tau_P",1.0,":\tau_R",10.433121023330788,":\omega",0.8964003238684634,":\d\lambda",-0.046140320267211606 +2.0834004950943164,":1-s",0.7,":ConsB",0.08998179749576593,":ConsW",173.6688903899909,":DF",1.6012532122936798,":DW",3.4733778077998183,":EB",0.08998179749576593,":I_R",3.131358570610808,"I_{fn}",0.03227177082352825,":IntDF",0.0160125321229368,":IntDW",0.034733778077998184,":IntL",0.2582306408794634,":Invest",6.388275802941846,":K",593.8573223522371,"K_R",291.09266309562173,":L",93.07087947821366,":LF",5.164612817589268,"N",123.80933362862258,"P",2.040097184301617,":P_K",2.040097184301617,":Repay",0.4709406360826933,"W",1.8751039335571054,":W_{fn}",-0.039998799174567196,":Wages",174.5175722092177,":Y",197.95244078407904,":Y_R",97.03088769854058,"a",1.0425483055766536,":d_r",0.026090169927344732,":inf_r",0.25944805961589945,":m_i",0.0,":m_r",3.0,":m_w",-0.04,":r_D",0.01,":r_L",0.05,":s_i",2.0,":s_r",100.0,":s_w",2.0,":v",3.0,":x_i",0.05,":x_r",0.03,":x_w",0.96,":y_i",0.05,":y_r",10.0,":y_w",0.0,":\Pi",23.192650466104823,":\alpha",0.02,":\beta",0.015,":\delta",0.02,":\lambda",0.751727488958048,":\lambda_w",0.01,":\pi_r",0.03905424685889192,":\tau_\mathrm{CB}",1.0,":\tau_\mathrm{CW}",0.02,":\tau_P",1.0,":\tau_R",10.966589888162474,":\omega",0.8816136417311295,":\d\lambda",-0.044242743058823926 diff --git a/test/exampleLogs/MonetaryMinskyNeoPrices.mky.log b/test/exampleLogs/MonetaryMinskyNeoPrices.mky.log index 88936d544..b16204bae 100644 --- a/test/exampleLogs/MonetaryMinskyNeoPrices.mky.log +++ b/test/exampleLogs/MonetaryMinskyNeoPrices.mky.log @@ -1,11 +1,11 @@ -nsteps 10 -0.0306374 {:1-s} 0.7 {:100} 100 {:ConsB} 0.000182049 {:ConsW} 62.8352 {:DF} -0.955866 {:DW} 1.2567 {:EB} 0.000182049 {:IR} 9.89355 {:Ifn} 0.098897 {:InfMarkup} 14.0858 {:InfSD} 1671.09 {:IntDF} -0.00955866 {:IntDW} 0.012567 {:IntL} 0.015051 {:Invest} 9.93664 {:K} 301.424 {:KR} 300.117 {:L} 99.9777 {:LF} 0.30102 {:N} 110.051 {:P} 1.00436 {:PK} 1.00436 {:PNeo} 0.538205 {:Repay} 0.020224 {:W} 0.802571 {:Wfn} -0.0369584 {:Wages} 80.2392 {:Y} 100.475 {:YR} 100.039 {:a} 1.00061 {:dr} 0.00299598 {:infNeo} 16.7109 {:infr} 0.140858 {:mi} 0 {:mr} 3 {:mw} -0.04 {:rD} 0.01 {:rL} 0.05 {:si} 2 {:sr} 100 {:sw} 2 {:v} 3 {:xi} 0.05 {:xr} 0.03 {:xw} 0.96 {:yi} 0.05 {:yr} 10 {:yw} 0 {:Π} 20.2109 {:α} 0.02 {:β} 0.015 {:δ} 0.02 {:λ} 0.90847 {:λw} 0.01 {:πr} 0.0670514 {:τCB} 1 {:τCW} 0.02 {:τP} 1 {:τR} 14.8843 {:ω} 0.798601 {:∂λ} -0.0220343 -0.0884031 {:1-s} 0.7 {:100} 100 {:ConsB} 0.00150533 {:ConsW} 79.5938 {:DF} -0.70891 {:DW} 1.59188 {:EB} 0.00150533 {:IR} 10.2199 {:Ifn} 0.10208 {:InfMarkup} 13.7091 {:InfSD} 131.06 {:IntDF} -0.0070891 {:IntDW} 0.0159188 {:IntL} 0.0442235 {:Invest} 10.3472 {:K} 304.09 {:KR} 300.351 {:L} 99.9401 {:LF} 0.884471 {:N} 110.146 {:P} 1.01245 {:PK} 1.01245 {:PNeo} 0.78475 {:Repay} 0.0588882 {:W} 0.8073 {:Wfn} -0.0371252 {:Wages} 80.6817 {:Y} 101.363 {:YR} 100.117 {:a} 1.00177 {:dr} 0.00872573 {:infNeo} 1.3106 {:infr} 0.137091 {:mi} 0 {:mr} 3 {:mw} -0.04 {:rD} 0.01 {:rL} 0.05 {:si} 2 {:sr} 100 {:sw} 2 {:v} 3 {:xi} 0.05 {:xr} 0.03 {:xw} 0.96 {:yi} 0.05 {:yr} 10 {:yw} 0 {:Π} 20.6305 {:α} 0.02 {:β} 0.015 {:δ} 0.02 {:λ} 0.907342 {:λw} 0.01 {:πr} 0.0678433 {:τCB} 1 {:τCW} 0.02 {:τP} 1 {:τR} 15.0195 {:ω} 0.795964 {:∂λ} -0.0209734 -0.224213 {:1-s} 0.7 {:100} 100 {:ConsB} 0.00955182 {:ConsW} 81.553 {:DF} 0.704002 {:DW} 1.63106 {:EB} 0.00955182 {:IR} 11.0398 {:Ifn} 0.11004 {:InfMarkup} 12.8247 {:InfSD} -28.3534 {:IntDF} 0.00704002 {:IntDW} 0.0163106 {:IntL} 0.117231 {:Invest} 11.3805 {:K} 310.265 {:KR} 300.977 {:L} 99.8768 {:LF} 2.34461 {:N} 110.371 {:P} 1.03086 {:PK} 1.03086 {:PNeo} 0.815281 {:Repay} 0.152782 {:W} 0.817803 {:Wfn} -0.0374528 {:Wages} 81.6796 {:Y} 103.422 {:YR} 100.326 {:a} 1.00449 {:dr} 0.0226704 {:infNeo} -0.283534 {:infr} 0.128247 {:mi} 0 {:mr} 3 {:mw} -0.04 {:rD} 0.01 {:rL} 0.05 {:si} 2 {:sr} 100 {:sw} 2 {:v} 3 {:xi} 0.05 {:xr} 0.03 {:xw} 0.96 {:yi} 0.05 {:yr} 10 {:yw} 0 {:Π} 21.6318 {:α} 0.02 {:β} 0.015 {:δ} 0.02 {:λ} 0.904922 {:λw} 0.01 {:πr} 0.0697205 {:τCB} 1 {:τCW} 0.02 {:τP} 1 {:τR} 15.3462 {:ω} 0.789773 {:∂λ} -0.01832 -0.33137 {:1-s} 0.7 {:100} 100 {:ConsB} 0.0206735 {:ConsW} 82.3047 {:DF} 1.92326 {:DW} 1.64609 {:EB} 0.0206735 {:IR} 11.7307 {:Ifn} 0.116704 {:InfMarkup} 12.1289 {:InfSD} 29.6636 {:IntDF} 0.0192326 {:IntDW} 0.0164609 {:IntL} 0.179501 {:Invest} 12.2555 {:K} 315.04 {:KR} 301.551 {:L} 99.8531 {:LF} 3.59003 {:N} 110.548 {:P} 1.04473 {:PK} 1.04473 {:PNeo} 0.816609 {:Repay} 0.230009 {:W} 0.825466 {:Wfn} -0.0376566 {:Wages} 82.4253 {:Y} 105.013 {:YR} 100.517 {:a} 1.00665 {:dr} 0.0341864 {:infNeo} 0.296636 {:infr} 0.121289 {:mi} 0 {:mr} 3 {:mw} -0.04 {:rD} 0.01 {:rL} 0.05 {:si} 2 {:sr} 100 {:sw} 2 {:v} 3 {:xi} 0.05 {:xr} 0.03 {:xw} 0.96 {:yi} 0.05 {:yr} 10 {:yw} 0 {:Π} 22.4279 {:α} 0.02 {:β} 0.015 {:δ} 0.02 {:λ} 0.903254 {:λw} 0.01 {:πr} 0.0711905 {:τCB} 1 {:τCW} 0.02 {:τP} 1 {:τR} 15.6082 {:ω} 0.784902 {:∂λ} -0.0160986 -0.44331 {:1-s} 0.7 {:100} 100 {:ConsB} 0.0366974 {:ConsW} 83.0522 {:DF} 3.28761 {:DW} 1.66104 {:EB} 0.0366974 {:IR} 12.4954 {:Ifn} 0.124032 {:InfMarkup} 11.4046 {:InfSD} -23.578 {:IntDF} 0.0328761 {:IntDW} 0.0166104 {:IntL} 0.249267 {:Invest} 13.2275 {:K} 319.937 {:KR} 302.231 {:L} 99.8543 {:LF} 4.98535 {:N} 110.734 {:P} 1.05858 {:PK} 1.05858 {:PNeo} 0.826691 {:Repay} 0.313832 {:W} 0.83287 {:Wfn} -0.0378264 {:Wages} 83.1657 {:Y} 106.646 {:YR} 100.744 {:a} 1.00891 {:dr} 0.0467469 {:infNeo} -0.23578 {:infr} 0.114046 {:mi} 0 {:mr} 3 {:mw} -0.04 {:rD} 0.01 {:rL} 0.05 {:si} 2 {:sr} 100 {:sw} 2 {:v} 3 {:xi} 0.05 {:xr} 0.03 {:xw} 0.96 {:yi} 0.05 {:yr} 10 {:yw} 0 {:Π} 23.2635 {:α} 0.02 {:β} 0.015 {:δ} 0.02 {:λ} 0.90175 {:λw} 0.01 {:πr} 0.0727129 {:τCB} 1 {:τCW} 0.02 {:τP} 1 {:τR} 15.8854 {:ω} 0.779832 {:∂λ} -0.013656 -0.552444 {:1-s} 0.7 {:100} 100 {:ConsB} 0.056606 {:ConsW} 83.7435 {:DF} 4.71295 {:DW} 1.67487 {:EB} 0.056606 {:IR} 13.2847 {:Ifn} 0.131542 {:InfMarkup} 10.7014 {:InfSD} 31.9006 {:IntDF} 0.0471295 {:IntDW} 0.0167487 {:IntL} 0.322221 {:Invest} 14.2336 {:K} 324.619 {:KR} 302.977 {:L} 99.8825 {:LF} 6.44443 {:N} 110.915 {:P} 1.07143 {:PK} 1.07143 {:PNeo} 0.827155 {:Repay} 0.398819 {:W} 0.839487 {:Wfn} -0.0379551 {:Wages} 83.8501 {:Y} 108.206 {:YR} 100.992 {:a} 1.01111 {:dr} 0.0595569 {:infNeo} 0.319006 {:infr} 0.107014 {:mi} 0 {:mr} 3 {:mw} -0.04 {:rD} 0.01 {:rL} 0.05 {:si} 2 {:sr} 100 {:sw} 2 {:v} 3 {:xi} 0.05 {:xr} 0.03 {:xw} 0.96 {:yi} 0.05 {:yr} 10 {:yw} 0 {:Π} 24.081 {:α} 0.02 {:β} 0.015 {:δ} 0.02 {:λ} 0.900529 {:λw} 0.01 {:πr} 0.0741825 {:τCB} 1 {:τCW} 0.02 {:τP} 1 {:τR} 16.1588 {:ω} 0.77491 {:∂λ} -0.0111528 -0.659906 {:1-s} 0.7 {:100} 100 {:ConsB} 0.0803276 {:ConsW} 84.3886 {:DF} 6.21422 {:DW} 1.68777 {:EB} 0.0803276 {:IR} 14.1056 {:Ifn} 0.139293 {:InfMarkup} 10.0124 {:InfSD} -14.263 {:IntDF} 0.0621422 {:IntDW} 0.0168777 {:IntL} 0.399116 {:Invest} 15.2823 {:K} 329.139 {:KR} 303.796 {:L} 99.9376 {:LF} 7.98232 {:N} 111.094 {:P} 1.08342 {:PK} 1.08342 {:PNeo} 0.835312 {:Repay} 0.485819 {:W} 0.845413 {:Wfn} -0.0380504 {:Wages} 84.4886 {:Y} 109.713 {:YR} 101.265 {:a} 1.01329 {:dr} 0.0727563 {:infNeo} -0.14263 {:infr} 0.100124 {:mi} 0 {:mr} 3 {:mw} -0.04 {:rD} 0.01 {:rL} 0.05 {:si} 2 {:sr} 100 {:sw} 2 {:v} 3 {:xi} 0.05 {:xr} 0.03 {:xw} 0.96 {:yi} 0.05 {:yr} 10 {:yw} 0 {:Π} 24.8875 {:α} 0.02 {:β} 0.015 {:δ} 0.02 {:λ} 0.899575 {:λw} 0.01 {:πr} 0.075614 {:τCB} 1 {:τCW} 0.02 {:τP} 1 {:τR} 16.4306 {:ω} 0.770087 {:∂λ} -0.00856893 -0.774203 {:1-s} 0.7 {:100} 100 {:ConsB} 0.110054 {:ConsW} 85.0369 {:DF} 7.92405 {:DW} 1.70074 {:EB} 0.110054 {:IR} 15.0279 {:Ifn} 0.14793 {:InfMarkup} 9.28351 {:InfSD} 45.4288 {:IntDF} 0.0792405 {:IntDW} 0.0170074 {:IntL} 0.486742 {:Invest} 16.4621 {:K} 333.85 {:KR} 304.765 {:L} 100.027 {:LF} 9.73484 {:N} 111.285 {:P} 1.09543 {:PK} 1.09543 {:PNeo} 0.834426 {:Repay} 0.582147 {:W} 0.851067 {:Wfn} -0.0381207 {:Wages} 85.13 {:Y} 111.283 {:YR} 101.588 {:a} 1.0156 {:dr} 0.0874779 {:infNeo} 0.454288 {:infr} 0.0928351 {:mi} 0 {:mr} 3 {:mw} -0.04 {:rD} 0.01 {:rL} 0.05 {:si} 2 {:sr} 100 {:sw} 2 {:v} 3 {:xi} 0.05 {:xr} 0.03 {:xw} 0.96 {:yi} 0.05 {:yr} 10 {:yw} 0 {:Π} 25.7458 {:α} 0.02 {:β} 0.015 {:δ} 0.02 {:λ} 0.898841 {:λw} 0.01 {:πr} 0.0771179 {:τCB} 1 {:τCW} 0.02 {:τP} 1 {:τR} 16.7223 {:ω} 0.764985 {:∂λ} -0.00569007 -0.878517 {:1-s} 0.7 {:100} 100 {:ConsB} 0.14126 {:ConsW} 85.5955 {:DF} 9.59218 {:DW} 1.71191 {:EB} 0.14126 {:IR} 15.9155 {:Ifn} 0.156166 {:InfMarkup} 8.62222 {:InfSD} -18.4229 {:IntDF} 0.0959218 {:IntDW} 0.0171191 {:IntL} 0.572267 {:Invest} 17.598 {:K} 338.062 {:KR} 305.742 {:L} 100.139 {:LF} 11.4453 {:N} 111.459 {:P} 1.10571 {:PK} 1.10571 {:PNeo} 0.842791 {:Repay} 0.673635 {:W} 0.855637 {:Wfn} -0.0381584 {:Wages} 85.6825 {:Y} 112.687 {:YR} 101.914 {:a} 1.01773 {:dr} 0.101567 {:infNeo} -0.184229 {:infr} 0.0862222 {:mi} 0 {:mr} 3 {:mw} -0.04 {:rD} 0.01 {:rL} 0.05 {:si} 2 {:sr} 100 {:sw} 2 {:v} 3 {:xi} 0.05 {:xr} 0.03 {:xw} 0.96 {:yi} 0.05 {:yr} 10 {:yw} 0 {:Π} 26.5286 {:α} 0.02 {:β} 0.015 {:δ} 0.02 {:λ} 0.898435 {:λw} 0.01 {:πr} 0.0784724 {:τCB} 1 {:τCW} 0.02 {:τP} 1 {:τR} 16.9904 {:ω} 0.760356 {:∂λ} -0.00294462 -0.992303 {:1-s} 0.7 {:100} 100 {:ConsB} 0.179799 {:ConsW} 86.1698 {:DF} 11.5356 {:DW} 1.7234 {:EB} 0.179799 {:IR} 16.935 {:Ifn} 0.165536 {:InfMarkup} 7.9055 {:InfSD} 53.0229 {:IntDF} 0.115356 {:IntDW} 0.017234 {:IntL} 0.671938 {:Invest} 18.9021 {:K} 342.563 {:KR} 306.913 {:L} 100.294 {:LF} 13.4388 {:N} 111.65 {:P} 1.11616 {:PK} 1.11616 {:PNeo} 0.839695 {:Repay} 0.777499 {:W} 0.859976 {:Wfn} -0.0381715 {:Wages} 86.2504 {:Y} 114.188 {:YR} 102.304 {:a} 1.02004 {:dr} 0.11769 {:infNeo} 0.530229 {:infr} 0.079055 {:mi} 0 {:mr} 3 {:mw} -0.04 {:rD} 0.01 {:rL} 0.05 {:si} 2 {:sr} 100 {:sw} 2 {:v} 3 {:xi} 0.05 {:xr} 0.03 {:xw} 0.96 {:yi} 0.05 {:yr} 10 {:yw} 0 {:Π} 27.3808 {:α} 0.02 {:β} 0.015 {:δ} 0.02 {:λ} 0.898293 {:λw} 0.01 {:πr} 0.0799291 {:τCB} 1 {:τCW} 0.02 {:τP} 1 {:τR} 17.2846 {:ω} 0.755338 {:∂λ} 0.00017853 +nsteps, 10 +0.03063738336663189,":1-s",0.7,":100",100.0,":Cons_B",0.00018204891620842497,":Cons_W",62.83519847873685,":D_F",-0.955865928569495,":D_W",1.256703969574737,":E_B",0.00018204891620842497,":I_R",9.893549869236779,":I_{fn}",0.09889699084741772,":Inf_{Markup}",14.085840070816404,":Inf_{SD}",1671.0879220341276,":Int_{DF}",-0.009558659285694951,":Int_{DW}",0.012567039695747372,":Int_L",0.015051004496072532,":Invest",9.936642297411943,":K",301.4240032664673,"K_R",300.11681198169964,":L",99.97765747820314,":L_F",0.30102008992145063,"N",110.05056330011912,"P",1.0043556083250924,":P_K",1.0043556083250924,"P_{Neo}",0.5382053898307259,":Repay",0.020224039320314108,"W",0.8025708959478424,":W_{fn}",-0.03695838216272887,":Wages",80.239158137048,":Y",100.47466775548911,":Y_R",100.03893732723321,"a",1.000612935435534,":d_r",0.00299597994843835,":inf_{Neo}",16.710879220341276,":inf_r",0.14085840070816405,":m_i",0.0,":m_r",3.0,":m_w",-0.04,":r_D",0.01,":r_L",0.05,":s_i",2.0,":s_r",100.0,":s_w",2.0,":v",3.0,":x_i",0.05,":x_r",0.03,":x_w",0.96,":y_i",0.05,":y_r",10.0,":y_w",0.0,":\Pi",20.21089995465934,":\alpha",0.02,":\beta",0.015,":\delta",0.02,":\lambda",0.9084702020611549,":\lambda_w",0.01,":\pi_r",0.06705139516308638,":\tau_{CB}",1.0,":\tau_{CW}",0.02,":\tau_P",1.0,":\tau_R",14.884271393751193,":\omega",0.7986008804957146,":\partial\lambda",-0.0220343363841941 +0.0884030535496019,":1-s",0.7,":100",100.0,":Cons_B",0.001505334994059747,":Cons_W",79.59377710982545,":D_F",-0.7089103681933228,":D_W",1.5918755421965092,":E_B",0.001505334994059747,":I_R",10.219925359619458,":I_{fn}",0.1020798948233008,":Inf_{Markup}",13.709116741661816,":Inf_{SD}",131.0601685431938,":Int_{DF}",-0.007089103681933228,":Int_{DW}",0.01591875542196509,":Int_L",0.04422352544986233,":Invest",10.347173519574019,":K",304.09044418055674,"K_R",300.3507804541738,":L",99.94007036977594,":L_F",0.8844705089972464,"N",110.14596179298012,"P",1.0124509872114467,":P_K",1.0124509872114467,"P_{Neo}",0.7847502903719165,":Repay",0.05888820870998671,"W",0.807300447911414,":W_{fn}",-0.037125193398735656,":Wages",80.68166357381834,":Y",101.36348139351891,":Y_R",100.11692681805793,"a",1.0017696250125463,":d_r",0.008725731366343921,":inf_{Neo}",1.3106016854319382,":inf_r",0.13709116741661817,":m_i",0.0,":m_r",3.0,":m_w",-0.04,":r_D",0.01,":r_L",0.05,":s_i",2.0,":s_r",100.0,":s_w",2.0,":v",3.0,":x_i",0.05,":x_r",0.03,":x_w",0.96,":y_i",0.05,":y_r",10.0,":y_w",0.0,":\Pi",20.63050519056877,":\alpha",0.02,":\beta",0.015,":\delta",0.02,":\lambda",0.9073421189749452,":\lambda_w",0.01,":\pi_r",0.067843319595795,":\tau_{CB}",1.0,":\tau_{CW}",0.02,":\tau_P",1.0,":\tau_R",15.019484008302857,":\omega",0.7959638171916327,":\partial\lambda",-0.02097336839223307 +0.22421305877259273,":1-s",0.7,":100",100.0,":Cons_B",0.009551820251278938,":Cons_W",81.55296031187373,":D_F",0.7040022459824196,":D_W",1.6310592062374747,":E_B",0.009551820251278938,":I_R",11.03982606563491,":I_{fn}",0.11003986653690295,":Inf_{Markup}",12.824724266516016,":Inf_{SD}",-28.353425732447867,":Int_{DF}",0.007040022459824196,":Int_{DW}",0.016310592062374746,":Int_L",0.1172306636235587,":Invest",11.38049521984442,":K",310.264695278266,"K_R",300.97708438966333,":L",99.87681537694934,":L_F",2.344613272471174,"N",110.37057435474682,"P",1.030858199412213,":P_K",1.030858199412213,"P_{Neo}",0.8152813942891761,":Repay",0.15278167252972083,"W",0.8178030771740297,":W_{fn}",-0.03745277599816632,":Wages",81.67956695361161,":Y",103.42156509275534,":Y_R",100.32569479655444,"a",1.004494330520161,":d_r",0.022670448570067264,":inf_{Neo}",-0.2835342573244787,":inf_r",0.12824724266516016,":m_i",0.0,":m_r",3.0,":m_w",-0.04,":r_D",0.01,":r_L",0.05,":s_i",2.0,":s_r",100.0,":s_w",2.0,":v",3.0,":x_i",0.05,":x_r",0.03,":x_w",0.96,":y_i",0.05,":y_r",10.0,":y_w",0.0,":\Pi",21.63180749797999,":\alpha",0.02,":\beta",0.015,":\delta",0.02,":\lambda",0.9049224937068006,":\lambda_w",0.01,":\pi_r",0.06972049294419125,":\tau_{CB}",1.0,":\tau_{CW}",0.02,":\tau_P",1.0,":\tau_R",15.346168382958847,":\omega",0.789773069865612,":\partial\lambda",-0.01832004448769902 +0.3313695401537761,":1-s",0.7,":100",100.0,":Cons_B",0.020673520824860025,":Cons_W",82.30469192141524,":D_F",1.923259973578532,":D_W",1.6460938384283048,":E_B",0.020673520824860025,":I_R",11.73074527353189,":I_{fn}",0.11670405223030192,":Inf_{Markup}",12.128922426590409,":Inf_{SD}",29.663600282840086,":Int_{DF}",0.01923259973578532,":Int_{DW}",0.016460938384283048,":Int_L",0.1795013666415849,":Invest",12.2554947915845,":K",315.04034069184763,"K_R",301.5511042508436,":L",99.8530716802276,":L_F",3.5900273328316974,"N",110.54812084188605,"P",1.0447328371571245,":P_K",1.0447328371571245,"P_{Neo}",0.8166091446452045,":Repay",0.2300094554702985,"W",0.8254659681398796,":W_{fn}",-0.03765661317033494,":Wages",82.42531248625987,":Y",105.01344689728255,":Y_R",100.5170347502812,"a",1.0066494005530435,":d_r",0.03418635840363599,":inf_{Neo}",0.29663600282840086,":inf_r",0.12128922426590408,":m_i",0.0,":m_r",3.0,":m_w",-0.04,":r_D",0.01,":r_L",0.05,":s_i",2.0,":s_r",100.0,":s_w",2.0,":v",3.0,":x_i",0.05,":x_r",0.03,":x_w",0.96,":y_i",0.05,":y_r",10.0,":y_w",0.0,":\Pi",22.427865644116878,":\alpha",0.02,":\beta",0.015,":\delta",0.02,":\lambda",0.9032543558388,":\lambda_w",0.01,":\pi_r",0.07119045641857778,":\tau_{CB}",1.0,":\tau_{CW}",0.02,":\tau_P",1.0,":\tau_R",15.608172827030947,":\omega",0.7849024569861329,":\partial\lambda",-0.016098649256566032 +0.443310255696468,":1-s",0.7,":100",100.0,":Cons_B",0.03669743306288952,":Cons_W",83.05223782713968,":D_F",3.287607450368236,":D_W",1.6610447565427937,":E_B",0.03669743306288952,":I_R",12.495425172179091,":I_{fn}",0.12403196114466815,":Inf_{Markup}",11.404601314573508,":Inf_{SD}",-23.578017316099242,":Int_{DF}",0.03287607450368236,":Int_{DW}",0.016610447565427938,":Int_L",0.24926748199869608,":Invest",13.22746453541965,":K",319.936839182719,"K_R",302.230773186067,":L",99.85432574947458,":L_F",4.985349639973921,"N",110.73389930577767,"P",1.058584590212299,":P_K",1.058584590212299,"P_{Neo}",0.8266913240412721,":Repay",0.31383226541031817,"W",0.8328701176516372,":W_{fn}",-0.037826380118348914,":Wages",83.16568403498981,":Y",106.64561306090634,":Y_R",100.74359106202233,"a",1.0089056263298881,":d_r",0.046746879659519985,":inf_{Neo}",-0.23578017316099242,":inf_r",0.11404601314573508,":m_i",0.0,":m_r",3.0,":m_w",-0.04,":r_D",0.01,":r_L",0.05,":s_i",2.0,":s_r",100.0,":s_w",2.0,":v",3.0,":x_i",0.05,":x_r",0.03,":x_w",0.96,":y_i",0.05,":y_r",10.0,":y_w",0.0,":\Pi",23.26353761842151,":\alpha",0.02,":\beta",0.015,":\delta",0.02,":\lambda",0.9017502894370176,":\lambda_w",0.01,":\pi_r",0.07271290695328611,":\tau_{CB}",1.0,":\tau_{CW}",0.02,":\tau_P",1.0,":\tau_R",15.885395446691419,":\omega",0.7798322092020146,":\partial\lambda",-0.013656012951777291 +0.5524442431799447,":1-s",0.7,":100",100.0,":Cons_B",0.05660600972301518,":Cons_W",83.74349041026588,":D_F",4.712952975901478,":D_W",1.6748698082053177,":E_B",0.05660600972301518,":I_R",13.284687137687994,":I_{fn}",0.1315416950203268,":Inf_{Markup}",10.7014487099722,":Inf_{SD}",31.90055251363709,":Int_{DF}",0.047129529759014785,":Int_{DW}",0.016748698082053176,":Int_L",0.32222143969149075,":Invest",14.233624225041428,":K",324.6185376319335,"K_R",302.97664483421346,":L",99.88250540538365,":L_F",6.444428793829815,"N",110.91532023889967,"P",1.0714308946472173,":P_K",1.0714308946472173,"P_{Neo}",0.827155136729476,":Repay",0.3988190797240615,"W",0.8394870077158181,":W_{fn}",-0.037955100115737786,":Wages",83.85006558592455,":Y",108.20617921064452,":Y_R",100.99221494473782,"a",1.011110149218327,":d_r",0.05955693880738984,":inf_{Neo}",0.3190055251363709,":inf_r",0.107014487099722,":m_i",0.0,":m_r",3.0,":m_w",-0.04,":r_D",0.01,":r_L",0.05,":s_i",2.0,":s_r",100.0,":s_w",2.0,":v",3.0,":x_i",0.05,":x_r",0.03,":x_w",0.96,":y_i",0.05,":y_r",10.0,":y_w",0.0,":\Pi",24.081021714787497,":\alpha",0.02,":\beta",0.015,":\delta",0.02,":\lambda",0.9005293875566286,":\lambda_w",0.01,":\pi_r",0.07418252170826915,":\tau_{CB}",1.0,":\tau_{CW}",0.02,":\tau_P",1.0,":\tau_R",16.15877755469634,":\omega",0.7749101409698053,":\partial\lambda",-0.01115276832655774 +0.6599056976085496,":1-s",0.7,":100",100.0,":Cons_B",0.08032763557025313,":Cons_W",84.38860808171329,":D_F",6.214217540702937,":D_W",1.6877721616342658,":E_B",0.08032763557025313,":I_R",14.105569993497811,":I_{fn}",0.1392932149841044,":Inf_{Markup}",10.012389719927045,":Inf_{SD}",-14.262996307443117,":Int_{DF}",0.062142175407029376,":Int_{DW}",0.01687772161634266,":Int_L",0.39911586689537293,":Invest",15.282282925220565,":K",329.1391384777324,"K_R",303.79591701808624,":L",99.93757566805024,":L_F",7.982317337907459,"N",111.094251236015,"P",1.083421863296923,":P_K",1.083421863296923,"P_{Neo}",0.8353115176643513,":Repay",0.48581925244408386,"W",0.8454133510367766,":W_{fn}",-0.03805042085290019,":Wages",84.48856074001779,":Y",109.71304615924414,":Y_R",101.26530567269542,"a",1.0132855934894331,":d_r",0.07275631857237325,":inf_{Neo}",-0.14262996307443118,":inf_r",0.10012389719927045,":m_i",0.0,":m_r",3.0,":m_w",-0.04,":r_D",0.01,":r_L",0.05,":s_i",2.0,":s_r",100.0,":s_w",2.0,":v",3.0,":x_i",0.05,":x_r",0.03,":x_w",0.96,":y_i",0.05,":y_r",10.0,":y_w",0.0,":\Pi",24.887511727738016,":\alpha",0.02,":\beta",0.015,":\delta",0.02,":\lambda",0.899574681463374,":\lambda_w",0.01,":\pi_r",0.07561395415580988,":\tau_{CB}",1.0,":\tau_{CW}",0.02,":\tau_P",1.0,":\tau_R",16.43063196394465,":\omega",0.7700867280394894,":\partial\lambda",-0.008568928338631869 +0.7742032809807866,":1-s",0.7,":100",100.0,":Cons_B",0.11005358771257223,":Cons_W",85.03694290628336,":D_F",7.924045082780559,":D_W",1.700738858125667,":E_B",0.11005358771257223,":I_R",15.027931310573802,":I_{fn}",0.14792978418812203,":Inf_{Markup}",9.283508376044468,":Inf_{SD}",45.42883497228242,":Int_{DF}",0.07924045082780559,":Int_{DW}",0.01700738858125667,":Int_L",0.4867418764309401,":Invest",16.462119304619456,":K",333.8499963675593,"K_R",304.76481919549366,":L",100.02738917895209,":L_F",9.734837528618801,"N",111.28488167044746,"P",1.0954348249540204,":P_K",1.0954348249540204,"P_{Neo}",0.8344262953945558,":Repay",0.5821468996744552,"W",0.8510672067485279,":W_{fn}",-0.03812066468999716,":Wages",85.13003070687869,":Y",111.28333212251977,":Y_R",101.58827306516456,"a",1.0156045648999195,":d_r",0.08747794789161259,":inf_{Neo}",0.45428834972282417,":inf_r",0.09283508376044468,":m_i",0.0,":m_r",3.0,":m_w",-0.04,":r_D",0.01,":r_L",0.05,":s_i",2.0,":s_r",100.0,":s_w",2.0,":v",3.0,":x_i",0.05,":x_r",0.03,":x_w",0.96,":y_i",0.05,":y_r",10.0,":y_w",0.0,":\Pi",25.745799990037952,":\alpha",0.02,":\beta",0.015,":\delta",0.02,":\lambda",0.8988407740340449,":\lambda_w",0.01,":\pi_r",0.07711786811491399,":\tau_{CB}",1.0,":\tau_{CW}",0.02,":\tau_P",1.0,":\tau_R",16.722304171099527,":\omega",0.7649845586323112,":\partial\lambda",-0.005690071937292665 +0.8785171816507462,":1-s",0.7,":100",100.0,":Cons_B",0.1412604481713063,":Cons_W",85.5955106826358,":D_F",9.592175435656813,":D_W",1.711910213652716,":E_B",0.1412604481713063,":I_R",15.915490436755839,":I_{fn}",0.15616613402209553,":Inf_{Markup}",8.622222168469044,":Inf_{SD}",-18.422885191879708,":Int_{DF}",0.09592175435656813,":Int_{DW}",0.01711910213652716,":Int_L",0.5722673048740419,":Invest",17.59796033649177,":K",338.0622907781379,"K_R",305.7415207801199,":L",100.13881860067464,":L_F",11.445346097480837,"N",111.45914637301406,"P",1.1057127272591218,":P_K",1.1057127272591218,"P_{Neo}",0.8427907070916292,":Repay",0.6736348803480439,"W",0.8556373521668434,":W_{fn}",-0.0381583928923516,":Wages",85.6825135965971,":Y",112.6874302593793,":Y_R",101.91384026003998,"a",1.0177256101496825,":d_r",0.10156719406180804,":inf_{Neo}",-0.1842288519187971,":inf_r",0.08622222168469043,":m_i",0.0,":m_r",3.0,":m_w",-0.04,":r_D",0.01,":r_L",0.05,":s_i",2.0,":s_r",100.0,":s_w",2.0,":v",3.0,":x_i",0.05,":x_r",0.03,":x_w",0.96,":y_i",0.05,":y_r",10.0,":y_w",0.0,":\Pi",26.528571112264714,":\alpha",0.02,":\beta",0.015,":\delta",0.02,":\lambda",0.8984351832872081,":\lambda_w",0.01,":\pi_r",0.07847243492080214,":\tau_{CB}",1.0,":\tau_{CW}",0.02,":\tau_P",1.0,":\tau_R",16.99042972888729,":\omega",0.7603555551792832,":\partial\lambda",-0.00294462199263483 +0.9923026455801952,":1-s",0.7,":100",100.0,":Cons_B",0.17979879583929737,":Cons_W",86.16984478435708,":D_F",11.535574292819671,":D_W",1.7233968956871417,":E_B",0.17979879583929737,":I_R",16.93500096176375,":I_{fn}",0.16553558991301184,":Inf_{Markup}",7.905497628694944,":Inf_{SD}",53.02286890217772,":Int_{DF}",0.11535574292819671,":Int_{DW}",0.017233968956871418,":Int_L",0.6719384992173055,":Invest",18.902142442203793,":K",342.56335665587284,"K_R",306.9128693834905,":L",100.29396790609067,":L_F",13.43876998434611,"N",111.6495452716842,"P",1.116158332962691,":P_K",1.116158332962691,"P_{Neo}",0.8396951223536456,":Repay",0.7774991793261117,"W",0.8599762334907182,":W_{fn}",-0.03817146910384632,":Wages",86.25042876171882,":Y",114.18778555195762,":Y_R",102.30428979449682,"a",1.0200442950894963,":d_r",0.11769008322025137,":inf_{Neo}",0.5302286890217772,":inf_r",0.07905497628694944,":m_i",0.0,":m_r",3.0,":m_w",-0.04,":r_D",0.01,":r_L",0.05,":s_i",2.0,":s_r",100.0,":s_w",2.0,":v",3.0,":x_i",0.05,":x_r",0.03,":x_w",0.96,":y_i",0.05,":y_r",10.0,":y_w",0.0,":\Pi",27.38077403394969,":\alpha",0.02,":\beta",0.015,":\delta",0.02,":\lambda",0.8982926680268938,":\lambda_w",0.01,":\pi_r",0.07992908027654418,":\tau_{CB}",1.0,":\tau_{CW}",0.02,":\tau_P",1.0,":\tau_R",17.284609864146745,":\omega",0.7553384834008646,":\partial\lambda",0.00017852997100394064 diff --git a/test/exampleLogs/PredatorPrey.mky.log b/test/exampleLogs/PredatorPrey.mky.log index 59eb2f597..49e60e0d2 100644 --- a/test/exampleLogs/PredatorPrey.mky.log +++ b/test/exampleLogs/PredatorPrey.mky.log @@ -1,11 +1,11 @@ -nsteps 10 -0.3 {:.0008} 0.0008 {:.001} 0.001 {:Predator} 113.453 {:Predator␣Births} 19.0235 {:Predator␣Birth␣Rate} 0.167678 {:Predator␣Deaths} 13.6143 {:Predator␣Death␣Rate} 0.12 {:Prey} 167.678 {:Prey␣Births} 26.8285 {:Prey␣Birth␣Rate} 0.16 {:Prey␣Deaths} 15.2188 {:Prey␣Death␣Rate} 0.0907623 -1 {:.0008} 0.0008 {:.001} 0.001 {:Predator} 117.637 {:Predator␣Births} 20.6813 {:Predator␣Birth␣Rate} 0.175805 {:Predator␣Deaths} 14.1165 {:Predator␣Death␣Rate} 0.12 {:Prey} 175.805 {:Prey␣Births} 28.1289 {:Prey␣Birth␣Rate} 0.16 {:Prey␣Deaths} 16.545 {:Prey␣Death␣Rate} 0.0941099 -1.7 {:.0008} 0.0008 {:.001} 0.001 {:Predator} 122.67 {:Predator␣Births} 22.5531 {:Predator␣Birth␣Rate} 0.183852 {:Predator␣Deaths} 14.7204 {:Predator␣Death␣Rate} 0.12 {:Prey} 183.852 {:Prey␣Births} 29.4164 {:Prey␣Birth␣Rate} 0.16 {:Prey␣Deaths} 18.0425 {:Prey␣Death␣Rate} 0.0981358 -2.4 {:.0008} 0.0008 {:.001} 0.001 {:Predator} 128.631 {:Predator␣Births} 24.6557 {:Predator␣Birth␣Rate} 0.191678 {:Predator␣Deaths} 15.4357 {:Predator␣Death␣Rate} 0.12 {:Prey} 191.678 {:Prey␣Births} 30.6684 {:Prey␣Birth␣Rate} 0.16 {:Prey␣Deaths} 19.7246 {:Prey␣Death␣Rate} 0.102905 -3.1 {:.0008} 0.0008 {:.001} 0.001 {:Predator} 135.606 {:Predator␣Births} 27.0011 {:Predator␣Birth␣Rate} 0.199114 {:Predator␣Deaths} 16.2727 {:Predator␣Death␣Rate} 0.12 {:Prey} 199.114 {:Prey␣Births} 31.8582 {:Prey␣Birth␣Rate} 0.16 {:Prey␣Deaths} 21.6009 {:Prey␣Death␣Rate} 0.108485 -3.8 {:.0008} 0.0008 {:.001} 0.001 {:Predator} 143.678 {:Predator␣Births} 29.5933 {:Predator␣Birth␣Rate} 0.20597 {:Predator␣Deaths} 17.2413 {:Predator␣Death␣Rate} 0.12 {:Prey} 205.97 {:Prey␣Births} 32.9552 {:Prey␣Birth␣Rate} 0.16 {:Prey␣Deaths} 23.6747 {:Prey␣Death␣Rate} 0.114942 -4.5 {:.0008} 0.0008 {:.001} 0.001 {:Predator} 152.922 {:Predator␣Births} 32.4244 {:Predator␣Birth␣Rate} 0.212032 {:Predator␣Deaths} 18.3506 {:Predator␣Death␣Rate} 0.12 {:Prey} 212.032 {:Prey␣Births} 33.9252 {:Prey␣Birth␣Rate} 0.16 {:Prey␣Deaths} 25.9395 {:Prey␣Death␣Rate} 0.122338 -5.2 {:.0008} 0.0008 {:.001} 0.001 {:Predator} 163.397 {:Predator␣Births} 35.4688 {:Predator␣Birth␣Rate} 0.217072 {:Predator␣Deaths} 19.6076 {:Predator␣Death␣Rate} 0.12 {:Prey} 217.072 {:Prey␣Births} 34.7315 {:Prey␣Birth␣Rate} 0.16 {:Prey␣Deaths} 28.375 {:Prey␣Death␣Rate} 0.130717 -5.9 {:.0008} 0.0008 {:.001} 0.001 {:Predator} 175.131 {:Predator␣Births} 38.6783 {:Predator␣Birth␣Rate} 0.220854 {:Predator␣Deaths} 21.0157 {:Predator␣Death␣Rate} 0.12 {:Prey} 220.854 {:Prey␣Births} 35.3366 {:Prey␣Birth␣Rate} 0.16 {:Prey␣Deaths} 30.9426 {:Prey␣Death␣Rate} 0.140105 -6.6 {:.0008} 0.0008 {:.001} 0.001 {:Predator} 188.11 {:Predator␣Births} 41.977 {:Predator␣Birth␣Rate} 0.223151 {:Predator␣Deaths} 22.5732 {:Predator␣Death␣Rate} 0.12 {:Prey} 223.151 {:Prey␣Births} 35.7042 {:Prey␣Birth␣Rate} 0.16 {:Prey␣Deaths} 33.5816 {:Prey␣Death␣Rate} 0.150488 +nsteps, 10 +0.30000000000000004,":.0008",0.0008,":.001",0.001,"Predator",113.45281718872222,":Predator Births",19.023544612753913,":Predator Birth Rate",0.16767802760780584,":Predator Deaths",13.614338062646667,":Predator Death Rate",0.12,"Prey",167.67802760780583,":Prey Births",26.828484417248934,":Prey Birth Rate",0.16,":Prey Deaths",15.21883569020313,":Prey Death Rate",0.09076225375097778 +1.0,":.0008",0.0008,":.001",0.001,"Predator",117.63743375261843,":Predator Births",20.681304591884466,":Predator Birth Rate",0.1758054722221797,":Predator Deaths",14.116492050314212,":Predator Death Rate",0.12,"Prey",175.8054722221797,":Prey Births",28.128875555548753,":Prey Birth Rate",0.16,":Prey Deaths",16.545043673507575,":Prey Death Rate",0.09410994700209475 +1.7000000000000002,":.0008",0.0008,":.001",0.001,"Predator",122.66979090925551,":Predator Births",22.553140958315854,":Predator Birth Rate",0.1838524447718302,":Predator Deaths",14.72037490911066,":Predator Death Rate",0.12,"Prey",183.8524447718302,":Prey Births",29.416391163492833,":Prey Birth Rate",0.16,":Prey Deaths",18.042512766652685,":Prey Death Rate",0.0981358327274044 +2.4000000000000004,":.0008",0.0008,":.001",0.001,"Predator",128.6311688300074,":Predator Births",24.65570772554839,":Predator Birth Rate",0.1916775533473707,":Predator Deaths",15.435740259600887,":Predator Death Rate",0.12,"Prey",191.6775533473707,":Prey Births",30.66840853557931,":Prey Birth Rate",0.16,":Prey Deaths",19.724566180438714,":Prey Death Rate",0.10290493506400593 +3.1000000000000005,":.0008",0.0008,":.001",0.001,"Predator",135.60607761304658,":Predator Births",27.001065106500626,":Predator Birth Rate",0.19911397469624081,":Predator Deaths",16.272729313565588,":Predator Death Rate",0.12,"Prey",199.1139746962408,":Prey Births",31.85823595139853,":Prey Birth Rate",0.16,":Prey Deaths",21.6008520852005,":Prey Death Rate",0.10848486209043727 +3.8000000000000007,":.0008",0.0008,":.001",0.001,"Predator",143.6778276204288,":Predator Births",29.59333476301195,":Predator Birth Rate",0.2059700877521079,":Predator Deaths",17.241339314451455,":Predator Death Rate",0.12,"Prey",205.9700877521079,":Prey Births",32.95521404033727,":Prey Birth Rate",0.16,":Prey Deaths",23.67466781040956,":Prey Death Rate",0.11494226209634303 +4.5,":.0008",0.0008,":.001",0.001,"Predator",152.92188465262137,":Predator Births",32.424400791642356,":Predator Birth Rate",0.21203244300381136,":Predator Deaths",18.350626158314565,":Predator Death Rate",0.12,"Prey",212.03244300381135,":Prey Births",33.92519088060982,":Prey Birth Rate",0.16,":Prey Deaths",25.939520633313887,":Prey Death Rate",0.1223375077220971 +5.199999999999999,":.0008",0.0008,":.001",0.001,"Predator",163.3965833625181,":Predator Births",35.4688035278663,":Predator Birth Rate",0.21707187994974053,":Predator Deaths",19.60759000350217,":Predator Death Rate",0.12,"Prey",217.07187994974052,":Prey Births",34.73150079195848,":Prey Birth Rate",0.16,":Prey Deaths",28.37504282229304,":Prey Death Rate",0.1307172666900145 +5.899999999999999,":.0008",0.0008,":.001",0.001,"Predator",175.1310091367096,":Predator Births",38.67830081549206,":Predator Birth Rate",0.2208535256329121,":Predator Deaths",21.01572109640515,":Predator Death Rate",0.12,"Prey",220.8535256329121,":Prey Births",35.336564101265935,":Prey Birth Rate",0.16,":Prey Deaths",30.942640652393642,":Prey Death Rate",0.14010480730936767 +6.599999999999998,":.0008",0.0008,":.001",0.001,"Predator",188.1103417550767,":Predator Births",41.977026990271376,":Predator Birth Rate",0.2231510856799478,":Predator Deaths",22.573241010609202,":Predator Death Rate",0.12,"Prey",223.15108567994778,":Prey Births",35.70417370879164,":Prey Birth Rate",0.16,":Prey Deaths",33.581621592217104,":Prey Death Rate",0.15048827340406135 diff --git a/test/exampleLogs/Solow.mky.log b/test/exampleLogs/Solow.mky.log index 3476a9fe3..8bdf1c223 100644 --- a/test/exampleLogs/Solow.mky.log +++ b/test/exampleLogs/Solow.mky.log @@ -1,11 +1,11 @@ -nsteps 10 -0.3 {:1} 1 {:A(t)␣-␣Technology␣at␣time␣t} 2 {:Beta} 0.5 {:I(t)␣-␣Investment␣at␣time␣t} 16.8583 {:K(t)␣-␣Capital␣at␣time␣t} 7.89454 {:L(t)␣-␣Labor␣at␣time␣t} 100 {:O(t)␣-␣Output␣at␣time␣t} 56.1945 {:d␣-␣Depreciation␣Rate} 0.25 {:s␣-␣Savings␣Rate} 0.3 -1 {:1} 1 {:A(t)␣-␣Technology␣at␣time␣t} 2 {:Beta} 0.5 {:I(t)␣-␣Investment␣at␣time␣t} 27.5103 {:K(t)␣-␣Capital␣at␣time␣t} 21.0226 {:L(t)␣-␣Labor␣at␣time␣t} 100 {:O(t)␣-␣Output␣at␣time␣t} 91.7009 {:d␣-␣Depreciation␣Rate} 0.25 {:s␣-␣Savings␣Rate} 0.3 -1.7 {:1} 1 {:A(t)␣-␣Technology␣at␣time␣t} 2 {:Beta} 0.5 {:I(t)␣-␣Investment␣at␣time␣t} 37.2699 {:K(t)␣-␣Capital␣at␣time␣t} 38.5846 {:L(t)␣-␣Labor␣at␣time␣t} 100 {:O(t)␣-␣Output␣at␣time␣t} 124.233 {:d␣-␣Depreciation␣Rate} 0.25 {:s␣-␣Savings␣Rate} 0.3 -2.4 {:1} 1 {:A(t)␣-␣Technology␣at␣time␣t} 2 {:Beta} 0.5 {:I(t)␣-␣Investment␣at␣time␣t} 46.2119 {:K(t)␣-␣Capital␣at␣time␣t} 59.3204 {:L(t)␣-␣Labor␣at␣time␣t} 100 {:O(t)␣-␣Output␣at␣time␣t} 154.04 {:d␣-␣Depreciation␣Rate} 0.25 {:s␣-␣Savings␣Rate} 0.3 -3.1 {:1} 1 {:A(t)␣-␣Technology␣at␣time␣t} 2 {:Beta} 0.5 {:I(t)␣-␣Investment␣at␣time␣t} 54.4047 {:K(t)␣-␣Capital␣at␣time␣t} 82.2185 {:L(t)␣-␣Labor␣at␣time␣t} 100 {:O(t)␣-␣Output␣at␣time␣t} 181.349 {:d␣-␣Depreciation␣Rate} 0.25 {:s␣-␣Savings␣Rate} 0.3 -3.8 {:1} 1 {:A(t)␣-␣Technology␣at␣time␣t} 2 {:Beta} 0.5 {:I(t)␣-␣Investment␣at␣time␣t} 61.9111 {:K(t)␣-␣Capital␣at␣time␣t} 106.472 {:L(t)␣-␣Labor␣at␣time␣t} 100 {:O(t)␣-␣Output␣at␣time␣t} 206.37 {:d␣-␣Depreciation␣Rate} 0.25 {:s␣-␣Savings␣Rate} 0.3 -4.5 {:1} 1 {:A(t)␣-␣Technology␣at␣time␣t} 2 {:Beta} 0.5 {:I(t)␣-␣Investment␣at␣time␣t} 68.7886 {:K(t)␣-␣Capital␣at␣time␣t} 131.441 {:L(t)␣-␣Labor␣at␣time␣t} 100 {:O(t)␣-␣Output␣at␣time␣t} 229.295 {:d␣-␣Depreciation␣Rate} 0.25 {:s␣-␣Savings␣Rate} 0.3 -5.2 {:1} 1 {:A(t)␣-␣Technology␣at␣time␣t} 2 {:Beta} 0.5 {:I(t)␣-␣Investment␣at␣time␣t} 75.0899 {:K(t)␣-␣Capital␣at␣time␣t} 156.625 {:L(t)␣-␣Labor␣at␣time␣t} 100 {:O(t)␣-␣Output␣at␣time␣t} 250.3 {:d␣-␣Depreciation␣Rate} 0.25 {:s␣-␣Savings␣Rate} 0.3 -5.9 {:1} 1 {:A(t)␣-␣Technology␣at␣time␣t} 2 {:Beta} 0.5 {:I(t)␣-␣Investment␣at␣time␣t} 80.8632 {:K(t)␣-␣Capital␣at␣time␣t} 181.635 {:L(t)␣-␣Labor␣at␣time␣t} 100 {:O(t)␣-␣Output␣at␣time␣t} 269.544 {:d␣-␣Depreciation␣Rate} 0.25 {:s␣-␣Savings␣Rate} 0.3 -6.6 {:1} 1 {:A(t)␣-␣Technology␣at␣time␣t} 2 {:Beta} 0.5 {:I(t)␣-␣Investment␣at␣time␣t} 86.1529 {:K(t)␣-␣Capital␣at␣time␣t} 206.176 {:L(t)␣-␣Labor␣at␣time␣t} 100 {:O(t)␣-␣Output␣at␣time␣t} 287.176 {:d␣-␣Depreciation␣Rate} 0.25 {:s␣-␣Savings␣Rate} 0.3 +nsteps, 10 +0.30000000000000004,":1",1.0,":A(t) - Technology at time t",2.0,":Beta",0.5,":I(t) - Investment at time t",16.85833647763432,"K(t) - Capital at time t",7.894541910920444,":L(t) - Labor at time t",100.0,":O(t) - Output at time t",56.19445492544774,":d - Depreciation Rate",0.25,":s - Savings Rate",0.3 +1.0,":1",1.0,":A(t) - Technology at time t",2.0,":Beta",0.5,":I(t) - Investment at time t",27.510263435905944,"K(t) - Capital at time t",21.022627619803988,":L(t) - Labor at time t",100.0,":O(t) - Output at time t",91.70087811968648,":d - Depreciation Rate",0.25,":s - Savings Rate",0.3 +1.7000000000000002,":1",1.0,":A(t) - Technology at time t",2.0,":Beta",0.5,":I(t) - Investment at time t",37.269893756007654,"K(t) - Capital at time t",38.58458279400273,":L(t) - Labor at time t",100.0,":O(t) - Output at time t",124.23297918669218,":d - Depreciation Rate",0.25,":s - Savings Rate",0.3 +2.4000000000000004,":1",1.0,":A(t) - Technology at time t",2.0,":Beta",0.5,":I(t) - Investment at time t",46.211860861481235,"K(t) - Capital at time t",59.320446785580586,":L(t) - Labor at time t",100.0,":O(t) - Output at time t",154.03953620493746,":d - Depreciation Rate",0.25,":s - Savings Rate",0.3 +3.1000000000000005,":1",1.0,":A(t) - Technology at time t",2.0,":Beta",0.5,":I(t) - Investment at time t",54.40466115748867,"K(t) - Capital at time t",82.21853210169878,":L(t) - Labor at time t",100.0,":O(t) - Output at time t",181.34887052496222,":d - Depreciation Rate",0.25,":s - Savings Rate",0.3 +3.8000000000000007,":1",1.0,":A(t) - Technology at time t",2.0,":Beta",0.5,":I(t) - Investment at time t",61.91105964318409,"K(t) - Capital at time t",106.47164739283048,":L(t) - Labor at time t",100.0,":O(t) - Output at time t",206.37019881061363,":d - Depreciation Rate",0.25,":s - Savings Rate",0.3 +4.5,":1",1.0,":A(t) - Technology at time t",2.0,":Beta",0.5,":I(t) - Investment at time t",68.78856365360059,"K(t) - Capital at time t",131.4407358201517,":L(t) - Labor at time t",100.0,":O(t) - Output at time t",229.29521217866866,":d - Depreciation Rate",0.25,":s - Savings Rate",0.3 +5.199999999999999,":1",1.0,":A(t) - Technology at time t",2.0,":Beta",0.5,":I(t) - Investment at time t",75.08986263670515,"K(t) - Capital at time t",156.62465196664579,":L(t) - Labor at time t",100.0,":O(t) - Output at time t",250.29954212235052,":d - Depreciation Rate",0.25,":s - Savings Rate",0.3 +5.899999999999999,":1",1.0,":A(t) - Technology at time t",2.0,":Beta",0.5,":I(t) - Investment at time t",80.86323168870591,"K(t) - Capital at time t",181.63506219837038,":L(t) - Labor at time t",100.0,":O(t) - Output at time t",269.5441056290197,":d - Depreciation Rate",0.25,":s - Savings Rate",0.3 +6.599999999999998,":1",1.0,":A(t) - Technology at time t",2.0,":Beta",0.5,":I(t) - Investment at time t",86.15290137115436,"K(t) - Capital at time t",206.17562262966254,":L(t) - Labor at time t",100.0,":O(t) - Output at time t",287.17633790384787,":d - Depreciation Rate",0.25,":s - Savings Rate",0.3 diff --git a/test/exampleLogs/Steve.mky.log b/test/exampleLogs/Steve.mky.log index f0bc51d9d..2903a198f 100644 --- a/test/exampleLogs/Steve.mky.log +++ b/test/exampleLogs/Steve.mky.log @@ -1,11 +1,11 @@ -nsteps 10 -1.02 {:A} 31.7743 {:B} 1.82257 {:C} 0.646742 {:D} 97.0113 {:E} 94.4873 {:F} 0.480107 {:Firm} 32.3371 {:G} 7.29026 {:Loan} 36.4513 {:Safe} 0.480107 {:Vault} 63.5487 {:Worker} 3.63413 {:cb} 1 {:cw} 26 {:rD} 0.02 {:rL} 0.05 {:repay} 0.2 {:v} 0.5 {:w} 3 -2.08 {:A} 22.6131 {:B} 2.73869 {:C} 0.961653 {:D} 144.248 {:E} 143.074 {:F} 1.18829 {:Firm} 48.0827 {:G} 10.9548 {:Loan} 54.7738 {:Safe} 1.18829 {:Vault} 45.2262 {:Worker} 5.50284 {:cb} 1 {:cw} 26 {:rD} 0.02 {:rL} 0.05 {:repay} 0.2 {:v} 0.5 {:w} 3 -3.14 {:A} 18.2509 {:B} 3.17491 {:C} 1.10857 {:D} 166.286 {:E} 165.737 {:F} 1.69509 {:Firm} 55.4286 {:G} 12.6996 {:Loan} 63.4982 {:Safe} 1.69509 {:Vault} 36.5018 {:Worker} 6.37448 {:cb} 1 {:cw} 26 {:rD} 0.02 {:rL} 0.05 {:repay} 0.2 {:v} 0.5 {:w} 3 -4.2 {:A} 16.1738 {:B} 3.38262 {:C} 1.17746 {:D} 176.619 {:E} 176.361 {:F} 1.99629 {:Firm} 58.873 {:G} 13.5305 {:Loan} 67.6524 {:Safe} 1.99629 {:Vault} 32.3476 {:Worker} 6.78311 {:cb} 1 {:cw} 26 {:rD} 0.02 {:rL} 0.05 {:repay} 0.2 {:v} 0.5 {:w} 3 -5.26 {:A} 15.1847 {:B} 3.48153 {:C} 1.20989 {:D} 181.483 {:E} 181.361 {:F} 2.16085 {:Firm} 60.4943 {:G} 13.9261 {:Loan} 69.6305 {:Safe} 2.16085 {:Vault} 30.3695 {:Worker} 6.97542 {:cb} 1 {:cw} 26 {:rD} 0.02 {:rL} 0.05 {:repay} 0.2 {:v} 0.5 {:w} 3 -6.32 {:A} 14.7138 {:B} 3.52862 {:C} 1.22519 {:D} 183.779 {:E} 183.721 {:F} 2.24668 {:Firm} 61.2595 {:G} 14.1145 {:Loan} 70.5724 {:Safe} 2.24668 {:Vault} 29.4276 {:Worker} 7.0662 {:cb} 1 {:cw} 26 {:rD} 0.02 {:rL} 0.05 {:repay} 0.2 {:v} 0.5 {:w} 3 -7.38 {:A} 14.4895 {:B} 3.55105 {:C} 1.23243 {:D} 184.865 {:E} 184.838 {:F} 2.29018 {:Firm} 61.6216 {:G} 14.2042 {:Loan} 71.0209 {:Safe} 2.29018 {:Vault} 28.9791 {:Worker} 7.10914 {:cb} 1 {:cw} 26 {:rD} 0.02 {:rL} 0.05 {:repay} 0.2 {:v} 0.5 {:w} 3 -8.44 {:A} 14.3828 {:B} 3.56172 {:C} 1.23586 {:D} 185.379 {:E} 185.367 {:F} 2.31182 {:Firm} 61.7932 {:G} 14.2469 {:Loan} 71.2345 {:Safe} 2.31182 {:Vault} 28.7655 {:Worker} 7.12948 {:cb} 1 {:cw} 26 {:rD} 0.02 {:rL} 0.05 {:repay} 0.2 {:v} 0.5 {:w} 3 -9.5 {:A} 14.3319 {:B} 3.56681 {:C} 1.23749 {:D} 185.624 {:E} 185.618 {:F} 2.32245 {:Firm} 61.8746 {:G} 14.2672 {:Loan} 71.3361 {:Safe} 2.32245 {:Vault} 28.6639 {:Worker} 7.13914 {:cb} 1 {:cw} 26 {:rD} 0.02 {:rL} 0.05 {:repay} 0.2 {:v} 0.5 {:w} 3 -10.56 {:A} 14.3077 {:B} 3.56923 {:C} 1.23826 {:D} 185.74 {:E} 185.737 {:F} 2.32763 {:Firm} 61.9132 {:G} 14.2769 {:Loan} 71.3846 {:Safe} 2.32763 {:Vault} 28.6154 {:Worker} 7.14372 {:cb} 1 {:cw} 26 {:rD} 0.02 {:rL} 0.05 {:repay} 0.2 {:v} 0.5 {:w} 3 +nsteps, 10 +1.0200000000000007,":A",31.774341020918946,":B",1.8225658979081059,":C",0.6467416922419161,":D",97.01125383628742,":E",94.4872864865843,":F",0.48010694273611065,":Firm",32.33708461209581,":G",7.290263591632423,":Loan",36.451317958162115,":Safe",0.48010694273611065,":Vault",63.54868204183789,":Worker",3.634126403330165,":cb",1.0,":cw",26.0,":rD",0.02,":rL",0.05,":repay",0.2,":v",0.5,":w",3.0 +2.0799999999999996,":A",22.613110007076305,":B",2.7386889992923704,":C",0.9616531257308699,":D",144.24796885963048,":E",143.07372392118387,":F",1.1882881638737341,":Firm",48.0826562865435,":G",10.954755997169482,":Loan",54.773779985847405,":Safe",1.1882881638737341,":Vault",45.22622001415261,":Worker",5.502835535430148,":cb",1.0,":cw",26.0,":rD",0.02,":rL",0.05,":repay",0.2,":v",0.5,":w",3.0 +3.139999999999978,":A",18.25089237260007,":B",3.174910762739994,":C",1.1085728422658094,":D",166.28592633987142,":E",165.73653107894452,":F",1.6950911769345631,":Firm",55.42864211329047,":G",12.699643050959976,":Loan",63.498215254799874,":Safe",1.6950911769345631,":Vault",36.50178474520014,":Worker",6.374481964574789,":cb",1.0,":cw",26.0,":rD",0.02,":rL",0.05,":repay",0.2,":v",0.5,":w",3.0 +4.199999999999957,":A",16.173776026359853,":B",3.3826223973640164,":C",1.177460860527845,":D",176.61912907917673,":E",176.360965514539,":F",1.9962908626364704,":Firm",58.873043026392246,":G",13.530489589456066,":Loan",67.65244794728032,":Safe",1.9962908626364704,":Vault",32.347552052719706,":Worker",6.7831140582515,":cb",1.0,":cw",26.0,":rD",0.02,":rL",0.05,":repay",0.2,":v",0.5,":w",3.0 +5.259999999999935,":A",15.184734974918515,":B",3.4815265025081494,":C",1.2098850544978585,":D",181.48275817467876,":E",181.36104431256985,":F",2.1608525440172652,":Firm",60.494252724892924,":G",13.926106010032598,":Loan",69.63053005016299,":Safe",2.1608525440172652,":Vault",30.36946994983703,":Worker",6.975424781252687,":cb",1.0,":cw",26.0,":rD",0.02,":rL",0.05,":repay",0.2,":v",0.5,":w",3.0 +6.319999999999913,":A",14.713792553610807,":B",3.528620744638921,":C",1.2251908686834552,":D",183.77863030251828,":E",183.7211033985836,":F",2.2466751740445776,":Firm",61.25954343417276,":G",14.114482978555683,":Loan",70.57241489277841,":Safe",2.2466751740445776,":Vault",29.427585107221613,":Worker",7.066196284560908,":cb",1.0,":cw",26.0,":rD",0.02,":rL",0.05,":repay",0.2,":v",0.5,":w",3.0 +7.3799999999998915,":A",14.489548308274415,":B",3.551045169172559,":C",1.2324318260419032,":D",184.86477390628548,":E",184.83753313336157,":F",2.2901761916111596,":Firm",61.62159130209516,":G",14.204180676690235,":Loan",71.02090338345117,":Safe",2.2901761916111596,":Vault",28.97909661654883,":Worker",7.109135889744676,":cb",1.0,":cw",26.0,":rD",0.02,":rL",0.05,":repay",0.2,":v",0.5,":w",3.0 +8.43999999999987,":A",14.38277202461143,":B",3.5617227975388546,":C",1.23586306599562,":D",185.379459899343,":E",185.36654232695471,":F",2.3118202538053576,":Firm",61.793153299781004,":G",14.246891190155418,":Loan",71.23445595077709,":Safe",2.3118202538053576,":Vault",28.76554404922286,":Worker",7.129482397190566,":cb",1.0,":cw",26.0,":rD",0.02,":rL",0.05,":repay",0.2,":v",0.5,":w",3.0 +9.499999999999849,":A",14.33192936090885,":B",3.5668070639091134,":C",1.2374910196500033,":D",185.6236529475005,":E",185.61752096630985,":F",2.3224548739007713,":Firm",61.87455098250017,":G",14.267228255636454,":Loan",71.33614127818227,":Safe",2.3224548739007713,":Vault",28.6638587218177,":Worker",7.139135421781148,":cb",1.0,":cw",26.0,":rD",0.02,":rL",0.05,":repay",0.2,":v",0.5,":w",3.0 +10.559999999999828,":A",14.307720085555793,":B",3.5692279914444223,":C",1.2382641153359093,":D",185.73961730038639,":E",185.7367041507383,":F",2.327634671679728,":Firm",61.913205766795464,":G",14.276911965777689,":Loan",71.38455982888844,":Safe",2.327634671679728,":Vault",28.615440171111587,":Worker",7.143719390413011,":cb",1.0,":cw",26.0,":rD",0.02,":rL",0.05,":repay",0.2,":v",0.5,":w",3.0 diff --git a/test/exampleLogs/SteveTest028.mky.log b/test/exampleLogs/SteveTest028.mky.log index 64a9a536b..dd027d442 100644 --- a/test/exampleLogs/SteveTest028.mky.log +++ b/test/exampleLogs/SteveTest028.mky.log @@ -1,11 +1,11 @@ -nsteps 10 -0.003 {:1} 1 {:A} 198.804 {:B} 0 {:BS} 0 {:BV} 99.4019 {:C} 1.66766 {:D} 0.0248271 {:E} 0 {:F} 0.0854394 {:FD} 0.595593 {:FL} 0.598076 {:WD} 0.00248271 {:rL} 0 {:s} 0.3 {:τB} 1 {:τL} 7 {:τS} 0.25 {:τV} 0.5 {:τW} 0.1 -0.01 {:1} 1 {:A} 196.043 {:B} 0 {:BS} 0 {:BV} 98.0213 {:C} 5.46581 {:D} 0.266499 {:E} 0 {:F} 0.282675 {:FD} 1.95207 {:FL} 1.97872 {:WD} 0.0266499 {:rL} 0 {:s} 0.3 {:τB} 1 {:τL} 7 {:τS} 0.25 {:τV} 0.5 {:τW} 0.1 -0.017 {:1} 1 {:A} 193.322 {:B} 0 {:BS} 0 {:BV} 96.6612 {:C} 9.14027 {:D} 0.744336 {:E} 0 {:F} 0.476974 {:FD} 3.26438 {:FL} 3.33882 {:WD} 0.0744336 {:rL} 0 {:s} 0.3 {:τB} 1 {:τL} 7 {:τS} 0.25 {:τV} 0.5 {:τW} 0.1 -0.024 {:1} 1 {:A} 190.643 {:B} 0 {:BS} 0 {:BV} 95.3213 {:C} 12.6987 {:D} 1.43427 {:E} 0 {:F} 0.66838 {:FD} 4.53523 {:FL} 4.67866 {:WD} 0.143427 {:rL} 0 {:s} 0.3 {:τB} 1 {:τL} 7 {:τS} 0.25 {:τV} 0.5 {:τW} 0.1 -0.031 {:1} 1 {:A} 188.003 {:B} 0 {:BS} 0 {:BV} 94.0014 {:C} 16.1479 {:D} 2.31437 {:E} 0 {:F} 0.856937 {:FD} 5.76712 {:FL} 5.99856 {:WD} 0.231437 {:rL} 0 {:s} 0.3 {:τB} 1 {:τL} 7 {:τS} 0.25 {:τV} 0.5 {:τW} 0.1 -0.038 {:1} 1 {:A} 185.402 {:B} 0 {:BS} 0 {:BV} 92.7012 {:C} 19.4946 {:D} 3.36461 {:E} 0 {:F} 1.04269 {:FD} 6.96234 {:FL} 7.2988 {:WD} 0.336461 {:rL} 0 {:s} 0.3 {:τB} 1 {:τL} 7 {:τS} 0.25 {:τV} 0.5 {:τW} 0.1 -0.045 {:1} 1 {:A} 182.841 {:B} 0 {:BS} 0 {:BV} 91.4203 {:C} 22.7444 {:D} 4.56676 {:E} 0 {:F} 1.22567 {:FD} 8.12301 {:FL} 8.57969 {:WD} 0.456676 {:rL} 0 {:s} 0.3 {:τB} 1 {:τL} 7 {:τS} 0.25 {:τV} 0.5 {:τW} 0.1 -0.052 {:1} 1 {:A} 180.317 {:B} 0 {:BS} 0 {:BV} 90.1585 {:C} 25.903 {:D} 5.9042 {:E} 0 {:F} 1.40593 {:FD} 9.25109 {:FL} 9.84151 {:WD} 0.59042 {:rL} 0 {:s} 0.3 {:τB} 1 {:τL} 7 {:τS} 0.25 {:τV} 0.5 {:τW} 0.1 -0.059 {:1} 1 {:A} 177.831 {:B} 0 {:BS} 0 {:BV} 88.9155 {:C} 28.9754 {:D} 7.36178 {:E} 0 {:F} 1.58351 {:FD} 10.3484 {:FL} 11.0845 {:WD} 0.736178 {:rL} 0 {:s} 0.3 {:τB} 1 {:τL} 7 {:τS} 0.25 {:τV} 0.5 {:τW} 0.1 -0.066 {:1} 1 {:A} 175.382 {:B} 0 {:BS} 0 {:BV} 87.6909 {:C} 31.9662 {:D} 8.92572 {:E} 0 {:F} 1.75844 {:FD} 11.4165 {:FL} 12.3091 {:WD} 0.892572 {:rL} 0 {:s} 0.3 {:τB} 1 {:τL} 7 {:τS} 0.25 {:τV} 0.5 {:τW} 0.1 +nsteps, 10 +0.003,":1",1.0,":A",198.8038488908175,":B",0.0,":BS",0.0,":BV",99.40192444540875,":C",1.6676599611029828,":D",0.02482711340190929,":E",0.0,":F",0.08543936494160805,":FD",0.5955928432510653,":FL",0.5980755545912563,":WD",0.002482711340190929,":rL",0.0,":s",0.3,":\tau_B",1.0,":\tau_L",7.0,":\tau_S",0.25,":\tau_V",0.5,":\tau_W",0.1 +0.010000000000000002,":1",1.0,":A",196.04255265334632,":B",0.0,":BS",0.0,":BV",98.02127632667316,":C",5.4658066102589355,":D",0.2664988394865661,":E",0.0,":F",0.282674810475264,":FD",1.9520737893781914,":FL",1.978723673326848,":WD",0.02664988394865661,":rL",0.0,":s",0.3,":\tau_B",1.0,":\tau_L",7.0,":\tau_S",0.25,":\tau_V",0.5,":\tau_W",0.1 +0.017000000000000005,":1",1.0,":A",193.32236676103244,":B",0.0,":BS",0.0,":BV",96.66118338051622,":C",9.14027242714622,":D",0.7443360978870591,":E",0.0,":F",0.4769738027833978,":FD",3.2643830096950786,":FL",3.3388166194837847,":WD",0.07443360978870592,":rL",0.0,":s",0.3,":\tau_B",1.0,":\tau_L",7.0,":\tau_S",0.25,":\tau_V",0.5,":\tau_W",0.1 +0.024000000000000007,":1",1.0,":A",190.64267916057423,":B",0.0,":BS",0.0,":BV",95.32133958028712,":C",12.698652358504834,":D",1.4342743453258837,":E",0.0,":F",0.6683800599589838,":FD",4.535232985180298,":FL",4.6786604197128865,":WD",0.14342743453258838,":rL",0.0,":s",0.3,":\tau_B",1.0,":\tau_L",7.0,":\tau_S",0.25,":\tau_V",0.5,":\tau_W",0.1 +0.03100000000000001,":1",1.0,":A",188.00288691095656,":B",0.0,":BS",0.0,":BV",94.00144345547828,":C",16.14793517709115,":D",2.3143683841773113,":E",0.0,":F",0.8569366492173877,":FD",5.7671197061039825,":FL",5.998556544521714,":WD",0.23143683841773116,":rL",0.0,":s",0.3,":\tau_B",1.0,":\tau_L",7.0,":\tau_S",0.25,":\tau_V",0.5,":\tau_W",0.1 +0.03800000000000001,":1",1.0,":A",185.4023960477866,":B",0.0,":BS",0.0,":BV",92.7011980238933,":C",19.494554766661906,":D",3.3646098801316286,":E",0.0,":F",1.0426859965866717,":FD",6.962340988093538,":FL",7.298801976106701,":WD",0.3364609880131629,":rL",0.0,":s",0.3,":\tau_B",1.0,":\tau_L",7.0,":\tau_S",0.25,":\tau_V",0.5,":\tau_W",0.1 +0.04500000000000001,":1",1.0,":A",182.8406214496492,":B",0.0,":BS",0.0,":BV",91.4203107248246,":C",22.744437021588702,":D",4.5667605317944275,":E",0.0,":F",1.22566989645363,":FD",8.123013221995965,":FL",8.57968927517541,":WD",0.45667605317944276,":rL",0.0,":s",0.3,":\tau_B",1.0,":\tau_L",7.0,":\tau_S",0.25,":\tau_V",0.5,":\tau_W",0.1 +0.05200000000000001,":1",1.0,":A",180.31698670645218,":B",0.0,":BS",0.0,":BV",90.15849335322609,":C",25.903042736795406,":D",5.904199550612625,":E",0.0,":F",1.4059295209677014,":FD",9.251086691712645,":FL",9.84150664677391,":WD",0.5904199550612625,":rL",0.0,":s",0.3,":\tau_B",1.0,":\tau_L",7.0,":\tau_S",0.25,":\tau_V",0.5,":\tau_W",0.1 +0.05900000000000001,":1",1.0,":A",177.8309239897317,":B",0.0,":BS",0.0,":BV",88.91546199486585,":C",28.975406831515105,":D",7.361784224501752,":E",0.0,":F",1.583505429304878,":FD",10.348359582683967,":FL",11.084538005134146,":WD",0.7361784224501753,":rL",0.0,":s",0.3,":\tau_B",1.0,":\tau_L",7.0,":\tau_S",0.25,":\tau_V",0.5,":\tau_W",0.1 +0.06600000000000002,":1",1.0,":A",175.38187392488834,":B",0.0,":BS",0.0,":BV",87.69093696244417,":C",31.966174220926593,":D",8.92572244367751,":E",0.0,":F",1.7584375767936893,":FD",11.41649079318807,":FL",12.309063037555825,":WD",0.8925722443677511,":rL",0.0,":s",0.3,":\tau_B",1.0,":\tau_L",7.0,":\tau_S",0.25,":\tau_V",0.5,":\tau_W",0.1 diff --git a/test/exampleLogs/UDFCallGroup.mky.log b/test/exampleLogs/UDFCallGroup.mky.log index 62c9c833c..d143df101 100644 --- a/test/exampleLogs/UDFCallGroup.mky.log +++ b/test/exampleLogs/UDFCallGroup.mky.log @@ -1,11 +1,11 @@ -nsteps 10 -0.03 {50111488:1} 0 {50111488:2} 0 {:int1} 0.000449966 -0.1 {50111488:1} 0 {50111488:2} 0 {:int1} 0.00499583 -0.17 {50111488:1} 0 {50111488:2} 0 {:int1} 0.0144152 -0.24 {50111488:1} 0 {50111488:2} 0 {:int1} 0.028662 -0.31 {50111488:1} 0 {50111488:2} 0 {:int1} 0.0476664 -0.38 {50111488:1} 0 {50111488:2} 0 {:int1} 0.0713354 -0.45 {50111488:1} 0 {50111488:2} 0 {:int1} 0.0995529 -0.52 {50111488:1} 0 {50111488:2} 0 {:int1} 0.132181 -0.59 {50111488:1} 0 {50111488:2} 0 {:int1} 0.169059 -0.66 {50111488:1} 0 {50111488:2} 0 {:int1} 0.210008 +nsteps, 10 +0.03,"1",0.0,"2",0.0,"int1",0.00044996625101242167 +0.09999999999999999,"1",0.0,"2",0.0,"int1",0.004995834721651212 +0.17,"1",0.0,"2",0.0,"int1",0.014415233089795365 +0.24000000000000005,"1",0.0,"2",0.0,"int1",0.028662025147009197 +0.31000000000000005,"1",0.0,"2",0.0,"int1",0.04766643011301332 +0.38000000000000006,"1",0.0,"2",0.0,"int1",0.07133536442191109 +0.45000000000000007,"1",0.0,"2",0.0,"int1",0.09955289764544725 +0.5200000000000001,"1",0.0,"2",0.0,"int1",0.13218082032018677 +0.5900000000000002,"1",0.0,"2",0.0,"int1",0.16905932089739675 +0.6600000000000003,"1",0.0,"2",0.0,"int1",0.21000776849993116 diff --git a/test/exampleLogs/UWS05.mky.log b/test/exampleLogs/UWS05.mky.log index 44d54066b..719025aa8 100644 --- a/test/exampleLogs/UWS05.mky.log +++ b/test/exampleLogs/UWS05.mky.log @@ -1,11 +1,11 @@ -nsteps 10 -0.12 {:A} 47.0882 {:B} 0.291177 {:C} 16.1116 {:D} 11.3379 {:E} 0.0169568 {:Firms} 5.37052 {:Loans} 5.82355 {:Safe} 0.0169568 {:Vault} 94.1765 {:Workers} 0.436072 {:bc} 1 {:rL} 0.05 {:v} 0.5 {:w} 3 {:wc} 26 -0.28 {:A} 43.4679 {:B} 0.653209 {:C} 35.3763 {:D} 30.855 {:E} 0.0853364 {:Firms} 11.7921 {:Loans} 13.0642 {:Safe} 0.0853364 {:Vault} 86.9358 {:Workers} 1.18673 {:bc} 1 {:rL} 0.05 {:v} 0.5 {:w} 3 {:wc} 26 -0.44 {:A} 40.1259 {:B} 0.987406 {:C} 53.0201 {:D} 48.8737 {:E} 0.194994 {:Firms} 17.6734 {:Loans} 19.7481 {:Safe} 0.194994 {:Vault} 80.2519 {:Workers} 1.87976 {:bc} 1 {:rL} 0.05 {:v} 0.5 {:w} 3 {:wc} 26 -0.6 {:A} 37.0409 {:B} 1.29591 {:C} 69.201 {:D} 65.3979 {:E} 0.335876 {:Firms} 23.067 {:Loans} 25.9182 {:Safe} 0.335876 {:Vault} 74.0818 {:Workers} 2.5153 {:bc} 1 {:rL} 0.05 {:v} 0.5 {:w} 3 {:wc} 26 -0.76 {:A} 34.1931 {:B} 1.58069 {:C} 84.0473 {:D} 80.5575 {:E} 0.499718 {:Firms} 28.0158 {:Loans} 31.6139 {:Safe} 0.499718 {:Vault} 68.3861 {:Workers} 3.09836 {:bc} 1 {:rL} 0.05 {:v} 0.5 {:w} 3 {:wc} 26 -0.92 {:A} 31.5642 {:B} 1.84358 {:C} 97.6751 {:D} 94.4713 {:E} 0.679759 {:Firms} 32.5584 {:Loans} 36.8716 {:Safe} 0.679759 {:Vault} 63.1284 {:Workers} 3.63351 {:bc} 1 {:rL} 0.05 {:v} 0.5 {:w} 3 {:wc} 26 -1.08 {:A} 29.1374 {:B} 2.08626 {:C} 110.189 {:D} 107.247 {:E} 0.870495 {:Firms} 36.7298 {:Loans} 41.7252 {:Safe} 0.870495 {:Vault} 58.2748 {:Workers} 4.12489 {:bc} 1 {:rL} 0.05 {:v} 0.5 {:w} 3 {:wc} 26 -1.24 {:A} 26.8972 {:B} 2.31028 {:C} 121.686 {:D} 118.982 {:E} 1.06748 {:Firms} 40.5618 {:Loans} 46.2056 {:Safe} 1.06748 {:Vault} 53.7944 {:Workers} 4.57624 {:bc} 1 {:rL} 0.05 {:v} 0.5 {:w} 3 {:wc} 26 -1.4 {:A} 24.8293 {:B} 2.51707 {:C} 132.25 {:D} 129.766 {:E} 1.26713 {:Firms} 44.0833 {:Loans} 50.3415 {:Safe} 1.26713 {:Vault} 49.6585 {:Workers} 4.99099 {:bc} 1 {:rL} 0.05 {:v} 0.5 {:w} 3 {:wc} 26 -1.56 {:A} 22.9203 {:B} 2.70797 {:C} 141.962 {:D} 139.678 {:E} 1.46662 {:Firms} 47.3206 {:Loans} 54.1594 {:Safe} 1.46662 {:Vault} 45.8406 {:Workers} 5.37222 {:bc} 1 {:rL} 0.05 {:v} 0.5 {:w} 3 {:wc} 26 +nsteps, 10 +0.11999999999999998,":A",47.088226679212426,":B",0.29117733207875723,":C",16.11155461996176,":D",11.33786126662728,":E",0.016956847743253387,":Firms",5.370518206653919,":Loans",5.8235466415751445,":Safe",0.016956847743253387,":Vault",94.17645335842485,":Workers",0.43607158717797234,":bc",1.0,":rL",0.05,":v",0.5,":w",3.0,":wc",26.0 +0.2800000000000001,":A",43.467911769930446,":B",0.6532088230069552,":C",35.376332302417424,":D",30.85496282517809,":E",0.08533635323670026,":Firms",11.792110767472476,":Loans",13.064176460139102,":Safe",0.08533635323670026,":Vault",86.93582353986089,":Workers",1.1867293394299265,":bc",1.0,":rL",0.05,":v",0.5,":w",3.0,":wc",26.0 +0.44000000000000017,":A",40.12593989810577,":B",0.987406010189424,":C",53.02010565642857,":D",48.87369567460112,":E",0.19499412569942726,":Firms",17.673368552142858,":Loans",19.748120203788478,":Safe",0.19499412569942726,":Vault",80.25187979621154,":Workers",1.879757525946197,":bc",1.0,":rL",0.05,":v",0.5,":w",3.0,":wc",26.0 +0.6000000000000002,":A",37.04091103406075,":B",1.2959088965939254,":C",69.2009995816062,":D",65.39785454297454,":E",0.33587597353640464,":Firms",23.0669998605354,":Loans",25.918177931878507,":Safe",0.33587597353640464,":Vault",74.0818220681215,":Workers",2.515302097806713,":bc",1.0,":rL",0.05,":v",0.5,":w",3.0,":wc",26.0 +0.7600000000000003,":A",34.19307046058686,":B",1.580692953941316,":C",84.04733234883844,":D",80.55745324690615,":E",0.4997180427940499,":Firms",28.015777449612813,":Loans",31.613859078826316,":Safe",0.4997180427940499,":Vault",68.38614092117372,":Workers",3.098363586419467,":bc",1.0,":rL",0.05,":v",0.5,":w",3.0,":wc",26.0 +0.9200000000000005,":A",31.564182275310593,":B",1.8435817724689416,":C",97.67509422145983,":D",94.47131092565155,":E",0.6797587502133282,":Firms",32.55836474048661,":Loans",36.87163544937883,":Safe",0.6797587502133282,":Vault",63.128364550621185,":Workers",3.633511958678906,":bc",1.0,":rL",0.05,":v",0.5,":w",3.0,":wc",26.0 +1.0800000000000005,":A",29.137412618659933,":B",2.0862587381340076,":C",110.18937762929292,":D",107.2470649962466,":E",0.8704951043422682,":Firms",36.72979254309764,":Loans",41.72517476268015,":Safe",0.8704951043422682,":Vault",58.27482523731987,":Workers",4.124887115240254,":bc",1.0,":rL",0.05,":v",0.5,":w",3.0,":wc",26.0 +1.2400000000000007,":A",26.897221879691134,":B",2.3102778120308876,":C",121.68550891284298,":D",118.98232379096225,":E",1.067476713607466,":Firms",40.561836304280995,":Loans",46.205556240617746,":Safe",1.067476713607466,":Vault",53.79444375938227,":Workers",4.5762432227293175,":bc",1.0,":rL",0.05,":v",0.5,":w",3.0,":wc",26.0 +1.4000000000000008,":A",24.829265189525543,":B",2.5170734810474467,":C",132.25004850142915,":D",129.7656968091977,":E",1.267131781657272,":Firms",44.08334950047639,":Loans",50.34146962094893,":Safe",1.267131781657272,":Vault",49.658530379051086,":Workers",4.990988338815296,":bc",1.0,":rL",0.05,":v",0.5,":w",3.0,":wc",26.0 +1.560000000000001,":A",22.92030056521451,":B",2.70796994347855,":C",141.9616773192844,":D",139.67770752836134,":E",1.4666202428212918,":Firms",47.320559106428135,":Loans",54.15939886957099,":Safe",1.4666202428212918,":Vault",45.84060113042902,":Workers",5.37221952032159,":bc",1.0,":rL",0.05,":v",0.5,":w",3.0,":wc",26.0 diff --git a/test/exampleLogs/binaryInterpolation.mky.log b/test/exampleLogs/binaryInterpolation.mky.log index 2c304f0e2..8f2b9f71b 100644 --- a/test/exampleLogs/binaryInterpolation.mky.log +++ b/test/exampleLogs/binaryInterpolation.mky.log @@ -1,11 +1,11 @@ -nsteps 10 -0.03 {:0} 0 {:int1|0} 0.12 {:int1|1} 0.15 {:int1|2} 0.165 {:int1|3} 0.15 {:int1|4} 0.225 {:int1|5} 0.21 {:int1|6} 0.18 {:int2|0} 60 {:int2|1} 90 {:int2|2} 75 {:int2|3} 102.411 {:int2|4} 132.411 {:int2|5} 177.411 {:int2|6} 150 {:int2|7} 150 {:int2|8} 225 {:x1|0} 1 {:x1|1} 2 {:x1|2} 2 {:x1|3} 1 {:x1|4} 3 {:x1|5} 2 {:x1|6} 1 {:x2|0} 3 {:x2|1} 4 {:x2|2} 5 {:x3|0} 1000 {:x3|1} 2000 {:x3|2} 1500 {:x3|3} 2000 {:x3|4} 3000 {:x3|5} 4500 {:x3|6} 3000 {:x3|7} 3000 {:x3|8} 5500 {:x4|0} 1000 {:x4|1} 2000 {:x4|2} 2000 {:x4|3} 3000 -0.1 {:0} 0 {:int1|0} 0.4 {:int1|1} 0.5 {:int1|2} 0.55 {:int1|3} 0.5 {:int1|4} 0.75 {:int1|5} 0.7 {:int1|6} 0.6 {:int2|0} 200 {:int2|1} 300 {:int2|2} 250 {:int2|3} 341.37 {:int2|4} 441.37 {:int2|5} 591.37 {:int2|6} 500 {:int2|7} 500 {:int2|8} 750 {:x1|0} 1 {:x1|1} 2 {:x1|2} 2 {:x1|3} 1 {:x1|4} 3 {:x1|5} 2 {:x1|6} 1 {:x2|0} 3 {:x2|1} 4 {:x2|2} 5 {:x3|0} 1000 {:x3|1} 2000 {:x3|2} 1500 {:x3|3} 2000 {:x3|4} 3000 {:x3|5} 4500 {:x3|6} 3000 {:x3|7} 3000 {:x3|8} 5500 {:x4|0} 1000 {:x4|1} 2000 {:x4|2} 2000 {:x4|3} 3000 -0.17 {:0} 0 {:int1|0} 0.68 {:int1|1} 0.85 {:int1|2} 0.935 {:int1|3} 0.85 {:int1|4} 1.275 {:int1|5} 1.19 {:int1|6} 1.02 {:int2|0} 340 {:int2|1} 510 {:int2|2} 425 {:int2|3} 580.329 {:int2|4} 750.329 {:int2|5} 1005.33 {:int2|6} 850 {:int2|7} 850 {:int2|8} 1275 {:x1|0} 1 {:x1|1} 2 {:x1|2} 2 {:x1|3} 1 {:x1|4} 3 {:x1|5} 2 {:x1|6} 1 {:x2|0} 3 {:x2|1} 4 {:x2|2} 5 {:x3|0} 1000 {:x3|1} 2000 {:x3|2} 1500 {:x3|3} 2000 {:x3|4} 3000 {:x3|5} 4500 {:x3|6} 3000 {:x3|7} 3000 {:x3|8} 5500 {:x4|0} 1000 {:x4|1} 2000 {:x4|2} 2000 {:x4|3} 3000 -0.24 {:0} 0 {:int1|0} 0.96 {:int1|1} 1.2 {:int1|2} 1.32 {:int1|3} 1.2 {:int1|4} 1.8 {:int1|5} 1.68 {:int1|6} 1.44 {:int2|0} 480 {:int2|1} 720 {:int2|2} 600 {:int2|3} 819.288 {:int2|4} 1059.29 {:int2|5} 1419.29 {:int2|6} 1200 {:int2|7} 1200 {:int2|8} 1800 {:x1|0} 1 {:x1|1} 2 {:x1|2} 2 {:x1|3} 1 {:x1|4} 3 {:x1|5} 2 {:x1|6} 1 {:x2|0} 3 {:x2|1} 4 {:x2|2} 5 {:x3|0} 1000 {:x3|1} 2000 {:x3|2} 1500 {:x3|3} 2000 {:x3|4} 3000 {:x3|5} 4500 {:x3|6} 3000 {:x3|7} 3000 {:x3|8} 5500 {:x4|0} 1000 {:x4|1} 2000 {:x4|2} 2000 {:x4|3} 3000 -0.31 {:0} 0 {:int1|0} 1.24 {:int1|1} 1.55 {:int1|2} 1.705 {:int1|3} 1.55 {:int1|4} 2.325 {:int1|5} 2.17 {:int1|6} 1.86 {:int2|0} 620 {:int2|1} 930 {:int2|2} 775 {:int2|3} 1058.25 {:int2|4} 1368.25 {:int2|5} 1833.25 {:int2|6} 1550 {:int2|7} 1550 {:int2|8} 2325 {:x1|0} 1 {:x1|1} 2 {:x1|2} 2 {:x1|3} 1 {:x1|4} 3 {:x1|5} 2 {:x1|6} 1 {:x2|0} 3 {:x2|1} 4 {:x2|2} 5 {:x3|0} 1000 {:x3|1} 2000 {:x3|2} 1500 {:x3|3} 2000 {:x3|4} 3000 {:x3|5} 4500 {:x3|6} 3000 {:x3|7} 3000 {:x3|8} 5500 {:x4|0} 1000 {:x4|1} 2000 {:x4|2} 2000 {:x4|3} 3000 -0.38 {:0} 0 {:int1|0} 1.52 {:int1|1} 1.9 {:int1|2} 2.09 {:int1|3} 1.9 {:int1|4} 2.85 {:int1|5} 2.66 {:int1|6} 2.28 {:int2|0} 760 {:int2|1} 1140 {:int2|2} 950 {:int2|3} 1297.21 {:int2|4} 1677.21 {:int2|5} 2247.21 {:int2|6} 1900 {:int2|7} 1900 {:int2|8} 2850 {:x1|0} 1 {:x1|1} 2 {:x1|2} 2 {:x1|3} 1 {:x1|4} 3 {:x1|5} 2 {:x1|6} 1 {:x2|0} 3 {:x2|1} 4 {:x2|2} 5 {:x3|0} 1000 {:x3|1} 2000 {:x3|2} 1500 {:x3|3} 2000 {:x3|4} 3000 {:x3|5} 4500 {:x3|6} 3000 {:x3|7} 3000 {:x3|8} 5500 {:x4|0} 1000 {:x4|1} 2000 {:x4|2} 2000 {:x4|3} 3000 -0.45 {:0} 0 {:int1|0} 1.8 {:int1|1} 2.25 {:int1|2} 2.475 {:int1|3} 2.25 {:int1|4} 3.375 {:int1|5} 3.15 {:int1|6} 2.7 {:int2|0} 900 {:int2|1} 1350 {:int2|2} 1125 {:int2|3} 1536.16 {:int2|4} 1986.16 {:int2|5} 2661.16 {:int2|6} 2250 {:int2|7} 2250 {:int2|8} 3375 {:x1|0} 1 {:x1|1} 2 {:x1|2} 2 {:x1|3} 1 {:x1|4} 3 {:x1|5} 2 {:x1|6} 1 {:x2|0} 3 {:x2|1} 4 {:x2|2} 5 {:x3|0} 1000 {:x3|1} 2000 {:x3|2} 1500 {:x3|3} 2000 {:x3|4} 3000 {:x3|5} 4500 {:x3|6} 3000 {:x3|7} 3000 {:x3|8} 5500 {:x4|0} 1000 {:x4|1} 2000 {:x4|2} 2000 {:x4|3} 3000 -0.52 {:0} 0 {:int1|0} 2.08 {:int1|1} 2.6 {:int1|2} 2.86 {:int1|3} 2.6 {:int1|4} 3.9 {:int1|5} 3.64 {:int1|6} 3.12 {:int2|0} 1040 {:int2|1} 1560 {:int2|2} 1300 {:int2|3} 1775.12 {:int2|4} 2295.12 {:int2|5} 3075.12 {:int2|6} 2600 {:int2|7} 2600 {:int2|8} 3900 {:x1|0} 1 {:x1|1} 2 {:x1|2} 2 {:x1|3} 1 {:x1|4} 3 {:x1|5} 2 {:x1|6} 1 {:x2|0} 3 {:x2|1} 4 {:x2|2} 5 {:x3|0} 1000 {:x3|1} 2000 {:x3|2} 1500 {:x3|3} 2000 {:x3|4} 3000 {:x3|5} 4500 {:x3|6} 3000 {:x3|7} 3000 {:x3|8} 5500 {:x4|0} 1000 {:x4|1} 2000 {:x4|2} 2000 {:x4|3} 3000 -0.59 {:0} 0 {:int1|0} 2.36 {:int1|1} 2.95 {:int1|2} 3.245 {:int1|3} 2.95 {:int1|4} 4.425 {:int1|5} 4.13 {:int1|6} 3.54 {:int2|0} 1180 {:int2|1} 1770 {:int2|2} 1475 {:int2|3} 2014.08 {:int2|4} 2604.08 {:int2|5} 3489.08 {:int2|6} 2950 {:int2|7} 2950 {:int2|8} 4425 {:x1|0} 1 {:x1|1} 2 {:x1|2} 2 {:x1|3} 1 {:x1|4} 3 {:x1|5} 2 {:x1|6} 1 {:x2|0} 3 {:x2|1} 4 {:x2|2} 5 {:x3|0} 1000 {:x3|1} 2000 {:x3|2} 1500 {:x3|3} 2000 {:x3|4} 3000 {:x3|5} 4500 {:x3|6} 3000 {:x3|7} 3000 {:x3|8} 5500 {:x4|0} 1000 {:x4|1} 2000 {:x4|2} 2000 {:x4|3} 3000 -0.66 {:0} 0 {:int1|0} 2.64 {:int1|1} 3.3 {:int1|2} 3.63 {:int1|3} 3.3 {:int1|4} 4.95 {:int1|5} 4.62 {:int1|6} 3.96 {:int2|0} 1320 {:int2|1} 1980 {:int2|2} 1650 {:int2|3} 2253.04 {:int2|4} 2913.04 {:int2|5} 3903.04 {:int2|6} 3300 {:int2|7} 3300 {:int2|8} 4950 {:x1|0} 1 {:x1|1} 2 {:x1|2} 2 {:x1|3} 1 {:x1|4} 3 {:x1|5} 2 {:x1|6} 1 {:x2|0} 3 {:x2|1} 4 {:x2|2} 5 {:x3|0} 1000 {:x3|1} 2000 {:x3|2} 1500 {:x3|3} 2000 {:x3|4} 3000 {:x3|5} 4500 {:x3|6} 3000 {:x3|7} 3000 {:x3|8} 5500 {:x4|0} 1000 {:x4|1} 2000 {:x4|2} 2000 {:x4|3} 3000 +nsteps, 10 +0.03,"0",0.0,"int1|0",0.15000000000000002,"int1|1",0.15000000000000002,"int1|2",0.15000000000000002,"int1|3",0.15000000000000002,"int1|4",0.15000000000000002,"int2|0",90.0,"int2|1",90.0,"int2|2",90.0,"int2|3",90.0,"int2|4",90.0,"int2|5",90.0,"int2|6",90.0,"int2|7",90.0,"int2|8",90.0,"x1|0",1.0,"x1|1",1.0,"x1|2",1.0,"x1|3",1.0,"x1|4",1.0,"x1|5",1.0,"x1|6",1.0,"x2|0",3.0,"x2|1",3.0,"x2|2",3.0,"x3|0",1000.0,"x3|1",1000.0,"x3|2",1000.0,"x3|3",1000.0,"x3|4",1000.0,"x3|5",1000.0,"x3|6",1000.0,"x3|7",1000.0,"x3|8",1000.0,"x4|0",1000.0,"x4|1",1000.0,"x4|2",1000.0,"x4|3",1000.0 +0.09999999999999999,"0",0.0,"int1|0",0.5,"int1|1",0.5,"int1|2",0.5,"int1|3",0.5,"int1|4",0.5,"int2|0",300.0,"int2|1",300.0,"int2|2",300.0,"int2|3",300.0,"int2|4",300.0,"int2|5",300.0,"int2|6",300.0,"int2|7",300.0,"int2|8",300.0,"x1|0",1.0,"x1|1",1.0,"x1|2",1.0,"x1|3",1.0,"x1|4",1.0,"x1|5",1.0,"x1|6",1.0,"x2|0",3.0,"x2|1",3.0,"x2|2",3.0,"x3|0",1000.0,"x3|1",1000.0,"x3|2",1000.0,"x3|3",1000.0,"x3|4",1000.0,"x3|5",1000.0,"x3|6",1000.0,"x3|7",1000.0,"x3|8",1000.0,"x4|0",1000.0,"x4|1",1000.0,"x4|2",1000.0,"x4|3",1000.0 +0.17,"0",0.0,"int1|0",0.8500000000000001,"int1|1",0.8500000000000001,"int1|2",0.8500000000000001,"int1|3",0.8500000000000001,"int1|4",0.8500000000000001,"int2|0",510.0,"int2|1",510.0,"int2|2",510.0,"int2|3",510.0,"int2|4",510.0,"int2|5",510.0,"int2|6",510.0,"int2|7",510.0,"int2|8",510.0,"x1|0",1.0,"x1|1",1.0,"x1|2",1.0,"x1|3",1.0,"x1|4",1.0,"x1|5",1.0,"x1|6",1.0,"x2|0",3.0,"x2|1",3.0,"x2|2",3.0,"x3|0",1000.0,"x3|1",1000.0,"x3|2",1000.0,"x3|3",1000.0,"x3|4",1000.0,"x3|5",1000.0,"x3|6",1000.0,"x3|7",1000.0,"x3|8",1000.0,"x4|0",1000.0,"x4|1",1000.0,"x4|2",1000.0,"x4|3",1000.0 +0.24000000000000005,"0",0.0,"int1|0",1.2000000000000002,"int1|1",1.2000000000000002,"int1|2",1.2000000000000002,"int1|3",1.2000000000000002,"int1|4",1.2000000000000002,"int2|0",720.0,"int2|1",720.0,"int2|2",720.0,"int2|3",720.0,"int2|4",720.0,"int2|5",720.0,"int2|6",720.0,"int2|7",720.0,"int2|8",720.0,"x1|0",1.0,"x1|1",1.0,"x1|2",1.0,"x1|3",1.0,"x1|4",1.0,"x1|5",1.0,"x1|6",1.0,"x2|0",3.0,"x2|1",3.0,"x2|2",3.0,"x3|0",1000.0,"x3|1",1000.0,"x3|2",1000.0,"x3|3",1000.0,"x3|4",1000.0,"x3|5",1000.0,"x3|6",1000.0,"x3|7",1000.0,"x3|8",1000.0,"x4|0",1000.0,"x4|1",1000.0,"x4|2",1000.0,"x4|3",1000.0 +0.31000000000000005,"0",0.0,"int1|0",1.5500000000000003,"int1|1",1.5500000000000003,"int1|2",1.5500000000000003,"int1|3",1.5500000000000003,"int1|4",1.5500000000000003,"int2|0",930.0,"int2|1",930.0,"int2|2",930.0,"int2|3",930.0,"int2|4",930.0,"int2|5",930.0,"int2|6",930.0,"int2|7",930.0,"int2|8",930.0,"x1|0",1.0,"x1|1",1.0,"x1|2",1.0,"x1|3",1.0,"x1|4",1.0,"x1|5",1.0,"x1|6",1.0,"x2|0",3.0,"x2|1",3.0,"x2|2",3.0,"x3|0",1000.0,"x3|1",1000.0,"x3|2",1000.0,"x3|3",1000.0,"x3|4",1000.0,"x3|5",1000.0,"x3|6",1000.0,"x3|7",1000.0,"x3|8",1000.0,"x4|0",1000.0,"x4|1",1000.0,"x4|2",1000.0,"x4|3",1000.0 +0.38000000000000006,"0",0.0,"int1|0",1.9000000000000004,"int1|1",1.9000000000000004,"int1|2",1.9000000000000004,"int1|3",1.9000000000000004,"int1|4",1.9000000000000004,"int2|0",1140.0,"int2|1",1140.0,"int2|2",1140.0,"int2|3",1140.0,"int2|4",1140.0,"int2|5",1140.0,"int2|6",1140.0,"int2|7",1140.0,"int2|8",1140.0,"x1|0",1.0,"x1|1",1.0,"x1|2",1.0,"x1|3",1.0,"x1|4",1.0,"x1|5",1.0,"x1|6",1.0,"x2|0",3.0,"x2|1",3.0,"x2|2",3.0,"x3|0",1000.0,"x3|1",1000.0,"x3|2",1000.0,"x3|3",1000.0,"x3|4",1000.0,"x3|5",1000.0,"x3|6",1000.0,"x3|7",1000.0,"x3|8",1000.0,"x4|0",1000.0,"x4|1",1000.0,"x4|2",1000.0,"x4|3",1000.0 +0.45000000000000007,"0",0.0,"int1|0",2.25,"int1|1",2.25,"int1|2",2.25,"int1|3",2.25,"int1|4",2.25,"int2|0",1350.0,"int2|1",1350.0,"int2|2",1350.0,"int2|3",1350.0,"int2|4",1350.0,"int2|5",1350.0,"int2|6",1350.0,"int2|7",1350.0,"int2|8",1350.0,"x1|0",1.0,"x1|1",1.0,"x1|2",1.0,"x1|3",1.0,"x1|4",1.0,"x1|5",1.0,"x1|6",1.0,"x2|0",3.0,"x2|1",3.0,"x2|2",3.0,"x3|0",1000.0,"x3|1",1000.0,"x3|2",1000.0,"x3|3",1000.0,"x3|4",1000.0,"x3|5",1000.0,"x3|6",1000.0,"x3|7",1000.0,"x3|8",1000.0,"x4|0",1000.0,"x4|1",1000.0,"x4|2",1000.0,"x4|3",1000.0 +0.5200000000000001,"0",0.0,"int1|0",2.5999999999999996,"int1|1",2.5999999999999996,"int1|2",2.5999999999999996,"int1|3",2.5999999999999996,"int1|4",2.5999999999999996,"int2|0",1560.0,"int2|1",1560.0,"int2|2",1560.0,"int2|3",1560.0,"int2|4",1560.0,"int2|5",1560.0,"int2|6",1560.0,"int2|7",1560.0,"int2|8",1560.0,"x1|0",1.0,"x1|1",1.0,"x1|2",1.0,"x1|3",1.0,"x1|4",1.0,"x1|5",1.0,"x1|6",1.0,"x2|0",3.0,"x2|1",3.0,"x2|2",3.0,"x3|0",1000.0,"x3|1",1000.0,"x3|2",1000.0,"x3|3",1000.0,"x3|4",1000.0,"x3|5",1000.0,"x3|6",1000.0,"x3|7",1000.0,"x3|8",1000.0,"x4|0",1000.0,"x4|1",1000.0,"x4|2",1000.0,"x4|3",1000.0 +0.5900000000000002,"0",0.0,"int1|0",2.9499999999999993,"int1|1",2.9499999999999993,"int1|2",2.9499999999999993,"int1|3",2.9499999999999993,"int1|4",2.9499999999999993,"int2|0",1770.0,"int2|1",1770.0,"int2|2",1770.0,"int2|3",1770.0,"int2|4",1770.0,"int2|5",1770.0,"int2|6",1770.0,"int2|7",1770.0,"int2|8",1770.0,"x1|0",1.0,"x1|1",1.0,"x1|2",1.0,"x1|3",1.0,"x1|4",1.0,"x1|5",1.0,"x1|6",1.0,"x2|0",3.0,"x2|1",3.0,"x2|2",3.0,"x3|0",1000.0,"x3|1",1000.0,"x3|2",1000.0,"x3|3",1000.0,"x3|4",1000.0,"x3|5",1000.0,"x3|6",1000.0,"x3|7",1000.0,"x3|8",1000.0,"x4|0",1000.0,"x4|1",1000.0,"x4|2",1000.0,"x4|3",1000.0 +0.6600000000000003,"0",0.0,"int1|0",3.299999999999999,"int1|1",3.299999999999999,"int1|2",3.299999999999999,"int1|3",3.299999999999999,"int1|4",3.299999999999999,"int2|0",1980.0,"int2|1",1980.0,"int2|2",1980.0,"int2|3",1980.0,"int2|4",1980.0,"int2|5",1980.0,"int2|6",1980.0,"int2|7",1980.0,"int2|8",1980.0,"x1|0",1.0,"x1|1",1.0,"x1|2",1.0,"x1|3",1.0,"x1|4",1.0,"x1|5",1.0,"x1|6",1.0,"x2|0",3.0,"x2|1",3.0,"x2|2",3.0,"x3|0",1000.0,"x3|1",1000.0,"x3|2",1000.0,"x3|3",1000.0,"x3|4",1000.0,"x3|5",1000.0,"x3|6",1000.0,"x3|7",1000.0,"x3|8",1000.0,"x4|0",1000.0,"x4|1",1000.0,"x4|2",1000.0,"x4|3",1000.0 diff --git a/test/exampleLogs/data-example.mky.log b/test/exampleLogs/data-example.mky.log index c786a3ddf..849bde075 100644 --- a/test/exampleLogs/data-example.mky.log +++ b/test/exampleLogs/data-example.mky.log @@ -1,11 +1,11 @@ -nsteps 10 -0.3 {:x} 1 -1 {:x} 1 -1.7 {:x} 3.1 -2.4 {:x} 6 -3.1 {:x} 9.7 -3.8 {:x} 14.6 -4.5 {:x} 20.5 -5.2 {:x} 25 -5.9 {:x} 25 -6.6 {:x} 25 +nsteps, 10 +0.30000000000000004,":x",1.0 +1.0,":x",1.0 +1.7000000000000002,":x",3.1000000000000005 +2.4000000000000004,":x",6.000000000000002 +3.1000000000000005,":x",9.700000000000003 +3.8000000000000007,":x",14.600000000000005 +4.5,":x",20.5 +5.199999999999999,":x",25.0 +5.899999999999999,":x",25.0 +6.599999999999998,":x",25.0 diff --git a/test/exampleLogs/exponentialGrowth.mky.log b/test/exampleLogs/exponentialGrowth.mky.log index 62e2a3c43..3a0344085 100644 --- a/test/exampleLogs/exponentialGrowth.mky.log +++ b/test/exampleLogs/exponentialGrowth.mky.log @@ -1,11 +1,11 @@ -nsteps 10 -0.03 {:y} 0.997004 -0.1 {:y} 0.99005 -0.17 {:y} 0.983144 -0.24 {:y} 0.976286 -0.31 {:y} 0.969476 -0.38 {:y} 0.962713 -0.45 {:y} 0.955997 -0.52 {:y} 0.949329 -0.59 {:y} 0.942707 -0.66 {:y} 0.936131 +nsteps, 10 +0.03,"y",0.997004495503373 +0.09999999999999999,"y",0.990049833749168 +0.17,"y",0.9831436846349095 +0.24000000000000005,"y",0.9762857097579092 +0.31000000000000005,"y",0.9694755730760258 +0.38000000000000006,"y",0.9627129408911993 +0.45000000000000007,"y",0.9559974818330997 +0.5200000000000001,"y",0.9493288668428894 +0.5900000000000002,"y",0.9427067691570995 +0.6600000000000003,"y",0.9361308642916186 diff --git a/test/exampleLogs/exponentialGrowthWithExtraLabel.mky.log b/test/exampleLogs/exponentialGrowthWithExtraLabel.mky.log index e3c340358..6f0a79b4e 100644 --- a/test/exampleLogs/exponentialGrowthWithExtraLabel.mky.log +++ b/test/exampleLogs/exponentialGrowthWithExtraLabel.mky.log @@ -1,11 +1,11 @@ -nsteps 10 -0.03 {:a} -0.1 {:y} 0.997004 {:yy} 0.997004 -0.1 {:a} -0.1 {:y} 0.99005 {:yy} 0.99005 -0.17 {:a} -0.1 {:y} 0.983144 {:yy} 0.983144 -0.24 {:a} -0.1 {:y} 0.976286 {:yy} 0.976286 -0.31 {:a} -0.1 {:y} 0.969476 {:yy} 0.969476 -0.38 {:a} -0.1 {:y} 0.962713 {:yy} 0.962713 -0.45 {:a} -0.1 {:y} 0.955997 {:yy} 0.955997 -0.52 {:a} -0.1 {:y} 0.949329 {:yy} 0.949329 -0.59 {:a} -0.1 {:y} 0.942707 {:yy} 0.942707 -0.66 {:a} -0.1 {:y} 0.936131 {:yy} 0.936131 +nsteps, 10 +0.03,":a",-0.1,"y",0.997004495503373,":yy",0.997004495503373 +0.09999999999999999,":a",-0.1,"y",0.990049833749168,":yy",0.990049833749168 +0.17,":a",-0.1,"y",0.9831436846349095,":yy",0.9831436846349095 +0.24000000000000005,":a",-0.1,"y",0.9762857097579092,":yy",0.9762857097579092 +0.31000000000000005,":a",-0.1,"y",0.9694755730760258,":yy",0.9694755730760258 +0.38000000000000006,":a",-0.1,"y",0.9627129408911993,":yy",0.9627129408911993 +0.45000000000000007,":a",-0.1,"y",0.9559974818330997,":yy",0.9559974818330997 +0.5200000000000001,":a",-0.1,"y",0.9493288668428894,":yy",0.9493288668428894 +0.5900000000000002,":a",-0.1,"y",0.9427067691570995,":yy",0.9427067691570995 +0.6600000000000003,":a",-0.1,"y",0.9361308642916186,":yy",0.9361308642916186 diff --git a/test/exampleLogs/fundamentalConstants.mky.log b/test/exampleLogs/fundamentalConstants.mky.log index cf2daac15..624ba9fa1 100644 --- a/test/exampleLogs/fundamentalConstants.mky.log +++ b/test/exampleLogs/fundamentalConstants.mky.log @@ -1,11 +1,11 @@ -nsteps 10 -0.03 {:int1} 0.059982 {:res} 1.11191 {:res1} 1.5708 -0.1 {:int1} 0.199337 {:res} 1.27098 {:res1} 1.5708 -0.17 {:int1} 0.33678 {:res} 1.38808 {:res1} 1.5708 -0.24 {:int1} 0.47109 {:res} 1.4831 {:res1} 1.5708 -0.31 {:int1} 0.601211 {:res} 1.56326 {:res1} 1.5708 -0.38 {:int1} 0.726294 {:res} 1.63244 {:res1} 1.5708 -0.45 {:int1} 0.845708 {:res} 1.69305 {:res1} 1.5708 -0.52 {:int1} 0.959039 {:res} 1.74677 {:res1} 1.5708 -0.59 {:int1} 1.06607 {:res} 1.79482 {:res1} 1.5708 -0.66 {:int1} 1.16675 {:res} 1.83811 {:res1} 1.5708 +nsteps, 10 +0.03,"int1",0.05998200971375715,"res",1.1119147078112788,"res1",1.5707963267948966 +0.09999999999999999,"int1",0.19933730500760927,"res",1.270981603655763,"res1",1.5707963267948966 +0.17,"int1",0.336780314370856,"res",1.3880824910058713,"res1",1.5707963267948966 +0.24000000000000005,"int1",0.4710899615810472,"res",1.4831002323000568,"res1",1.5707963267948966 +0.31000000000000005,"int1",0.6012113402872921,"res",1.563262727569189,"res1",1.5707963267948966 +0.38000000000000006,"int1",0.7262940201472587,"res",1.6324364484183371,"res1",1.5707963267948966 +0.45000000000000007,"int1",0.845707852556959,"res",1.6930507122805996,"res1",1.5707963267948966 +0.5200000000000001,"int1",0.9590385842955692,"res",1.746774825246542,"res1",1.5707963267948966 +0.5900000000000002,"int1",1.0660682206704422,"res",1.79482294845334,"res1",1.5707963267948966 +0.6600000000000003,"int1",1.1667460142981665,"res",1.8381135562878388,"res1",1.5707963267948966 diff --git a/test/exampleLogs/gammaAndFriends.mky.log b/test/exampleLogs/gammaAndFriends.mky.log index 62597aa62..d3d1572b3 100644 --- a/test/exampleLogs/gammaAndFriends.mky.log +++ b/test/exampleLogs/gammaAndFriends.mky.log @@ -1,11 +1,11 @@ -nsteps 10 -0.13 {:int1} 0.248139 {:int2} -0.27444 {:int3} 2.34987 -0.2 {:int1} 0.648463 {:int2} -0.728652 {:int3} 5.13483 -0.27 {:int1} 0.921634 {:int2} -1.04597 {:int3} 6.5164 -0.34 {:int1} 1.12845 {:int2} -1.28795 {:int3} 7.35794 -0.41 {:int1} 1.29491 {:int2} -1.48129 {:int3} 7.93367 -0.48 {:int1} 1.43456 {:int2} -1.64007 {:int3} 8.35817 -0.55 {:int1} 1.5553 {:int2} -1.77269 {:int3} 8.68792 -0.62 {:int1} 1.66216 {:int2} -1.88458 {:int3} 8.95405 -0.69 {:int1} 1.75854 {:int2} -1.97951 {:int3} 9.17518 -0.76 {:int1} 1.84682 {:int2} -2.06017 {:int3} 9.36317 +nsteps, 10 +0.13,"int1",0.24813874993271332,"int2",-0.27444015895652046,"int3",2.3498736130332216 +0.2,"int1",0.6484629839606554,"int2",-0.7286516550261035,"int3",5.1348254736101 +0.27,"int1",0.9216344376460274,"int2",-1.0459656486444338,"int3",6.516400790216075 +0.34,"int1",1.1284451227684762,"int2",-1.2879537480615928,"int3",7.357943429623248 +0.41000000000000003,"int1",1.2949119632779649,"int2",-1.4812933867621971,"int3",7.933670271943572 +0.48000000000000004,"int1",1.4345576137424076,"int2",-1.6400706428919996,"int3",8.358167809399248 +0.55,"int1",1.5552983164678849,"int2",-1.7726850020630782,"int3",8.687915651306646 +0.6200000000000001,"int1",1.6621615140304364,"int2",-1.8845801193220395,"int3",8.954048527645881 +0.6900000000000002,"int1",1.7585372863869748,"int2",-1.97950559185106,"int3",9.17518474880836 +0.7600000000000002,"int1",1.8468204948011147,"int2",-2.0601672990781985,"int3",9.363170957137317 diff --git a/test/exampleLogs/inner-outer-example.mky.log b/test/exampleLogs/inner-outer-example.mky.log index 5b5469e25..be1bbef25 100644 --- a/test/exampleLogs/inner-outer-example.mky.log +++ b/test/exampleLogs/inner-outer-example.mky.log @@ -1,11 +1,11 @@ -nsteps 10 -0.03 {:int1|0} 0 {:int1|1} 0 {:int1|2} 0 {:int1|3} 0 {:int1|4} 0 {:int1|5} 0 {:int1|6} 0.03 {:int1|7} 0.06 {:int1|8} 0.09 {:int1|9} 0.12 {:int1|10} 0 {:int1|11} 0.06 {:int1|12} 0.12 {:int1|13} 0.18 {:int1|14} 0.24 {:int1|15} 0 {:int1|16} 0.09 {:int1|17} 0.18 {:int1|18} 0.27 {:int1|19} 0.36 {:int1|20} 0 {:int1|21} 0.12 {:int1|22} 0.24 {:int1|23} 0.36 {:int1|24} 0.48 {:int2|0} 0 {:int2|1} 0 {:int2|2} 0 {:int2|3} 0 {:int2|4} 0 {:int2|5} 0 {:int2|6} 0.9 {:int2|7} 1.8 {:int2|8} 2.7 {:int2|9} 3.6 {:int2|10} 0 {:int2|11} 1.8 {:int2|12} 3.6 {:int2|13} 5.4 {:int2|14} 7.2 {:int2|15} 0 {:int2|16} 2.7 {:int2|17} 5.4 {:int2|18} 8.1 {:int2|19} 10.8 {:int2|20} 0 {:int2|21} 3.6 {:int2|22} 7.2 {:int2|23} 10.8 {:int2|24} 14.4 {:iota(5)|0} 0 {:iota(5)|1} 1 {:iota(5)|2} 2 {:iota(5)|3} 3 {:iota(5)|4} 4 {:i·i|0} 0 {:i·i|1} 0 {:i·i|2} 0 {:i·i|3} 0 {:i·i|4} 0 {:i·i|5} 0 {:i·i|6} 30 {:i·i|7} 60 {:i·i|8} 90 {:i·i|9} 120 {:i·i|10} 0 {:i·i|11} 60 {:i·i|12} 120 {:i·i|13} 180 {:i·i|14} 240 {:i·i|15} 0 {:i·i|16} 90 {:i·i|17} 180 {:i·i|18} 270 {:i·i|19} 360 {:i·i|20} 0 {:i·i|21} 120 {:i·i|22} 240 {:i·i|23} 360 {:i·i|24} 480 {:i⊗i|0} 0 {:i⊗i|1} 0 {:i⊗i|2} 0 {:i⊗i|3} 0 {:i⊗i|4} 0 {:i⊗i|5} 0 {:i⊗i|6} 1 {:i⊗i|7} 2 {:i⊗i|8} 3 {:i⊗i|9} 4 {:i⊗i|10} 0 {:i⊗i|11} 2 {:i⊗i|12} 4 {:i⊗i|13} 6 {:i⊗i|14} 8 {:i⊗i|15} 0 {:i⊗i|16} 3 {:i⊗i|17} 6 {:i⊗i|18} 9 {:i⊗i|19} 12 {:i⊗i|20} 0 {:i⊗i|21} 4 {:i⊗i|22} 8 {:i⊗i|23} 12 {:i⊗i|24} 16 -0.1 {:int1|0} 0 {:int1|1} 0 {:int1|2} 0 {:int1|3} 0 {:int1|4} 0 {:int1|5} 0 {:int1|6} 0.1 {:int1|7} 0.2 {:int1|8} 0.3 {:int1|9} 0.4 {:int1|10} 0 {:int1|11} 0.2 {:int1|12} 0.4 {:int1|13} 0.6 {:int1|14} 0.8 {:int1|15} 0 {:int1|16} 0.3 {:int1|17} 0.6 {:int1|18} 0.9 {:int1|19} 1.2 {:int1|20} 0 {:int1|21} 0.4 {:int1|22} 0.8 {:int1|23} 1.2 {:int1|24} 1.6 {:int2|0} 0 {:int2|1} 0 {:int2|2} 0 {:int2|3} 0 {:int2|4} 0 {:int2|5} 0 {:int2|6} 3 {:int2|7} 6 {:int2|8} 9 {:int2|9} 12 {:int2|10} 0 {:int2|11} 6 {:int2|12} 12 {:int2|13} 18 {:int2|14} 24 {:int2|15} 0 {:int2|16} 9 {:int2|17} 18 {:int2|18} 27 {:int2|19} 36 {:int2|20} 0 {:int2|21} 12 {:int2|22} 24 {:int2|23} 36 {:int2|24} 48 {:iota(5)|0} 0 {:iota(5)|1} 1 {:iota(5)|2} 2 {:iota(5)|3} 3 {:iota(5)|4} 4 {:i·i|0} 0 {:i·i|1} 0 {:i·i|2} 0 {:i·i|3} 0 {:i·i|4} 0 {:i·i|5} 0 {:i·i|6} 30 {:i·i|7} 60 {:i·i|8} 90 {:i·i|9} 120 {:i·i|10} 0 {:i·i|11} 60 {:i·i|12} 120 {:i·i|13} 180 {:i·i|14} 240 {:i·i|15} 0 {:i·i|16} 90 {:i·i|17} 180 {:i·i|18} 270 {:i·i|19} 360 {:i·i|20} 0 {:i·i|21} 120 {:i·i|22} 240 {:i·i|23} 360 {:i·i|24} 480 {:i⊗i|0} 0 {:i⊗i|1} 0 {:i⊗i|2} 0 {:i⊗i|3} 0 {:i⊗i|4} 0 {:i⊗i|5} 0 {:i⊗i|6} 1 {:i⊗i|7} 2 {:i⊗i|8} 3 {:i⊗i|9} 4 {:i⊗i|10} 0 {:i⊗i|11} 2 {:i⊗i|12} 4 {:i⊗i|13} 6 {:i⊗i|14} 8 {:i⊗i|15} 0 {:i⊗i|16} 3 {:i⊗i|17} 6 {:i⊗i|18} 9 {:i⊗i|19} 12 {:i⊗i|20} 0 {:i⊗i|21} 4 {:i⊗i|22} 8 {:i⊗i|23} 12 {:i⊗i|24} 16 -0.17 {:int1|0} 0 {:int1|1} 0 {:int1|2} 0 {:int1|3} 0 {:int1|4} 0 {:int1|5} 0 {:int1|6} 0.17 {:int1|7} 0.34 {:int1|8} 0.51 {:int1|9} 0.68 {:int1|10} 0 {:int1|11} 0.34 {:int1|12} 0.68 {:int1|13} 1.02 {:int1|14} 1.36 {:int1|15} 0 {:int1|16} 0.51 {:int1|17} 1.02 {:int1|18} 1.53 {:int1|19} 2.04 {:int1|20} 0 {:int1|21} 0.68 {:int1|22} 1.36 {:int1|23} 2.04 {:int1|24} 2.72 {:int2|0} 0 {:int2|1} 0 {:int2|2} 0 {:int2|3} 0 {:int2|4} 0 {:int2|5} 0 {:int2|6} 5.1 {:int2|7} 10.2 {:int2|8} 15.3 {:int2|9} 20.4 {:int2|10} 0 {:int2|11} 10.2 {:int2|12} 20.4 {:int2|13} 30.6 {:int2|14} 40.8 {:int2|15} 0 {:int2|16} 15.3 {:int2|17} 30.6 {:int2|18} 45.9 {:int2|19} 61.2 {:int2|20} 0 {:int2|21} 20.4 {:int2|22} 40.8 {:int2|23} 61.2 {:int2|24} 81.6 {:iota(5)|0} 0 {:iota(5)|1} 1 {:iota(5)|2} 2 {:iota(5)|3} 3 {:iota(5)|4} 4 {:i·i|0} 0 {:i·i|1} 0 {:i·i|2} 0 {:i·i|3} 0 {:i·i|4} 0 {:i·i|5} 0 {:i·i|6} 30 {:i·i|7} 60 {:i·i|8} 90 {:i·i|9} 120 {:i·i|10} 0 {:i·i|11} 60 {:i·i|12} 120 {:i·i|13} 180 {:i·i|14} 240 {:i·i|15} 0 {:i·i|16} 90 {:i·i|17} 180 {:i·i|18} 270 {:i·i|19} 360 {:i·i|20} 0 {:i·i|21} 120 {:i·i|22} 240 {:i·i|23} 360 {:i·i|24} 480 {:i⊗i|0} 0 {:i⊗i|1} 0 {:i⊗i|2} 0 {:i⊗i|3} 0 {:i⊗i|4} 0 {:i⊗i|5} 0 {:i⊗i|6} 1 {:i⊗i|7} 2 {:i⊗i|8} 3 {:i⊗i|9} 4 {:i⊗i|10} 0 {:i⊗i|11} 2 {:i⊗i|12} 4 {:i⊗i|13} 6 {:i⊗i|14} 8 {:i⊗i|15} 0 {:i⊗i|16} 3 {:i⊗i|17} 6 {:i⊗i|18} 9 {:i⊗i|19} 12 {:i⊗i|20} 0 {:i⊗i|21} 4 {:i⊗i|22} 8 {:i⊗i|23} 12 {:i⊗i|24} 16 -0.24 {:int1|0} 0 {:int1|1} 0 {:int1|2} 0 {:int1|3} 0 {:int1|4} 0 {:int1|5} 0 {:int1|6} 0.24 {:int1|7} 0.48 {:int1|8} 0.72 {:int1|9} 0.96 {:int1|10} 0 {:int1|11} 0.48 {:int1|12} 0.96 {:int1|13} 1.44 {:int1|14} 1.92 {:int1|15} 0 {:int1|16} 0.72 {:int1|17} 1.44 {:int1|18} 2.16 {:int1|19} 2.88 {:int1|20} 0 {:int1|21} 0.96 {:int1|22} 1.92 {:int1|23} 2.88 {:int1|24} 3.84 {:int2|0} 0 {:int2|1} 0 {:int2|2} 0 {:int2|3} 0 {:int2|4} 0 {:int2|5} 0 {:int2|6} 7.2 {:int2|7} 14.4 {:int2|8} 21.6 {:int2|9} 28.8 {:int2|10} 0 {:int2|11} 14.4 {:int2|12} 28.8 {:int2|13} 43.2 {:int2|14} 57.6 {:int2|15} 0 {:int2|16} 21.6 {:int2|17} 43.2 {:int2|18} 64.8 {:int2|19} 86.4 {:int2|20} 0 {:int2|21} 28.8 {:int2|22} 57.6 {:int2|23} 86.4 {:int2|24} 115.2 {:iota(5)|0} 0 {:iota(5)|1} 1 {:iota(5)|2} 2 {:iota(5)|3} 3 {:iota(5)|4} 4 {:i·i|0} 0 {:i·i|1} 0 {:i·i|2} 0 {:i·i|3} 0 {:i·i|4} 0 {:i·i|5} 0 {:i·i|6} 30 {:i·i|7} 60 {:i·i|8} 90 {:i·i|9} 120 {:i·i|10} 0 {:i·i|11} 60 {:i·i|12} 120 {:i·i|13} 180 {:i·i|14} 240 {:i·i|15} 0 {:i·i|16} 90 {:i·i|17} 180 {:i·i|18} 270 {:i·i|19} 360 {:i·i|20} 0 {:i·i|21} 120 {:i·i|22} 240 {:i·i|23} 360 {:i·i|24} 480 {:i⊗i|0} 0 {:i⊗i|1} 0 {:i⊗i|2} 0 {:i⊗i|3} 0 {:i⊗i|4} 0 {:i⊗i|5} 0 {:i⊗i|6} 1 {:i⊗i|7} 2 {:i⊗i|8} 3 {:i⊗i|9} 4 {:i⊗i|10} 0 {:i⊗i|11} 2 {:i⊗i|12} 4 {:i⊗i|13} 6 {:i⊗i|14} 8 {:i⊗i|15} 0 {:i⊗i|16} 3 {:i⊗i|17} 6 {:i⊗i|18} 9 {:i⊗i|19} 12 {:i⊗i|20} 0 {:i⊗i|21} 4 {:i⊗i|22} 8 {:i⊗i|23} 12 {:i⊗i|24} 16 -0.31 {:int1|0} 0 {:int1|1} 0 {:int1|2} 0 {:int1|3} 0 {:int1|4} 0 {:int1|5} 0 {:int1|6} 0.31 {:int1|7} 0.62 {:int1|8} 0.93 {:int1|9} 1.24 {:int1|10} 0 {:int1|11} 0.62 {:int1|12} 1.24 {:int1|13} 1.86 {:int1|14} 2.48 {:int1|15} 0 {:int1|16} 0.93 {:int1|17} 1.86 {:int1|18} 2.79 {:int1|19} 3.72 {:int1|20} 0 {:int1|21} 1.24 {:int1|22} 2.48 {:int1|23} 3.72 {:int1|24} 4.96 {:int2|0} 0 {:int2|1} 0 {:int2|2} 0 {:int2|3} 0 {:int2|4} 0 {:int2|5} 0 {:int2|6} 9.3 {:int2|7} 18.6 {:int2|8} 27.9 {:int2|9} 37.2 {:int2|10} 0 {:int2|11} 18.6 {:int2|12} 37.2 {:int2|13} 55.8 {:int2|14} 74.4 {:int2|15} 0 {:int2|16} 27.9 {:int2|17} 55.8 {:int2|18} 83.7 {:int2|19} 111.6 {:int2|20} 0 {:int2|21} 37.2 {:int2|22} 74.4 {:int2|23} 111.6 {:int2|24} 148.8 {:iota(5)|0} 0 {:iota(5)|1} 1 {:iota(5)|2} 2 {:iota(5)|3} 3 {:iota(5)|4} 4 {:i·i|0} 0 {:i·i|1} 0 {:i·i|2} 0 {:i·i|3} 0 {:i·i|4} 0 {:i·i|5} 0 {:i·i|6} 30 {:i·i|7} 60 {:i·i|8} 90 {:i·i|9} 120 {:i·i|10} 0 {:i·i|11} 60 {:i·i|12} 120 {:i·i|13} 180 {:i·i|14} 240 {:i·i|15} 0 {:i·i|16} 90 {:i·i|17} 180 {:i·i|18} 270 {:i·i|19} 360 {:i·i|20} 0 {:i·i|21} 120 {:i·i|22} 240 {:i·i|23} 360 {:i·i|24} 480 {:i⊗i|0} 0 {:i⊗i|1} 0 {:i⊗i|2} 0 {:i⊗i|3} 0 {:i⊗i|4} 0 {:i⊗i|5} 0 {:i⊗i|6} 1 {:i⊗i|7} 2 {:i⊗i|8} 3 {:i⊗i|9} 4 {:i⊗i|10} 0 {:i⊗i|11} 2 {:i⊗i|12} 4 {:i⊗i|13} 6 {:i⊗i|14} 8 {:i⊗i|15} 0 {:i⊗i|16} 3 {:i⊗i|17} 6 {:i⊗i|18} 9 {:i⊗i|19} 12 {:i⊗i|20} 0 {:i⊗i|21} 4 {:i⊗i|22} 8 {:i⊗i|23} 12 {:i⊗i|24} 16 -0.38 {:int1|0} 0 {:int1|1} 0 {:int1|2} 0 {:int1|3} 0 {:int1|4} 0 {:int1|5} 0 {:int1|6} 0.38 {:int1|7} 0.76 {:int1|8} 1.14 {:int1|9} 1.52 {:int1|10} 0 {:int1|11} 0.76 {:int1|12} 1.52 {:int1|13} 2.28 {:int1|14} 3.04 {:int1|15} 0 {:int1|16} 1.14 {:int1|17} 2.28 {:int1|18} 3.42 {:int1|19} 4.56 {:int1|20} 0 {:int1|21} 1.52 {:int1|22} 3.04 {:int1|23} 4.56 {:int1|24} 6.08 {:int2|0} 0 {:int2|1} 0 {:int2|2} 0 {:int2|3} 0 {:int2|4} 0 {:int2|5} 0 {:int2|6} 11.4 {:int2|7} 22.8 {:int2|8} 34.2 {:int2|9} 45.6 {:int2|10} 0 {:int2|11} 22.8 {:int2|12} 45.6 {:int2|13} 68.4 {:int2|14} 91.2 {:int2|15} 0 {:int2|16} 34.2 {:int2|17} 68.4 {:int2|18} 102.6 {:int2|19} 136.8 {:int2|20} 0 {:int2|21} 45.6 {:int2|22} 91.2 {:int2|23} 136.8 {:int2|24} 182.4 {:iota(5)|0} 0 {:iota(5)|1} 1 {:iota(5)|2} 2 {:iota(5)|3} 3 {:iota(5)|4} 4 {:i·i|0} 0 {:i·i|1} 0 {:i·i|2} 0 {:i·i|3} 0 {:i·i|4} 0 {:i·i|5} 0 {:i·i|6} 30 {:i·i|7} 60 {:i·i|8} 90 {:i·i|9} 120 {:i·i|10} 0 {:i·i|11} 60 {:i·i|12} 120 {:i·i|13} 180 {:i·i|14} 240 {:i·i|15} 0 {:i·i|16} 90 {:i·i|17} 180 {:i·i|18} 270 {:i·i|19} 360 {:i·i|20} 0 {:i·i|21} 120 {:i·i|22} 240 {:i·i|23} 360 {:i·i|24} 480 {:i⊗i|0} 0 {:i⊗i|1} 0 {:i⊗i|2} 0 {:i⊗i|3} 0 {:i⊗i|4} 0 {:i⊗i|5} 0 {:i⊗i|6} 1 {:i⊗i|7} 2 {:i⊗i|8} 3 {:i⊗i|9} 4 {:i⊗i|10} 0 {:i⊗i|11} 2 {:i⊗i|12} 4 {:i⊗i|13} 6 {:i⊗i|14} 8 {:i⊗i|15} 0 {:i⊗i|16} 3 {:i⊗i|17} 6 {:i⊗i|18} 9 {:i⊗i|19} 12 {:i⊗i|20} 0 {:i⊗i|21} 4 {:i⊗i|22} 8 {:i⊗i|23} 12 {:i⊗i|24} 16 -0.45 {:int1|0} 0 {:int1|1} 0 {:int1|2} 0 {:int1|3} 0 {:int1|4} 0 {:int1|5} 0 {:int1|6} 0.45 {:int1|7} 0.9 {:int1|8} 1.35 {:int1|9} 1.8 {:int1|10} 0 {:int1|11} 0.9 {:int1|12} 1.8 {:int1|13} 2.7 {:int1|14} 3.6 {:int1|15} 0 {:int1|16} 1.35 {:int1|17} 2.7 {:int1|18} 4.05 {:int1|19} 5.4 {:int1|20} 0 {:int1|21} 1.8 {:int1|22} 3.6 {:int1|23} 5.4 {:int1|24} 7.2 {:int2|0} 0 {:int2|1} 0 {:int2|2} 0 {:int2|3} 0 {:int2|4} 0 {:int2|5} 0 {:int2|6} 13.5 {:int2|7} 27 {:int2|8} 40.5 {:int2|9} 54 {:int2|10} 0 {:int2|11} 27 {:int2|12} 54 {:int2|13} 81 {:int2|14} 108 {:int2|15} 0 {:int2|16} 40.5 {:int2|17} 81 {:int2|18} 121.5 {:int2|19} 162 {:int2|20} 0 {:int2|21} 54 {:int2|22} 108 {:int2|23} 162 {:int2|24} 216 {:iota(5)|0} 0 {:iota(5)|1} 1 {:iota(5)|2} 2 {:iota(5)|3} 3 {:iota(5)|4} 4 {:i·i|0} 0 {:i·i|1} 0 {:i·i|2} 0 {:i·i|3} 0 {:i·i|4} 0 {:i·i|5} 0 {:i·i|6} 30 {:i·i|7} 60 {:i·i|8} 90 {:i·i|9} 120 {:i·i|10} 0 {:i·i|11} 60 {:i·i|12} 120 {:i·i|13} 180 {:i·i|14} 240 {:i·i|15} 0 {:i·i|16} 90 {:i·i|17} 180 {:i·i|18} 270 {:i·i|19} 360 {:i·i|20} 0 {:i·i|21} 120 {:i·i|22} 240 {:i·i|23} 360 {:i·i|24} 480 {:i⊗i|0} 0 {:i⊗i|1} 0 {:i⊗i|2} 0 {:i⊗i|3} 0 {:i⊗i|4} 0 {:i⊗i|5} 0 {:i⊗i|6} 1 {:i⊗i|7} 2 {:i⊗i|8} 3 {:i⊗i|9} 4 {:i⊗i|10} 0 {:i⊗i|11} 2 {:i⊗i|12} 4 {:i⊗i|13} 6 {:i⊗i|14} 8 {:i⊗i|15} 0 {:i⊗i|16} 3 {:i⊗i|17} 6 {:i⊗i|18} 9 {:i⊗i|19} 12 {:i⊗i|20} 0 {:i⊗i|21} 4 {:i⊗i|22} 8 {:i⊗i|23} 12 {:i⊗i|24} 16 -0.52 {:int1|0} 0 {:int1|1} 0 {:int1|2} 0 {:int1|3} 0 {:int1|4} 0 {:int1|5} 0 {:int1|6} 0.52 {:int1|7} 1.04 {:int1|8} 1.56 {:int1|9} 2.08 {:int1|10} 0 {:int1|11} 1.04 {:int1|12} 2.08 {:int1|13} 3.12 {:int1|14} 4.16 {:int1|15} 0 {:int1|16} 1.56 {:int1|17} 3.12 {:int1|18} 4.68 {:int1|19} 6.24 {:int1|20} 0 {:int1|21} 2.08 {:int1|22} 4.16 {:int1|23} 6.24 {:int1|24} 8.32 {:int2|0} 0 {:int2|1} 0 {:int2|2} 0 {:int2|3} 0 {:int2|4} 0 {:int2|5} 0 {:int2|6} 15.6 {:int2|7} 31.2 {:int2|8} 46.8 {:int2|9} 62.4 {:int2|10} 0 {:int2|11} 31.2 {:int2|12} 62.4 {:int2|13} 93.6 {:int2|14} 124.8 {:int2|15} 0 {:int2|16} 46.8 {:int2|17} 93.6 {:int2|18} 140.4 {:int2|19} 187.2 {:int2|20} 0 {:int2|21} 62.4 {:int2|22} 124.8 {:int2|23} 187.2 {:int2|24} 249.6 {:iota(5)|0} 0 {:iota(5)|1} 1 {:iota(5)|2} 2 {:iota(5)|3} 3 {:iota(5)|4} 4 {:i·i|0} 0 {:i·i|1} 0 {:i·i|2} 0 {:i·i|3} 0 {:i·i|4} 0 {:i·i|5} 0 {:i·i|6} 30 {:i·i|7} 60 {:i·i|8} 90 {:i·i|9} 120 {:i·i|10} 0 {:i·i|11} 60 {:i·i|12} 120 {:i·i|13} 180 {:i·i|14} 240 {:i·i|15} 0 {:i·i|16} 90 {:i·i|17} 180 {:i·i|18} 270 {:i·i|19} 360 {:i·i|20} 0 {:i·i|21} 120 {:i·i|22} 240 {:i·i|23} 360 {:i·i|24} 480 {:i⊗i|0} 0 {:i⊗i|1} 0 {:i⊗i|2} 0 {:i⊗i|3} 0 {:i⊗i|4} 0 {:i⊗i|5} 0 {:i⊗i|6} 1 {:i⊗i|7} 2 {:i⊗i|8} 3 {:i⊗i|9} 4 {:i⊗i|10} 0 {:i⊗i|11} 2 {:i⊗i|12} 4 {:i⊗i|13} 6 {:i⊗i|14} 8 {:i⊗i|15} 0 {:i⊗i|16} 3 {:i⊗i|17} 6 {:i⊗i|18} 9 {:i⊗i|19} 12 {:i⊗i|20} 0 {:i⊗i|21} 4 {:i⊗i|22} 8 {:i⊗i|23} 12 {:i⊗i|24} 16 -0.59 {:int1|0} 0 {:int1|1} 0 {:int1|2} 0 {:int1|3} 0 {:int1|4} 0 {:int1|5} 0 {:int1|6} 0.59 {:int1|7} 1.18 {:int1|8} 1.77 {:int1|9} 2.36 {:int1|10} 0 {:int1|11} 1.18 {:int1|12} 2.36 {:int1|13} 3.54 {:int1|14} 4.72 {:int1|15} 0 {:int1|16} 1.77 {:int1|17} 3.54 {:int1|18} 5.31 {:int1|19} 7.08 {:int1|20} 0 {:int1|21} 2.36 {:int1|22} 4.72 {:int1|23} 7.08 {:int1|24} 9.44 {:int2|0} 0 {:int2|1} 0 {:int2|2} 0 {:int2|3} 0 {:int2|4} 0 {:int2|5} 0 {:int2|6} 17.7 {:int2|7} 35.4 {:int2|8} 53.1 {:int2|9} 70.8 {:int2|10} 0 {:int2|11} 35.4 {:int2|12} 70.8 {:int2|13} 106.2 {:int2|14} 141.6 {:int2|15} 0 {:int2|16} 53.1 {:int2|17} 106.2 {:int2|18} 159.3 {:int2|19} 212.4 {:int2|20} 0 {:int2|21} 70.8 {:int2|22} 141.6 {:int2|23} 212.4 {:int2|24} 283.2 {:iota(5)|0} 0 {:iota(5)|1} 1 {:iota(5)|2} 2 {:iota(5)|3} 3 {:iota(5)|4} 4 {:i·i|0} 0 {:i·i|1} 0 {:i·i|2} 0 {:i·i|3} 0 {:i·i|4} 0 {:i·i|5} 0 {:i·i|6} 30 {:i·i|7} 60 {:i·i|8} 90 {:i·i|9} 120 {:i·i|10} 0 {:i·i|11} 60 {:i·i|12} 120 {:i·i|13} 180 {:i·i|14} 240 {:i·i|15} 0 {:i·i|16} 90 {:i·i|17} 180 {:i·i|18} 270 {:i·i|19} 360 {:i·i|20} 0 {:i·i|21} 120 {:i·i|22} 240 {:i·i|23} 360 {:i·i|24} 480 {:i⊗i|0} 0 {:i⊗i|1} 0 {:i⊗i|2} 0 {:i⊗i|3} 0 {:i⊗i|4} 0 {:i⊗i|5} 0 {:i⊗i|6} 1 {:i⊗i|7} 2 {:i⊗i|8} 3 {:i⊗i|9} 4 {:i⊗i|10} 0 {:i⊗i|11} 2 {:i⊗i|12} 4 {:i⊗i|13} 6 {:i⊗i|14} 8 {:i⊗i|15} 0 {:i⊗i|16} 3 {:i⊗i|17} 6 {:i⊗i|18} 9 {:i⊗i|19} 12 {:i⊗i|20} 0 {:i⊗i|21} 4 {:i⊗i|22} 8 {:i⊗i|23} 12 {:i⊗i|24} 16 -0.66 {:int1|0} 0 {:int1|1} 0 {:int1|2} 0 {:int1|3} 0 {:int1|4} 0 {:int1|5} 0 {:int1|6} 0.66 {:int1|7} 1.32 {:int1|8} 1.98 {:int1|9} 2.64 {:int1|10} 0 {:int1|11} 1.32 {:int1|12} 2.64 {:int1|13} 3.96 {:int1|14} 5.28 {:int1|15} 0 {:int1|16} 1.98 {:int1|17} 3.96 {:int1|18} 5.94 {:int1|19} 7.92 {:int1|20} 0 {:int1|21} 2.64 {:int1|22} 5.28 {:int1|23} 7.92 {:int1|24} 10.56 {:int2|0} 0 {:int2|1} 0 {:int2|2} 0 {:int2|3} 0 {:int2|4} 0 {:int2|5} 0 {:int2|6} 19.8 {:int2|7} 39.6 {:int2|8} 59.4 {:int2|9} 79.2 {:int2|10} 0 {:int2|11} 39.6 {:int2|12} 79.2 {:int2|13} 118.8 {:int2|14} 158.4 {:int2|15} 0 {:int2|16} 59.4 {:int2|17} 118.8 {:int2|18} 178.2 {:int2|19} 237.6 {:int2|20} 0 {:int2|21} 79.2 {:int2|22} 158.4 {:int2|23} 237.6 {:int2|24} 316.8 {:iota(5)|0} 0 {:iota(5)|1} 1 {:iota(5)|2} 2 {:iota(5)|3} 3 {:iota(5)|4} 4 {:i·i|0} 0 {:i·i|1} 0 {:i·i|2} 0 {:i·i|3} 0 {:i·i|4} 0 {:i·i|5} 0 {:i·i|6} 30 {:i·i|7} 60 {:i·i|8} 90 {:i·i|9} 120 {:i·i|10} 0 {:i·i|11} 60 {:i·i|12} 120 {:i·i|13} 180 {:i·i|14} 240 {:i·i|15} 0 {:i·i|16} 90 {:i·i|17} 180 {:i·i|18} 270 {:i·i|19} 360 {:i·i|20} 0 {:i·i|21} 120 {:i·i|22} 240 {:i·i|23} 360 {:i·i|24} 480 {:i⊗i|0} 0 {:i⊗i|1} 0 {:i⊗i|2} 0 {:i⊗i|3} 0 {:i⊗i|4} 0 {:i⊗i|5} 0 {:i⊗i|6} 1 {:i⊗i|7} 2 {:i⊗i|8} 3 {:i⊗i|9} 4 {:i⊗i|10} 0 {:i⊗i|11} 2 {:i⊗i|12} 4 {:i⊗i|13} 6 {:i⊗i|14} 8 {:i⊗i|15} 0 {:i⊗i|16} 3 {:i⊗i|17} 6 {:i⊗i|18} 9 {:i⊗i|19} 12 {:i⊗i|20} 0 {:i⊗i|21} 4 {:i⊗i|22} 8 {:i⊗i|23} 12 {:i⊗i|24} 16 +nsteps, 10 +0.03,"int1|0",0.0,"int1|1",0.0,"int1|2",0.0,"int1|3",0.0,"int1|4",0.0,"int1|5",0.0,"int1|6",0.0,"int1|7",0.0,"int1|8",0.0,"int1|9",0.0,"int1|10",0.0,"int1|11",0.0,"int1|12",0.0,"int1|13",0.0,"int1|14",0.0,"int1|15",0.0,"int1|16",0.0,"int1|17",0.0,"int1|18",0.0,"int1|19",0.0,"int1|20",0.0,"int1|21",0.0,"int1|22",0.0,"int1|23",0.0,"int1|24",0.0,"int2|0",0.0,"int2|1",0.0,"int2|2",0.0,"int2|3",0.0,"int2|4",0.0,"int2|5",0.0,"int2|6",0.0,"int2|7",0.0,"int2|8",0.0,"int2|9",0.0,"int2|10",0.0,"int2|11",0.0,"int2|12",0.0,"int2|13",0.0,"int2|14",0.0,"int2|15",0.0,"int2|16",0.0,"int2|17",0.0,"int2|18",0.0,"int2|19",0.0,"int2|20",0.0,"int2|21",0.0,"int2|22",0.0,"int2|23",0.0,"int2|24",0.0,"iota(5)|0",0.0,"iota(5)|1",0.0,"iota(5)|2",0.0,"iota(5)|3",0.0,"iota(5)|4",0.0,"i\cdot i|0",0.0,"i\cdot i|1",0.0,"i\cdot i|2",0.0,"i\cdot i|3",0.0,"i\cdot i|4",0.0,"i\cdot i|5",0.0,"i\cdot i|6",0.0,"i\cdot i|7",0.0,"i\cdot i|8",0.0,"i\cdot i|9",0.0,"i\cdot i|10",0.0,"i\cdot i|11",0.0,"i\cdot i|12",0.0,"i\cdot i|13",0.0,"i\cdot i|14",0.0,"i\cdot i|15",0.0,"i\cdot i|16",0.0,"i\cdot i|17",0.0,"i\cdot i|18",0.0,"i\cdot i|19",0.0,"i\cdot i|20",0.0,"i\cdot i|21",0.0,"i\cdot i|22",0.0,"i\cdot i|23",0.0,"i\cdot i|24",0.0,"i\otimes i|0",0.0,"i\otimes i|1",0.0,"i\otimes i|2",0.0,"i\otimes i|3",0.0,"i\otimes i|4",0.0,"i\otimes i|5",0.0,"i\otimes i|6",0.0,"i\otimes i|7",0.0,"i\otimes i|8",0.0,"i\otimes i|9",0.0,"i\otimes i|10",0.0,"i\otimes i|11",0.0,"i\otimes i|12",0.0,"i\otimes i|13",0.0,"i\otimes i|14",0.0,"i\otimes i|15",0.0,"i\otimes i|16",0.0,"i\otimes i|17",0.0,"i\otimes i|18",0.0,"i\otimes i|19",0.0,"i\otimes i|20",0.0,"i\otimes i|21",0.0,"i\otimes i|22",0.0,"i\otimes i|23",0.0,"i\otimes i|24",0.0 +0.09999999999999999,"int1|0",0.0,"int1|1",0.0,"int1|2",0.0,"int1|3",0.0,"int1|4",0.0,"int1|5",0.0,"int1|6",0.0,"int1|7",0.0,"int1|8",0.0,"int1|9",0.0,"int1|10",0.0,"int1|11",0.0,"int1|12",0.0,"int1|13",0.0,"int1|14",0.0,"int1|15",0.0,"int1|16",0.0,"int1|17",0.0,"int1|18",0.0,"int1|19",0.0,"int1|20",0.0,"int1|21",0.0,"int1|22",0.0,"int1|23",0.0,"int1|24",0.0,"int2|0",0.0,"int2|1",0.0,"int2|2",0.0,"int2|3",0.0,"int2|4",0.0,"int2|5",0.0,"int2|6",0.0,"int2|7",0.0,"int2|8",0.0,"int2|9",0.0,"int2|10",0.0,"int2|11",0.0,"int2|12",0.0,"int2|13",0.0,"int2|14",0.0,"int2|15",0.0,"int2|16",0.0,"int2|17",0.0,"int2|18",0.0,"int2|19",0.0,"int2|20",0.0,"int2|21",0.0,"int2|22",0.0,"int2|23",0.0,"int2|24",0.0,"iota(5)|0",0.0,"iota(5)|1",0.0,"iota(5)|2",0.0,"iota(5)|3",0.0,"iota(5)|4",0.0,"i\cdot i|0",0.0,"i\cdot i|1",0.0,"i\cdot i|2",0.0,"i\cdot i|3",0.0,"i\cdot i|4",0.0,"i\cdot i|5",0.0,"i\cdot i|6",0.0,"i\cdot i|7",0.0,"i\cdot i|8",0.0,"i\cdot i|9",0.0,"i\cdot i|10",0.0,"i\cdot i|11",0.0,"i\cdot i|12",0.0,"i\cdot i|13",0.0,"i\cdot i|14",0.0,"i\cdot i|15",0.0,"i\cdot i|16",0.0,"i\cdot i|17",0.0,"i\cdot i|18",0.0,"i\cdot i|19",0.0,"i\cdot i|20",0.0,"i\cdot i|21",0.0,"i\cdot i|22",0.0,"i\cdot i|23",0.0,"i\cdot i|24",0.0,"i\otimes i|0",0.0,"i\otimes i|1",0.0,"i\otimes i|2",0.0,"i\otimes i|3",0.0,"i\otimes i|4",0.0,"i\otimes i|5",0.0,"i\otimes i|6",0.0,"i\otimes i|7",0.0,"i\otimes i|8",0.0,"i\otimes i|9",0.0,"i\otimes i|10",0.0,"i\otimes i|11",0.0,"i\otimes i|12",0.0,"i\otimes i|13",0.0,"i\otimes i|14",0.0,"i\otimes i|15",0.0,"i\otimes i|16",0.0,"i\otimes i|17",0.0,"i\otimes i|18",0.0,"i\otimes i|19",0.0,"i\otimes i|20",0.0,"i\otimes i|21",0.0,"i\otimes i|22",0.0,"i\otimes i|23",0.0,"i\otimes i|24",0.0 +0.17,"int1|0",0.0,"int1|1",0.0,"int1|2",0.0,"int1|3",0.0,"int1|4",0.0,"int1|5",0.0,"int1|6",0.0,"int1|7",0.0,"int1|8",0.0,"int1|9",0.0,"int1|10",0.0,"int1|11",0.0,"int1|12",0.0,"int1|13",0.0,"int1|14",0.0,"int1|15",0.0,"int1|16",0.0,"int1|17",0.0,"int1|18",0.0,"int1|19",0.0,"int1|20",0.0,"int1|21",0.0,"int1|22",0.0,"int1|23",0.0,"int1|24",0.0,"int2|0",0.0,"int2|1",0.0,"int2|2",0.0,"int2|3",0.0,"int2|4",0.0,"int2|5",0.0,"int2|6",0.0,"int2|7",0.0,"int2|8",0.0,"int2|9",0.0,"int2|10",0.0,"int2|11",0.0,"int2|12",0.0,"int2|13",0.0,"int2|14",0.0,"int2|15",0.0,"int2|16",0.0,"int2|17",0.0,"int2|18",0.0,"int2|19",0.0,"int2|20",0.0,"int2|21",0.0,"int2|22",0.0,"int2|23",0.0,"int2|24",0.0,"iota(5)|0",0.0,"iota(5)|1",0.0,"iota(5)|2",0.0,"iota(5)|3",0.0,"iota(5)|4",0.0,"i\cdot i|0",0.0,"i\cdot i|1",0.0,"i\cdot i|2",0.0,"i\cdot i|3",0.0,"i\cdot i|4",0.0,"i\cdot i|5",0.0,"i\cdot i|6",0.0,"i\cdot i|7",0.0,"i\cdot i|8",0.0,"i\cdot i|9",0.0,"i\cdot i|10",0.0,"i\cdot i|11",0.0,"i\cdot i|12",0.0,"i\cdot i|13",0.0,"i\cdot i|14",0.0,"i\cdot i|15",0.0,"i\cdot i|16",0.0,"i\cdot i|17",0.0,"i\cdot i|18",0.0,"i\cdot i|19",0.0,"i\cdot i|20",0.0,"i\cdot i|21",0.0,"i\cdot i|22",0.0,"i\cdot i|23",0.0,"i\cdot i|24",0.0,"i\otimes i|0",0.0,"i\otimes i|1",0.0,"i\otimes i|2",0.0,"i\otimes i|3",0.0,"i\otimes i|4",0.0,"i\otimes i|5",0.0,"i\otimes i|6",0.0,"i\otimes i|7",0.0,"i\otimes i|8",0.0,"i\otimes i|9",0.0,"i\otimes i|10",0.0,"i\otimes i|11",0.0,"i\otimes i|12",0.0,"i\otimes i|13",0.0,"i\otimes i|14",0.0,"i\otimes i|15",0.0,"i\otimes i|16",0.0,"i\otimes i|17",0.0,"i\otimes i|18",0.0,"i\otimes i|19",0.0,"i\otimes i|20",0.0,"i\otimes i|21",0.0,"i\otimes i|22",0.0,"i\otimes i|23",0.0,"i\otimes i|24",0.0 +0.24000000000000005,"int1|0",0.0,"int1|1",0.0,"int1|2",0.0,"int1|3",0.0,"int1|4",0.0,"int1|5",0.0,"int1|6",0.0,"int1|7",0.0,"int1|8",0.0,"int1|9",0.0,"int1|10",0.0,"int1|11",0.0,"int1|12",0.0,"int1|13",0.0,"int1|14",0.0,"int1|15",0.0,"int1|16",0.0,"int1|17",0.0,"int1|18",0.0,"int1|19",0.0,"int1|20",0.0,"int1|21",0.0,"int1|22",0.0,"int1|23",0.0,"int1|24",0.0,"int2|0",0.0,"int2|1",0.0,"int2|2",0.0,"int2|3",0.0,"int2|4",0.0,"int2|5",0.0,"int2|6",0.0,"int2|7",0.0,"int2|8",0.0,"int2|9",0.0,"int2|10",0.0,"int2|11",0.0,"int2|12",0.0,"int2|13",0.0,"int2|14",0.0,"int2|15",0.0,"int2|16",0.0,"int2|17",0.0,"int2|18",0.0,"int2|19",0.0,"int2|20",0.0,"int2|21",0.0,"int2|22",0.0,"int2|23",0.0,"int2|24",0.0,"iota(5)|0",0.0,"iota(5)|1",0.0,"iota(5)|2",0.0,"iota(5)|3",0.0,"iota(5)|4",0.0,"i\cdot i|0",0.0,"i\cdot i|1",0.0,"i\cdot i|2",0.0,"i\cdot i|3",0.0,"i\cdot i|4",0.0,"i\cdot i|5",0.0,"i\cdot i|6",0.0,"i\cdot i|7",0.0,"i\cdot i|8",0.0,"i\cdot i|9",0.0,"i\cdot i|10",0.0,"i\cdot i|11",0.0,"i\cdot i|12",0.0,"i\cdot i|13",0.0,"i\cdot i|14",0.0,"i\cdot i|15",0.0,"i\cdot i|16",0.0,"i\cdot i|17",0.0,"i\cdot i|18",0.0,"i\cdot i|19",0.0,"i\cdot i|20",0.0,"i\cdot i|21",0.0,"i\cdot i|22",0.0,"i\cdot i|23",0.0,"i\cdot i|24",0.0,"i\otimes i|0",0.0,"i\otimes i|1",0.0,"i\otimes i|2",0.0,"i\otimes i|3",0.0,"i\otimes i|4",0.0,"i\otimes i|5",0.0,"i\otimes i|6",0.0,"i\otimes i|7",0.0,"i\otimes i|8",0.0,"i\otimes i|9",0.0,"i\otimes i|10",0.0,"i\otimes i|11",0.0,"i\otimes i|12",0.0,"i\otimes i|13",0.0,"i\otimes i|14",0.0,"i\otimes i|15",0.0,"i\otimes i|16",0.0,"i\otimes i|17",0.0,"i\otimes i|18",0.0,"i\otimes i|19",0.0,"i\otimes i|20",0.0,"i\otimes i|21",0.0,"i\otimes i|22",0.0,"i\otimes i|23",0.0,"i\otimes i|24",0.0 +0.31000000000000005,"int1|0",0.0,"int1|1",0.0,"int1|2",0.0,"int1|3",0.0,"int1|4",0.0,"int1|5",0.0,"int1|6",0.0,"int1|7",0.0,"int1|8",0.0,"int1|9",0.0,"int1|10",0.0,"int1|11",0.0,"int1|12",0.0,"int1|13",0.0,"int1|14",0.0,"int1|15",0.0,"int1|16",0.0,"int1|17",0.0,"int1|18",0.0,"int1|19",0.0,"int1|20",0.0,"int1|21",0.0,"int1|22",0.0,"int1|23",0.0,"int1|24",0.0,"int2|0",0.0,"int2|1",0.0,"int2|2",0.0,"int2|3",0.0,"int2|4",0.0,"int2|5",0.0,"int2|6",0.0,"int2|7",0.0,"int2|8",0.0,"int2|9",0.0,"int2|10",0.0,"int2|11",0.0,"int2|12",0.0,"int2|13",0.0,"int2|14",0.0,"int2|15",0.0,"int2|16",0.0,"int2|17",0.0,"int2|18",0.0,"int2|19",0.0,"int2|20",0.0,"int2|21",0.0,"int2|22",0.0,"int2|23",0.0,"int2|24",0.0,"iota(5)|0",0.0,"iota(5)|1",0.0,"iota(5)|2",0.0,"iota(5)|3",0.0,"iota(5)|4",0.0,"i\cdot i|0",0.0,"i\cdot i|1",0.0,"i\cdot i|2",0.0,"i\cdot i|3",0.0,"i\cdot i|4",0.0,"i\cdot i|5",0.0,"i\cdot i|6",0.0,"i\cdot i|7",0.0,"i\cdot i|8",0.0,"i\cdot i|9",0.0,"i\cdot i|10",0.0,"i\cdot i|11",0.0,"i\cdot i|12",0.0,"i\cdot i|13",0.0,"i\cdot i|14",0.0,"i\cdot i|15",0.0,"i\cdot i|16",0.0,"i\cdot i|17",0.0,"i\cdot i|18",0.0,"i\cdot i|19",0.0,"i\cdot i|20",0.0,"i\cdot i|21",0.0,"i\cdot i|22",0.0,"i\cdot i|23",0.0,"i\cdot i|24",0.0,"i\otimes i|0",0.0,"i\otimes i|1",0.0,"i\otimes i|2",0.0,"i\otimes i|3",0.0,"i\otimes i|4",0.0,"i\otimes i|5",0.0,"i\otimes i|6",0.0,"i\otimes i|7",0.0,"i\otimes i|8",0.0,"i\otimes i|9",0.0,"i\otimes i|10",0.0,"i\otimes i|11",0.0,"i\otimes i|12",0.0,"i\otimes i|13",0.0,"i\otimes i|14",0.0,"i\otimes i|15",0.0,"i\otimes i|16",0.0,"i\otimes i|17",0.0,"i\otimes i|18",0.0,"i\otimes i|19",0.0,"i\otimes i|20",0.0,"i\otimes i|21",0.0,"i\otimes i|22",0.0,"i\otimes i|23",0.0,"i\otimes i|24",0.0 +0.38000000000000006,"int1|0",0.0,"int1|1",0.0,"int1|2",0.0,"int1|3",0.0,"int1|4",0.0,"int1|5",0.0,"int1|6",0.0,"int1|7",0.0,"int1|8",0.0,"int1|9",0.0,"int1|10",0.0,"int1|11",0.0,"int1|12",0.0,"int1|13",0.0,"int1|14",0.0,"int1|15",0.0,"int1|16",0.0,"int1|17",0.0,"int1|18",0.0,"int1|19",0.0,"int1|20",0.0,"int1|21",0.0,"int1|22",0.0,"int1|23",0.0,"int1|24",0.0,"int2|0",0.0,"int2|1",0.0,"int2|2",0.0,"int2|3",0.0,"int2|4",0.0,"int2|5",0.0,"int2|6",0.0,"int2|7",0.0,"int2|8",0.0,"int2|9",0.0,"int2|10",0.0,"int2|11",0.0,"int2|12",0.0,"int2|13",0.0,"int2|14",0.0,"int2|15",0.0,"int2|16",0.0,"int2|17",0.0,"int2|18",0.0,"int2|19",0.0,"int2|20",0.0,"int2|21",0.0,"int2|22",0.0,"int2|23",0.0,"int2|24",0.0,"iota(5)|0",0.0,"iota(5)|1",0.0,"iota(5)|2",0.0,"iota(5)|3",0.0,"iota(5)|4",0.0,"i\cdot i|0",0.0,"i\cdot i|1",0.0,"i\cdot i|2",0.0,"i\cdot i|3",0.0,"i\cdot i|4",0.0,"i\cdot i|5",0.0,"i\cdot i|6",0.0,"i\cdot i|7",0.0,"i\cdot i|8",0.0,"i\cdot i|9",0.0,"i\cdot i|10",0.0,"i\cdot i|11",0.0,"i\cdot i|12",0.0,"i\cdot i|13",0.0,"i\cdot i|14",0.0,"i\cdot i|15",0.0,"i\cdot i|16",0.0,"i\cdot i|17",0.0,"i\cdot i|18",0.0,"i\cdot i|19",0.0,"i\cdot i|20",0.0,"i\cdot i|21",0.0,"i\cdot i|22",0.0,"i\cdot i|23",0.0,"i\cdot i|24",0.0,"i\otimes i|0",0.0,"i\otimes i|1",0.0,"i\otimes i|2",0.0,"i\otimes i|3",0.0,"i\otimes i|4",0.0,"i\otimes i|5",0.0,"i\otimes i|6",0.0,"i\otimes i|7",0.0,"i\otimes i|8",0.0,"i\otimes i|9",0.0,"i\otimes i|10",0.0,"i\otimes i|11",0.0,"i\otimes i|12",0.0,"i\otimes i|13",0.0,"i\otimes i|14",0.0,"i\otimes i|15",0.0,"i\otimes i|16",0.0,"i\otimes i|17",0.0,"i\otimes i|18",0.0,"i\otimes i|19",0.0,"i\otimes i|20",0.0,"i\otimes i|21",0.0,"i\otimes i|22",0.0,"i\otimes i|23",0.0,"i\otimes i|24",0.0 +0.45000000000000007,"int1|0",0.0,"int1|1",0.0,"int1|2",0.0,"int1|3",0.0,"int1|4",0.0,"int1|5",0.0,"int1|6",0.0,"int1|7",0.0,"int1|8",0.0,"int1|9",0.0,"int1|10",0.0,"int1|11",0.0,"int1|12",0.0,"int1|13",0.0,"int1|14",0.0,"int1|15",0.0,"int1|16",0.0,"int1|17",0.0,"int1|18",0.0,"int1|19",0.0,"int1|20",0.0,"int1|21",0.0,"int1|22",0.0,"int1|23",0.0,"int1|24",0.0,"int2|0",0.0,"int2|1",0.0,"int2|2",0.0,"int2|3",0.0,"int2|4",0.0,"int2|5",0.0,"int2|6",0.0,"int2|7",0.0,"int2|8",0.0,"int2|9",0.0,"int2|10",0.0,"int2|11",0.0,"int2|12",0.0,"int2|13",0.0,"int2|14",0.0,"int2|15",0.0,"int2|16",0.0,"int2|17",0.0,"int2|18",0.0,"int2|19",0.0,"int2|20",0.0,"int2|21",0.0,"int2|22",0.0,"int2|23",0.0,"int2|24",0.0,"iota(5)|0",0.0,"iota(5)|1",0.0,"iota(5)|2",0.0,"iota(5)|3",0.0,"iota(5)|4",0.0,"i\cdot i|0",0.0,"i\cdot i|1",0.0,"i\cdot i|2",0.0,"i\cdot i|3",0.0,"i\cdot i|4",0.0,"i\cdot i|5",0.0,"i\cdot i|6",0.0,"i\cdot i|7",0.0,"i\cdot i|8",0.0,"i\cdot i|9",0.0,"i\cdot i|10",0.0,"i\cdot i|11",0.0,"i\cdot i|12",0.0,"i\cdot i|13",0.0,"i\cdot i|14",0.0,"i\cdot i|15",0.0,"i\cdot i|16",0.0,"i\cdot i|17",0.0,"i\cdot i|18",0.0,"i\cdot i|19",0.0,"i\cdot i|20",0.0,"i\cdot i|21",0.0,"i\cdot i|22",0.0,"i\cdot i|23",0.0,"i\cdot i|24",0.0,"i\otimes i|0",0.0,"i\otimes i|1",0.0,"i\otimes i|2",0.0,"i\otimes i|3",0.0,"i\otimes i|4",0.0,"i\otimes i|5",0.0,"i\otimes i|6",0.0,"i\otimes i|7",0.0,"i\otimes i|8",0.0,"i\otimes i|9",0.0,"i\otimes i|10",0.0,"i\otimes i|11",0.0,"i\otimes i|12",0.0,"i\otimes i|13",0.0,"i\otimes i|14",0.0,"i\otimes i|15",0.0,"i\otimes i|16",0.0,"i\otimes i|17",0.0,"i\otimes i|18",0.0,"i\otimes i|19",0.0,"i\otimes i|20",0.0,"i\otimes i|21",0.0,"i\otimes i|22",0.0,"i\otimes i|23",0.0,"i\otimes i|24",0.0 +0.5200000000000001,"int1|0",0.0,"int1|1",0.0,"int1|2",0.0,"int1|3",0.0,"int1|4",0.0,"int1|5",0.0,"int1|6",0.0,"int1|7",0.0,"int1|8",0.0,"int1|9",0.0,"int1|10",0.0,"int1|11",0.0,"int1|12",0.0,"int1|13",0.0,"int1|14",0.0,"int1|15",0.0,"int1|16",0.0,"int1|17",0.0,"int1|18",0.0,"int1|19",0.0,"int1|20",0.0,"int1|21",0.0,"int1|22",0.0,"int1|23",0.0,"int1|24",0.0,"int2|0",0.0,"int2|1",0.0,"int2|2",0.0,"int2|3",0.0,"int2|4",0.0,"int2|5",0.0,"int2|6",0.0,"int2|7",0.0,"int2|8",0.0,"int2|9",0.0,"int2|10",0.0,"int2|11",0.0,"int2|12",0.0,"int2|13",0.0,"int2|14",0.0,"int2|15",0.0,"int2|16",0.0,"int2|17",0.0,"int2|18",0.0,"int2|19",0.0,"int2|20",0.0,"int2|21",0.0,"int2|22",0.0,"int2|23",0.0,"int2|24",0.0,"iota(5)|0",0.0,"iota(5)|1",0.0,"iota(5)|2",0.0,"iota(5)|3",0.0,"iota(5)|4",0.0,"i\cdot i|0",0.0,"i\cdot i|1",0.0,"i\cdot i|2",0.0,"i\cdot i|3",0.0,"i\cdot i|4",0.0,"i\cdot i|5",0.0,"i\cdot i|6",0.0,"i\cdot i|7",0.0,"i\cdot i|8",0.0,"i\cdot i|9",0.0,"i\cdot i|10",0.0,"i\cdot i|11",0.0,"i\cdot i|12",0.0,"i\cdot i|13",0.0,"i\cdot i|14",0.0,"i\cdot i|15",0.0,"i\cdot i|16",0.0,"i\cdot i|17",0.0,"i\cdot i|18",0.0,"i\cdot i|19",0.0,"i\cdot i|20",0.0,"i\cdot i|21",0.0,"i\cdot i|22",0.0,"i\cdot i|23",0.0,"i\cdot i|24",0.0,"i\otimes i|0",0.0,"i\otimes i|1",0.0,"i\otimes i|2",0.0,"i\otimes i|3",0.0,"i\otimes i|4",0.0,"i\otimes i|5",0.0,"i\otimes i|6",0.0,"i\otimes i|7",0.0,"i\otimes i|8",0.0,"i\otimes i|9",0.0,"i\otimes i|10",0.0,"i\otimes i|11",0.0,"i\otimes i|12",0.0,"i\otimes i|13",0.0,"i\otimes i|14",0.0,"i\otimes i|15",0.0,"i\otimes i|16",0.0,"i\otimes i|17",0.0,"i\otimes i|18",0.0,"i\otimes i|19",0.0,"i\otimes i|20",0.0,"i\otimes i|21",0.0,"i\otimes i|22",0.0,"i\otimes i|23",0.0,"i\otimes i|24",0.0 +0.5900000000000002,"int1|0",0.0,"int1|1",0.0,"int1|2",0.0,"int1|3",0.0,"int1|4",0.0,"int1|5",0.0,"int1|6",0.0,"int1|7",0.0,"int1|8",0.0,"int1|9",0.0,"int1|10",0.0,"int1|11",0.0,"int1|12",0.0,"int1|13",0.0,"int1|14",0.0,"int1|15",0.0,"int1|16",0.0,"int1|17",0.0,"int1|18",0.0,"int1|19",0.0,"int1|20",0.0,"int1|21",0.0,"int1|22",0.0,"int1|23",0.0,"int1|24",0.0,"int2|0",0.0,"int2|1",0.0,"int2|2",0.0,"int2|3",0.0,"int2|4",0.0,"int2|5",0.0,"int2|6",0.0,"int2|7",0.0,"int2|8",0.0,"int2|9",0.0,"int2|10",0.0,"int2|11",0.0,"int2|12",0.0,"int2|13",0.0,"int2|14",0.0,"int2|15",0.0,"int2|16",0.0,"int2|17",0.0,"int2|18",0.0,"int2|19",0.0,"int2|20",0.0,"int2|21",0.0,"int2|22",0.0,"int2|23",0.0,"int2|24",0.0,"iota(5)|0",0.0,"iota(5)|1",0.0,"iota(5)|2",0.0,"iota(5)|3",0.0,"iota(5)|4",0.0,"i\cdot i|0",0.0,"i\cdot i|1",0.0,"i\cdot i|2",0.0,"i\cdot i|3",0.0,"i\cdot i|4",0.0,"i\cdot i|5",0.0,"i\cdot i|6",0.0,"i\cdot i|7",0.0,"i\cdot i|8",0.0,"i\cdot i|9",0.0,"i\cdot i|10",0.0,"i\cdot i|11",0.0,"i\cdot i|12",0.0,"i\cdot i|13",0.0,"i\cdot i|14",0.0,"i\cdot i|15",0.0,"i\cdot i|16",0.0,"i\cdot i|17",0.0,"i\cdot i|18",0.0,"i\cdot i|19",0.0,"i\cdot i|20",0.0,"i\cdot i|21",0.0,"i\cdot i|22",0.0,"i\cdot i|23",0.0,"i\cdot i|24",0.0,"i\otimes i|0",0.0,"i\otimes i|1",0.0,"i\otimes i|2",0.0,"i\otimes i|3",0.0,"i\otimes i|4",0.0,"i\otimes i|5",0.0,"i\otimes i|6",0.0,"i\otimes i|7",0.0,"i\otimes i|8",0.0,"i\otimes i|9",0.0,"i\otimes i|10",0.0,"i\otimes i|11",0.0,"i\otimes i|12",0.0,"i\otimes i|13",0.0,"i\otimes i|14",0.0,"i\otimes i|15",0.0,"i\otimes i|16",0.0,"i\otimes i|17",0.0,"i\otimes i|18",0.0,"i\otimes i|19",0.0,"i\otimes i|20",0.0,"i\otimes i|21",0.0,"i\otimes i|22",0.0,"i\otimes i|23",0.0,"i\otimes i|24",0.0 +0.6600000000000003,"int1|0",0.0,"int1|1",0.0,"int1|2",0.0,"int1|3",0.0,"int1|4",0.0,"int1|5",0.0,"int1|6",0.0,"int1|7",0.0,"int1|8",0.0,"int1|9",0.0,"int1|10",0.0,"int1|11",0.0,"int1|12",0.0,"int1|13",0.0,"int1|14",0.0,"int1|15",0.0,"int1|16",0.0,"int1|17",0.0,"int1|18",0.0,"int1|19",0.0,"int1|20",0.0,"int1|21",0.0,"int1|22",0.0,"int1|23",0.0,"int1|24",0.0,"int2|0",0.0,"int2|1",0.0,"int2|2",0.0,"int2|3",0.0,"int2|4",0.0,"int2|5",0.0,"int2|6",0.0,"int2|7",0.0,"int2|8",0.0,"int2|9",0.0,"int2|10",0.0,"int2|11",0.0,"int2|12",0.0,"int2|13",0.0,"int2|14",0.0,"int2|15",0.0,"int2|16",0.0,"int2|17",0.0,"int2|18",0.0,"int2|19",0.0,"int2|20",0.0,"int2|21",0.0,"int2|22",0.0,"int2|23",0.0,"int2|24",0.0,"iota(5)|0",0.0,"iota(5)|1",0.0,"iota(5)|2",0.0,"iota(5)|3",0.0,"iota(5)|4",0.0,"i\cdot i|0",0.0,"i\cdot i|1",0.0,"i\cdot i|2",0.0,"i\cdot i|3",0.0,"i\cdot i|4",0.0,"i\cdot i|5",0.0,"i\cdot i|6",0.0,"i\cdot i|7",0.0,"i\cdot i|8",0.0,"i\cdot i|9",0.0,"i\cdot i|10",0.0,"i\cdot i|11",0.0,"i\cdot i|12",0.0,"i\cdot i|13",0.0,"i\cdot i|14",0.0,"i\cdot i|15",0.0,"i\cdot i|16",0.0,"i\cdot i|17",0.0,"i\cdot i|18",0.0,"i\cdot i|19",0.0,"i\cdot i|20",0.0,"i\cdot i|21",0.0,"i\cdot i|22",0.0,"i\cdot i|23",0.0,"i\cdot i|24",0.0,"i\otimes i|0",0.0,"i\otimes i|1",0.0,"i\otimes i|2",0.0,"i\otimes i|3",0.0,"i\otimes i|4",0.0,"i\otimes i|5",0.0,"i\otimes i|6",0.0,"i\otimes i|7",0.0,"i\otimes i|8",0.0,"i\otimes i|9",0.0,"i\otimes i|10",0.0,"i\otimes i|11",0.0,"i\otimes i|12",0.0,"i\otimes i|13",0.0,"i\otimes i|14",0.0,"i\otimes i|15",0.0,"i\otimes i|16",0.0,"i\otimes i|17",0.0,"i\otimes i|18",0.0,"i\otimes i|19",0.0,"i\otimes i|20",0.0,"i\otimes i|21",0.0,"i\otimes i|22",0.0,"i\otimes i|23",0.0,"i\otimes i|24",0.0 diff --git a/test/exampleLogs/math-examples.mky.log b/test/exampleLogs/math-examples.mky.log index 2a04bf2c7..2300129b3 100644 --- a/test/exampleLogs/math-examples.mky.log +++ b/test/exampleLogs/math-examples.mky.log @@ -1,11 +1,11 @@ -nsteps 10 -0.3 {:3√2} 0 {:français} 0 {:universität} 0 {:τRD} 0 {:ℵ0} 0 {:∂f(x)/∂x|0} 0 {:∫0∞e-x2/2} 0 -1 {:3√2} 0 {:français} 0 {:universität} 0 {:τRD} 0 {:ℵ0} 0 {:∂f(x)/∂x|0} 0 {:∫0∞e-x2/2} 0 -1.7 {:3√2} 0 {:français} 0 {:universität} 0 {:τRD} 0 {:ℵ0} 0 {:∂f(x)/∂x|0} 0 {:∫0∞e-x2/2} 0 -2.4 {:3√2} 0 {:français} 0 {:universität} 0 {:τRD} 0 {:ℵ0} 0 {:∂f(x)/∂x|0} 0 {:∫0∞e-x2/2} 0 -3.1 {:3√2} 0 {:français} 0 {:universität} 0 {:τRD} 0 {:ℵ0} 0 {:∂f(x)/∂x|0} 0 {:∫0∞e-x2/2} 0 -3.8 {:3√2} 0 {:français} 0 {:universität} 0 {:τRD} 0 {:ℵ0} 0 {:∂f(x)/∂x|0} 0 {:∫0∞e-x2/2} 0 -4.5 {:3√2} 0 {:français} 0 {:universität} 0 {:τRD} 0 {:ℵ0} 0 {:∂f(x)/∂x|0} 0 {:∫0∞e-x2/2} 0 -5.2 {:3√2} 0 {:français} 0 {:universität} 0 {:τRD} 0 {:ℵ0} 0 {:∂f(x)/∂x|0} 0 {:∫0∞e-x2/2} 0 -5.9 {:3√2} 0 {:français} 0 {:universität} 0 {:τRD} 0 {:ℵ0} 0 {:∂f(x)/∂x|0} 0 {:∫0∞e-x2/2} 0 -6.6 {:3√2} 0 {:français} 0 {:universität} 0 {:τRD} 0 {:ℵ0} 0 {:∂f(x)/∂x|0} 0 {:∫0∞e-x2/2} 0 +nsteps, 10 +0.30000000000000004,":\sqrt[3]2",0.0,":\mathrm{fran\c{c}ais",0.0,":\mathrm{universit\"at}",0.0,":\tau_\mathrm{RD}",0.0,":\aleph_0",0.0,":\partial f(x)/\partial x|_0",0.0,":\int_0^\infty e^{-x^2/2}",0.0 +1.0,":\sqrt[3]2",0.0,":\mathrm{fran\c{c}ais",0.0,":\mathrm{universit\"at}",0.0,":\tau_\mathrm{RD}",0.0,":\aleph_0",0.0,":\partial f(x)/\partial x|_0",0.0,":\int_0^\infty e^{-x^2/2}",0.0 +1.7000000000000002,":\sqrt[3]2",0.0,":\mathrm{fran\c{c}ais",0.0,":\mathrm{universit\"at}",0.0,":\tau_\mathrm{RD}",0.0,":\aleph_0",0.0,":\partial f(x)/\partial x|_0",0.0,":\int_0^\infty e^{-x^2/2}",0.0 +2.4000000000000004,":\sqrt[3]2",0.0,":\mathrm{fran\c{c}ais",0.0,":\mathrm{universit\"at}",0.0,":\tau_\mathrm{RD}",0.0,":\aleph_0",0.0,":\partial f(x)/\partial x|_0",0.0,":\int_0^\infty e^{-x^2/2}",0.0 +3.1000000000000005,":\sqrt[3]2",0.0,":\mathrm{fran\c{c}ais",0.0,":\mathrm{universit\"at}",0.0,":\tau_\mathrm{RD}",0.0,":\aleph_0",0.0,":\partial f(x)/\partial x|_0",0.0,":\int_0^\infty e^{-x^2/2}",0.0 +3.8000000000000007,":\sqrt[3]2",0.0,":\mathrm{fran\c{c}ais",0.0,":\mathrm{universit\"at}",0.0,":\tau_\mathrm{RD}",0.0,":\aleph_0",0.0,":\partial f(x)/\partial x|_0",0.0,":\int_0^\infty e^{-x^2/2}",0.0 +4.5,":\sqrt[3]2",0.0,":\mathrm{fran\c{c}ais",0.0,":\mathrm{universit\"at}",0.0,":\tau_\mathrm{RD}",0.0,":\aleph_0",0.0,":\partial f(x)/\partial x|_0",0.0,":\int_0^\infty e^{-x^2/2}",0.0 +5.199999999999999,":\sqrt[3]2",0.0,":\mathrm{fran\c{c}ais",0.0,":\mathrm{universit\"at}",0.0,":\tau_\mathrm{RD}",0.0,":\aleph_0",0.0,":\partial f(x)/\partial x|_0",0.0,":\int_0^\infty e^{-x^2/2}",0.0 +5.899999999999999,":\sqrt[3]2",0.0,":\mathrm{fran\c{c}ais",0.0,":\mathrm{universit\"at}",0.0,":\tau_\mathrm{RD}",0.0,":\aleph_0",0.0,":\partial f(x)/\partial x|_0",0.0,":\int_0^\infty e^{-x^2/2}",0.0 +6.599999999999998,":\sqrt[3]2",0.0,":\mathrm{fran\c{c}ais",0.0,":\mathrm{universit\"at}",0.0,":\tau_\mathrm{RD}",0.0,":\aleph_0",0.0,":\partial f(x)/\partial x|_0",0.0,":\int_0^\infty e^{-x^2/2}",0.0 diff --git a/test/exampleLogs/plotWidget.mky.log b/test/exampleLogs/plotWidget.mky.log index 3fc6c2d41..9ea720a52 100644 --- a/test/exampleLogs/plotWidget.mky.log +++ b/test/exampleLogs/plotWidget.mky.log @@ -1,11 +1,11 @@ -nsteps 10 -0.03 {:cos} 0.99955 {:sin} 0.0299955 {:string-dimensioned|0} 20 {:string-dimensioned|1} 20 {:string-dimensioned|2} 20 {:time-dimensioned|0} 20 {:time-dimensioned|1} 20 {:time-dimensioned|2} 20 -0.1 {:cos} 0.995004 {:sin} 0.0998334 {:string-dimensioned|0} 20 {:string-dimensioned|1} 20 {:string-dimensioned|2} 20 {:time-dimensioned|0} 20 {:time-dimensioned|1} 20 {:time-dimensioned|2} 20 -0.17 {:cos} 0.985585 {:sin} 0.169182 {:string-dimensioned|0} 20 {:string-dimensioned|1} 20 {:string-dimensioned|2} 20 {:time-dimensioned|0} 20 {:time-dimensioned|1} 20 {:time-dimensioned|2} 20 -0.24 {:cos} 0.971338 {:sin} 0.237703 {:string-dimensioned|0} 20 {:string-dimensioned|1} 20 {:string-dimensioned|2} 20 {:time-dimensioned|0} 20 {:time-dimensioned|1} 20 {:time-dimensioned|2} 20 -0.31 {:cos} 0.952334 {:sin} 0.305059 {:string-dimensioned|0} 20 {:string-dimensioned|1} 20 {:string-dimensioned|2} 20 {:time-dimensioned|0} 20 {:time-dimensioned|1} 20 {:time-dimensioned|2} 20 -0.38 {:cos} 0.928665 {:sin} 0.37092 {:string-dimensioned|0} 20 {:string-dimensioned|1} 20 {:string-dimensioned|2} 20 {:time-dimensioned|0} 20 {:time-dimensioned|1} 20 {:time-dimensioned|2} 20 -0.45 {:cos} 0.900447 {:sin} 0.434966 {:string-dimensioned|0} 20 {:string-dimensioned|1} 20 {:string-dimensioned|2} 20 {:time-dimensioned|0} 20 {:time-dimensioned|1} 20 {:time-dimensioned|2} 20 -0.52 {:cos} 0.867819 {:sin} 0.49688 {:string-dimensioned|0} 20 {:string-dimensioned|1} 20 {:string-dimensioned|2} 20 {:time-dimensioned|0} 20 {:time-dimensioned|1} 20 {:time-dimensioned|2} 20 -0.59 {:cos} 0.830941 {:sin} 0.556361 {:string-dimensioned|0} 20 {:string-dimensioned|1} 20 {:string-dimensioned|2} 20 {:time-dimensioned|0} 20 {:time-dimensioned|1} 20 {:time-dimensioned|2} 20 -0.66 {:cos} 0.789992 {:sin} 0.613117 {:string-dimensioned|0} 20 {:string-dimensioned|1} 20 {:string-dimensioned|2} 20 {:time-dimensioned|0} 20 {:time-dimensioned|1} 20 {:time-dimensioned|2} 20 +nsteps, 10 +0.03,":cos",0.9995500337489875,":sin",0.02999550020249566,":string-dimensioned|0",20.0,":string-dimensioned|1",20.0,":string-dimensioned|2",20.0,":time-dimensioned|0",20.0,":time-dimensioned|1",20.0,":time-dimensioned|2",20.0 +0.09999999999999999,":cos",0.9950041652780258,":sin",0.09983341664682814,":string-dimensioned|0",20.0,":string-dimensioned|1",20.0,":string-dimensioned|2",20.0,":time-dimensioned|0",20.0,":time-dimensioned|1",20.0,":time-dimensioned|2",20.0 +0.17,":cos",0.9855847669095608,":sin",0.16918234906699603,":string-dimensioned|0",20.0,":string-dimensioned|1",20.0,":string-dimensioned|2",20.0,":time-dimensioned|0",20.0,":time-dimensioned|1",20.0,":time-dimensioned|2",20.0 +0.24000000000000005,":cos",0.9713379748520296,":sin",0.23770262642713463,":string-dimensioned|0",20.0,":string-dimensioned|1",20.0,":string-dimensioned|2",20.0,":time-dimensioned|0",20.0,":time-dimensioned|1",20.0,":time-dimensioned|2",20.0 +0.31000000000000005,":cos",0.9523335698857134,":sin",0.30505863644344355,":string-dimensioned|0",20.0,":string-dimensioned|1",20.0,":string-dimensioned|2",20.0,":time-dimensioned|0",20.0,":time-dimensioned|1",20.0,":time-dimensioned|2",20.0 +0.38000000000000006,":cos",0.9286646355765102,":sin",0.37092046941298273,":string-dimensioned|0",20.0,":string-dimensioned|1",20.0,":string-dimensioned|2",20.0,":time-dimensioned|0",20.0,":time-dimensioned|1",20.0,":time-dimensioned|2",20.0 +0.45000000000000007,":cos",0.9004471023526769,":sin",0.4349655341112303,":string-dimensioned|0",20.0,":string-dimensioned|1",20.0,":string-dimensioned|2",20.0,":time-dimensioned|0",20.0,":time-dimensioned|1",20.0,":time-dimensioned|2",20.0 +0.5200000000000001,":cos",0.8678191796776499,":sin",0.4968801378437368,":string-dimensioned|0",20.0,":string-dimensioned|1",20.0,":string-dimensioned|2",20.0,":time-dimensioned|0",20.0,":time-dimensioned|1",20.0,":time-dimensioned|2",20.0 +0.5900000000000002,":cos",0.8309406791001633,":sin",0.5563610229127839,":string-dimensioned|0",20.0,":string-dimensioned|1",20.0,":string-dimensioned|2",20.0,":time-dimensioned|0",20.0,":time-dimensioned|1",20.0,":time-dimensioned|2",20.0 +0.6600000000000003,":cos",0.789992231497365,":sin",0.613116851973434,":string-dimensioned|0",20.0,":string-dimensioned|1",20.0,":string-dimensioned|2",20.0,":time-dimensioned|0",20.0,":time-dimensioned|1",20.0,":time-dimensioned|2",20.0 diff --git a/test/exampleLogs/rand-gather-interpolation.mky.log b/test/exampleLogs/rand-gather-interpolation.mky.log index 03842c81e..58aef7cc2 100644 --- a/test/exampleLogs/rand-gather-interpolation.mky.log +++ b/test/exampleLogs/rand-gather-interpolation.mky.log @@ -1,11 +1,11 @@ -nsteps 10 -0.03 {:rand|0} 0.90354 {:rand|1} 0.994062 {:rand|2} 0.54912 {:rand|3} 0.372699 {:rand|4} 0.861315 {:rand|5} 0.0143594 {:rand|6} 0.589363 {:rand|7} 0.944337 {:rand|8} 0.362713 {:rand|9} 0.401735 {:rand|10} 0.0877127 {:rand|11} 0.978609 {:rand|12} 0.0365029 {:rand|13} 0.514121 {:rand|14} 0.0354315 {:rand|15} 0.664903 {:rand|16} 0.303691 {:rand|17} 0.230775 {:rand|18} 0.968643 {:rand|19} 0.0439152 {:rand|20} 0.788876 {:rand|21} 0.0527686 {:rand|22} 0.868531 {:rand|23} 0.359448 {:rand|24} 0.965036 {:rand|25} 0.856063 {:rand|26} 0.536334 {:rand|27} 0.751689 {:rand|28} 0.340894 {:rand|29} 0.223026 {:rand|30} 0.564667 {:rand|31} 0.244434 {:rand|32} 0.217088 {:rand|33} 0.113787 {:rand|34} 0.617133 {:rand|35} 0.0784028 {:rand|36} 0.128146 {:rand|37} 0.206496 {:rand|38} 0.0227399 {:rand|39} 0.490859 {:rand|40} 0.608231 {:rand|41} 0.110453 {:rand|42} 0.469468 {:rand|43} 0.644734 {:rand|44} 0.624574 {:rand|45} 0.5049 {:rand|46} 0.309637 {:rand|47} 0.928265 {:rand|48} 0.735675 {:rand|49} 0.278279 {:rand|50} 0.97218 {:rand|51} 0.524551 {:rand|52} 0.331048 {:rand|53} 0.840711 {:rand|54} 0.883999 {:rand|55} 0.296084 {:rand|56} 0.696774 {:rand|57} 0.420332 {:rand|58} 0.0477728 {:rand|59} 0.0376678 {:rand|60} 0.643359 {:rand|61} 0.61244 {:rand|62} 0.282102 {:rand|63} 0.860446 {:rand|64} 0.726227 {:rand|65} 0.899234 {:rand|66} 0.938849 {:rand|67} 0.854373 {:rand|68} 0.10573 {:rand|69} 0.961589 {:rand|70} 0.345233 {:rand|71} 0.713961 {:rand|72} 0.0720415 {:rand|73} 0.814701 {:rand|74} 0.358695 {:rand|75} 0.696615 {:rand|76} 0.319601 {:rand|77} 0.668331 {:rand|78} 0.62488 {:rand|79} 0.0552756 {:rand|80} 0.946611 {:rand|81} 0.59706 {:rand|82} 0.579826 {:rand|83} 0.277659 {:rand|84} 0.437771 {:rand|85} 0.463825 {:rand|86} 0.573742 {:rand|87} 0.134545 {:rand|88} 0.884158 {:rand|89} 0.621515 {:rand|90} 0.172213 {:rand|91} 0.527516 {:rand|92} 0.233955 {:rand|93} 0.454314 {:rand|94} 0.387962 {:rand|95} 0.960182 {:rand|96} 0.353549 {:rand|97} 0.326811 {:rand|98} 0.814555 {:rand|99} 0.459279 -0.1 {:rand|0} 0.90354 {:rand|1} 0.994062 {:rand|2} 0.54912 {:rand|3} 0.372699 {:rand|4} 0.861315 {:rand|5} 0.0143594 {:rand|6} 0.589363 {:rand|7} 0.944337 {:rand|8} 0.362713 {:rand|9} 0.401735 {:rand|10} 0.0877127 {:rand|11} 0.978609 {:rand|12} 0.0365029 {:rand|13} 0.514121 {:rand|14} 0.0354315 {:rand|15} 0.664903 {:rand|16} 0.303691 {:rand|17} 0.230775 {:rand|18} 0.968643 {:rand|19} 0.0439152 {:rand|20} 0.788876 {:rand|21} 0.0527686 {:rand|22} 0.868531 {:rand|23} 0.359448 {:rand|24} 0.965036 {:rand|25} 0.856063 {:rand|26} 0.536334 {:rand|27} 0.751689 {:rand|28} 0.340894 {:rand|29} 0.223026 {:rand|30} 0.564667 {:rand|31} 0.244434 {:rand|32} 0.217088 {:rand|33} 0.113787 {:rand|34} 0.617133 {:rand|35} 0.0784028 {:rand|36} 0.128146 {:rand|37} 0.206496 {:rand|38} 0.0227399 {:rand|39} 0.490859 {:rand|40} 0.608231 {:rand|41} 0.110453 {:rand|42} 0.469468 {:rand|43} 0.644734 {:rand|44} 0.624574 {:rand|45} 0.5049 {:rand|46} 0.309637 {:rand|47} 0.928265 {:rand|48} 0.735675 {:rand|49} 0.278279 {:rand|50} 0.97218 {:rand|51} 0.524551 {:rand|52} 0.331048 {:rand|53} 0.840711 {:rand|54} 0.883999 {:rand|55} 0.296084 {:rand|56} 0.696774 {:rand|57} 0.420332 {:rand|58} 0.0477728 {:rand|59} 0.0376678 {:rand|60} 0.643359 {:rand|61} 0.61244 {:rand|62} 0.282102 {:rand|63} 0.860446 {:rand|64} 0.726227 {:rand|65} 0.899234 {:rand|66} 0.938849 {:rand|67} 0.854373 {:rand|68} 0.10573 {:rand|69} 0.961589 {:rand|70} 0.345233 {:rand|71} 0.713961 {:rand|72} 0.0720415 {:rand|73} 0.814701 {:rand|74} 0.358695 {:rand|75} 0.696615 {:rand|76} 0.319601 {:rand|77} 0.668331 {:rand|78} 0.62488 {:rand|79} 0.0552756 {:rand|80} 0.946611 {:rand|81} 0.59706 {:rand|82} 0.579826 {:rand|83} 0.277659 {:rand|84} 0.437771 {:rand|85} 0.463825 {:rand|86} 0.573742 {:rand|87} 0.134545 {:rand|88} 0.884158 {:rand|89} 0.621515 {:rand|90} 0.172213 {:rand|91} 0.527516 {:rand|92} 0.233955 {:rand|93} 0.454314 {:rand|94} 0.387962 {:rand|95} 0.960182 {:rand|96} 0.353549 {:rand|97} 0.326811 {:rand|98} 0.814555 {:rand|99} 0.459279 -0.17 {:rand|0} 0.90354 {:rand|1} 0.994062 {:rand|2} 0.54912 {:rand|3} 0.372699 {:rand|4} 0.861315 {:rand|5} 0.0143594 {:rand|6} 0.589363 {:rand|7} 0.944337 {:rand|8} 0.362713 {:rand|9} 0.401735 {:rand|10} 0.0877127 {:rand|11} 0.978609 {:rand|12} 0.0365029 {:rand|13} 0.514121 {:rand|14} 0.0354315 {:rand|15} 0.664903 {:rand|16} 0.303691 {:rand|17} 0.230775 {:rand|18} 0.968643 {:rand|19} 0.0439152 {:rand|20} 0.788876 {:rand|21} 0.0527686 {:rand|22} 0.868531 {:rand|23} 0.359448 {:rand|24} 0.965036 {:rand|25} 0.856063 {:rand|26} 0.536334 {:rand|27} 0.751689 {:rand|28} 0.340894 {:rand|29} 0.223026 {:rand|30} 0.564667 {:rand|31} 0.244434 {:rand|32} 0.217088 {:rand|33} 0.113787 {:rand|34} 0.617133 {:rand|35} 0.0784028 {:rand|36} 0.128146 {:rand|37} 0.206496 {:rand|38} 0.0227399 {:rand|39} 0.490859 {:rand|40} 0.608231 {:rand|41} 0.110453 {:rand|42} 0.469468 {:rand|43} 0.644734 {:rand|44} 0.624574 {:rand|45} 0.5049 {:rand|46} 0.309637 {:rand|47} 0.928265 {:rand|48} 0.735675 {:rand|49} 0.278279 {:rand|50} 0.97218 {:rand|51} 0.524551 {:rand|52} 0.331048 {:rand|53} 0.840711 {:rand|54} 0.883999 {:rand|55} 0.296084 {:rand|56} 0.696774 {:rand|57} 0.420332 {:rand|58} 0.0477728 {:rand|59} 0.0376678 {:rand|60} 0.643359 {:rand|61} 0.61244 {:rand|62} 0.282102 {:rand|63} 0.860446 {:rand|64} 0.726227 {:rand|65} 0.899234 {:rand|66} 0.938849 {:rand|67} 0.854373 {:rand|68} 0.10573 {:rand|69} 0.961589 {:rand|70} 0.345233 {:rand|71} 0.713961 {:rand|72} 0.0720415 {:rand|73} 0.814701 {:rand|74} 0.358695 {:rand|75} 0.696615 {:rand|76} 0.319601 {:rand|77} 0.668331 {:rand|78} 0.62488 {:rand|79} 0.0552756 {:rand|80} 0.946611 {:rand|81} 0.59706 {:rand|82} 0.579826 {:rand|83} 0.277659 {:rand|84} 0.437771 {:rand|85} 0.463825 {:rand|86} 0.573742 {:rand|87} 0.134545 {:rand|88} 0.884158 {:rand|89} 0.621515 {:rand|90} 0.172213 {:rand|91} 0.527516 {:rand|92} 0.233955 {:rand|93} 0.454314 {:rand|94} 0.387962 {:rand|95} 0.960182 {:rand|96} 0.353549 {:rand|97} 0.326811 {:rand|98} 0.814555 {:rand|99} 0.459279 -0.24 {:rand|0} 0.90354 {:rand|1} 0.994062 {:rand|2} 0.54912 {:rand|3} 0.372699 {:rand|4} 0.861315 {:rand|5} 0.0143594 {:rand|6} 0.589363 {:rand|7} 0.944337 {:rand|8} 0.362713 {:rand|9} 0.401735 {:rand|10} 0.0877127 {:rand|11} 0.978609 {:rand|12} 0.0365029 {:rand|13} 0.514121 {:rand|14} 0.0354315 {:rand|15} 0.664903 {:rand|16} 0.303691 {:rand|17} 0.230775 {:rand|18} 0.968643 {:rand|19} 0.0439152 {:rand|20} 0.788876 {:rand|21} 0.0527686 {:rand|22} 0.868531 {:rand|23} 0.359448 {:rand|24} 0.965036 {:rand|25} 0.856063 {:rand|26} 0.536334 {:rand|27} 0.751689 {:rand|28} 0.340894 {:rand|29} 0.223026 {:rand|30} 0.564667 {:rand|31} 0.244434 {:rand|32} 0.217088 {:rand|33} 0.113787 {:rand|34} 0.617133 {:rand|35} 0.0784028 {:rand|36} 0.128146 {:rand|37} 0.206496 {:rand|38} 0.0227399 {:rand|39} 0.490859 {:rand|40} 0.608231 {:rand|41} 0.110453 {:rand|42} 0.469468 {:rand|43} 0.644734 {:rand|44} 0.624574 {:rand|45} 0.5049 {:rand|46} 0.309637 {:rand|47} 0.928265 {:rand|48} 0.735675 {:rand|49} 0.278279 {:rand|50} 0.97218 {:rand|51} 0.524551 {:rand|52} 0.331048 {:rand|53} 0.840711 {:rand|54} 0.883999 {:rand|55} 0.296084 {:rand|56} 0.696774 {:rand|57} 0.420332 {:rand|58} 0.0477728 {:rand|59} 0.0376678 {:rand|60} 0.643359 {:rand|61} 0.61244 {:rand|62} 0.282102 {:rand|63} 0.860446 {:rand|64} 0.726227 {:rand|65} 0.899234 {:rand|66} 0.938849 {:rand|67} 0.854373 {:rand|68} 0.10573 {:rand|69} 0.961589 {:rand|70} 0.345233 {:rand|71} 0.713961 {:rand|72} 0.0720415 {:rand|73} 0.814701 {:rand|74} 0.358695 {:rand|75} 0.696615 {:rand|76} 0.319601 {:rand|77} 0.668331 {:rand|78} 0.62488 {:rand|79} 0.0552756 {:rand|80} 0.946611 {:rand|81} 0.59706 {:rand|82} 0.579826 {:rand|83} 0.277659 {:rand|84} 0.437771 {:rand|85} 0.463825 {:rand|86} 0.573742 {:rand|87} 0.134545 {:rand|88} 0.884158 {:rand|89} 0.621515 {:rand|90} 0.172213 {:rand|91} 0.527516 {:rand|92} 0.233955 {:rand|93} 0.454314 {:rand|94} 0.387962 {:rand|95} 0.960182 {:rand|96} 0.353549 {:rand|97} 0.326811 {:rand|98} 0.814555 {:rand|99} 0.459279 -0.31 {:rand|0} 0.90354 {:rand|1} 0.994062 {:rand|2} 0.54912 {:rand|3} 0.372699 {:rand|4} 0.861315 {:rand|5} 0.0143594 {:rand|6} 0.589363 {:rand|7} 0.944337 {:rand|8} 0.362713 {:rand|9} 0.401735 {:rand|10} 0.0877127 {:rand|11} 0.978609 {:rand|12} 0.0365029 {:rand|13} 0.514121 {:rand|14} 0.0354315 {:rand|15} 0.664903 {:rand|16} 0.303691 {:rand|17} 0.230775 {:rand|18} 0.968643 {:rand|19} 0.0439152 {:rand|20} 0.788876 {:rand|21} 0.0527686 {:rand|22} 0.868531 {:rand|23} 0.359448 {:rand|24} 0.965036 {:rand|25} 0.856063 {:rand|26} 0.536334 {:rand|27} 0.751689 {:rand|28} 0.340894 {:rand|29} 0.223026 {:rand|30} 0.564667 {:rand|31} 0.244434 {:rand|32} 0.217088 {:rand|33} 0.113787 {:rand|34} 0.617133 {:rand|35} 0.0784028 {:rand|36} 0.128146 {:rand|37} 0.206496 {:rand|38} 0.0227399 {:rand|39} 0.490859 {:rand|40} 0.608231 {:rand|41} 0.110453 {:rand|42} 0.469468 {:rand|43} 0.644734 {:rand|44} 0.624574 {:rand|45} 0.5049 {:rand|46} 0.309637 {:rand|47} 0.928265 {:rand|48} 0.735675 {:rand|49} 0.278279 {:rand|50} 0.97218 {:rand|51} 0.524551 {:rand|52} 0.331048 {:rand|53} 0.840711 {:rand|54} 0.883999 {:rand|55} 0.296084 {:rand|56} 0.696774 {:rand|57} 0.420332 {:rand|58} 0.0477728 {:rand|59} 0.0376678 {:rand|60} 0.643359 {:rand|61} 0.61244 {:rand|62} 0.282102 {:rand|63} 0.860446 {:rand|64} 0.726227 {:rand|65} 0.899234 {:rand|66} 0.938849 {:rand|67} 0.854373 {:rand|68} 0.10573 {:rand|69} 0.961589 {:rand|70} 0.345233 {:rand|71} 0.713961 {:rand|72} 0.0720415 {:rand|73} 0.814701 {:rand|74} 0.358695 {:rand|75} 0.696615 {:rand|76} 0.319601 {:rand|77} 0.668331 {:rand|78} 0.62488 {:rand|79} 0.0552756 {:rand|80} 0.946611 {:rand|81} 0.59706 {:rand|82} 0.579826 {:rand|83} 0.277659 {:rand|84} 0.437771 {:rand|85} 0.463825 {:rand|86} 0.573742 {:rand|87} 0.134545 {:rand|88} 0.884158 {:rand|89} 0.621515 {:rand|90} 0.172213 {:rand|91} 0.527516 {:rand|92} 0.233955 {:rand|93} 0.454314 {:rand|94} 0.387962 {:rand|95} 0.960182 {:rand|96} 0.353549 {:rand|97} 0.326811 {:rand|98} 0.814555 {:rand|99} 0.459279 -0.38 {:rand|0} 0.90354 {:rand|1} 0.994062 {:rand|2} 0.54912 {:rand|3} 0.372699 {:rand|4} 0.861315 {:rand|5} 0.0143594 {:rand|6} 0.589363 {:rand|7} 0.944337 {:rand|8} 0.362713 {:rand|9} 0.401735 {:rand|10} 0.0877127 {:rand|11} 0.978609 {:rand|12} 0.0365029 {:rand|13} 0.514121 {:rand|14} 0.0354315 {:rand|15} 0.664903 {:rand|16} 0.303691 {:rand|17} 0.230775 {:rand|18} 0.968643 {:rand|19} 0.0439152 {:rand|20} 0.788876 {:rand|21} 0.0527686 {:rand|22} 0.868531 {:rand|23} 0.359448 {:rand|24} 0.965036 {:rand|25} 0.856063 {:rand|26} 0.536334 {:rand|27} 0.751689 {:rand|28} 0.340894 {:rand|29} 0.223026 {:rand|30} 0.564667 {:rand|31} 0.244434 {:rand|32} 0.217088 {:rand|33} 0.113787 {:rand|34} 0.617133 {:rand|35} 0.0784028 {:rand|36} 0.128146 {:rand|37} 0.206496 {:rand|38} 0.0227399 {:rand|39} 0.490859 {:rand|40} 0.608231 {:rand|41} 0.110453 {:rand|42} 0.469468 {:rand|43} 0.644734 {:rand|44} 0.624574 {:rand|45} 0.5049 {:rand|46} 0.309637 {:rand|47} 0.928265 {:rand|48} 0.735675 {:rand|49} 0.278279 {:rand|50} 0.97218 {:rand|51} 0.524551 {:rand|52} 0.331048 {:rand|53} 0.840711 {:rand|54} 0.883999 {:rand|55} 0.296084 {:rand|56} 0.696774 {:rand|57} 0.420332 {:rand|58} 0.0477728 {:rand|59} 0.0376678 {:rand|60} 0.643359 {:rand|61} 0.61244 {:rand|62} 0.282102 {:rand|63} 0.860446 {:rand|64} 0.726227 {:rand|65} 0.899234 {:rand|66} 0.938849 {:rand|67} 0.854373 {:rand|68} 0.10573 {:rand|69} 0.961589 {:rand|70} 0.345233 {:rand|71} 0.713961 {:rand|72} 0.0720415 {:rand|73} 0.814701 {:rand|74} 0.358695 {:rand|75} 0.696615 {:rand|76} 0.319601 {:rand|77} 0.668331 {:rand|78} 0.62488 {:rand|79} 0.0552756 {:rand|80} 0.946611 {:rand|81} 0.59706 {:rand|82} 0.579826 {:rand|83} 0.277659 {:rand|84} 0.437771 {:rand|85} 0.463825 {:rand|86} 0.573742 {:rand|87} 0.134545 {:rand|88} 0.884158 {:rand|89} 0.621515 {:rand|90} 0.172213 {:rand|91} 0.527516 {:rand|92} 0.233955 {:rand|93} 0.454314 {:rand|94} 0.387962 {:rand|95} 0.960182 {:rand|96} 0.353549 {:rand|97} 0.326811 {:rand|98} 0.814555 {:rand|99} 0.459279 -0.45 {:rand|0} 0.90354 {:rand|1} 0.994062 {:rand|2} 0.54912 {:rand|3} 0.372699 {:rand|4} 0.861315 {:rand|5} 0.0143594 {:rand|6} 0.589363 {:rand|7} 0.944337 {:rand|8} 0.362713 {:rand|9} 0.401735 {:rand|10} 0.0877127 {:rand|11} 0.978609 {:rand|12} 0.0365029 {:rand|13} 0.514121 {:rand|14} 0.0354315 {:rand|15} 0.664903 {:rand|16} 0.303691 {:rand|17} 0.230775 {:rand|18} 0.968643 {:rand|19} 0.0439152 {:rand|20} 0.788876 {:rand|21} 0.0527686 {:rand|22} 0.868531 {:rand|23} 0.359448 {:rand|24} 0.965036 {:rand|25} 0.856063 {:rand|26} 0.536334 {:rand|27} 0.751689 {:rand|28} 0.340894 {:rand|29} 0.223026 {:rand|30} 0.564667 {:rand|31} 0.244434 {:rand|32} 0.217088 {:rand|33} 0.113787 {:rand|34} 0.617133 {:rand|35} 0.0784028 {:rand|36} 0.128146 {:rand|37} 0.206496 {:rand|38} 0.0227399 {:rand|39} 0.490859 {:rand|40} 0.608231 {:rand|41} 0.110453 {:rand|42} 0.469468 {:rand|43} 0.644734 {:rand|44} 0.624574 {:rand|45} 0.5049 {:rand|46} 0.309637 {:rand|47} 0.928265 {:rand|48} 0.735675 {:rand|49} 0.278279 {:rand|50} 0.97218 {:rand|51} 0.524551 {:rand|52} 0.331048 {:rand|53} 0.840711 {:rand|54} 0.883999 {:rand|55} 0.296084 {:rand|56} 0.696774 {:rand|57} 0.420332 {:rand|58} 0.0477728 {:rand|59} 0.0376678 {:rand|60} 0.643359 {:rand|61} 0.61244 {:rand|62} 0.282102 {:rand|63} 0.860446 {:rand|64} 0.726227 {:rand|65} 0.899234 {:rand|66} 0.938849 {:rand|67} 0.854373 {:rand|68} 0.10573 {:rand|69} 0.961589 {:rand|70} 0.345233 {:rand|71} 0.713961 {:rand|72} 0.0720415 {:rand|73} 0.814701 {:rand|74} 0.358695 {:rand|75} 0.696615 {:rand|76} 0.319601 {:rand|77} 0.668331 {:rand|78} 0.62488 {:rand|79} 0.0552756 {:rand|80} 0.946611 {:rand|81} 0.59706 {:rand|82} 0.579826 {:rand|83} 0.277659 {:rand|84} 0.437771 {:rand|85} 0.463825 {:rand|86} 0.573742 {:rand|87} 0.134545 {:rand|88} 0.884158 {:rand|89} 0.621515 {:rand|90} 0.172213 {:rand|91} 0.527516 {:rand|92} 0.233955 {:rand|93} 0.454314 {:rand|94} 0.387962 {:rand|95} 0.960182 {:rand|96} 0.353549 {:rand|97} 0.326811 {:rand|98} 0.814555 {:rand|99} 0.459279 -0.52 {:rand|0} 0.90354 {:rand|1} 0.994062 {:rand|2} 0.54912 {:rand|3} 0.372699 {:rand|4} 0.861315 {:rand|5} 0.0143594 {:rand|6} 0.589363 {:rand|7} 0.944337 {:rand|8} 0.362713 {:rand|9} 0.401735 {:rand|10} 0.0877127 {:rand|11} 0.978609 {:rand|12} 0.0365029 {:rand|13} 0.514121 {:rand|14} 0.0354315 {:rand|15} 0.664903 {:rand|16} 0.303691 {:rand|17} 0.230775 {:rand|18} 0.968643 {:rand|19} 0.0439152 {:rand|20} 0.788876 {:rand|21} 0.0527686 {:rand|22} 0.868531 {:rand|23} 0.359448 {:rand|24} 0.965036 {:rand|25} 0.856063 {:rand|26} 0.536334 {:rand|27} 0.751689 {:rand|28} 0.340894 {:rand|29} 0.223026 {:rand|30} 0.564667 {:rand|31} 0.244434 {:rand|32} 0.217088 {:rand|33} 0.113787 {:rand|34} 0.617133 {:rand|35} 0.0784028 {:rand|36} 0.128146 {:rand|37} 0.206496 {:rand|38} 0.0227399 {:rand|39} 0.490859 {:rand|40} 0.608231 {:rand|41} 0.110453 {:rand|42} 0.469468 {:rand|43} 0.644734 {:rand|44} 0.624574 {:rand|45} 0.5049 {:rand|46} 0.309637 {:rand|47} 0.928265 {:rand|48} 0.735675 {:rand|49} 0.278279 {:rand|50} 0.97218 {:rand|51} 0.524551 {:rand|52} 0.331048 {:rand|53} 0.840711 {:rand|54} 0.883999 {:rand|55} 0.296084 {:rand|56} 0.696774 {:rand|57} 0.420332 {:rand|58} 0.0477728 {:rand|59} 0.0376678 {:rand|60} 0.643359 {:rand|61} 0.61244 {:rand|62} 0.282102 {:rand|63} 0.860446 {:rand|64} 0.726227 {:rand|65} 0.899234 {:rand|66} 0.938849 {:rand|67} 0.854373 {:rand|68} 0.10573 {:rand|69} 0.961589 {:rand|70} 0.345233 {:rand|71} 0.713961 {:rand|72} 0.0720415 {:rand|73} 0.814701 {:rand|74} 0.358695 {:rand|75} 0.696615 {:rand|76} 0.319601 {:rand|77} 0.668331 {:rand|78} 0.62488 {:rand|79} 0.0552756 {:rand|80} 0.946611 {:rand|81} 0.59706 {:rand|82} 0.579826 {:rand|83} 0.277659 {:rand|84} 0.437771 {:rand|85} 0.463825 {:rand|86} 0.573742 {:rand|87} 0.134545 {:rand|88} 0.884158 {:rand|89} 0.621515 {:rand|90} 0.172213 {:rand|91} 0.527516 {:rand|92} 0.233955 {:rand|93} 0.454314 {:rand|94} 0.387962 {:rand|95} 0.960182 {:rand|96} 0.353549 {:rand|97} 0.326811 {:rand|98} 0.814555 {:rand|99} 0.459279 -0.59 {:rand|0} 0.90354 {:rand|1} 0.994062 {:rand|2} 0.54912 {:rand|3} 0.372699 {:rand|4} 0.861315 {:rand|5} 0.0143594 {:rand|6} 0.589363 {:rand|7} 0.944337 {:rand|8} 0.362713 {:rand|9} 0.401735 {:rand|10} 0.0877127 {:rand|11} 0.978609 {:rand|12} 0.0365029 {:rand|13} 0.514121 {:rand|14} 0.0354315 {:rand|15} 0.664903 {:rand|16} 0.303691 {:rand|17} 0.230775 {:rand|18} 0.968643 {:rand|19} 0.0439152 {:rand|20} 0.788876 {:rand|21} 0.0527686 {:rand|22} 0.868531 {:rand|23} 0.359448 {:rand|24} 0.965036 {:rand|25} 0.856063 {:rand|26} 0.536334 {:rand|27} 0.751689 {:rand|28} 0.340894 {:rand|29} 0.223026 {:rand|30} 0.564667 {:rand|31} 0.244434 {:rand|32} 0.217088 {:rand|33} 0.113787 {:rand|34} 0.617133 {:rand|35} 0.0784028 {:rand|36} 0.128146 {:rand|37} 0.206496 {:rand|38} 0.0227399 {:rand|39} 0.490859 {:rand|40} 0.608231 {:rand|41} 0.110453 {:rand|42} 0.469468 {:rand|43} 0.644734 {:rand|44} 0.624574 {:rand|45} 0.5049 {:rand|46} 0.309637 {:rand|47} 0.928265 {:rand|48} 0.735675 {:rand|49} 0.278279 {:rand|50} 0.97218 {:rand|51} 0.524551 {:rand|52} 0.331048 {:rand|53} 0.840711 {:rand|54} 0.883999 {:rand|55} 0.296084 {:rand|56} 0.696774 {:rand|57} 0.420332 {:rand|58} 0.0477728 {:rand|59} 0.0376678 {:rand|60} 0.643359 {:rand|61} 0.61244 {:rand|62} 0.282102 {:rand|63} 0.860446 {:rand|64} 0.726227 {:rand|65} 0.899234 {:rand|66} 0.938849 {:rand|67} 0.854373 {:rand|68} 0.10573 {:rand|69} 0.961589 {:rand|70} 0.345233 {:rand|71} 0.713961 {:rand|72} 0.0720415 {:rand|73} 0.814701 {:rand|74} 0.358695 {:rand|75} 0.696615 {:rand|76} 0.319601 {:rand|77} 0.668331 {:rand|78} 0.62488 {:rand|79} 0.0552756 {:rand|80} 0.946611 {:rand|81} 0.59706 {:rand|82} 0.579826 {:rand|83} 0.277659 {:rand|84} 0.437771 {:rand|85} 0.463825 {:rand|86} 0.573742 {:rand|87} 0.134545 {:rand|88} 0.884158 {:rand|89} 0.621515 {:rand|90} 0.172213 {:rand|91} 0.527516 {:rand|92} 0.233955 {:rand|93} 0.454314 {:rand|94} 0.387962 {:rand|95} 0.960182 {:rand|96} 0.353549 {:rand|97} 0.326811 {:rand|98} 0.814555 {:rand|99} 0.459279 -0.66 {:rand|0} 0.90354 {:rand|1} 0.994062 {:rand|2} 0.54912 {:rand|3} 0.372699 {:rand|4} 0.861315 {:rand|5} 0.0143594 {:rand|6} 0.589363 {:rand|7} 0.944337 {:rand|8} 0.362713 {:rand|9} 0.401735 {:rand|10} 0.0877127 {:rand|11} 0.978609 {:rand|12} 0.0365029 {:rand|13} 0.514121 {:rand|14} 0.0354315 {:rand|15} 0.664903 {:rand|16} 0.303691 {:rand|17} 0.230775 {:rand|18} 0.968643 {:rand|19} 0.0439152 {:rand|20} 0.788876 {:rand|21} 0.0527686 {:rand|22} 0.868531 {:rand|23} 0.359448 {:rand|24} 0.965036 {:rand|25} 0.856063 {:rand|26} 0.536334 {:rand|27} 0.751689 {:rand|28} 0.340894 {:rand|29} 0.223026 {:rand|30} 0.564667 {:rand|31} 0.244434 {:rand|32} 0.217088 {:rand|33} 0.113787 {:rand|34} 0.617133 {:rand|35} 0.0784028 {:rand|36} 0.128146 {:rand|37} 0.206496 {:rand|38} 0.0227399 {:rand|39} 0.490859 {:rand|40} 0.608231 {:rand|41} 0.110453 {:rand|42} 0.469468 {:rand|43} 0.644734 {:rand|44} 0.624574 {:rand|45} 0.5049 {:rand|46} 0.309637 {:rand|47} 0.928265 {:rand|48} 0.735675 {:rand|49} 0.278279 {:rand|50} 0.97218 {:rand|51} 0.524551 {:rand|52} 0.331048 {:rand|53} 0.840711 {:rand|54} 0.883999 {:rand|55} 0.296084 {:rand|56} 0.696774 {:rand|57} 0.420332 {:rand|58} 0.0477728 {:rand|59} 0.0376678 {:rand|60} 0.643359 {:rand|61} 0.61244 {:rand|62} 0.282102 {:rand|63} 0.860446 {:rand|64} 0.726227 {:rand|65} 0.899234 {:rand|66} 0.938849 {:rand|67} 0.854373 {:rand|68} 0.10573 {:rand|69} 0.961589 {:rand|70} 0.345233 {:rand|71} 0.713961 {:rand|72} 0.0720415 {:rand|73} 0.814701 {:rand|74} 0.358695 {:rand|75} 0.696615 {:rand|76} 0.319601 {:rand|77} 0.668331 {:rand|78} 0.62488 {:rand|79} 0.0552756 {:rand|80} 0.946611 {:rand|81} 0.59706 {:rand|82} 0.579826 {:rand|83} 0.277659 {:rand|84} 0.437771 {:rand|85} 0.463825 {:rand|86} 0.573742 {:rand|87} 0.134545 {:rand|88} 0.884158 {:rand|89} 0.621515 {:rand|90} 0.172213 {:rand|91} 0.527516 {:rand|92} 0.233955 {:rand|93} 0.454314 {:rand|94} 0.387962 {:rand|95} 0.960182 {:rand|96} 0.353549 {:rand|97} 0.326811 {:rand|98} 0.814555 {:rand|99} 0.459279 +nsteps, 10 +0.03,"rand|0",0.90354,"rand|1",0.90354,"rand|2",0.90354,"rand|3",0.90354,"rand|4",0.90354,"rand|5",0.90354,"rand|6",0.90354,"rand|7",0.90354,"rand|8",0.90354,"rand|9",0.90354,"rand|10",0.90354,"rand|11",0.90354,"rand|12",0.90354,"rand|13",0.90354,"rand|14",0.90354,"rand|15",0.90354,"rand|16",0.90354,"rand|17",0.90354,"rand|18",0.90354,"rand|19",0.90354,"rand|20",0.90354,"rand|21",0.90354,"rand|22",0.90354,"rand|23",0.90354,"rand|24",0.90354,"rand|25",0.90354,"rand|26",0.90354,"rand|27",0.90354,"rand|28",0.90354,"rand|29",0.90354,"rand|30",0.90354,"rand|31",0.90354,"rand|32",0.90354,"rand|33",0.90354,"rand|34",0.90354,"rand|35",0.90354,"rand|36",0.90354,"rand|37",0.90354,"rand|38",0.90354,"rand|39",0.90354,"rand|40",0.90354,"rand|41",0.90354,"rand|42",0.90354,"rand|43",0.90354,"rand|44",0.90354,"rand|45",0.90354,"rand|46",0.90354,"rand|47",0.90354,"rand|48",0.90354,"rand|49",0.90354,"rand|50",0.90354,"rand|51",0.90354,"rand|52",0.90354,"rand|53",0.90354,"rand|54",0.90354,"rand|55",0.90354,"rand|56",0.90354,"rand|57",0.90354,"rand|58",0.90354,"rand|59",0.90354,"rand|60",0.90354,"rand|61",0.90354,"rand|62",0.90354,"rand|63",0.90354,"rand|64",0.90354,"rand|65",0.90354,"rand|66",0.90354,"rand|67",0.90354,"rand|68",0.90354,"rand|69",0.90354,"rand|70",0.90354,"rand|71",0.90354,"rand|72",0.90354,"rand|73",0.90354,"rand|74",0.90354,"rand|75",0.90354,"rand|76",0.90354,"rand|77",0.90354,"rand|78",0.90354,"rand|79",0.90354,"rand|80",0.90354,"rand|81",0.90354,"rand|82",0.90354,"rand|83",0.90354,"rand|84",0.90354,"rand|85",0.90354,"rand|86",0.90354,"rand|87",0.90354,"rand|88",0.90354,"rand|89",0.90354,"rand|90",0.90354,"rand|91",0.90354,"rand|92",0.90354,"rand|93",0.90354,"rand|94",0.90354,"rand|95",0.90354,"rand|96",0.90354,"rand|97",0.90354,"rand|98",0.90354,"rand|99",0.90354 +0.09999999999999999,"rand|0",0.90354,"rand|1",0.90354,"rand|2",0.90354,"rand|3",0.90354,"rand|4",0.90354,"rand|5",0.90354,"rand|6",0.90354,"rand|7",0.90354,"rand|8",0.90354,"rand|9",0.90354,"rand|10",0.90354,"rand|11",0.90354,"rand|12",0.90354,"rand|13",0.90354,"rand|14",0.90354,"rand|15",0.90354,"rand|16",0.90354,"rand|17",0.90354,"rand|18",0.90354,"rand|19",0.90354,"rand|20",0.90354,"rand|21",0.90354,"rand|22",0.90354,"rand|23",0.90354,"rand|24",0.90354,"rand|25",0.90354,"rand|26",0.90354,"rand|27",0.90354,"rand|28",0.90354,"rand|29",0.90354,"rand|30",0.90354,"rand|31",0.90354,"rand|32",0.90354,"rand|33",0.90354,"rand|34",0.90354,"rand|35",0.90354,"rand|36",0.90354,"rand|37",0.90354,"rand|38",0.90354,"rand|39",0.90354,"rand|40",0.90354,"rand|41",0.90354,"rand|42",0.90354,"rand|43",0.90354,"rand|44",0.90354,"rand|45",0.90354,"rand|46",0.90354,"rand|47",0.90354,"rand|48",0.90354,"rand|49",0.90354,"rand|50",0.90354,"rand|51",0.90354,"rand|52",0.90354,"rand|53",0.90354,"rand|54",0.90354,"rand|55",0.90354,"rand|56",0.90354,"rand|57",0.90354,"rand|58",0.90354,"rand|59",0.90354,"rand|60",0.90354,"rand|61",0.90354,"rand|62",0.90354,"rand|63",0.90354,"rand|64",0.90354,"rand|65",0.90354,"rand|66",0.90354,"rand|67",0.90354,"rand|68",0.90354,"rand|69",0.90354,"rand|70",0.90354,"rand|71",0.90354,"rand|72",0.90354,"rand|73",0.90354,"rand|74",0.90354,"rand|75",0.90354,"rand|76",0.90354,"rand|77",0.90354,"rand|78",0.90354,"rand|79",0.90354,"rand|80",0.90354,"rand|81",0.90354,"rand|82",0.90354,"rand|83",0.90354,"rand|84",0.90354,"rand|85",0.90354,"rand|86",0.90354,"rand|87",0.90354,"rand|88",0.90354,"rand|89",0.90354,"rand|90",0.90354,"rand|91",0.90354,"rand|92",0.90354,"rand|93",0.90354,"rand|94",0.90354,"rand|95",0.90354,"rand|96",0.90354,"rand|97",0.90354,"rand|98",0.90354,"rand|99",0.90354 +0.17,"rand|0",0.90354,"rand|1",0.90354,"rand|2",0.90354,"rand|3",0.90354,"rand|4",0.90354,"rand|5",0.90354,"rand|6",0.90354,"rand|7",0.90354,"rand|8",0.90354,"rand|9",0.90354,"rand|10",0.90354,"rand|11",0.90354,"rand|12",0.90354,"rand|13",0.90354,"rand|14",0.90354,"rand|15",0.90354,"rand|16",0.90354,"rand|17",0.90354,"rand|18",0.90354,"rand|19",0.90354,"rand|20",0.90354,"rand|21",0.90354,"rand|22",0.90354,"rand|23",0.90354,"rand|24",0.90354,"rand|25",0.90354,"rand|26",0.90354,"rand|27",0.90354,"rand|28",0.90354,"rand|29",0.90354,"rand|30",0.90354,"rand|31",0.90354,"rand|32",0.90354,"rand|33",0.90354,"rand|34",0.90354,"rand|35",0.90354,"rand|36",0.90354,"rand|37",0.90354,"rand|38",0.90354,"rand|39",0.90354,"rand|40",0.90354,"rand|41",0.90354,"rand|42",0.90354,"rand|43",0.90354,"rand|44",0.90354,"rand|45",0.90354,"rand|46",0.90354,"rand|47",0.90354,"rand|48",0.90354,"rand|49",0.90354,"rand|50",0.90354,"rand|51",0.90354,"rand|52",0.90354,"rand|53",0.90354,"rand|54",0.90354,"rand|55",0.90354,"rand|56",0.90354,"rand|57",0.90354,"rand|58",0.90354,"rand|59",0.90354,"rand|60",0.90354,"rand|61",0.90354,"rand|62",0.90354,"rand|63",0.90354,"rand|64",0.90354,"rand|65",0.90354,"rand|66",0.90354,"rand|67",0.90354,"rand|68",0.90354,"rand|69",0.90354,"rand|70",0.90354,"rand|71",0.90354,"rand|72",0.90354,"rand|73",0.90354,"rand|74",0.90354,"rand|75",0.90354,"rand|76",0.90354,"rand|77",0.90354,"rand|78",0.90354,"rand|79",0.90354,"rand|80",0.90354,"rand|81",0.90354,"rand|82",0.90354,"rand|83",0.90354,"rand|84",0.90354,"rand|85",0.90354,"rand|86",0.90354,"rand|87",0.90354,"rand|88",0.90354,"rand|89",0.90354,"rand|90",0.90354,"rand|91",0.90354,"rand|92",0.90354,"rand|93",0.90354,"rand|94",0.90354,"rand|95",0.90354,"rand|96",0.90354,"rand|97",0.90354,"rand|98",0.90354,"rand|99",0.90354 +0.24000000000000005,"rand|0",0.90354,"rand|1",0.90354,"rand|2",0.90354,"rand|3",0.90354,"rand|4",0.90354,"rand|5",0.90354,"rand|6",0.90354,"rand|7",0.90354,"rand|8",0.90354,"rand|9",0.90354,"rand|10",0.90354,"rand|11",0.90354,"rand|12",0.90354,"rand|13",0.90354,"rand|14",0.90354,"rand|15",0.90354,"rand|16",0.90354,"rand|17",0.90354,"rand|18",0.90354,"rand|19",0.90354,"rand|20",0.90354,"rand|21",0.90354,"rand|22",0.90354,"rand|23",0.90354,"rand|24",0.90354,"rand|25",0.90354,"rand|26",0.90354,"rand|27",0.90354,"rand|28",0.90354,"rand|29",0.90354,"rand|30",0.90354,"rand|31",0.90354,"rand|32",0.90354,"rand|33",0.90354,"rand|34",0.90354,"rand|35",0.90354,"rand|36",0.90354,"rand|37",0.90354,"rand|38",0.90354,"rand|39",0.90354,"rand|40",0.90354,"rand|41",0.90354,"rand|42",0.90354,"rand|43",0.90354,"rand|44",0.90354,"rand|45",0.90354,"rand|46",0.90354,"rand|47",0.90354,"rand|48",0.90354,"rand|49",0.90354,"rand|50",0.90354,"rand|51",0.90354,"rand|52",0.90354,"rand|53",0.90354,"rand|54",0.90354,"rand|55",0.90354,"rand|56",0.90354,"rand|57",0.90354,"rand|58",0.90354,"rand|59",0.90354,"rand|60",0.90354,"rand|61",0.90354,"rand|62",0.90354,"rand|63",0.90354,"rand|64",0.90354,"rand|65",0.90354,"rand|66",0.90354,"rand|67",0.90354,"rand|68",0.90354,"rand|69",0.90354,"rand|70",0.90354,"rand|71",0.90354,"rand|72",0.90354,"rand|73",0.90354,"rand|74",0.90354,"rand|75",0.90354,"rand|76",0.90354,"rand|77",0.90354,"rand|78",0.90354,"rand|79",0.90354,"rand|80",0.90354,"rand|81",0.90354,"rand|82",0.90354,"rand|83",0.90354,"rand|84",0.90354,"rand|85",0.90354,"rand|86",0.90354,"rand|87",0.90354,"rand|88",0.90354,"rand|89",0.90354,"rand|90",0.90354,"rand|91",0.90354,"rand|92",0.90354,"rand|93",0.90354,"rand|94",0.90354,"rand|95",0.90354,"rand|96",0.90354,"rand|97",0.90354,"rand|98",0.90354,"rand|99",0.90354 +0.31000000000000005,"rand|0",0.90354,"rand|1",0.90354,"rand|2",0.90354,"rand|3",0.90354,"rand|4",0.90354,"rand|5",0.90354,"rand|6",0.90354,"rand|7",0.90354,"rand|8",0.90354,"rand|9",0.90354,"rand|10",0.90354,"rand|11",0.90354,"rand|12",0.90354,"rand|13",0.90354,"rand|14",0.90354,"rand|15",0.90354,"rand|16",0.90354,"rand|17",0.90354,"rand|18",0.90354,"rand|19",0.90354,"rand|20",0.90354,"rand|21",0.90354,"rand|22",0.90354,"rand|23",0.90354,"rand|24",0.90354,"rand|25",0.90354,"rand|26",0.90354,"rand|27",0.90354,"rand|28",0.90354,"rand|29",0.90354,"rand|30",0.90354,"rand|31",0.90354,"rand|32",0.90354,"rand|33",0.90354,"rand|34",0.90354,"rand|35",0.90354,"rand|36",0.90354,"rand|37",0.90354,"rand|38",0.90354,"rand|39",0.90354,"rand|40",0.90354,"rand|41",0.90354,"rand|42",0.90354,"rand|43",0.90354,"rand|44",0.90354,"rand|45",0.90354,"rand|46",0.90354,"rand|47",0.90354,"rand|48",0.90354,"rand|49",0.90354,"rand|50",0.90354,"rand|51",0.90354,"rand|52",0.90354,"rand|53",0.90354,"rand|54",0.90354,"rand|55",0.90354,"rand|56",0.90354,"rand|57",0.90354,"rand|58",0.90354,"rand|59",0.90354,"rand|60",0.90354,"rand|61",0.90354,"rand|62",0.90354,"rand|63",0.90354,"rand|64",0.90354,"rand|65",0.90354,"rand|66",0.90354,"rand|67",0.90354,"rand|68",0.90354,"rand|69",0.90354,"rand|70",0.90354,"rand|71",0.90354,"rand|72",0.90354,"rand|73",0.90354,"rand|74",0.90354,"rand|75",0.90354,"rand|76",0.90354,"rand|77",0.90354,"rand|78",0.90354,"rand|79",0.90354,"rand|80",0.90354,"rand|81",0.90354,"rand|82",0.90354,"rand|83",0.90354,"rand|84",0.90354,"rand|85",0.90354,"rand|86",0.90354,"rand|87",0.90354,"rand|88",0.90354,"rand|89",0.90354,"rand|90",0.90354,"rand|91",0.90354,"rand|92",0.90354,"rand|93",0.90354,"rand|94",0.90354,"rand|95",0.90354,"rand|96",0.90354,"rand|97",0.90354,"rand|98",0.90354,"rand|99",0.90354 +0.38000000000000006,"rand|0",0.90354,"rand|1",0.90354,"rand|2",0.90354,"rand|3",0.90354,"rand|4",0.90354,"rand|5",0.90354,"rand|6",0.90354,"rand|7",0.90354,"rand|8",0.90354,"rand|9",0.90354,"rand|10",0.90354,"rand|11",0.90354,"rand|12",0.90354,"rand|13",0.90354,"rand|14",0.90354,"rand|15",0.90354,"rand|16",0.90354,"rand|17",0.90354,"rand|18",0.90354,"rand|19",0.90354,"rand|20",0.90354,"rand|21",0.90354,"rand|22",0.90354,"rand|23",0.90354,"rand|24",0.90354,"rand|25",0.90354,"rand|26",0.90354,"rand|27",0.90354,"rand|28",0.90354,"rand|29",0.90354,"rand|30",0.90354,"rand|31",0.90354,"rand|32",0.90354,"rand|33",0.90354,"rand|34",0.90354,"rand|35",0.90354,"rand|36",0.90354,"rand|37",0.90354,"rand|38",0.90354,"rand|39",0.90354,"rand|40",0.90354,"rand|41",0.90354,"rand|42",0.90354,"rand|43",0.90354,"rand|44",0.90354,"rand|45",0.90354,"rand|46",0.90354,"rand|47",0.90354,"rand|48",0.90354,"rand|49",0.90354,"rand|50",0.90354,"rand|51",0.90354,"rand|52",0.90354,"rand|53",0.90354,"rand|54",0.90354,"rand|55",0.90354,"rand|56",0.90354,"rand|57",0.90354,"rand|58",0.90354,"rand|59",0.90354,"rand|60",0.90354,"rand|61",0.90354,"rand|62",0.90354,"rand|63",0.90354,"rand|64",0.90354,"rand|65",0.90354,"rand|66",0.90354,"rand|67",0.90354,"rand|68",0.90354,"rand|69",0.90354,"rand|70",0.90354,"rand|71",0.90354,"rand|72",0.90354,"rand|73",0.90354,"rand|74",0.90354,"rand|75",0.90354,"rand|76",0.90354,"rand|77",0.90354,"rand|78",0.90354,"rand|79",0.90354,"rand|80",0.90354,"rand|81",0.90354,"rand|82",0.90354,"rand|83",0.90354,"rand|84",0.90354,"rand|85",0.90354,"rand|86",0.90354,"rand|87",0.90354,"rand|88",0.90354,"rand|89",0.90354,"rand|90",0.90354,"rand|91",0.90354,"rand|92",0.90354,"rand|93",0.90354,"rand|94",0.90354,"rand|95",0.90354,"rand|96",0.90354,"rand|97",0.90354,"rand|98",0.90354,"rand|99",0.90354 +0.45000000000000007,"rand|0",0.90354,"rand|1",0.90354,"rand|2",0.90354,"rand|3",0.90354,"rand|4",0.90354,"rand|5",0.90354,"rand|6",0.90354,"rand|7",0.90354,"rand|8",0.90354,"rand|9",0.90354,"rand|10",0.90354,"rand|11",0.90354,"rand|12",0.90354,"rand|13",0.90354,"rand|14",0.90354,"rand|15",0.90354,"rand|16",0.90354,"rand|17",0.90354,"rand|18",0.90354,"rand|19",0.90354,"rand|20",0.90354,"rand|21",0.90354,"rand|22",0.90354,"rand|23",0.90354,"rand|24",0.90354,"rand|25",0.90354,"rand|26",0.90354,"rand|27",0.90354,"rand|28",0.90354,"rand|29",0.90354,"rand|30",0.90354,"rand|31",0.90354,"rand|32",0.90354,"rand|33",0.90354,"rand|34",0.90354,"rand|35",0.90354,"rand|36",0.90354,"rand|37",0.90354,"rand|38",0.90354,"rand|39",0.90354,"rand|40",0.90354,"rand|41",0.90354,"rand|42",0.90354,"rand|43",0.90354,"rand|44",0.90354,"rand|45",0.90354,"rand|46",0.90354,"rand|47",0.90354,"rand|48",0.90354,"rand|49",0.90354,"rand|50",0.90354,"rand|51",0.90354,"rand|52",0.90354,"rand|53",0.90354,"rand|54",0.90354,"rand|55",0.90354,"rand|56",0.90354,"rand|57",0.90354,"rand|58",0.90354,"rand|59",0.90354,"rand|60",0.90354,"rand|61",0.90354,"rand|62",0.90354,"rand|63",0.90354,"rand|64",0.90354,"rand|65",0.90354,"rand|66",0.90354,"rand|67",0.90354,"rand|68",0.90354,"rand|69",0.90354,"rand|70",0.90354,"rand|71",0.90354,"rand|72",0.90354,"rand|73",0.90354,"rand|74",0.90354,"rand|75",0.90354,"rand|76",0.90354,"rand|77",0.90354,"rand|78",0.90354,"rand|79",0.90354,"rand|80",0.90354,"rand|81",0.90354,"rand|82",0.90354,"rand|83",0.90354,"rand|84",0.90354,"rand|85",0.90354,"rand|86",0.90354,"rand|87",0.90354,"rand|88",0.90354,"rand|89",0.90354,"rand|90",0.90354,"rand|91",0.90354,"rand|92",0.90354,"rand|93",0.90354,"rand|94",0.90354,"rand|95",0.90354,"rand|96",0.90354,"rand|97",0.90354,"rand|98",0.90354,"rand|99",0.90354 +0.5200000000000001,"rand|0",0.90354,"rand|1",0.90354,"rand|2",0.90354,"rand|3",0.90354,"rand|4",0.90354,"rand|5",0.90354,"rand|6",0.90354,"rand|7",0.90354,"rand|8",0.90354,"rand|9",0.90354,"rand|10",0.90354,"rand|11",0.90354,"rand|12",0.90354,"rand|13",0.90354,"rand|14",0.90354,"rand|15",0.90354,"rand|16",0.90354,"rand|17",0.90354,"rand|18",0.90354,"rand|19",0.90354,"rand|20",0.90354,"rand|21",0.90354,"rand|22",0.90354,"rand|23",0.90354,"rand|24",0.90354,"rand|25",0.90354,"rand|26",0.90354,"rand|27",0.90354,"rand|28",0.90354,"rand|29",0.90354,"rand|30",0.90354,"rand|31",0.90354,"rand|32",0.90354,"rand|33",0.90354,"rand|34",0.90354,"rand|35",0.90354,"rand|36",0.90354,"rand|37",0.90354,"rand|38",0.90354,"rand|39",0.90354,"rand|40",0.90354,"rand|41",0.90354,"rand|42",0.90354,"rand|43",0.90354,"rand|44",0.90354,"rand|45",0.90354,"rand|46",0.90354,"rand|47",0.90354,"rand|48",0.90354,"rand|49",0.90354,"rand|50",0.90354,"rand|51",0.90354,"rand|52",0.90354,"rand|53",0.90354,"rand|54",0.90354,"rand|55",0.90354,"rand|56",0.90354,"rand|57",0.90354,"rand|58",0.90354,"rand|59",0.90354,"rand|60",0.90354,"rand|61",0.90354,"rand|62",0.90354,"rand|63",0.90354,"rand|64",0.90354,"rand|65",0.90354,"rand|66",0.90354,"rand|67",0.90354,"rand|68",0.90354,"rand|69",0.90354,"rand|70",0.90354,"rand|71",0.90354,"rand|72",0.90354,"rand|73",0.90354,"rand|74",0.90354,"rand|75",0.90354,"rand|76",0.90354,"rand|77",0.90354,"rand|78",0.90354,"rand|79",0.90354,"rand|80",0.90354,"rand|81",0.90354,"rand|82",0.90354,"rand|83",0.90354,"rand|84",0.90354,"rand|85",0.90354,"rand|86",0.90354,"rand|87",0.90354,"rand|88",0.90354,"rand|89",0.90354,"rand|90",0.90354,"rand|91",0.90354,"rand|92",0.90354,"rand|93",0.90354,"rand|94",0.90354,"rand|95",0.90354,"rand|96",0.90354,"rand|97",0.90354,"rand|98",0.90354,"rand|99",0.90354 +0.5900000000000002,"rand|0",0.90354,"rand|1",0.90354,"rand|2",0.90354,"rand|3",0.90354,"rand|4",0.90354,"rand|5",0.90354,"rand|6",0.90354,"rand|7",0.90354,"rand|8",0.90354,"rand|9",0.90354,"rand|10",0.90354,"rand|11",0.90354,"rand|12",0.90354,"rand|13",0.90354,"rand|14",0.90354,"rand|15",0.90354,"rand|16",0.90354,"rand|17",0.90354,"rand|18",0.90354,"rand|19",0.90354,"rand|20",0.90354,"rand|21",0.90354,"rand|22",0.90354,"rand|23",0.90354,"rand|24",0.90354,"rand|25",0.90354,"rand|26",0.90354,"rand|27",0.90354,"rand|28",0.90354,"rand|29",0.90354,"rand|30",0.90354,"rand|31",0.90354,"rand|32",0.90354,"rand|33",0.90354,"rand|34",0.90354,"rand|35",0.90354,"rand|36",0.90354,"rand|37",0.90354,"rand|38",0.90354,"rand|39",0.90354,"rand|40",0.90354,"rand|41",0.90354,"rand|42",0.90354,"rand|43",0.90354,"rand|44",0.90354,"rand|45",0.90354,"rand|46",0.90354,"rand|47",0.90354,"rand|48",0.90354,"rand|49",0.90354,"rand|50",0.90354,"rand|51",0.90354,"rand|52",0.90354,"rand|53",0.90354,"rand|54",0.90354,"rand|55",0.90354,"rand|56",0.90354,"rand|57",0.90354,"rand|58",0.90354,"rand|59",0.90354,"rand|60",0.90354,"rand|61",0.90354,"rand|62",0.90354,"rand|63",0.90354,"rand|64",0.90354,"rand|65",0.90354,"rand|66",0.90354,"rand|67",0.90354,"rand|68",0.90354,"rand|69",0.90354,"rand|70",0.90354,"rand|71",0.90354,"rand|72",0.90354,"rand|73",0.90354,"rand|74",0.90354,"rand|75",0.90354,"rand|76",0.90354,"rand|77",0.90354,"rand|78",0.90354,"rand|79",0.90354,"rand|80",0.90354,"rand|81",0.90354,"rand|82",0.90354,"rand|83",0.90354,"rand|84",0.90354,"rand|85",0.90354,"rand|86",0.90354,"rand|87",0.90354,"rand|88",0.90354,"rand|89",0.90354,"rand|90",0.90354,"rand|91",0.90354,"rand|92",0.90354,"rand|93",0.90354,"rand|94",0.90354,"rand|95",0.90354,"rand|96",0.90354,"rand|97",0.90354,"rand|98",0.90354,"rand|99",0.90354 +0.6600000000000003,"rand|0",0.90354,"rand|1",0.90354,"rand|2",0.90354,"rand|3",0.90354,"rand|4",0.90354,"rand|5",0.90354,"rand|6",0.90354,"rand|7",0.90354,"rand|8",0.90354,"rand|9",0.90354,"rand|10",0.90354,"rand|11",0.90354,"rand|12",0.90354,"rand|13",0.90354,"rand|14",0.90354,"rand|15",0.90354,"rand|16",0.90354,"rand|17",0.90354,"rand|18",0.90354,"rand|19",0.90354,"rand|20",0.90354,"rand|21",0.90354,"rand|22",0.90354,"rand|23",0.90354,"rand|24",0.90354,"rand|25",0.90354,"rand|26",0.90354,"rand|27",0.90354,"rand|28",0.90354,"rand|29",0.90354,"rand|30",0.90354,"rand|31",0.90354,"rand|32",0.90354,"rand|33",0.90354,"rand|34",0.90354,"rand|35",0.90354,"rand|36",0.90354,"rand|37",0.90354,"rand|38",0.90354,"rand|39",0.90354,"rand|40",0.90354,"rand|41",0.90354,"rand|42",0.90354,"rand|43",0.90354,"rand|44",0.90354,"rand|45",0.90354,"rand|46",0.90354,"rand|47",0.90354,"rand|48",0.90354,"rand|49",0.90354,"rand|50",0.90354,"rand|51",0.90354,"rand|52",0.90354,"rand|53",0.90354,"rand|54",0.90354,"rand|55",0.90354,"rand|56",0.90354,"rand|57",0.90354,"rand|58",0.90354,"rand|59",0.90354,"rand|60",0.90354,"rand|61",0.90354,"rand|62",0.90354,"rand|63",0.90354,"rand|64",0.90354,"rand|65",0.90354,"rand|66",0.90354,"rand|67",0.90354,"rand|68",0.90354,"rand|69",0.90354,"rand|70",0.90354,"rand|71",0.90354,"rand|72",0.90354,"rand|73",0.90354,"rand|74",0.90354,"rand|75",0.90354,"rand|76",0.90354,"rand|77",0.90354,"rand|78",0.90354,"rand|79",0.90354,"rand|80",0.90354,"rand|81",0.90354,"rand|82",0.90354,"rand|83",0.90354,"rand|84",0.90354,"rand|85",0.90354,"rand|86",0.90354,"rand|87",0.90354,"rand|88",0.90354,"rand|89",0.90354,"rand|90",0.90354,"rand|91",0.90354,"rand|92",0.90354,"rand|93",0.90354,"rand|94",0.90354,"rand|95",0.90354,"rand|96",0.90354,"rand|97",0.90354,"rand|98",0.90354,"rand|99",0.90354 diff --git a/test/exampleLogs/reductionExample.mky.log b/test/exampleLogs/reductionExample.mky.log index df62147bf..6783614d0 100644 --- a/test/exampleLogs/reductionExample.mky.log +++ b/test/exampleLogs/reductionExample.mky.log @@ -1,11 +1,11 @@ -nsteps 10 -0.03 {:iota(5)|0} 0 {:iota(5)|1} 1 {:iota(5)|2} 2 {:iota(5)|3} 3 {:iota(5)|4} 4 {:y} 0.00449663 -0.1 {:iota(5)|0} 0 {:iota(5)|1} 1 {:iota(5)|2} 2 {:iota(5)|3} 3 {:iota(5)|4} 4 {:y} 0.0495851 -0.17 {:iota(5)|0} 0 {:iota(5)|1} 1 {:iota(5)|2} 2 {:iota(5)|3} 3 {:iota(5)|4} 4 {:y} 0.141063 -0.24 {:iota(5)|0} 0 {:iota(5)|1} 1 {:iota(5)|2} 2 {:iota(5)|3} 3 {:iota(5)|4} 4 {:y} 0.274516 -0.31 {:iota(5)|0} 0 {:iota(5)|1} 1 {:iota(5)|2} 2 {:iota(5)|3} 3 {:iota(5)|4} 4 {:y} 0.443583 -0.38 {:iota(5)|0} 0 {:iota(5)|1} 1 {:iota(5)|2} 2 {:iota(5)|3} 3 {:iota(5)|4} 4 {:y} 0.640359 -0.45 {:iota(5)|0} 0 {:iota(5)|1} 1 {:iota(5)|2} 2 {:iota(5)|3} 3 {:iota(5)|4} 4 {:y} 0.85588 -0.52 {:iota(5)|0} 0 {:iota(5)|1} 1 {:iota(5)|2} 2 {:iota(5)|3} 3 {:iota(5)|4} 4 {:y} 1.08068 -0.59 {:iota(5)|0} 0 {:iota(5)|1} 1 {:iota(5)|2} 2 {:iota(5)|3} 3 {:iota(5)|4} 4 {:y} 1.30534 -0.66 {:iota(5)|0} 0 {:iota(5)|1} 1 {:iota(5)|2} 2 {:iota(5)|3} 3 {:iota(5)|4} 4 {:y} 1.52108 +nsteps, 10 +0.03,"iota(5)|0",0.0,"iota(5)|1",0.0,"iota(5)|2",0.0,"iota(5)|3",0.0,"iota(5)|4",0.0,"y",0.004496626315865199 +0.09999999999999999,"iota(5)|0",0.0,"iota(5)|1",0.0,"iota(5)|2",0.0,"iota(5)|3",0.0,"iota(5)|4",0.0,"y",0.049585133847756535 +0.17,"iota(5)|0",0.0,"iota(5)|1",0.0,"iota(5)|2",0.0,"iota(5)|3",0.0,"iota(5)|4",0.0,"y",0.14106321730560914 +0.24000000000000005,"iota(5)|0",0.0,"iota(5)|1",0.0,"iota(5)|2",0.0,"iota(5)|3",0.0,"iota(5)|4",0.0,"y",0.2745159897658231 +0.31000000000000005,"iota(5)|0",0.0,"iota(5)|1",0.0,"iota(5)|2",0.0,"iota(5)|3",0.0,"iota(5)|4",0.0,"y",0.44358346859195674 +0.38000000000000006,"iota(5)|0",0.0,"iota(5)|1",0.0,"iota(5)|2",0.0,"iota(5)|3",0.0,"iota(5)|4",0.0,"y",0.640358901723092 +0.45000000000000007,"iota(5)|0",0.0,"iota(5)|1",0.0,"iota(5)|2",0.0,"iota(5)|3",0.0,"iota(5)|4",0.0,"y",0.8558795400268089 +0.5200000000000001,"iota(5)|0",0.0,"iota(5)|1",0.0,"iota(5)|2",0.0,"iota(5)|3",0.0,"iota(5)|4",0.0,"y",1.0806758435667978 +0.5900000000000002,"iota(5)|0",0.0,"iota(5)|1",0.0,"iota(5)|2",0.0,"iota(5)|3",0.0,"iota(5)|4",0.0,"y",1.3053413181640379 +0.6600000000000003,"iota(5)|0",0.0,"iota(5)|1",0.0,"iota(5)|2",0.0,"iota(5)|3",0.0,"iota(5)|4",0.0,"y",1.5210841389681269 diff --git a/test/exampleLogs/reductionsTest.mky.log b/test/exampleLogs/reductionsTest.mky.log index 47c86ae5f..9f25965b8 100644 --- a/test/exampleLogs/reductionsTest.mky.log +++ b/test/exampleLogs/reductionsTest.mky.log @@ -1,11 +1,11 @@ -nsteps 10 -0.03 {:all} 1 {:any} 0 {:inf} 0.841471 {:infi} 0 {:int1} 0.0045 {:int2} 0.00437135 {:int3} 0.0018 {:int4} 0.0252441 {:int5} 0 {:int6} 0.115259 {:int7} 0 {:int8} 0.03 {:iota|0} 0 {:iota|1} 1 {:iota|2} 2 {:iota|3} 3 {:iota|4} 4 {:prod} 0.287334 {:sum} 0.3 {:sup} 0.12 {:supi} 4 -0.1 {:all} 1 {:any} 0 {:inf} 0.841471 {:infi} 0 {:int1} 0.05 {:int2} 0.0456906 {:int3} 0.02 {:int4} 0.0841471 {:int5} 0 {:int6} 0.395259 {:int7} 0 {:int8} 0.1 {:iota|0} 0 {:iota|1} 1 {:iota|2} 2 {:iota|3} 3 {:iota|4} 4 {:prod} 0.876468 {:sum} 1 {:sup} 0.4 {:supi} 4 -0.17 {:all} 1 {:any} 0 {:inf} 0.841471 {:infi} 0 {:int1} 0.1445 {:int2} 0.125105 {:int3} 0.0578 {:int4} 0.14305 {:int5} 0 {:int6} 0.666444 {:int7} 0 {:int8} 0.17 {:iota|0} 0 {:iota|1} 1 {:iota|2} 2 {:iota|3} 3 {:iota|4} 4 {:prod} 1.38058 {:sum} 1.7 {:sup} 0.68 {:supi} 3 -0.212964 {:all} 1 {:any} 0 {:inf} 0.841471 {:infi} 0 {:int1} 0.226767 {:int2} 0.190458 {:int3} 0.090707 {:int4} 0.179203 {:int5} 0 {:int6} 0.795335 {:int7} 0 {:int8} 0.212964 {:iota|0} 0 {:iota|1} 1 {:iota|2} 2 {:iota|3} 3 {:iota|4} 4 {:prod} 1.6581 {:sum} 2.12964 {:sup} 0.851854 {:supi} 3 -0.282964 {:all} 1 {:any} 0 {:inf} 0.841471 {:infi} 0 {:int1} 0.400342 {:int2} 0.321184 {:int3} 0.160137 {:int4} 0.238106 {:int5} 0 {:int6} 0.941261 {:int7} 0 {:int8} 0.282964 {:iota|0} 0 {:iota|1} 1 {:iota|2} 2 {:iota|3} 3 {:iota|4} 4 {:prod} 2.06923 {:sum} 2.82964 {:sup} 1.13185 {:supi} 2 -0.346725 {:all} 0 {:any} 1 {:inf} 0.685066 {:infi} 4 {:int1} 0.60109 {:int2} 0.464068 {:int3} 0.240436 {:int4} 0.287178 {:int5} 0.234299 {:int6} 1.06878 {:int7} 0.0358632 {:int8} 0.310862 {:iota|0} 0 {:iota|1} 1 {:iota|2} 2 {:iota|3} 3 {:iota|4} 4 {:prod} 2.40747 {:sum} 3.46725 {:sup} 1.3869 {:supi} 2 -0.416725 {:all} 0 {:any} 1 {:inf} 0.457066 {:infi} 4 {:int1} 0.868298 {:int2} 0.644636 {:int3} 0.347319 {:int4} 0.327416 {:int5} 0.514299 {:int6} 1.17248 {:int7} 0.105863 {:int8} 0.310862 {:iota|0} 0 {:iota|1} 1 {:iota|2} 2 {:iota|3} 3 {:iota|4} 4 {:prod} 2.74647 {:sum} 4.16725 {:sup} 1.6669 {:supi} 1 -0.486725 {:all} 0 {:any} 1 {:inf} 0.193466 {:infi} 4 {:int1} 1.1845 {:int2} 0.847919 {:int3} 0.473802 {:int4} 0.350335 {:int5} 0.794299 {:int6} 1.24248 {:int7} 0.175863 {:int8} 0.310862 {:iota|0} 0 {:iota|1} 1 {:iota|2} 2 {:iota|3} 3 {:iota|4} 4 {:prod} 3.05734 {:sum} 4.86725 {:sup} 1.9469 {:supi} 1 -0.556725 {:all} 0 {:any} 1 {:inf} -0.0852029 {:infi} 4 {:int1} 1.54971 {:int2} 1.07211 {:int3} 0.619885 {:int4} 0.354149 {:int5} 1.0743 {:int6} 1.31248 {:int7} 0.245863 {:int8} 0.310862 {:iota|0} 0 {:iota|1} 1 {:iota|2} 2 {:iota|3} 3 {:iota|4} 4 {:prod} 3.34457 {:sum} 5.56725 {:sup} 2.2269 {:supi} 1 -0.626725 {:all} 0 {:any} 1 {:inf} -0.357235 {:infi} 4 {:int1} 1.96392 {:int2} 1.31569 {:int3} 0.785568 {:int4} 0.338562 {:int5} 1.3543 {:int6} 1.38248 {:int7} 0.315863 {:int8} 0.310862 {:iota|0} 0 {:iota|1} 1 {:iota|2} 2 {:iota|3} 3 {:iota|4} 4 {:prod} 3.61161 {:sum} 6.26725 {:sup} 2.5069 {:supi} 1 +nsteps, 10 +0.03,"all",1.0,"any",0.0,"inf",0.8414709848078965,"infi",0.0,"int1",0.0045000000000000005,"int2",0.004371349133219845,"int3",0.0018,"int4",0.025244129544236896,"int5",0.0,"int6",0.11525925925925926,"int7",0.0,"int8",0.03,"iota|0",0.0,"iota|1",0.0,"iota|2",0.0,"iota|3",0.0,"iota|4",0.0,"prod",0.2873340919135759,"sum",0.3,"sup",0.12,"supi",4.0 +0.09999999999999999,"all",1.0,"any",0.0,"inf",0.8414709848078965,"infi",0.0,"int1",0.05,"int2",0.045690592001826506,"int3",0.020000000000000004,"int4",0.08414709848078965,"int5",0.0,"int6",0.3952592592592592,"int7",0.0,"int8",0.09999999999999999,"iota|0",0.0,"iota|1",0.0,"iota|2",0.0,"iota|3",0.0,"iota|4",0.0,"prod",0.8764682376869835,"sum",1.0,"sup",0.39999999999999997,"supi",4.0 +0.17,"all",1.0,"any",0.0,"inf",0.8414709848078965,"infi",0.0,"int1",0.14450000000000002,"int2",0.1251049394946893,"int3",0.057800000000000004,"int4",0.14305006741734239,"int5",0.0,"int6",0.6664444444444444,"int7",0.0,"int8",0.17,"iota|0",0.0,"iota|1",0.0,"iota|2",0.0,"iota|3",0.0,"iota|4",0.0,"prod",1.3805768070144853,"sum",1.7000000000000002,"sup",0.68,"supi",3.0 +0.21296358588172648,"all",1.0,"any",0.0,"inf",0.8414709848078965,"infi",0.0,"int1",0.22676744455801737,"int2",0.19045753921440864,"int3",0.09070697782320696,"int4",0.17920267834011736,"int5",0.0,"int6",0.7953352020896237,"int7",0.0,"int8",0.21296358588172648,"iota|0",0.0,"iota|1",0.0,"iota|2",0.0,"iota|3",0.0,"iota|4",0.0,"prod",1.6580959892558904,"sum",2.129635858817265,"sup",0.8518543435269059,"supi",3.0 +0.2829635858817265,"all",1.0,"any",0.0,"inf",0.8414709848078965,"infi",0.0,"int1",0.40034195467522593,"int2",0.3211838162263442,"int3",0.16013678187009037,"int4",0.2381056472766701,"int5",0.0,"int6",0.9412611280155497,"int7",0.0,"int8",0.2829635858817265,"iota|0",0.0,"iota|1",0.0,"iota|2",0.0,"iota|3",0.0,"iota|4",0.0,"prod",2.0692288474105713,"sum",2.829635858817265,"sup",1.131854343526906,"supi",2.0 +0.34672474093468963,"all",0.0,"any",1.0,"inf",0.6850655595471485,"infi",4.0,"int1",0.601090229881138,"int2",0.46406805696382697,"int3",0.2404360919524552,"int4",0.2871783425894743,"int5",0.23429859114970697,"int6",1.068783438121476,"int7",0.03586320544570959,"int8",0.31086153548898,"iota|0",0.0,"iota|1",0.0,"iota|2",0.0,"iota|3",0.0,"iota|4",0.0,"prod",2.407473315345021,"sum",3.4672474093468963,"sup",1.3868989637387585,"supi",2.0 +0.41672474093468964,"all",0.0,"any",1.0,"inf",0.4570660263420836,"infi",4.0,"int1",0.8682975485354207,"int2",0.6446356196426464,"int3",0.34731901941416826,"int4",0.32741617970822023,"int5",0.514298591149707,"int6",1.1724768636043752,"int7",0.10586320544570958,"int8",0.31086153548898,"iota|0",0.0,"iota|1",0.0,"iota|2",0.0,"iota|3",0.0,"iota|4",0.0,"prod",2.7464708485351896,"sum",4.1672474093468965,"sup",1.6668989637387586,"supi",1.0 +0.48672474093468965,"all",0.0,"any",1.0,"inf",0.19346602101915886,"infi",4.0,"int1",1.1845048671897034,"int2",0.847918860796098,"int3",0.4738019468758814,"int4",0.3503347322346882,"int5",0.7942985911497071,"int6",1.2424768636043753,"int7",0.1758632054457096,"int8",0.31086153548898,"iota|0",0.0,"iota|1",0.0,"iota|2",0.0,"iota|3",0.0,"iota|4",0.0,"prod",3.057344145997781,"sum",4.867247409346897,"sup",1.9468989637387586,"supi",1.0 +0.5567247409346897,"all",0.0,"any",1.0,"inf",-0.0852028830844669,"infi",4.0,"int1",1.5497121858439862,"int2",1.0721128210243696,"int3",0.6198848743375945,"int4",0.35414889420348844,"int5",1.0742985911497072,"int6",1.3124768636043753,"int7",0.2458632054457096,"int8",0.31086153548898,"iota|0",0.0,"iota|1",0.0,"iota|2",0.0,"iota|3",0.0,"iota|4",0.0,"prod",3.3445708524661324,"sum",5.567247409346898,"sup",2.226898963738759,"supi",1.0 +0.6267247409346898,"all",0.0,"any",1.0,"inf",-0.35723540931532627,"infi",4.0,"int1",1.9639195044982691,"int2",1.31568837930513,"int3",0.7855678017993077,"int4",0.3385615838824476,"int5",1.3542985911497072,"int6",1.3824768636043754,"int7",0.3158632054457096,"int8",0.31086153548898,"iota|0",0.0,"iota|1",0.0,"iota|2",0.0,"iota|3",0.0,"iota|4",0.0,"prod",3.611613724427541,"sum",6.267247409346897,"sup",2.506898963738759,"supi",1.0 diff --git a/test/exampleLogs/scansTest.mky.log b/test/exampleLogs/scansTest.mky.log index 7816be277..2a573ba90 100644 --- a/test/exampleLogs/scansTest.mky.log +++ b/test/exampleLogs/scansTest.mky.log @@ -1,11 +1,11 @@ -nsteps 10 -0.03 {:int1} 0.383333 {:int2} 0.094835 {:int3} 0.000910835 {:Δ|0} 0.015828 {:Δ|1} 0.0150565 {:Δ|2} 0.0142714 {:Δ|3} 0.0134735 {:Π|0} 0.841471 {:Π|1} 0.721392 {:Π|2} 0.62931 {:Π|3} 0.557964 {:Π|4} 0.502223 {:Σ|0} 0.841471 {:Σ|1} 1.69877 {:Σ|2} 2.57113 {:Σ|3} 3.45775 {:Σ|4} 4.35785 {:ι|0} 0 {:ι|1} 1 {:ι|2} 2 {:ι|3} 3 {:ι|4} 4 -0.1 {:int1} 1.30893 {:int2} 0.336204 {:int3} 0.00843669 {:Δ|0} 0.0497364 {:Δ|1} 0.0408317 {:Δ|2} 0.0315191 {:Δ|3} 0.0218915 {:Π|0} 0.841471 {:Π|1} 0.749925 {:Π|2} 0.69896 {:Π|3} 0.673488 {:Π|4} 0.663689 {:Σ|0} 0.841471 {:Σ|1} 1.73268 {:Σ|2} 2.66472 {:Σ|3} 3.62828 {:Σ|4} 4.61373 {:ι|0} 0 {:ι|1} 1 {:ι|2} 2 {:ι|3} 3 {:ι|4} 4 -0.17 {:int1} 2.26519 {:int2} 0.599613 {:int3} 0.0192722 {:Δ|0} 0.0792796 {:Δ|1} 0.0527339 {:Δ|2} 0.0246679 {:Δ|3} -0.00410927 {:Π|0} 0.841471 {:Π|1} 0.774785 {:Π|2} 0.754241 {:Π|3} 0.752848 {:Π|4} 0.748363 {:Σ|0} 0.841471 {:Σ|1} 1.76222 {:Σ|2} 2.73571 {:Σ|3} 3.73386 {:Σ|4} 4.7279 {:ι|0} 0 {:ι|1} 1 {:ι|2} 2 {:ι|3} 3 {:ι|4} 4 -0.24 {:int1} 3.23548 {:int2} 0.874079 {:int3} 0.0279855 {:Δ|0} 0.104313 {:Δ|1} 0.0500968 {:Δ|2} -0.00699108 {:Δ|3} -0.0636782 {:Π|0} 0.841471 {:Π|1} 0.79585 {:Π|2} 0.792572 {:Π|3} 0.783766 {:Π|4} 0.725149 {:Σ|0} 0.841471 {:Σ|1} 1.78725 {:Σ|2} 2.78314 {:Σ|3} 3.77203 {:Σ|4} 4.69724 {:ι|0} 0 {:ι|1} 1 {:ι|2} 2 {:ι|3} 3 {:ι|4} 4 -0.31 {:int1} 4.20304 {:int2} 1.14674 {:int3} 0.02931 {:Δ|0} 0.124714 {:Δ|1} 0.0326048 {:Δ|2} -0.0626127 {:Δ|3} -0.151861 {:Π|0} 0.841471 {:Π|1} 0.813017 {:Π|2} 0.812033 {:Π|3} 0.760206 {:Π|4} 0.596242 {:Σ|0} 0.841471 {:Σ|1} 1.80766 {:Σ|2} 2.80645 {:Σ|3} 3.74262 {:Σ|4} 4.52694 {:ι|0} 0 {:ι|1} 1 {:ι|2} 2 {:ι|3} 3 {:ι|4} 4 -0.38 {:int1} 5.15183 {:int2} 1.40585 {:int3} 0.0185546 {:Δ|0} 0.140383 {:Δ|1} 0.000300787 {:Δ|2} -0.139824 {:Δ|3} -0.26 {:Π|0} 0.841471 {:Π|1} 0.826201 {:Π|2} 0.811457 {:Π|3} 0.683515 {:Π|4} 0.398032 {:Σ|0} 0.841471 {:Σ|1} 1.82332 {:Σ|2} 2.80548 {:Σ|3} 3.64781 {:Σ|4} 4.23014 {:ι|0} 0 {:ι|1} 1 {:ι|2} 2 {:ι|3} 3 {:ι|4} 4 -0.45 {:int1} 6.0672 {:int2} 1.64336 {:int3} -0.00803078 {:Δ|0} 0.151242 {:Δ|1} -0.0464129 {:Δ|2} -0.234827 {:Δ|3} -0.376485 {:Π|0} 0.841471 {:Π|1} 0.835339 {:Π|2} 0.790482 {:Π|3} 0.562407 {:Π|4} 0.1884 {:Σ|0} 0.841471 {:Σ|1} 1.83418 {:Σ|2} 2.78048 {:Σ|3} 3.49196 {:Σ|4} 3.82695 {:ι|0} 0 {:ι|1} 1 {:ι|2} 2 {:ι|3} 3 {:ι|4} 4 -0.52 {:int1} 6.93652 {:int2} 1.85624 {:int3} -0.0529634 {:Δ|0} 0.157239 {:Δ|1} -0.106781 {:Δ|2} -0.342573 {:Δ|3} -0.487802 {:Π|0} 0.841471 {:Π|1} 0.840386 {:Π|2} 0.749564 {:Π|3} 0.411777 {:Π|4} 0.0253464 {:Σ|0} 0.841471 {:Σ|1} 1.84018 {:Σ|2} 2.73211 {:Σ|3} 3.28147 {:Σ|4} 3.34302 {:ι|0} 0 {:ι|1} 1 {:ι|2} 2 {:ι|3} 3 {:ι|4} 4 -0.59 {:int1} 7.74964 {:int2} 2.04615 {:int3} -0.117331 {:Δ|0} 0.158345 {:Δ|1} -0.179712 {:Δ|2} -0.457004 {:Δ|3} -0.579775 {:Π|0} 0.841471 {:Π|1} 0.841316 {:Π|2} 0.689966 {:Π|3} 0.250527 {:Π|4} -0.0542829 {:Σ|0} 0.841471 {:Σ|1} 1.84129 {:Σ|2} 2.66139 {:Σ|3} 3.02449 {:Σ|4} 2.80782 {:ι|0} 0 {:ι|1} 1 {:ι|2} 2 {:ι|3} 3 {:ι|4} 4 -0.66 {:int1} 8.49929 {:int2} 2.21768 {:int3} -0.200709 {:Δ|0} 0.154553 {:Δ|1} -0.263793 {:Δ|2} -0.571341 {:Δ|3} -0.638918 {:Π|0} 0.841471 {:Π|1} 0.838125 {:Π|2} 0.613702 {:Π|3} 0.0987387 {:Π|4} -0.0471998 {:Σ|0} 0.841471 {:Σ|1} 1.83749 {:Σ|2} 2.56973 {:Σ|3} 2.73062 {:Σ|4} 2.25259 {:ι|0} 0 {:ι|1} 1 {:ι|2} 2 {:ι|3} 3 {:ι|4} 4 +nsteps, 10 +0.03,"int1",0.38333275155170693,"int2",0.09483498619099312,"int3",0.0009108353535889638,"\Delta|0",0.01582800438070686,"\Delta|1",0.01582800438070686,"\Delta|2",0.01582800438070686,"\Delta|3",0.01582800438070686,"\Pi|0",0.8414709848078965,"\Pi|1",0.8414709848078965,"\Pi|2",0.8414709848078965,"\Pi|3",0.8414709848078965,"\Pi|4",0.8414709848078965,"\Sigma|0",0.8414709848078965,"\Sigma|1",0.8414709848078965,"\Sigma|2",0.8414709848078965,"\Sigma|3",0.8414709848078965,"\Sigma|4",0.8414709848078965,"\iota|0",0.0,"\iota|1",0.0,"\iota|2",0.0,"\iota|3",0.0,"\iota|4",0.0 +0.09999999999999999,"int1",1.3089298326437722,"int2",0.3362042505342634,"int3",0.008436692148581755,"\Delta|0",0.04973637525353891,"\Delta|1",0.04973637525353891,"\Delta|2",0.04973637525353891,"\Delta|3",0.04973637525353891,"\Pi|0",0.8414709848078965,"\Pi|1",0.8414709848078965,"\Pi|2",0.8414709848078965,"\Pi|3",0.8414709848078965,"\Pi|4",0.8414709848078965,"\Sigma|0",0.8414709848078965,"\Sigma|1",0.8414709848078965,"\Sigma|2",0.8414709848078965,"\Sigma|3",0.8414709848078965,"\Sigma|4",0.8414709848078965,"\iota|0",0.0,"\iota|1",0.0,"\iota|2",0.0,"\iota|3",0.0,"\iota|4",0.0 +0.17,"int1",2.265194951124186,"int2",0.5996132672595323,"int3",0.019272196974919463,"\Delta|0",0.07927961292823915,"\Delta|1",0.07927961292823915,"\Delta|2",0.07927961292823915,"\Delta|3",0.07927961292823915,"\Pi|0",0.8414709848078965,"\Pi|1",0.8414709848078965,"\Pi|2",0.8414709848078965,"\Pi|3",0.8414709848078965,"\Pi|4",0.8414709848078965,"\Sigma|0",0.8414709848078965,"\Sigma|1",0.8414709848078965,"\Sigma|2",0.8414709848078965,"\Sigma|3",0.8414709848078965,"\Sigma|4",0.8414709848078965,"\iota|0",0.0,"\iota|1",0.0,"\iota|2",0.0,"\iota|3",0.0,"\iota|4",0.0 +0.24000000000000005,"int1",3.235475811165275,"int2",0.8740789458329633,"int3",0.02798548124545895,"\Delta|0",0.10431301464164244,"\Delta|1",0.10431301464164244,"\Delta|2",0.10431301464164244,"\Delta|3",0.10431301464164244,"\Pi|0",0.8414709848078965,"\Pi|1",0.8414709848078965,"\Pi|2",0.8414709848078965,"\Pi|3",0.8414709848078965,"\Pi|4",0.8414709848078965,"\Sigma|0",0.8414709848078965,"\Sigma|1",0.8414709848078965,"\Sigma|2",0.8414709848078965,"\Sigma|3",0.8414709848078965,"\Sigma|4",0.8414709848078965,"\iota|0",0.0,"\iota|1",0.0,"\iota|2",0.0,"\iota|3",0.0,"\iota|4",0.0 +0.31000000000000005,"int1",4.203038389483237,"int2",1.1467433468656212,"int3",0.02930997427176394,"\Delta|0",0.12471396680483748,"\Delta|1",0.12471396680483748,"\Delta|2",0.12471396680483748,"\Delta|3",0.12471396680483748,"\Pi|0",0.8414709848078965,"\Pi|1",0.8414709848078965,"\Pi|2",0.8414709848078965,"\Pi|3",0.8414709848078965,"\Pi|4",0.8414709848078965,"\Sigma|0",0.8414709848078965,"\Sigma|1",0.8414709848078965,"\Sigma|2",0.8414709848078965,"\Sigma|3",0.8414709848078965,"\Sigma|4",0.8414709848078965,"\iota|0",0.0,"\iota|1",0.0,"\iota|2",0.0,"\iota|3",0.0,"\iota|4",0.0 +0.38000000000000006,"int1",5.151832242784837,"int2",1.405853235420858,"int3",0.01855461183823801,"\Delta|0",0.14038254556446328,"\Delta|1",0.14038254556446328,"\Delta|2",0.14038254556446328,"\Delta|3",0.14038254556446328,"\Pi|0",0.8414709848078965,"\Pi|1",0.8414709848078965,"\Pi|2",0.8414709848078965,"\Pi|3",0.8414709848078965,"\Pi|4",0.8414709848078965,"\Sigma|0",0.8414709848078965,"\Sigma|1",0.8414709848078965,"\Sigma|2",0.8414709848078965,"\Sigma|3",0.8414709848078965,"\Sigma|4",0.8414709848078965,"\iota|0",0.0,"\iota|1",0.0,"\iota|2",0.0,"\iota|3",0.0,"\iota|4",0.0 +0.45000000000000007,"int1",6.067203755009967,"int2",1.6433590324954783,"int3",-0.008030780918410547,"\Delta|0",0.15124200622969197,"\Delta|1",0.15124200622969197,"\Delta|2",0.15124200622969197,"\Delta|3",0.15124200622969197,"\Pi|0",0.8414709848078965,"\Pi|1",0.8414709848078965,"\Pi|2",0.8414709848078965,"\Pi|3",0.8414709848078965,"\Pi|4",0.8414709848078965,"\Sigma|0",0.8414709848078965,"\Sigma|1",0.8414709848078965,"\Sigma|2",0.8414709848078965,"\Sigma|3",0.8414709848078965,"\Sigma|4",0.8414709848078965,"\iota|0",0.0,"\iota|1",0.0,"\iota|2",0.0,"\iota|3",0.0,"\iota|4",0.0 +0.5200000000000001,"int1",6.936515788891217,"int2",1.8562376915154135,"int3",-0.052963391676551,"\Delta|0",0.1572391591676865,"\Delta|1",0.1572391591676865,"\Delta|2",0.1572391591676865,"\Delta|3",0.1572391591676865,"\Pi|0",0.8414709848078965,"\Pi|1",0.8414709848078965,"\Pi|2",0.8414709848078965,"\Pi|3",0.8414709848078965,"\Pi|4",0.8414709848078965,"\Sigma|0",0.8414709848078965,"\Sigma|1",0.8414709848078965,"\Sigma|2",0.8414709848078965,"\Sigma|3",0.8414709848078965,"\Sigma|4",0.8414709848078965,"\iota|0",0.0,"\iota|1",0.0,"\iota|2",0.0,"\iota|3",0.0,"\iota|4",0.0 +0.5900000000000002,"int1",7.749638798132,"int2",2.0461479620806187,"int3",-0.11733135938798298,"\Delta|0",0.15834463032639434,"\Delta|1",0.15834463032639434,"\Delta|2",0.15834463032639434,"\Delta|3",0.15834463032639434,"\Pi|0",0.8414709848078965,"\Pi|1",0.8414709848078965,"\Pi|2",0.8414709848078965,"\Pi|3",0.8414709848078965,"\Pi|4",0.8414709848078965,"\Sigma|0",0.8414709848078965,"\Sigma|1",0.8414709848078965,"\Sigma|2",0.8414709848078965,"\Sigma|3",0.8414709848078965,"\Sigma|4",0.8414709848078965,"\iota|0",0.0,"\iota|1",0.0,"\iota|2",0.0,"\iota|3",0.0,"\iota|4",0.0 +0.6600000000000003,"int1",8.499287316779448,"int2",2.2176834583070506,"int3",-0.2007090200888668,"\Delta|0",0.15455300510864023,"\Delta|1",0.15455300510864023,"\Delta|2",0.15455300510864023,"\Delta|3",0.15455300510864023,"\Pi|0",0.8414709848078965,"\Pi|1",0.8414709848078965,"\Pi|2",0.8414709848078965,"\Pi|3",0.8414709848078965,"\Pi|4",0.8414709848078965,"\Sigma|0",0.8414709848078965,"\Sigma|1",0.8414709848078965,"\Sigma|2",0.8414709848078965,"\Sigma|3",0.8414709848078965,"\Sigma|4",0.8414709848078965,"\iota|0",0.0,"\iota|1",0.0,"\iota|2",0.0,"\iota|3",0.0,"\iota|4",0.0 diff --git a/test/exampleLogs/statistics.mky.log b/test/exampleLogs/statistics.mky.log index 2230ee6e2..445364c32 100644 --- a/test/exampleLogs/statistics.mky.log +++ b/test/exampleLogs/statistics.mky.log @@ -1,11 +1,11 @@ -nsteps 10 -0.03 {:3rd␣moment␣about␣mean} -2.02927e-07 {:int1} 0.000899325 {:int2} 0.00089973 {:int3} 0.000710691 {:int4} -1.01606e-09 {:iota(5)|0} 0 {:iota(5)|1} 0 {:iota(5)|2} 0 {:iota(5)|3} 0 {:iota(5)|4} 0 {:mean} 0.0599101 {:median} 0.059964 {:std␣deviation} 0.0473247 -0.1 {:3rd␣moment␣about␣mean} -7.86813e-05 {:int1} 0.00991703 {:int2} 0.00996671 {:int3} 0.00780493 {:int4} -1.33295e-06 {:iota(5)|0} 0 {:iota(5)|1} 0 {:iota(5)|2} 0 {:iota(5)|3} 0 {:iota(5)|4} 0 {:mean} 0.196688 {:median} 0.198669 {:std␣deviation} 0.154097 -0.17 {:3rd␣moment␣about␣mean} -0.00098563 {:int1} 0.0282126 {:int2} 0.0286227 {:int3} 0.0220167 {:int4} -2.93211e-05 {:iota(5)|0} 0 {:iota(5)|1} 0 {:iota(5)|2} 0 {:iota(5)|3} 0 {:iota(5)|4} 0 {:mean} 0.323928 {:median} 0.333487 {:std␣deviation} 0.249443 -0.24 {:3rd␣moment␣about␣mean} -0.00455031 {:int1} 0.0549032 {:int2} 0.0565025 {:int3} 0.0423023 {:int4} -0.000201309 {:iota(5)|0} 0 {:iota(5)|1} 0 {:iota(5)|2} 0 {:iota(5)|3} 0 {:iota(5)|4} 0 {:mean} 0.435612 {:median} 0.461779 {:std␣deviation} 0.326657 -0.31 {:3rd␣moment␣about␣mean} -0.0124914 {:int1} 0.0887167 {:int2} 0.0930608 {:int3} 0.0672133 {:int4} -0.000770355 {:iota(5)|0} 0 {:iota(5)|1} 0 {:iota(5)|2} 0 {:iota(5)|3} 0 {:iota(5)|4} 0 {:mean} 0.5267 {:median} 0.581035 {:std␣deviation} 0.381019 -0.38 {:3rd␣moment␣about␣mean} -0.0242515 {:int1} 0.128072 {:int2} 0.137582 {:int3} 0.0950641 {:int4} -0.00204215 {:iota(5)|0} 0 {:iota(5)|1} 0 {:iota(5)|2} 0 {:iota(5)|3} 0 {:iota(5)|4} 0 {:mean} 0.593437 {:median} 0.688921 {:std␣deviation} 0.410607 -0.45 {:3rd␣moment␣about␣mean} -0.0358693 {:int1} 0.171176 {:int2} 0.189195 {:int3} 0.124158 {:int4} -0.00416394 {:iota(5)|0} 0 {:iota(5)|1} 0 {:iota(5)|2} 0 {:iota(5)|3} 0 {:iota(5)|4} 0 {:mean} 0.633573 {:median} 0.783327 {:std␣deviation} 0.417175 -0.52 {:3rd␣moment␣about␣mean} -0.0415298 {:int1} 0.216135 {:int2} 0.24689 {:int3} 0.153078 {:int4} -0.00692326 {:iota(5)|0} 0 {:iota(5)|1} 0 {:iota(5)|2} 0 {:iota(5)|3} 0 {:iota(5)|4} 0 {:mean} 0.646472 {:median} 0.862404 {:std␣deviation} 0.4072 -0.59 {:3rd␣moment␣about␣mean} -0.0374571 {:int1} 0.261068 {:int2} 0.302404 {:int3} 0.181059 {:int4} -0.00974618 {:iota(5)|0} 0 {:iota(5)|1} 0 {:iota(5)|2} 0 {:iota(5)|3} 0 {:iota(5)|4} 0 {:mean} 0.63312 {:median} 0.704411 {:std␣deviation} 0.39283 -0.66 {:3rd␣moment␣about␣mean} -0.0256555 {:int1} 0.304217 {:int2} 0.346335 {:int3} 0.208364 {:int4} -0.0119816 {:iota(5)|0} 0 {:iota(5)|1} 0 {:iota(5)|2} 0 {:iota(5)|3} 0 {:iota(5)|4} 0 {:mean} 0.596019 {:median} 0.613117 {:std␣deviation} 0.390837 +nsteps, 10 +0.03,":3rd moment about mean",-2.0292673311071924e-07,"int1",0.0008993252631730396,"int2",0.0008997300323959314,"int3",0.0007106911814749187,"int4",-1.016062930657174e-09,":iota(5)|0",0.0,":iota(5)|1",0.0,":iota(5)|2",0.0,":iota(5)|3",0.0,":iota(5)|4",0.0,":mean",0.05991005263377412,":median",0.059964006479444595,":std deviation",0.04732469295326001 +0.09999999999999999,":3rd moment about mean",-7.868129624787386e-05,"int1",0.009917026769551307,"int2",0.009966711069091841,"int3",0.007804929459896071,"int4",-1.3329499828777703e-06,":iota(5)|0",0.0,":iota(5)|1",0.0,":iota(5)|2",0.0,":iota(5)|3",0.0,":iota(5)|4",0.0,":mean",0.19668825928237588,":median",0.1986693307950612,":std deviation",0.15409712460965908 +0.17,":3rd moment about mean",-0.0009856303111363263,"int1",0.02821264346112183,"int2",0.028622667215516158,"int3",0.02201674950609756,"int4",-2.9321132506064002e-05,":iota(5)|0",0.0,":iota(5)|1",0.0,":iota(5)|2",0.0,":iota(5)|3",0.0,":iota(5)|4",0.0,":mean",0.3239279424218373,":median",0.3334870921408144,":std deviation",0.24944309966433367 +0.24000000000000005,":3rd moment about mean",-0.004550307828363455,"int1",0.054903197953164624,"int2",0.056502538580481904,"int3",0.04230232562206343,"int4",-0.00020130943619458777,":iota(5)|0",0.0,":iota(5)|1",0.0,":iota(5)|2",0.0,":iota(5)|3",0.0,":iota(5)|4",0.0,":mean",0.4356116084482179,":median",0.46177917554148296,":std deviation",0.32665660474965497 +0.31000000000000005,":3rd moment about mean",-0.012491449849376283,"int1",0.08871669371839137,"int2",0.09306077162993705,"int3",0.06721331782666183,"int4",-0.0007703546791511086,":iota(5)|0",0.0,":iota(5)|1",0.0,":iota(5)|2",0.0,":iota(5)|3",0.0,":iota(5)|4",0.0,":mean",0.526699547462813,":median",0.5810351605373052,":std deviation",0.3810191813409665 +0.38000000000000006,":3rd moment about mean",-0.02425148883315172,"int1",0.12807178034461844,"int2",0.1375819945826513,"int3",0.09506409822818755,"int4",-0.002042147058067,":iota(5)|0",0.0,":iota(5)|1",0.0,":iota(5)|2",0.0,":iota(5)|3",0.0,":iota(5)|4",0.0,":mean",0.5934371109230001,":median",0.6889214451105514,":std deviation",0.4106073279311618 +0.45000000000000007,":3rd moment about mean",-0.03586934827918635,"int1",0.1711759080053618,"int2",0.18919501581064985,"int3",0.12415753334341158,"int4",-0.004163939582111588,":iota(5)|0",0.0,":iota(5)|1",0.0,":iota(5)|2",0.0,":iota(5)|3",0.0,":iota(5)|4",0.0,":mean",0.6335726864887136,":median",0.7833269096274835,":std deviation",0.4171749024882091 +0.5200000000000001,":3rd moment about mean",-0.04152977397200162,"int1",0.21613516871335958,"int2",0.24688987132358878,"int3",0.1530780452204575,"int4",-0.006923257567686358,":iota(5)|0",0.0,":iota(5)|1",0.0,":iota(5)|2",0.0,":iota(5)|3",0.0,":iota(5)|4",0.0,":mean",0.6464718129649116,":median",0.8624042272433385,":std deviation",0.407199748747537 +0.5900000000000002,":3rd moment about mean",-0.037457133890196344,"int1",0.2610682636328076,"int2",0.3024039072298484,"int3",0.18105875440634436,"int4",-0.00974617803610759,":iota(5)|0",0.0,":iota(5)|1",0.0,":iota(5)|2",0.0,":iota(5)|3",0.0,":iota(5)|4",0.0,":mean",0.633120454775805,":median",0.7044107657701756,":std deviation",0.3928297527891491 +0.6600000000000003,":3rd moment about mean",-0.0256555083845987,"int1",0.30421682779362547,"int2",0.34633475037757544,"int3",0.20836414543166,"int4",-0.011981561984442791,":iota(5)|0",0.0,":iota(5)|1",0.0,":iota(5)|2",0.0,":iota(5)|3",0.0,":iota(5)|4",0.0,":mean",0.5960185044724312,":median",0.613116851973434,":std deviation",0.39083683292372 diff --git a/test/exampleLogs/switchBlock.mky.log b/test/exampleLogs/switchBlock.mky.log index e40e5656c..118c11d19 100644 --- a/test/exampleLogs/switchBlock.mky.log +++ b/test/exampleLogs/switchBlock.mky.log @@ -1,11 +1,11 @@ -nsteps 10 -0.03 {:2p1} 2.5 {:int1} 0.015 {:p1} 1.25 -0.1 {:2p1} 2.5 {:int1} 0.05 {:p1} 1.25 -0.17 {:2p1} 2.5 {:int1} 0.085 {:p1} 1.25 -0.24 {:2p1} 2.5 {:int1} 0.12 {:p1} 1.25 -0.31 {:2p1} 2.5 {:int1} 0.155 {:p1} 1.25 -0.38 {:2p1} 2.5 {:int1} 0.19 {:p1} 1.25 -0.45 {:2p1} 2.5 {:int1} 0.225 {:p1} 1.25 -0.52 {:2p1} 2.5 {:int1} 0.26 {:p1} 1.25 -0.59 {:2p1} 2.5 {:int1} 0.295 {:p1} 1.25 -0.66 {:2p1} 2.5 {:int1} 0.33 {:p1} 1.25 +nsteps, 10 +0.03,"2p1",2.5,"int1",0.015,"p1",1.25 +0.09999999999999999,"2p1",2.5,"int1",0.049999999999999996,"p1",1.25 +0.17,"2p1",2.5,"int1",0.085,"p1",1.25 +0.24000000000000005,"2p1",2.5,"int1",0.12000000000000002,"p1",1.25 +0.31000000000000005,"2p1",2.5,"int1",0.15500000000000003,"p1",1.25 +0.38000000000000006,"2p1",2.5,"int1",0.19000000000000003,"p1",1.25 +0.45000000000000007,"2p1",2.5,"int1",0.22500000000000003,"p1",1.25 +0.5200000000000001,"2p1",2.5,"int1",0.26000000000000006,"p1",1.25 +0.5900000000000002,"2p1",2.5,"int1",0.2950000000000001,"p1",1.25 +0.6600000000000003,"2p1",2.5,"int1",0.3300000000000001,"p1",1.25 diff --git a/test/exampleLogs/tensor-switch.mky.log b/test/exampleLogs/tensor-switch.mky.log index 16ceef174..50b6b8e4d 100644 --- a/test/exampleLogs/tensor-switch.mky.log +++ b/test/exampleLogs/tensor-switch.mky.log @@ -1,11 +1,11 @@ -nsteps 10 -0.03 {:a|0} 0 {:a|1} 1 {:a|2} 2 {:a|3} 3 {:a|4} 4 {:b|0} 0.104315 {:b|1} 0.495252 {:b|2} 0.484064 {:b|3} 0.66362 {:b|4} 0.393601 {:c|0} 1 {:c|1} 1 {:c|2} 1 {:c|3} 1 {:c|4} 1 {:iota(5)|0} 0 {:iota(5)|1} 1 {:iota(5)|2} 2 {:iota(5)|3} 3 {:iota(5)|4} 4 -0.1 {:a|0} 0 {:a|1} 1 {:a|2} 2 {:a|3} 3 {:a|4} 4 {:b|0} 0.104315 {:b|1} 0.495252 {:b|2} 0.484064 {:b|3} 0.66362 {:b|4} 0.393601 {:c|0} 1 {:c|1} 1 {:c|2} 1 {:c|3} 1 {:c|4} 1 {:iota(5)|0} 0 {:iota(5)|1} 1 {:iota(5)|2} 2 {:iota(5)|3} 3 {:iota(5)|4} 4 -0.17 {:a|0} 0 {:a|1} 1 {:a|2} 2 {:a|3} 3 {:a|4} 4 {:b|0} 0.104315 {:b|1} 0.495252 {:b|2} 0.484064 {:b|3} 0.66362 {:b|4} 0.393601 {:c|0} 1 {:c|1} 1 {:c|2} 1 {:c|3} 1 {:c|4} 1 {:iota(5)|0} 0 {:iota(5)|1} 1 {:iota(5)|2} 2 {:iota(5)|3} 3 {:iota(5)|4} 4 -0.24 {:a|0} 0 {:a|1} 1 {:a|2} 2 {:a|3} 3 {:a|4} 4 {:b|0} 0.104315 {:b|1} 0.495252 {:b|2} 0.484064 {:b|3} 0.66362 {:b|4} 0.393601 {:c|0} 1 {:c|1} 1 {:c|2} 1 {:c|3} 1 {:c|4} 1 {:iota(5)|0} 0 {:iota(5)|1} 1 {:iota(5)|2} 2 {:iota(5)|3} 3 {:iota(5)|4} 4 -0.31 {:a|0} 0 {:a|1} 1 {:a|2} 2 {:a|3} 3 {:a|4} 4 {:b|0} 0.104315 {:b|1} 0.495252 {:b|2} 0.484064 {:b|3} 0.66362 {:b|4} 0.393601 {:c|0} 1 {:c|1} 1 {:c|2} 1 {:c|3} 1 {:c|4} 1 {:iota(5)|0} 0 {:iota(5)|1} 1 {:iota(5)|2} 2 {:iota(5)|3} 3 {:iota(5)|4} 4 -0.38 {:a|0} 0 {:a|1} 1 {:a|2} 2 {:a|3} 3 {:a|4} 4 {:b|0} 0.104315 {:b|1} 0.495252 {:b|2} 0.484064 {:b|3} 0.66362 {:b|4} 0.393601 {:c|0} 1 {:c|1} 1 {:c|2} 1 {:c|3} 1 {:c|4} 1 {:iota(5)|0} 0 {:iota(5)|1} 1 {:iota(5)|2} 2 {:iota(5)|3} 3 {:iota(5)|4} 4 -0.45 {:a|0} 0 {:a|1} 1 {:a|2} 2 {:a|3} 3 {:a|4} 4 {:b|0} 0.104315 {:b|1} 0.495252 {:b|2} 0.484064 {:b|3} 0.66362 {:b|4} 0.393601 {:c|0} 1 {:c|1} 1 {:c|2} 1 {:c|3} 1 {:c|4} 1 {:iota(5)|0} 0 {:iota(5)|1} 1 {:iota(5)|2} 2 {:iota(5)|3} 3 {:iota(5)|4} 4 -0.52 {:a|0} 0 {:a|1} 1 {:a|2} 2 {:a|3} 3 {:a|4} 4 {:b|0} 0.104315 {:b|1} 0.495252 {:b|2} 0.484064 {:b|3} 0.66362 {:b|4} 0.393601 {:c|0} 1 {:c|1} 1 {:c|2} 1 {:c|3} 1 {:c|4} 1 {:iota(5)|0} 0 {:iota(5)|1} 1 {:iota(5)|2} 2 {:iota(5)|3} 3 {:iota(5)|4} 4 -0.59 {:a|0} 0 {:a|1} 1 {:a|2} 2 {:a|3} 3 {:a|4} 4 {:b|0} 0.104315 {:b|1} 0.495252 {:b|2} 0.484064 {:b|3} 0.66362 {:b|4} 0.393601 {:c|0} 1 {:c|1} 1 {:c|2} 1 {:c|3} 1 {:c|4} 1 {:iota(5)|0} 0 {:iota(5)|1} 1 {:iota(5)|2} 2 {:iota(5)|3} 3 {:iota(5)|4} 4 -0.66 {:a|0} 0 {:a|1} 1 {:a|2} 2 {:a|3} 3 {:a|4} 4 {:b|0} 0.104315 {:b|1} 0.495252 {:b|2} 0.484064 {:b|3} 0.66362 {:b|4} 0.393601 {:c|0} 1 {:c|1} 1 {:c|2} 1 {:c|3} 1 {:c|4} 1 {:iota(5)|0} 0 {:iota(5)|1} 1 {:iota(5)|2} 2 {:iota(5)|3} 3 {:iota(5)|4} 4 +nsteps, 10 +0.03,"a|0",0.0,"a|1",0.0,"a|2",0.0,"a|3",0.0,"a|4",0.0,"b|0",0.104315,"b|1",0.104315,"b|2",0.104315,"b|3",0.104315,"b|4",0.104315,"c|0",1.0,"c|1",1.0,"c|2",1.0,"c|3",1.0,"c|4",1.0,"iota(5)|0",0.0,"iota(5)|1",0.0,"iota(5)|2",0.0,"iota(5)|3",0.0,"iota(5)|4",0.0 +0.09999999999999999,"a|0",0.0,"a|1",0.0,"a|2",0.0,"a|3",0.0,"a|4",0.0,"b|0",0.104315,"b|1",0.104315,"b|2",0.104315,"b|3",0.104315,"b|4",0.104315,"c|0",1.0,"c|1",1.0,"c|2",1.0,"c|3",1.0,"c|4",1.0,"iota(5)|0",0.0,"iota(5)|1",0.0,"iota(5)|2",0.0,"iota(5)|3",0.0,"iota(5)|4",0.0 +0.17,"a|0",0.0,"a|1",0.0,"a|2",0.0,"a|3",0.0,"a|4",0.0,"b|0",0.104315,"b|1",0.104315,"b|2",0.104315,"b|3",0.104315,"b|4",0.104315,"c|0",1.0,"c|1",1.0,"c|2",1.0,"c|3",1.0,"c|4",1.0,"iota(5)|0",0.0,"iota(5)|1",0.0,"iota(5)|2",0.0,"iota(5)|3",0.0,"iota(5)|4",0.0 +0.24000000000000005,"a|0",0.0,"a|1",0.0,"a|2",0.0,"a|3",0.0,"a|4",0.0,"b|0",0.104315,"b|1",0.104315,"b|2",0.104315,"b|3",0.104315,"b|4",0.104315,"c|0",1.0,"c|1",1.0,"c|2",1.0,"c|3",1.0,"c|4",1.0,"iota(5)|0",0.0,"iota(5)|1",0.0,"iota(5)|2",0.0,"iota(5)|3",0.0,"iota(5)|4",0.0 +0.31000000000000005,"a|0",0.0,"a|1",0.0,"a|2",0.0,"a|3",0.0,"a|4",0.0,"b|0",0.104315,"b|1",0.104315,"b|2",0.104315,"b|3",0.104315,"b|4",0.104315,"c|0",1.0,"c|1",1.0,"c|2",1.0,"c|3",1.0,"c|4",1.0,"iota(5)|0",0.0,"iota(5)|1",0.0,"iota(5)|2",0.0,"iota(5)|3",0.0,"iota(5)|4",0.0 +0.38000000000000006,"a|0",0.0,"a|1",0.0,"a|2",0.0,"a|3",0.0,"a|4",0.0,"b|0",0.104315,"b|1",0.104315,"b|2",0.104315,"b|3",0.104315,"b|4",0.104315,"c|0",1.0,"c|1",1.0,"c|2",1.0,"c|3",1.0,"c|4",1.0,"iota(5)|0",0.0,"iota(5)|1",0.0,"iota(5)|2",0.0,"iota(5)|3",0.0,"iota(5)|4",0.0 +0.45000000000000007,"a|0",0.0,"a|1",0.0,"a|2",0.0,"a|3",0.0,"a|4",0.0,"b|0",0.104315,"b|1",0.104315,"b|2",0.104315,"b|3",0.104315,"b|4",0.104315,"c|0",1.0,"c|1",1.0,"c|2",1.0,"c|3",1.0,"c|4",1.0,"iota(5)|0",0.0,"iota(5)|1",0.0,"iota(5)|2",0.0,"iota(5)|3",0.0,"iota(5)|4",0.0 +0.5200000000000001,"a|0",0.0,"a|1",0.0,"a|2",0.0,"a|3",0.0,"a|4",0.0,"b|0",0.104315,"b|1",0.104315,"b|2",0.104315,"b|3",0.104315,"b|4",0.104315,"c|0",1.0,"c|1",1.0,"c|2",1.0,"c|3",1.0,"c|4",1.0,"iota(5)|0",0.0,"iota(5)|1",0.0,"iota(5)|2",0.0,"iota(5)|3",0.0,"iota(5)|4",0.0 +0.5900000000000002,"a|0",0.0,"a|1",0.0,"a|2",0.0,"a|3",0.0,"a|4",0.0,"b|0",0.104315,"b|1",0.104315,"b|2",0.104315,"b|3",0.104315,"b|4",0.104315,"c|0",1.0,"c|1",1.0,"c|2",1.0,"c|3",1.0,"c|4",1.0,"iota(5)|0",0.0,"iota(5)|1",0.0,"iota(5)|2",0.0,"iota(5)|3",0.0,"iota(5)|4",0.0 +0.6600000000000003,"a|0",0.0,"a|1",0.0,"a|2",0.0,"a|3",0.0,"a|4",0.0,"b|0",0.104315,"b|1",0.104315,"b|2",0.104315,"b|3",0.104315,"b|4",0.104315,"c|0",1.0,"c|1",1.0,"c|2",1.0,"c|3",1.0,"c|4",1.0,"iota(5)|0",0.0,"iota(5)|1",0.0,"iota(5)|2",0.0,"iota(5)|3",0.0,"iota(5)|4",0.0 From 37d53640b003b23b0a8ba457f1ce4b9077e950aa Mon Sep 17 00:00:00 2001 From: Russell Standish Date: Fri, 12 Apr 2024 19:43:18 +1000 Subject: [PATCH 2/3] Minor code review stuff --- test/compareFileLog.py | 5 +---- test/createFileLog.py | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/test/compareFileLog.py b/test/compareFileLog.py index ce9c8219b..85c5f1333 100644 --- a/test/compareFileLog.py +++ b/test/compareFileLog.py @@ -43,10 +43,7 @@ def testValue(key, value): row=next(reader) nsteps=int(row[1]) - step=0 - - while step Date: Tue, 16 Apr 2024 17:50:20 +1000 Subject: [PATCH 3/3] Added createIcons.py script --- RavelCAPI | 2 +- createIcons.py | 22 ++++++++++++++++++ ecolab | 2 +- .../src/assets/images/icons/Gamma.gif | Bin 390 -> 0 bytes .../src/assets/images/icons/Gamma.png | Bin 0 -> 311 bytes .../src/assets/images/icons/abs.gif | Bin 406 -> 0 bytes .../src/assets/images/icons/abs.png | Bin 0 -> 360 bytes .../src/assets/images/icons/acos.gif | Bin 653 -> 0 bytes .../src/assets/images/icons/acos.png | Bin 0 -> 474 bytes .../src/assets/images/icons/add.gif | Bin 301 -> 0 bytes .../src/assets/images/icons/add.png | Bin 0 -> 428 bytes .../src/assets/images/icons/all.gif | Bin 626 -> 0 bytes .../src/assets/images/icons/all.png | Bin 0 -> 354 bytes .../src/assets/images/icons/and_.gif | Bin 281 -> 0 bytes .../src/assets/images/icons/and_.png | Bin 0 -> 361 bytes .../src/assets/images/icons/any.gif | Bin 657 -> 0 bytes .../src/assets/images/icons/any.png | Bin 0 -> 480 bytes .../src/assets/images/icons/asin.gif | Bin 649 -> 0 bytes .../src/assets/images/icons/asin.png | Bin 0 -> 424 bytes .../src/assets/images/icons/atan.gif | Bin 653 -> 0 bytes .../src/assets/images/icons/atan.png | Bin 0 -> 449 bytes .../src/assets/images/icons/cos.gif | Bin 653 -> 0 bytes .../src/assets/images/icons/cos.png | Bin 0 -> 453 bytes .../src/assets/images/icons/cosh.gif | Bin 627 -> 0 bytes .../src/assets/images/icons/cosh.png | Bin 0 -> 397 bytes .../src/assets/images/icons/covariance.gif | Bin 734 -> 0 bytes .../src/assets/images/icons/covariance.png | Bin 0 -> 539 bytes .../src/assets/images/icons/data.gif | Bin 425 -> 0 bytes .../src/assets/images/icons/data.png | Bin 1147 -> 434 bytes .../src/assets/images/icons/difference.gif | Bin 389 -> 0 bytes .../src/assets/images/icons/difference.png | Bin 0 -> 359 bytes .../src/assets/images/icons/differentiate.gif | Bin 405 -> 0 bytes .../src/assets/images/icons/differentiate.png | Bin 0 -> 412 bytes .../src/assets/images/icons/divide.gif | Bin 441 -> 0 bytes .../src/assets/images/icons/divide.png | Bin 0 -> 520 bytes .../minsky-web/src/assets/images/icons/eq.gif | Bin 718 -> 0 bytes .../minsky-web/src/assets/images/icons/eq.png | Bin 0 -> 556 bytes .../src/assets/images/icons/euler.gif | Bin 396 -> 0 bytes .../src/assets/images/icons/euler.png | Bin 0 -> 352 bytes .../src/assets/images/icons/exp.gif | Bin 618 -> 0 bytes .../src/assets/images/icons/exp.png | Bin 0 -> 395 bytes .../src/assets/images/icons/fact.gif | Bin 382 -> 0 bytes .../src/assets/images/icons/fact.png | Bin 0 -> 320 bytes .../src/assets/images/icons/floor.gif | Bin 417 -> 0 bytes .../src/assets/images/icons/floor.png | Bin 0 -> 385 bytes .../src/assets/images/icons/frac.gif | Bin 618 -> 0 bytes .../src/assets/images/icons/frac.png | Bin 0 -> 382 bytes .../src/assets/images/icons/gather.gif | Bin 655 -> 0 bytes .../src/assets/images/icons/gather.png | Bin 0 -> 434 bytes .../src/assets/images/icons/histogram.gif | Bin 487 -> 0 bytes .../src/assets/images/icons/histogram.png | Bin 0 -> 500 bytes .../src/assets/images/icons/index.gif | Bin 642 -> 112 bytes .../src/assets/images/icons/index.png | Bin 0 -> 433 bytes .../src/assets/images/icons/inf.gif | Bin 650 -> 112 bytes .../src/assets/images/icons/inf.png | Bin 0 -> 471 bytes .../src/assets/images/icons/infIndex.gif | Bin 651 -> 0 bytes .../src/assets/images/icons/infIndex.png | Bin 0 -> 372 bytes .../src/assets/images/icons/infimum.gif | Bin 636 -> 0 bytes .../src/assets/images/icons/infimum.png | Bin 0 -> 369 bytes .../src/assets/images/icons/innerProduct.gif | Bin 252 -> 0 bytes .../src/assets/images/icons/innerProduct.png | Bin 0 -> 288 bytes .../minsky-web/src/assets/images/icons/le.gif | Bin 724 -> 0 bytes .../minsky-web/src/assets/images/icons/le.png | Bin 0 -> 567 bytes .../minsky-web/src/assets/images/icons/ln.gif | Bin 639 -> 0 bytes .../minsky-web/src/assets/images/icons/ln.png | Bin 0 -> 314 bytes .../src/assets/images/icons/log.gif | Bin 744 -> 0 bytes .../src/assets/images/icons/log.png | Bin 0 -> 535 bytes .../minsky-web/src/assets/images/icons/lt.gif | Bin 715 -> 0 bytes .../minsky-web/src/assets/images/icons/lt.png | Bin 0 -> 564 bytes .../src/assets/images/icons/max.gif | Bin 716 -> 0 bytes .../src/assets/images/icons/max.png | Bin 0 -> 445 bytes .../src/assets/images/icons/mean.gif | Bin 634 -> 0 bytes .../src/assets/images/icons/mean.png | Bin 0 -> 457 bytes .../src/assets/images/icons/median.gif | Bin 395 -> 0 bytes .../src/assets/images/icons/median.png | Bin 0 -> 386 bytes .../src/assets/images/icons/meld.gif | Bin 395 -> 0 bytes .../src/assets/images/icons/meld.png | Bin 0 -> 387 bytes .../src/assets/images/icons/merge.gif | Bin 274 -> 0 bytes .../src/assets/images/icons/merge.png | Bin 0 -> 334 bytes .../src/assets/images/icons/min.gif | Bin 709 -> 0 bytes .../src/assets/images/icons/min.png | Bin 0 -> 378 bytes .../src/assets/images/icons/moment.gif | Bin 700 -> 0 bytes .../src/assets/images/icons/moment.png | Bin 0 -> 536 bytes .../src/assets/images/icons/multiply.gif | Bin 442 -> 0 bytes .../src/assets/images/icons/multiply.png | Bin 0 -> 549 bytes .../src/assets/images/icons/not_.gif | Bin 365 -> 0 bytes .../src/assets/images/icons/not_.png | Bin 0 -> 305 bytes .../src/assets/images/icons/one.gif | Bin 387 -> 0 bytes .../src/assets/images/icons/one.png | Bin 0 -> 316 bytes .../src/assets/images/icons/or_.gif | Bin 281 -> 0 bytes .../src/assets/images/icons/or_.png | Bin 0 -> 365 bytes .../src/assets/images/icons/outerProduct.gif | Bin 648 -> 0 bytes .../src/assets/images/icons/outerProduct.png | Bin 0 -> 430 bytes .../src/assets/images/icons/percent.gif | Bin 392 -> 0 bytes .../src/assets/images/icons/percent.png | Bin 0 -> 373 bytes .../minsky-web/src/assets/images/icons/pi.gif | Bin 401 -> 0 bytes .../minsky-web/src/assets/images/icons/pi.png | Bin 0 -> 339 bytes .../src/assets/images/icons/polygamma.gif | Bin 712 -> 0 bytes .../src/assets/images/icons/polygamma.png | Bin 0 -> 553 bytes .../src/assets/images/icons/pow.gif | Bin 634 -> 0 bytes .../src/assets/images/icons/pow.png | Bin 0 -> 463 bytes .../src/assets/images/icons/product.gif | Bin 388 -> 0 bytes .../src/assets/images/icons/product.png | Bin 0 -> 322 bytes .../src/assets/images/icons/rho.gif | Bin 409 -> 0 bytes .../src/assets/images/icons/rho.png | Bin 0 -> 369 bytes .../src/assets/images/icons/runmode.gif | Bin 139 -> 0 bytes .../assets/images/icons/runningProduct.gif | Bin 408 -> 0 bytes .../assets/images/icons/runningProduct.png | Bin 0 -> 387 bytes .../src/assets/images/icons/runningSum.gif | Bin 401 -> 0 bytes .../src/assets/images/icons/runningSum.png | Bin 0 -> 421 bytes .../src/assets/images/icons/shape.gif | Bin 677 -> 0 bytes .../src/assets/images/icons/shape.png | Bin 0 -> 503 bytes .../src/assets/images/icons/sin.gif | Bin 636 -> 0 bytes .../src/assets/images/icons/sin.png | Bin 0 -> 396 bytes .../src/assets/images/icons/sinh.gif | Bin 622 -> 0 bytes .../src/assets/images/icons/sinh.png | Bin 0 -> 386 bytes .../src/assets/images/icons/size.gif | Bin 394 -> 0 bytes .../src/assets/images/icons/size.png | Bin 0 -> 347 bytes .../src/assets/images/icons/slice.gif | Bin 413 -> 0 bytes .../src/assets/images/icons/slice.png | Bin 0 -> 390 bytes .../src/assets/images/icons/sqrt.gif | Bin 388 -> 0 bytes .../src/assets/images/icons/sqrt.png | Bin 0 -> 370 bytes .../src/assets/images/icons/stdDev.gif | Bin 387 -> 0 bytes .../src/assets/images/icons/stdDev.png | Bin 0 -> 359 bytes .../src/assets/images/icons/subtract.gif | Bin 279 -> 0 bytes .../src/assets/images/icons/subtract.png | Bin 0 -> 387 bytes .../src/assets/images/icons/sum.gif | Bin 382 -> 0 bytes .../src/assets/images/icons/sum.png | Bin 0 -> 378 bytes .../src/assets/images/icons/supIndex.gif | Bin 683 -> 0 bytes .../src/assets/images/icons/supIndex.png | Bin 0 -> 486 bytes .../src/assets/images/icons/supremum.gif | Bin 662 -> 0 bytes .../src/assets/images/icons/supremum.png | Bin 0 -> 461 bytes .../src/assets/images/icons/switch.gif | Bin 639 -> 0 bytes .../src/assets/images/icons/switch.png | Bin 0 -> 533 bytes .../src/assets/images/icons/tan.gif | Bin 642 -> 0 bytes .../src/assets/images/icons/tan.png | Bin 0 -> 410 bytes .../src/assets/images/icons/tanh.gif | Bin 630 -> 0 bytes .../src/assets/images/icons/tanh.png | Bin 0 -> 415 bytes .../src/assets/images/icons/time.gif | Bin 388 -> 0 bytes .../src/assets/images/icons/time.png | Bin 0 -> 334 bytes .../src/assets/images/icons/userFunction.gif | Bin 1177 -> 0 bytes .../src/assets/images/icons/userFunction.png | Bin 0 -> 1035 bytes .../src/assets/images/icons/zero.gif | Bin 414 -> 0 bytes .../src/assets/images/icons/zero.png | Bin 0 -> 372 bytes gui-js/libs/shared/src/lib/backend/minsky.ts | 3 +++ .../available-operations.component.html | 4 ++-- .../src/lib/wiring/wiring.component.html | 8 +++---- 147 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 createIcons.py delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/Gamma.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/Gamma.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/abs.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/abs.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/acos.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/acos.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/add.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/add.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/all.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/all.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/and_.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/and_.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/any.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/any.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/asin.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/asin.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/atan.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/atan.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/cos.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/cos.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/cosh.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/cosh.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/covariance.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/covariance.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/data.gif delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/difference.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/difference.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/differentiate.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/differentiate.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/divide.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/divide.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/eq.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/eq.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/euler.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/euler.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/exp.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/exp.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/fact.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/fact.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/floor.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/floor.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/frac.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/frac.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/gather.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/gather.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/histogram.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/histogram.png create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/index.png create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/inf.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/infIndex.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/infIndex.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/infimum.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/infimum.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/innerProduct.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/innerProduct.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/le.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/le.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/ln.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/ln.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/log.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/log.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/lt.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/lt.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/max.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/max.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/mean.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/mean.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/median.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/median.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/meld.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/meld.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/merge.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/merge.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/min.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/min.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/moment.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/moment.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/multiply.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/multiply.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/not_.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/not_.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/one.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/one.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/or_.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/or_.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/outerProduct.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/outerProduct.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/percent.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/percent.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/pi.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/pi.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/polygamma.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/polygamma.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/pow.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/pow.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/product.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/product.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/rho.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/rho.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/runmode.gif delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/runningProduct.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/runningProduct.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/runningSum.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/runningSum.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/shape.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/shape.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/sin.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/sin.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/sinh.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/sinh.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/size.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/size.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/slice.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/slice.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/sqrt.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/sqrt.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/stdDev.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/stdDev.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/subtract.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/subtract.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/sum.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/sum.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/supIndex.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/supIndex.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/supremum.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/supremum.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/switch.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/switch.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/tan.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/tan.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/tanh.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/tanh.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/time.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/time.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/userFunction.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/userFunction.png delete mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/zero.gif create mode 100644 gui-js/apps/minsky-web/src/assets/images/icons/zero.png diff --git a/RavelCAPI b/RavelCAPI index 3b87cf19f..46e96ac5e 160000 --- a/RavelCAPI +++ b/RavelCAPI @@ -1 +1 @@ -Subproject commit 3b87cf19f84ea2f3594c28bab15f34695c52f7c2 +Subproject commit 46e96ac5ecbd080ef80109356e44f7f1b0feaa38 diff --git a/createIcons.py b/createIcons.py new file mode 100644 index 000000000..94ac8b629 --- /dev/null +++ b/createIcons.py @@ -0,0 +1,22 @@ +import sys +from pathlib import Path +here=str(Path(sys.argv[0]).parent) +if here: sys.path.append(here) +else: sys.path.append('.') + +from pyminsky import minsky + +iconDir=here+'/gui-js/apps/minsky-web/src/assets/images/icons/' +minsky.histogramResource.setResource(iconDir+'histogram.svg') +# make the background transparent +minsky.canvas.backgroundColour({'a':0}) +ops=minsky.availableOperations() +ops.append("switch") +for op in ops: + # ignore some operations + if op in ["numOps","constant","copy","ravel","integrate"]: continue + + if op=="switch": minsky.canvas.addSwitch() + else: minsky.canvas.addOperation(op) + minsky.renderCanvasToPNG(iconDir+op+'.png') + minsky.clearAllMaps() diff --git a/ecolab b/ecolab index 7a8f9a1ce..793c3df6c 160000 --- a/ecolab +++ b/ecolab @@ -1 +1 @@ -Subproject commit 7a8f9a1ceea50fb4f4ad1c05b3c51cec11f7bbd0 +Subproject commit 793c3df6cf255cbde983202e04f9d1481c8d9b7f diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/Gamma.gif b/gui-js/apps/minsky-web/src/assets/images/icons/Gamma.gif deleted file mode 100644 index 408cd3b2373ac32aad1052e17591c2da24309a2e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 390 zcmZ?wbhEHblw*)!xXJ(mLPA1jW@ZZ)E_84>dGzSfmoHzMo14FS^~&1%bb0yqn3$M` zhV52XX9@~-ym|Act7}Jh_YPK8R&jB0bMteFiMwyzx|5W&``x>DJ9qB9efw@pOUwKB z@3pnHSFBj!@9+QN!-vw+($%Y1pFe-z-~Zs6HEV){gL!y(o;-OnckWyvq1PKX9ugFM zy1IJPro)1Qf?!7xODO(iVPs%XV9)_+0Qrf5ZLx!Zhhw2c|A{4+F7D!JmMWyk4_rD+ ziv(K>g)kPkcPSGhHx3NTz`x;(E%TS;R-(${X7EfJ3Iso zeBk>Cs76^6L5#CzNWIofu*n9I_bh0arpW}SX!dRC3(o#-#RP@2$?9;XU7EBRPP4&( z>2Q?|W_1{o_AHwua5q18e~UTsI1qTP&aVR(IK}xu;5(kX;umS_HvO?a11JCh002ov JPDHLkV1k=2gQ@@k literal 0 HcmV?d00001 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/abs.gif b/gui-js/apps/minsky-web/src/assets/images/icons/abs.gif deleted file mode 100644 index 9560bdd09d536aa047c9bc047b9847db1b3b4cba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 406 zcmZ?wbhEHblw*)!xXQp#TU-0$#S0Y`6$git*RNmSvSrJwSFfzCPnVZ(Z)gCbhS#rO zTUnhcDA*Aj8~f(Xo35@M-Q7EuE?w&5;N z-n~mmNVt9b?)&%er%jvo;lqcLl9K!P@5{={`uiU=FfiD^e}6?qg`uHgXlUqx0|yio z6oiCcZ`^oj-n@B&f^Rl#*x>4VY}2O0n>KAaa^wgDUZD7sg^__lkwFKf3gjmSw#^3u zI0`c*`cEv`qsGFwAHpEQ%EY9-bM6{{K2s(WE>S*~lu6rzh1vXN&L?+tRfp7GyY63p>$YOi iz1umDuAe!3-zh%vrGG>eGv}wzU%r0hRIPAium%8(e5w)v diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/abs.png b/gui-js/apps/minsky-web/src/assets/images/icons/abs.png new file mode 100644 index 0000000000000000000000000000000000000000..ce3861326c135b57111d8d29dd674d3e95ef4808 GIT binary patch literal 360 zcmV-u0hj)XP)!%!3k;4jj_#X*pEQQQO@+{C5gAU=kJxH~(DAn4@i z8;B0Rfs2Dehb|q{%|)lyO>n*rNvm{e8pzcjE|-%V_&7NsBq8jgqu#ub^q_%*Vs&f6 zwy=&~QHP6s)s?VMcpg^^^+A(lNF##DFyBKn5(oy0E@Oi2nBZiN|L&3Q;k?4xbYgdy z3=s&;vfvf&uz@$MRZs^=%YxU~!98y9UIEPJ0YCA8P25(%CMgT9;1GSBRJ2lLWx+E% z;Rwg_SP2ejY$Hh12y*)X4cry(E000052xu>V+t5>fkPMm0M zeY(7S`|;z)8ydDZG&H<^{aRgJ-OB2WrKM#-!47Y4@7UPbH*el_b?xZx-l3tPv2^Lu zf`S5ZadC6=bBT$&Z{50+l(f6Bu<+fxcT=ZM_4D()efusDynp}R-`_tmF|oL~_};yH zA3l6oxpJknv~*irTVP;dX=&+$2M^lY+h@+4nUa!n{`~o}va*K{AIi$g`uiVrbad?O z?3_J&_Wu3**R5N3;J|_O^mGLU1tTLPA)(h*RaF}|9ugFMG?L<9RxO`6tR z)wNX>H`8O|5O6Xw^%Lj!@0W3CQk1wh^~1*%F1=y_Gv;&%Ixwm?yq@AS(@^0!gH+&( zoCAfA+eJ90UEviHbvY#S-FXk>*JZ3qtcuwvyyp-1E%T<7?R5>(uSrIrnzn_nh@&oQTyc1lx<9SO`B|%d3>7W2DDJZ>$_>)fUmM2yB+~H+3ojL0?o^6F6NH zxH`vDz&*H$8{rpk=?~n;rtphZcpZ1~86Vcd%`y_H(+1pzNB9)C+=?x@hZR|ormzdo zv4q>$fGaqQuPu4|=(Yhb#O8h%XfFTfPl9;I?QlzxQdFni;K87H_kgd zJ7HnF+S=S=V!Ls1af5?{+uPmm@9)ga%<%B=Pfx)?K|yzScjM#ZoSd8z66@vV<*~8C z5fSV~MaHtS!vFvPA^8LW000vJEC2ui03HAs000H5;4}@1VV-EJ8eJob!|={@J#WGs z)0pi~jEqh;v;2G+$ZI#zJRX$?;7BWYmc+>A;<#w2vjqZ6GlFLa7mWCl6wSX)f&8<; zeGCrWX9p+OM}1UQfMs?T3JQmJGYtoYZ+3}`K8}z!f=7fSY?zETf1H7zGZZDZW za;FodM`?6gTwZ4)VsuVWQnwSEqD8(Up}{XbzClC7H8?r}1kuvd)YSwOY9RnS5V3?= diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/add.png b/gui-js/apps/minsky-web/src/assets/images/icons/add.png new file mode 100644 index 0000000000000000000000000000000000000000..7577ca060f297794b1a00ead2486b541f4b39e3e GIT binary patch literal 428 zcmV;d0aN~oP)CSOkt` zj9P;20Gq&AVx5@Lmh=(m=PX+Ae0|aYF$LnP!0m9JnwVMl!PL;!DsV1-AGiR%f$IS3 z8)lbN7w`wT5x*h+F94PSBjCve)WDbc-+~WOUPoUIZymWrMjd5G>IHt(T)0e?ci52B z1kj-S9RUG3R#(&5O04*>ByY#IQXuYfhk*Oy+e%7eJMU8rJaoCk2uM2u>H(lYO?|+v zhKMnyX}tIF)R9Z5U%w~=x|&7-YvPxH9_I0$)r1rk1FvPk72r(#uK3X3Qv}?X0cXIK z_+G(>C_hqP4d26AdSGTXtpdCY2hKYb=0`dNec8a`F706+?i@G*mVxz_fSbXTq2$T0000&{;TX&L@b{7^F zzI*phOG_&uA>sDzyG2Ds@87?lHf`F96)Qe`_;COJ{kFEY88c=C1_mZ4C(Fplw70hh z1qJQhyZ8M0^Zxz^_4V~<&6>4l%^Dsap7QeYwQJYz-@ji-==J5xmp5)aG;iKKLBTh! zuC5z4Y;biwwrSI0K|#Tqni^$gWm8jAcX#*5$Vi4E1r&d>FfuTxFzA3>4T=*6_VW!Y zDx4zxZS5VMUHo=ZO--Df{gbCmoovZ5dE&G=(qEi}Y+AM~JOVtrtCsC-($ln1aM3e1Gge)- z=B5g_t1O$2sgtr3?}gaGbv5;Aqvr(V)24 zsga94A+b85d$LiYtTrRFWYHzvNvf0E0CE;0U@n diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/all.png b/gui-js/apps/minsky-web/src/assets/images/icons/all.png new file mode 100644 index 0000000000000000000000000000000000000000..1c290bc40c22ed28f873f3512a4973f543a9c06f GIT binary patch literal 354 zcmV-o0iFJdP)D9mXGI3Y|{_P+}`sx!74KU z$03I}Yo&_^9J!|Mbvwi#T~{bDjVEMY)54OBL($z!y-m_8c}y#B%4DXCw>2Gl zXDg6zS{+;IQr~FOD%9-k)1l9ttt2SM=$uz(CTu+0HZ3F6G=9NC{c@kTR)9xhT&JAxhI5VKT=NzASy zoDp8zYNtEUI_4Nw1UAdKhJ#8#u#hZk0tYpL>p7MJo0O%obxSWX-U7Hb>=hhpaF_Pa z2n9!%gg`hbF&zJ~&y59!C5E@S7fmOMEn{1A4X?!ZKjRT!wzJH>G&iDEYxI!nk{dh3 zJO?TN&tE*3%G|9^9jHRVzLBWn~+qQLe?da~_p`oEMdGh3ff`Z$(Z;OkI zzkU1G-2B|KWy^ehedFWf6BBpex^*WhY4^K#@3geEmM>qPkdSct^y%BT?-msmNlHq- zfB#-vTie#wcEySnt*xyeK76pZw_mktRbXIXa&j^k7uSOa4`gIy+S}Xp^z>%VoEa1p zbpHH#fB%E}`uekG%_=W1H#9VyGiT0$0|)r{_$n(ag@j&TzI?f=s!CB&apT5A^XAPH z6nwK`!vS<}D z6D7_ub=l4)TT>6Mn6PjcXMTOoNL_(xYpxmc#j3K~u<5DzSZRcFdj(HZ7JX@=z$o9u zU?J#ys-1x)>cE37`gg^2MEKr3*tEf$jnB#K&V!b`2^wnQEPrN9e89@dDG?E3cxmM< z_aIiAH5U$ewrnVw>*K0U?cr zVv)vxsP91#EPMn0sYEPdVhDj$N4S835JH+9DYQxHSj;48_V!M^-NGLXGqdx|e&>0f znc2+)#PJ0*11D&abMuouaDAr-DA|Tk4 zysQ#fuM&8c$Nx5@g&vOL9Zs-|8(79SH1QJ;(%i3jlIFd_n|xk&gg_X}12*s-snI3k9yhI^^qNx#K>Ul+p}3Tzu_x{ literal 0 HcmV?d00001 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/asin.gif b/gui-js/apps/minsky-web/src/assets/images/icons/asin.gif deleted file mode 100644 index 53464ddf2617cb9b5eb622a569a7110dbcbe2caf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 649 zcmZ?wbhEHblw*)!c*ek>qN3v9aPsBLm#V6&=H}+FUcH()aiX>LX)iCY^78Es4M5cJ z`t@sdb#*JNGX(`ZyuH2Oym`~rwWGUxhn1Dp_U+r_;^GPl3dF_5-@bioZhr36sZ)uG zyKmjPla#c(u&_`RX~v9Y;*`z{c?fB$~kv}ykS{)vf+_wLec7ZpDQaXZ`!npVQ>J&pDc_F47vRjS`^`+Jthudg<|oMQ zZ)>1zE~ux`FYY)+PUz0e4#oox++s$0FE|_*9oJ}hSMubCU~40*GDn}tf{Do?yB!y~ z@nj?@u(T>DO))t5VfAFQ30ti!o5dyv8O$=3zk6ur=2o3~miC9j>;Sbd;=v`}UQ7M=JE%}hYhmR#lp&gBI5 z`}jYBv)I9>3hluqeUC3g_WZ^^CM&eQ!|@S;dpP)uwk`H&4bQ8$6dgh!G^>C!_=;yZ z!w0P6jW{jVaf7FLi_H-a-9}ke(s%eNmf$<42J|0zg$t~V2qTrX3b>2gw4s6SfPRgD zUwAU0o#Eqs)GFXAzF|JSFAO>Ps8OO-)x&dq#)RndLj2|bHRjUy>b@-?OcAcgH)%@I zT{d8^oR8aKJ2xmPTw#Uf#&Cg4k{e?8!dI1?K+0WWdbOa1^8OyGcyN=lShvpy?*`r%aZXsl>$Hw{G1@O4?mmSSTSO@$TI_EiEk@8yi1AzuUL(N=iyj zn>NkX*4E$OKQS@!!-o&kr%$)DvkM3axPSk?w6yf9Rjc;w+4JDR0~r~a_V#u?J-wMT zXF51I1O)}1KYzZgtnA^#hyMNt9UUFltXXs6!iA8Kkcx_mb?eq0IB?+7rAtCWuMZwP z$j{GTRaLcd#-|Wt_TPSC@Cpz+I0B&^XHp3ZDOD=Q2fcl z$iQI0paZfN6ekSquNn*t_~pgh+B-VC#6y&un)vzqCr_C=*`H_f#A$P;DS6MDG0;Mn!u@g1#}9UNva%~wXk1|EYLc?~;tg-BX(Ly1Gg{!Wvj@axa(4;NEU=0A@ Cdg#~y diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/atan.png b/gui-js/apps/minsky-web/src/assets/images/icons/atan.png new file mode 100644 index 0000000000000000000000000000000000000000..447016e13afd5e521d2a72c1b34711cb8c15664e GIT binary patch literal 449 zcmV;y0Y3hTP)T*2y-Z508r2Xb5%}x3F2{VIf9S3J(eIy4jWHKxb+rPYBEo;~It%0YOL6WlCTx zCGc#H{~9=kB`lWejUDMPyum=JUfbb4?4bVwpch!h0rt;7&JGa>LuFt;Ug0KQ;s)07 z87sxk=dpzk*v4%<$0SZ_Hq}912L8kh_ArM#SQc;Ch@R)};66U#aSh~mwUPJz;iWHl ziYH>XSBv^L1RUd9>6`aORH|x*K{R!k73VUoayA!Ij&>Dr7eDYCYnZ}E4C4AFfGxDE zj`X{DQ@a|i`N^}tV})U4WJjr-CKoSFGHYw42L6{0JE?)GIt;^c&5jZQd-J2`C=-PF rhJfRW`E`LCq90zyMe6hwZ@bAUssc}Mi5}mR00000NkvXXu0mjfzD~h& literal 0 HcmV?d00001 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/cos.gif b/gui-js/apps/minsky-web/src/assets/images/icons/cos.gif deleted file mode 100644 index bde1b6d950cfcb4d7802d81c5ca4e2d9d591af8d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 653 zcmZ?wbhEHblw*)!c*el+;>8OyGqZ&Y7dkkcJbLu#_3PJ#g@xY}5gj~zR9(fJ zTUlB8`1rhi`_|n2oTjE`V&d*wx9%h*?Jg`VymRM{goH$MbMx}$%WvPl`~LlVe}Dg7 zyLR2Xcdxaz^}~k`c6N3F0Rg*r?@mfe;^gF%mX=OVPEJWlIe-3qSy`FC|H0tkU>+Wx z*|TS-rKLT7{P@6u1D7scQczIn?(P;6dhO!kvVQ&gjEoFLMa7L94+#ps*|1@QtLw2V zSFQ*M2t0fCY}2O0CMG6_4+6e*jAR%fp!k!8k%2*h(DjE`(I*5wAh~gDms=&q1;_p?k;Nrrg-KrjQ?nF4ez2cE@ugtHib{8781sJRWsE_9@ diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/cos.png b/gui-js/apps/minsky-web/src/assets/images/icons/cos.png new file mode 100644 index 0000000000000000000000000000000000000000..b0224e37caeb5b6dfb1426e4bfaddac67e998f7c GIT binary patch literal 453 zcmV;$0XqJPP)@f~Bz943(%A}v*eFC;Ay%d^3xX-cDnA-gA*30LI~xVxZuds;z%bm$JihPT!`xSq zW-+5#y`|cK7Ov*iYY27*6WGXgT8!0{(q+>6pgPtZ=tx`W76ev1v8Q$+An403O9H1# z0*`Y1Z(BOjVGFDHfzP;@&ppI9e8Kg6b{sEpfDbrb&#QKjNbNe{4P3)C*6;}PxGhHD zBA(&|ZlaBoc!z}%F8k=#0cWv}Pgubn%;7aY;#qvHv!Yd#SjG$78v)!J2K-Y8qOEnR zgsW+6n45n200000NkvXXu0mjfB1gqk literal 0 HcmV?d00001 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/cosh.gif b/gui-js/apps/minsky-web/src/assets/images/icons/cosh.gif deleted file mode 100644 index 0ebfe465e61ebcfc557156114534b8b91201dffd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 627 zcmZ?wbhEHblw*)!c*ek>qN1{S^JWK!lM^OPShQ%7r>EzZEn9BfxS^(|HgV!aYwOeH z<=c-RKc1JD*U+&2=FOY0U%#F-X_A%InSz2HZ{ED=>e|uWy+cDo!^g+x_U+qEO-<(J z=QK4nt*xz>EnAkDxckE!O;IMb^UVs0C`uh57)~tE-=uu~9=l=csD=I3S zot@Lu(}jdyySTViRaI@=cxc|dd4hs(TwRZC+H}~&#AM^fjS&$MSFc_*H8pj2cRzCE z2*Y3nia%Kx85lGfbU+RS#R&uZg$7McZfW7R_KwajVHd@wCT{Nj$y26IcI28oaoU_| z3U;$5&0XAYr_w)r$r2&g6^mBQl^0vLVX-JeE=#;tw7*FJd*}*I`vt;xM-| zP;n?~IXcPf>>Ey{1xs2QMcu3_ZX8T*B;f{qu_)~DhC?R&v$6%Dh*%`S75LP0FoTd=Kufz diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/cosh.png b/gui-js/apps/minsky-web/src/assets/images/icons/cosh.png new file mode 100644 index 0000000000000000000000000000000000000000..27750a49108505c0832c27af43be6bc9f3c08bdd GIT binary patch literal 397 zcmV;80doF{P)7eOq@NiYPZj-z51@-Z*|T-1z{Fd<;FF|J@jHR zty)R2ag5+TSZiPh? zfiU=2z&))0a;AYwC*ZjFnY+afM$>Z*2cj$UxWo-sQ{4)#aH_L&^=`mT9Ag15*un|s zFpY`S)LUxcG1Z-68B6HvCbOHR0Uv1n$bas4IKoV72;Ngox2T}r33!MNT%<$$Si?0Q z@PuJ;Zj-)mf!|_Gw6*Np0>TiXMZWj2BC5*%B_$gpyYCXtbmJ3Gq~5+`?ew*vzMZf-GqdM@9*y`D=Vm|sLagF2nYz?-rn%= z@IF31P*6}A87+{Is$ybd8yg!fEiF+|QDb9c&d$yX3JT!h;2azrhlhumnVGArt9EvF z;o;#=Prl+)!)6>%r z4-c`i!VC=TGcz-uo}LjA?69z~S65d>MaF4qY1GuzdwYAbvcrvyjWjegv9Ynk!^3K7 zYSq=%j*gBsH8r51pacYN#Kgn^0000000000000000000000000A^8LW002G!EC2ui z03HAs000O7fIdDFDH?`{h>40CX)J<*5)zM-l$DcW5R;LXoR%wInv$KPk6tv7o1~-} zZK$HEohl-(l{-mOmbSQ$A&!u*k53bDmcqo3Vi~kPTSp)b4hauFO=wdu4A9a(6dwdZ zV>iDrZeeIRSU*=KJ^~180Y2&LK1?1PWL*)zLtF+pKC(P;0>lT3Hv_-~99Yl}hZ<}$ znD|Ad4jvyah}cl@289nJF)(W6h+;$nGI3at_|-rT4;^%<_<%yB!4wM^K*XF`6A70b zAUfRnCCHAH0xhKII59_yhaw7)DrIVghX)*Agb)>kX99q)3(CA$bA*Feup=%kk>SJC zR#=ofdgN%Z!pt(bkCe>N;v?Bzygtrwsp6y8U%-!K9Y*Yf)ndeM-!k^`Db!?SnNS_5 Qz`3*M&!8(r@f8RFI{?f-@Bjb+ diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/covariance.png b/gui-js/apps/minsky-web/src/assets/images/icons/covariance.png new file mode 100644 index 0000000000000000000000000000000000000000..9059b12bd1a52380783206bae20e3761ed9921cd GIT binary patch literal 539 zcmV+$0_6RPP)`)yv=W6tvH=kVMMW{Kv9c10;aHs6B!(LmmU{;dXV2Yl_dj#y+u4FN zhEdhV3yNuI;AE`HieUS&1JiL%m-DJB(h1V@_GwLZpv8ELp&Eh3*Sx2mnt$N4rcVk=&kXcAt<>)p5&@7>_n2MjF-UWrW4;s>^16Fy=A z+wly0aX+4wXeOFoSW~6KCk&8QRj}-GwQ+C+#&Oo27|+ zvRPJYT9L>j?2?TZk-m|78p>nA-)%k>dzofHzMb}!Ead{dK&KIOnU$T002ovPDHLkV1jK-`N;qP literal 0 HcmV?d00001 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/data.gif b/gui-js/apps/minsky-web/src/assets/images/icons/data.gif deleted file mode 100644 index 1ba431061d3544f67d0e1084b985ce3964c7d2d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 425 zcmZ?wbhEHblw*)!xXJ(m4h|=Ca&oR;zkcJ!4QuPuTeog4FW=tKu>I!En+**OR#s;U z3U+MUwym+Tv8!uGclQo)aq*_6CUf(1iHW;!-MW*Mw7a>v`Q5vBw{PD)bLPy44<9%= zIcLn6VQ+8m;NalzfAGSE3p_kLa&mIKyu9-A@}Z%j3JMBBLa#S&JR~Ui#?|%MvuDpX zZ93f7*B2QX33d?)gyK&YMg|6H1|5(dke?XXjvYAr%pg&s|HP6>8#i&ZwjVC`TI(0w zntA2a*06x6%4)b-h7HMvWI`Be3!babTj zl=)&rwc7oaSVEaqV$&)^7`P;YCAb)3bLIy#$O)=3F{ug4FOL!9U**4CQC3`BR#AFu z*!G=HhZn5Kb*_?D;tb`S6Ep8j2%mCyZ@;S0K~zYIz0^HVR6!KR@!usB#zYee7PKKW6uY6L11$&^dLp>IA?qUJlA?D7LoJ`KiWd1pC(~vf>u3vqiIe}Sh zg&p?_bfN$^xyI8^9u$72?jyoMn3utK0yGr^NU$GaAp1=jjYry14)4&}wK3api3TF7T}UI}>FKQ51cdvEP)bMB0cP)*bh zq}3Q?;{sZ__w5IP64;2wM2rcwencdGY>YeOLKldMy7M2Pae>ANG=Pw}&<%*Ome6}= zD5S=qQ;6C?0fT7^w0G`%Trh3gGEl-VIg5L8^8C(u-<-TxsH67w_D8ZTdqzYynAvI( zSqU@(_t#3U1DDL~yoj6ue#z(aKMV{E{JW4P3&5+hEZb#fFQ{rB_|JQPT0|;lb_uvv zD_trgMKfCkw5sZZ-uqNl4|(r*l}e@GZZUAqZ3lX5kX|#}mn2C7SiLFdNW(CURJ8|q z8(3;)Zzf6d&8$INTicUamYq@6pH#Ky0LAFDARm^GM@nH_Y_J$JA0 zFbtmsj?B&F=6;CCIPiTGMP*>WnH^iQWJ!5oVBmT^;HFKR3ghGBPl?E8?|qM|hTi+% zfu_0!H*VZ$DHIAj% z_W;v%4Tgt@r-9wT?#|B66=|BT2iAzlN)agn%K%jMZ!;^2$Ov#IP1Al=Z483oTpY)# zbFTgowYIh{9~v4O12}Qw#6{pxEf!T6hJTpZ&i3~9z25uT{Jcxf=ks4V=Nj(@xKOIv zp{fU})#{$P`FRs~?>`5=bI$$hz28?Vl@h>n2X%LM2bD_2dGB8WI#u;UU`t(tQmJ$t z*ce68W)a!$ocqFipQ-9UW;SMKlW=oyM5O4wf3#Am1m62{5CjJY2M0d@?6!Bn%_H+k zk{kt&&U833GSX~jMG;w6tD6jhU@VT~(U}RIb6-bM6eLMalF+zw{2=_>RadB zl$rf3B4snH6bgm0{{H?+fR2uihHAB16p>Xx2yFD;=S8Gw{VIy!o#xw-jIReeuY-)(AYDmFJaU+wDZx-dLEe8(rVySqCm6bc={8)nvPW{<1t zjwDHr!-7Y@t*z}zGy4R15x5VS08Rsy+M-Rs?4m6PRsk(QL#^ur-usWsfH-B4Z7Y(?is^@{zX4ao&*^j4Aow~Y^^*>9k*=aOj6iEO8 N002ovPDHLkV1hPB9;pBT diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/difference.gif b/gui-js/apps/minsky-web/src/assets/images/icons/difference.gif deleted file mode 100644 index 023902752abb676a10875c2db4c2f3851a8c65e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 389 zcmZ?wbhEHblw*)!xXQrr;>8OGhm+T@U$?eCU0%Mup<(;$*RQRt&J+~vXl!ik>e|uW zz2o-n+f7YPZ{NN(H$SJTscCI(otU`$)~!29NxN^~zWe_Dds|!E4<9}_I5@0cy*el; z$lw24VY}2O0CMG5k z5fO(EA7&s6DE?$&WB__a2c#S1CkD1f4m@oi93=WrED@Txh@+L|P_frqKkw$uE2p;l zc|>KF|4|8@7j5)&fm8R@*pr8N<+bNrC>J$ln&8b|5+D#6Nn&cW8odd&hrGU z1Z@>k){>k-Sc~068{w_+RtJ`4hMoO0A3JPC*h62l@=P^?7LL*yHU!(oCPqmQ zw{bNk;gIk&*OrR}ogY#Crng zxK0rW?Hu5SI5BQ;kq1OdYYy-ncjAcJ!g?lfoC93O2?qGU1CBF+s9(cH@4FPwh`ptnutYWPp;2R$2$|u}{IbXSeXXyX{002ovPDHLk FV1gc3me>FQ literal 0 HcmV?d00001 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/differentiate.gif b/gui-js/apps/minsky-web/src/assets/images/icons/differentiate.gif deleted file mode 100644 index c3e06ce4a896766b8c9d06768b5eb3591a539a87..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 405 zcmZ?wbhEHblw*)!xXQrL-`~G^^JWK!lfuHn=H}+s)~CzMw>LCwpEPNbmDQPof*oC5 zJG#4f6ciM^ef!qj{M@o-%MufJ-@0`tDQUN#pI<^k!tL94B_$=_zkk1L*RBsAJ|rb2 z-M@cdT3WiTt!>7P8TR(}Wo2dl{s;B-_4n=Dcj3Z?M~@yE7#KJ?Idye)IXgQaIB?*} zlP5w#uQzTyWNd6KDEP+J_1Lp#&o*s3Jb(UtQ&UrScXtNdK=CIFBLjmJgAPau$WIJx zn;d$NeF%`~Kd~f8a5hIP+u>rbwSKX!nO9D2^@@thEdP@eIWOAC($Km4>Rpb*xw%Uo z%xV?>b!|$PnXF`m9%qTasJxN5T7{57yOe~MiZ%;hg;ZKiFo(K=^h~LoIsS~xSFA`8 z=3eTwa>MGi&b5nzmuxAO)0Zijz0<$GQG=NwtACsW(=-(es!q;ZV4|#( kRdjNj(~biVQ`6TyjZb{)9}&gG{_)f2FJIY}svQ}u0X|fv$^ZZW diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/differentiate.png b/gui-js/apps/minsky-web/src/assets/images/icons/differentiate.png new file mode 100644 index 0000000000000000000000000000000000000000..927abdf2bd4acaf7e42b584ddad89bde945180f3 GIT binary patch literal 412 zcmV;N0b~A&P)aC8Pd1-j5nA!1TN)aYzX;F;U?V|w|X_FhWLsj=|yU)OB8h%ZQ_0T zeT*0XI5WxsPEmB#7M1Ee96d0rz>nNMe2s4_0{fWe^kEP0u#1B{R@_D)%yRnh557oq z?K}^tkcwudJ`9;K%5eSS`^oBX@VbS0xJ*es`MA0-}^Vm(@Yr2!|!xAo|X#f z11WB&JH2 literal 0 HcmV?d00001 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/divide.gif b/gui-js/apps/minsky-web/src/assets/images/icons/divide.gif deleted file mode 100644 index 87f621c29b47c976f6ecacd23862f6ef15cf2441..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 441 zcmZ?wbhEHblw*)!xXQrb;Bd08t}Zt>*V_8@;>C;0%eUv{HZ)j++vN}^xu;avu z6J1?9y1RE+Sy?Szy0oC6;O*PD=H};?EnAkDxck(;G% z^5jW(clX@6bA^OnKYjXi#j0_C23_2ib zke?XXt{w1Ot`I2Ee_~0H<7ST5)7{X+Vy9O ze}CyQ$j@G6=3cJEW~N&iD#BYEpDUZy63pWlkfEaBuPH6g!XjR2$k~ysq^hb^DQY}F zOi58ut)*~czBs?|?8@p5AsoAQ?@1Qp*%2&o_{hD aa~vaByTusTmAvM7Y<$EhGNFlq!5RSbw8KsS diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/divide.png b/gui-js/apps/minsky-web/src/assets/images/icons/divide.png new file mode 100644 index 0000000000000000000000000000000000000000..3bdddb687e8be79a60a392b7cd1c310e995e8187 GIT binary patch literal 520 zcmV+j0{8uiP)+1OkV>@-edD~r?HF&3rtJn6eh)GOI>0#^(1KHNgmk~qX*7VsNB;d%zU zgLS0sc*#!8=@QYyGQGh8yv8+rXa~zR5?PMRG9)rPhv&jjT{S|V@{&%<_z?H;QIxlf z@;;W8^e7%=AfmkAg=rF8%+}YjTN60Kr7GZ$Y!tPf%~wpbJ&Z>+fq8~iJ)EUUrVU)1 z?8N?bsmi5QdW@eL>}A7yM;O!r-l$kV^-p|v&U1!!fyZm?sjWJ|n}zG1b}l7M^Q>tP zFKg#g;>8~}1u{Lv8@M!Gj{B1FJYdh>vbA;TK$vFcd$@wPI8s>K6}@|*S^xU8fIZ>N zFL)x1b*#a|%amtWR?wGV8h;$wp99c@&TUJ!}sFz^s6Im zIp$R&8MPI*uZDn<)pkT+6B}=@$y|-=K#=^q#=FOX~t{vUo zJGO7%-qh6e_U&79^K*%byKmjP!^Xyzl(f6Bu<+fxcL@mzw{PEVX=!=?{=K%g_Oxl! zY;A4*{rwXY6FE3IK79DFd-v|MXU}qSa^Amxzpbq;FfcGVIr-eVb6i|p4<0;_k&)5U z({pfeNJ&ZQ=;-kGKd7&-9~>OKZ{NPzvuCeeyOx)ix1yp#US2*lG?b5z@5z%V3JMBy z=gt)pdVTrw<*KTxr%#_MDk^T=ct}w2jjOBch7B7I9XjOddhE)TD*^%n)z#I{o;};N z>2PmvubZ2jprBw)P0jP?&y|&xBO@b^9616GHtG zf@oWNM`xF4q)Jm0FK_?kDN`qh@JycA&zWSQHf^Dj|Ex((#$475SNm)9&o+#8_7GdW zP$X{svTb`5Wp?d3DBU+<_rZlBA_oiutX!F#bcK_Bt_ErODKi?frm!0-g`U>ZO9+g% z6!v9!V_@x~>>}vx(7*O*zniiFx1pAiER#@RAafflzfcJ0p;rG1ViL9{M+_8~N(nO> zs;PK3E;ynhBrP>-hkzUV6bZ2#8?7InKi;LRF5j55qk)Z0E+)x^L&D%0Hv^xBp^S>= zaj|~>Wi^{ql$pi6zIVt~e>u#x!u{d2qX!b79b@+v%y}W3xZ{| zQN$uB5fK7f*l43gI`IdBicJz@5wO%;Ap}whcZwof2>w`$nadqGy9RO_d|=pp+2Q@p z^Um%&n~@*FsA@G&wg@#GiQ`p8uzlE##Te(4VN|7joP4ew)e-~rw`(@%{Yul1&bq= zHT9N$ijbSQh$dcQzwpVxPyE1ROkxb%Fk1p#DgwgRn0z3{W6@0;_#S((f;YGl7xkqC zi1Z%r!~`zjj8NWr?Cl!kg2Ufdc@ zyM#txrlB$*JVy)P|B+~|Ds`CQIA(eTBRFhOd^}z4A*>B7Eol#x4~A>j+8|(O|LBx- ul>B@}zyrGejcUUG=oW0R2)K-A?cfhiOm8tCfc66b0000P$hwjuR(Nban0M?%uI<>C%FNg12wqnwy_Hb?Q`N;_h3w?y#}3B_-{C_wL>8+jrU7 z**Q2kK79C~qoZSIXQ!*H>)_yU{``4=|ATASu1!lzGc+`uGiMGTAD@uW>&urfKYjXi zRqzZ(LoEUAb~))2732Zf;pwS%QLs&!0aBI}+Z^fkBQz2P6&h69d~y zhyLddnG*dcmTY1?&C%L^xY%p0Uvz8cl~Y^eLZULu|Ageui#D36=-hoZmiq{=y#1UD z=A|mH<|HNS@|1+?uqdeNaU_fDw}fcOD$8-p3n!;lhM6!(NN_4nkIk7CswU4TDyp3# z$-gv&O@>L(n0f7b=PG|GAx%>?v+Uemr8Clx9*gVSa4Nj{>^Z0M{!30pSFbI(cxmRH ZQ}Kz{{3D_mxn8_{_4*B$N`)hXH30nvn8N@7 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/euler.png b/gui-js/apps/minsky-web/src/assets/images/icons/euler.png new file mode 100644 index 0000000000000000000000000000000000000000..6c0574b949dcc5158d7250688695c75acef113b6 GIT binary patch literal 352 zcmV-m0iXVfP)IQLC{Os zXr--6ko00Y8@nWU1YL`LFShRqZ*^c8rWpQwGdsfu;tu+nwMW7bS~w_t&=70`YZw-J zJWt+~#eL#Knawo^n%OIQ8G&J(Vr*vuf{{XHPGC1Da5l$(+tPqDO!1DRn!wr$k8q4_ zoZ>v;(xfZ`{XSPez%?G$Y literal 0 HcmV?d00001 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/exp.gif b/gui-js/apps/minsky-web/src/assets/images/icons/exp.gif deleted file mode 100644 index 421deeba0ecd89bf11428baacc757a8f07f46ca6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 618 zcmZ?wbhEHblw*)!c*Xz%4h|WrnOWkJD?6DLk|b?xZx-m!G)((T)~7ZemUH8s6``_|n2oTjGcsZ*yC6L;Ubb%%|O zEh%ZYgoMPqckgcBzRS+eK5g1Ge}Dg7yLNGKaD4diK}Sc&&dzT4?%le&x-)0abZ~Gu zfBw9`|H1O|^0jN%rlqAle*D zzHxOucIC>IO`8t8xw&O!WeExjK7alk?4hAVDE?$&WMEKZ&;dCb6ekSq#~akt*v0wU z+B-VC`0Qkxn%LR*zSYt6G|vaXJ*vAvO%{$gp{!%dbf8U{8TnsVApmhGHuqN=OLEy1f|F28uq z-F_zq85vG3u??~UubT|j`6VSSwtoHYBf+8Q;5318>lNNhUmKlz6%9MCJleJ)Og;UA zP7v3$z{iWDWo>6o5WTecP?wT=pv%llN0tZZvL;>6$J$%vc2qf8Xcn5aTGJNiDuT=%<&{|PTpir{^xnlnKvOUqN!TllC)q5t6AMw z1e?JmT3H|V)2d2gg>aL11J!}LYNHVmn7pKGs6_&Tj?86DU_BGUpY*$hc`T99mDv-NV#(+F9?KMk;8Rqd<&Sz5w5U}&FsYO64VYF zMZhIY<1y<$v5R+{mjLBzqfr#;ATBT}jc_c3^`#=<9hR|%IUM)+zLy$k7e#uG6P)1# zTha&fSJis~zp#^4p9&L5NM2)2n(m8^1+2#g{)@v-Y+x*hVIp0V*GRyhGdKSan}qF( pfU~mu%YpaOSvg)2@ClcB^9|5)M6rsE)&>9o002ovPDHLkV1jqos)Yam literal 0 HcmV?d00001 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/fact.gif b/gui-js/apps/minsky-web/src/assets/images/icons/fact.gif deleted file mode 100644 index 91c593ff9c82088a58b64ff5144d6db6257efb95..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 382 zcmZ?wbhEHblw*)!xXQqgot^FAa55??%G&yLdHME+1|Vv9{ra_))tQ2V9bH{Jy1RF< zva%Kw6quWzv$nQQOx%6z)}5rJ-S6JLyM6oa`}gmsO`CS_-aRQPsSh7MtX#R0i;L^Q zg9i={4zjYc9UUG1{s;H(-#=&093i3CmoH!5xbcvn;2T%hW7XBw&z?QowCOMdWkB&K z3nK%AB!dpf7?7VB*k&K_X?x%y(SKrzQQ;(xR+dA>UTgiln=`MR+Un*Om0A8rCU9P~ zk>otO0%2i@5** diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/fact.png b/gui-js/apps/minsky-web/src/assets/images/icons/fact.png new file mode 100644 index 0000000000000000000000000000000000000000..269de125f4d212d6f99e99cf620e1cd1166011ba GIT binary patch literal 320 zcmV-G0l)rs`!J)ZD$06J=ipV%A#w&=!y7kI=;A=sdsjriaV=Vex0AQ1XmFHI|5 znrcs5Qycu34!58OGhm&=6buVAOoG@X+qD70gY}sOMeY(7Sdqcza*RNk& zS)H-8v@9stAtomF=FOX~t{vUoJKny1Yi@onF>&{;TX&L@cE5Y~?)L4w@87>qOiVm; z=FEo=A9Qqd?Ck84l9KMr05 z*3=TB&0XT(*4i8@s?+V%tE8-^uhG~anpPj&%cX9>GG$Ik&itM^tcncF+C#(yR&9`B zkds&17P@)s>=r{NBOd7kVJn>*nE9kOIw@$$o=;6b6(S@Qb~A3${({iX$qzznA3q5$ ldj7)cIIAlf{h@8 zcd!sVf!G?bu-60;EG?4K3#`SyBv#3L;CqE1EW^Og{+XGb-9X$%OS$S0USJlx*?KMs zwt-c=WPZFzt1QJG;?vNZDGxMK7tIQRp`UE5RRjb*S(a4-8&v{FeVhcG!5+et!}9FQ zRnj@!NV7UgdG_VX@DCOGh{ReE;0eC5iF>?ar9gZS&1vQOt!pgePxeitb#!7K zfiO`1_eAzZb*S!XYe=`WGGMc6U_%=Ge_7I4Pc{rH0*?E~cz#;Mc1gf3S^tK>XDmoV fU4}mKICOphM07!*R_JRi00000NkvXXu0mjff}pAL literal 0 HcmV?d00001 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/frac.gif b/gui-js/apps/minsky-web/src/assets/images/icons/frac.gif deleted file mode 100644 index 361b8ced3e041816ec63eb669d0431e0aebfb0f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 618 zcmZ?wbhEHblw*)!c*ej`TU*=T-|ygX^7{4b6DCYpv}lp1r{|U}TaFz&mYbVvVPRoy zeY(7Sdqczan>TO1e*N0Y>WrnOWkJD?H*el_b?xZx-eF~BRZvjy_U&79^K(ss;b(!@la1s zkFl}wym|8k1>d;39^16(@cjAnuU@@cQ&VGVYRWLAfZ|UUMg|6T1|5*AL2<&se!M|l zokvort-YhOOUOa4sfmZDfAW;6ldZWYPn?%a)CoZ z9%!qjs)4?S9Y4#1N6m|zG}N^$B)BY%Oxd($mOS{hL-Vg|t ze!xlG)9re5mDaiH!`_$0<%SUs84IE%Rfmd;zHVeP3pApkq z_H6;7N@$bs9M(j2*?^sN4!6QqZeT8jp&EVho(cF}KjLp9%oDat0?tYG>j3K*!$e8I cC$Zs!FI@^scdtae6951J07*qoM6N<$g0%LZ-v9sr literal 0 HcmV?d00001 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/gather.gif b/gui-js/apps/minsky-web/src/assets/images/icons/gather.gif deleted file mode 100644 index 45fc11491f39a90635604d7199a949ca263b63fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 655 zcmZ?wbhEHblw*)!c*ekxot83JP|3dwXx&w(ZTEH(gyj zy1RE+Sy>en6f`w8y?y)E-2B{>DO0Sit#|C$k(jvq)~!29NxSddx#Q>Ow{z#tgoK3C zr%&I$eHRGczkjc-t$pUqnGYX6*xA{Yl$4x1ckaQ12dh`F4hjk?D=T~W@S(r|L4AGw z;NakW`}U=#rk0nNKYH}Yz`!6RBqS{@ZO)uI2M!!CGBOepdhO!kvT@^~o}L~-!8aQ= zY;biw_UzfSO`8s1y?XWe^XJOS%BH5K3lDfE)sf69)D-4Ms)+isEhU z9i3g`e(Ft40s{S$r%avf#XEW8v^mq%JZ4SmXO+{MJIzD4e|EpQ?eb}20jn1o1!>#+ zZAneD4@~nC+doapSl&p|iFuBi >z22w`CB6@RI9+{)XFU-NkEj)MA z!?n($wmh7Yns%Q0bJeBaG$}B$ISOj&Fb1`pSXuKs<;aXlk67DywE3Py6lL9A5M{Mu z!ixkJwnjmn0uxKtcZ-&)+qj%4C{XcI&$`wV>LhmAgLh_A%h4r?%*%V?3>lXk&b+up lftTUkL!Hbk&lmeIoD+9yi&sO->WIx*ceN6aZ*X9+1^|(A?au%J diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/gather.png b/gui-js/apps/minsky-web/src/assets/images/icons/gather.png new file mode 100644 index 0000000000000000000000000000000000000000..a150f4aaccf19cf30c0635b0ec5c4c8129055f69 GIT binary patch literal 434 zcmV;j0ZsmiP)K~zYIz16>J8$l4q@z2RBLP%pABuJB9LY+Gq3?h&>2kz76a;JGHHL{FPGT!cp+o4UUZptDOd~Y2fDu08ICYT%XZ(D?=zy^Mn(LhT&)O9DRjkH?AMCL9+8+?Vt(1rG2Gy9EJ% c;W~Bx0iQKWM>lwZrHka@3E^_ZvcU{_385R?KS1w z8*8^WG;D8f*xu5xy`yD&SKD?gt1|@!JG#1dba(HVJYk2q`MJcz-M4PtNlMy%`}W=W z^LF36ckjc84@ZxjT{wTwiR0&%F5Y|k^!b&`_pMvI&)@&xg$oxRK76!x%>f~y*Bdt; z5)^z>n6qhO|3+8WW6z#F+qCI$asKA#&!0080Th3-FfuU6G3bEQg8an5_TQo3y>O;P z|A{3phKclV1hq&dZeez2Qau z6Q>d(!;1K-*qXYA;3^5x){>4|?)ruj5x;==>`7hIsV^PHvYR_thro5-M|qBL3NvgZEwO&8k5YWXJ% z)bibuTeU{+KKH}g$J|e2OBPO;^ZG6K`;Wy{GhTjwbYf=l7ycNBif2WcQV*F}Iyl(w zeocHJ;KJcn`YyvrVX-R%lTnHQ$AgUwCmB_kr!*8YwMm);9XqjRQ7g9`BX7~GJ0~}% NGqVWKY+_)r1^~UU;5`5U diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/histogram.png b/gui-js/apps/minsky-web/src/assets/images/icons/histogram.png new file mode 100644 index 0000000000000000000000000000000000000000..bf48e0ad3652c0447e4b9dffbd28a42c4f59a35d GIT binary patch literal 500 zcmV#n!Sn{7%K^czG|Exq0+aqnyXZq*!0A5D0@o@6<|+LP zSh5f5`$g);5q9O>KMFUj(e`SS*aND)prY z|IY{bs^Q&+-jk;OQD(YQar916)CU~&!^tgkh!Z=D%6gVhsEILUq!I;W9# zblgdOu}x@4$DM}NpOFW-FBp&U4Y#nDRVc#f9Po#GpYWw*RAsc6zO+YqbVc9}@#PX> qMLm@5Uk)7NvaG9Aps#qF4}JqtG-x~)6HrC~0000qM~AEX6E2<^61f{jEs!J!orIdE%NmAWMX2<&CR`W`}gk?6BEyz zIrHJe2Rl2vfPjFcq@)=$X4u=?KX~v!Pfsr>D9GRcU}|dWg$ozt(+&ah8{R@fRB%_ySrOR=ygU$20uUl#*K#r1>bDgu))>! z*p(|+1Ox=CtE)F{I&5NMa^%PnhCu)nf3h$#Fz7PqfZPI#69)GC4Z6B~aw2W*9i3ew zzRFEae0=?rr%avf#XEW8v^mq1+-FUiySU$7qks02CBlI#7Ok4AD7kLKVu`*9i?p1r z`n3%V}#Y)*h@ni`U%O z6_www>m$qK$Z~qIvc!8Kb{Ul|2Adup;%0I3_*ng&!HHj3XGy~Y#wTvPqHm*kg|<32 zx5_YNsJuuxa7dVS@t)i@S650JPMg}Yx5e`1HJ@2cDR+;&d?$M@XnD=QKO(Q5EBnl1 Tafvv!W##4Nf;kVkSQxAUyoT4I diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/index.png b/gui-js/apps/minsky-web/src/assets/images/icons/index.png new file mode 100644 index 0000000000000000000000000000000000000000..542ae408840e9357d50a7f647a78037fdc2e2379 GIT binary patch literal 433 zcmV;i0Z#sjP)3nAINEZix4U>N4iW&S+p%so>OHqchD zzEhmS65gh9QWIgfrIbUOotoT7acyr7tz`7)c0K+V;M(jZ-$B?0-;e= z!*_Uv*EpDp?~2`{D|V9473YxBdb>`y^%CE3DZ2Zc;(rokA3GS%0qmok=az;4^#X(K8Tm=y_nuAmFQOizlvS{0&h%i?lyj44?TPo-Of@=Ol#e* z1%xKyH~BhEDZ0xB9HsOBb~wll%;hjN<6K;20#543tkm@%Ap5QT_)dc*7 b!_nd&tqM#b+bl9400000NkvXXu0mjf-4MWB literal 0 HcmV?d00001 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/inf.gif b/gui-js/apps/minsky-web/src/assets/images/icons/inf.gif index d3ecd207170a5e25fdbcc548015ec1125ac3854b..f270f6d4e12ff18f2204661222459a41c31c2a50 100644 GIT binary patch literal 112 zcmZ?wbhEHblwpu!XkdVV|B63Z7#SEC8FWB=kPHKpdr$vL&JFy&lh@wrj-6p$?Gt$a zMCKFC&gIj~w0Ez3fA!pk%yf@+@-{DiN0uGp+PGrk$1IPui<&L}mYklEeJk*m(?q?C K-0wsf7_0$@Pb#?p literal 650 zcmZ?wbhEHblw*)!c*el+;>8OU6%`K;4+n>nQBhHsqE&O1B-hOm@bu>Q(Km6_)R-dCH(~u`9T{UUb0$MBDG^57 z=|Wqk%BouEtMS+vG+9ck^((tvnIgjWP+!;0sfk^ibMmso)4bHhn>fTon-m!ZCP!Rc zUBYs!n~O_;gCU`*f!#~RfM?AT!) z7SwBRDYl`3#WY$q!7kxEw$nO1ilZ(I*9cqP)uH-8J!_+x5m@ZTIZR{%f{vszCvY|= zuvf?IDQ#3ZbP^9RgH5a;U<&usyo!yIvy~M#u!eEGz#TlnIlRFhUSbJ14jwOdo%TZ-Nb9`m&9nIJ!%a<;~v&U1wU~M zA8-Qi#Wa7!;~_C-#k5v>Eso%HiT|jma)^aV!Z)hjL*h^KwZ#8BjbYXl)n)56-E?LH z{uhOv+`wE4!(^O`FPVV-`q94@3xtO?0WVAS>jGOihEp{Gcf{8N`~^HQSt68np|1b{ N002ovPDHLkV1f?Q(#8M) literal 0 HcmV?d00001 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/infIndex.gif b/gui-js/apps/minsky-web/src/assets/images/icons/infIndex.gif deleted file mode 100644 index af221ea30d4c81cc8890b54722dd9c179eed0943..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 651 zcmZ?wbhEHblw*)!c*ekxot?dK;X((8lZ=dv*RNlH`SPWzs_KLZ6FfaVj~zRfo13eq zreS9o^kKCQqJh zWo1=RQ1JHcTXXYsnwpxvzP^cxyKmjPla#dk-Me=-Ha5$bFHcBFIDPu`?b~aJR~ii?X&Pfu_4>ec@K2lwsUS6*KJ=+UFj&d$e=AJ3UH zCp0wlz<~pNe0)!yJP{Ilosp4o`SN9ce*UVes*M{D&6_t*Q1Fc_2pqd|<%)oSKy`KX zrcH-?dwUNbJ}f9G=SO)rY2tA{>f9OPIlv&JaO8bY08eXCe2;k@2J&3d&v@EzZHvC%~g_Gw_&kl--Jcl zwpLSE)QnB`PID99(q!j7#X`o}{M0;;p5dhi<;AQs@xwi)yJl&_n|?69ThQzK2>OAQ*}+Qvw?)fs;AT0v_Q}er4th2>6PdqWA_2XGP3T S<9yfv0000DHa0fPmoHC9NH~4^^zGYs-@kuvYiqk= z#fsL})(;;(l$4aTwYBN$>aJR~ii?X&Pfu_4>ebxb-2VOt%gf6jJ$lsH+4=bK<2iHY zgocJ5IB2@1Y(1%YE%u3Qli5U8%M-n8j( zZ*TA6!-oY01>N1np#+R z4JNDz_{y8C>vy4N?iv@Lr>8u($LteP@qTuu>|NS4tEs`ymj_tMCtgxH(0FmN$7HS2 K0_Jc925SHbi`4-D diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/infimum.png b/gui-js/apps/minsky-web/src/assets/images/icons/infimum.png new file mode 100644 index 0000000000000000000000000000000000000000..24875d7203f06881b4841f30873f6b099ad162db GIT binary patch literal 369 zcmV-%0gnEOP)<0UbfyEGkP^;3z zH5}p`7g!b(_(U7`70#fHwF>ZEjPF&9@3%i%zbf!gl@r)NKPPZUj5YOZ!J@H9p@!%# z8*m)w|8_XY4b0^*)Z<=^G6ARkWBTSb373h0d&>TefnBU)GZF9&x8vdmSZhOo4uDKe P00000NkvXXu0mjf?5mY4 literal 0 HcmV?d00001 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/innerProduct.gif b/gui-js/apps/minsky-web/src/assets/images/icons/innerProduct.gif deleted file mode 100644 index 893715e66cdc4aa951a97b18317370e065ed185a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 252 zcmZ?wbhEHblw*)!IKsf-;BeB~`gD2u_J)S-R#s;U3U+jL?da~_(bUvrZhkH?ardoT zcaoBJ-@bjfrKRP=hY$Y#2YGpUg@j)7^Yd@qct}w2&4vvdTwRZC+H`o+rcDeOK=CIF zBLf3JgAParWG4e_<%7>0o{94^R*8u#cQt)DS7IA{Q0DfYy&hJP`9CI^#91p%Y;fe7 zYJ2n`r>s=WhV-p&iUHgAof3~RPCIG#Owu=5;+pAk73R{znH?RhtK>3o@~71`=yNBP o=foyAgm>oz^<~sHw=}wUq}V%7wXkAfUa)Y{;w8)i5sD1f0JBtJHUIzs diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/innerProduct.png b/gui-js/apps/minsky-web/src/assets/images/icons/innerProduct.png new file mode 100644 index 0000000000000000000000000000000000000000..f1fcef6c30e6079d09ca5b960d82e21695039322 GIT binary patch literal 288 zcmV+*0pI?KP)K_4JB(AU>w-q#tyM z5!Z=e+0{E1Ng&v2Rc3-iCU}_RzinxDg=L2z7FiY2+L{TD*&yZ88w1b*RdN`3&N!z{vv;EB@!0000+I~D zJ$v@rwQG5Kc`GU^Lk}D{z{kf|Sy`!|pfGptTp^*?moHzgs;W{{RNT1n zkf7ijS69~!8#Wv|bja29*p(|+1Ox=CtE-TGJM)M$MYkWXbKcaCMY+|7??V??8#w3&k?lFWa_9MQ+!g zgR*@Sb{||ACw9Oj+R=~6%Rschz%5dZ(S)^-qe(UXw60-ROsa#4u9QM*j*ps;aG1yB zwMYB?)r@&evLj5x1v1{uXjEij4ec+uDeRKQCdg+}l`!*?3TrP{P=tzu<4c$JRxP6) zoSR%Hbnu(;9LNkj!a8NrWE;Jd1BjJ24y+>Bhx$}7nr7ZPOQAvD2AM!96=CdP)# z(oGdP0>LZeE+#kiH87gKylo_9|LliAU?x+)0<)It?^$d-eBSzo3uHccX5P4NQ1l{c u>BHBJ`32?J8SOWk^6Co-9 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/le.png b/gui-js/apps/minsky-web/src/assets/images/icons/le.png new file mode 100644 index 0000000000000000000000000000000000000000..8bcc289828de1d9903f013b7f2f2462e75b6e4c9 GIT binary patch literal 567 zcmV-70?7S|P)Zxj`$jiG?pjL_x$xu(7a9 z;RB3?h$s;eVyA^7XkjaYg0I5FSOf$MHQNOOHfFK0vv3`YnawVG_huox!4HPH=iXud zbI!~;b2Gwj4C$>V$flr#1F6055o|lQVk+6;YHYny*hd&|Sf!j18E&Ev5AkJ@#AysR zjAeOC!ZYkZb&)V+b7|UgJ79+6_>iF8P*w6WFQftIy98xs_%Zb&QB7`4c{4zh+dn;Rg<)hPB1KaF;OLZV%Up`Ph$NI4#!N`*?sdX44|B z<6VMxqJKQxfN!{n?_zixT8)#~lI#okjZ+zKh|%}X;+*RWYE@(Za_1caC3QUBS&WSywc!wg69xJxjihgI5NPdB;bat=@8HBA5j002ovPDHLk FV1iD<`(^+D literal 0 HcmV?d00001 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/ln.gif b/gui-js/apps/minsky-web/src/assets/images/icons/ln.gif deleted file mode 100644 index 678bf513663d16696a42896b512b76b208b566d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 639 zcmZ?wbhEHblw*)!c*ekxot-TtB=q9N3l9$u2Zxg{U%s3$VM1YV28K2_nS9wy1I6Bckj^9&^USWWI;i}?c2BCzI|(Meoj+UGcj@Z zty_24*w~VicJJJ|^Y-n#@87?lHf>sBV&aDnAEr;AZf9qA?%X*pE-o1vnfCVfprD|X zloWsegN}}lYu2o}aNzHQh~(Rp-jso$6<0 z)Do9<@^ms^yzJl<16h4}S!Wdnk;QACPPUX)SJE(1;c{9mC-kX5he0rb(XoX?s^iOV za}NnlF(U&935O(i9_9~GrgKCN9p!3a_Xv5>kaA~b?_P_@!_y`S8BNob|Jx)vxkY!D k;bX=%njLq}&6@A@v8KgSn32t6vR3S=DURF;jSLLd0DWx36aWAK diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/ln.png b/gui-js/apps/minsky-web/src/assets/images/icons/ln.png new file mode 100644 index 0000000000000000000000000000000000000000..9a641041bc07ca6068edfaf49e1f7f755e0d319a GIT binary patch literal 314 zcmV-A0mc4_P)L_rh=;O~l}NwDlj`(A9@)+B<}x3CxlgVndPDs0$l z*b53a%Pt1rU<`BbY7z%_PVm4mob>UZ6J{FHDQ4={6U_p4ao(SKCF}&pSoD3m&!<+U zGt%SG?bL%dwL}{THmiK6Q4k0^eac915(#eh_#1eM7wl~T3?J#A68@|!Iqfq(ab4y$ zDfVH)SVSqFjN`y+o7VMe;E1Wxt)8^AdZa8wC=!^6;g0k*?7Mwd6I3;+NC M07*qoM6N<$g7KY%M*si- literal 0 HcmV?d00001 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/log.gif b/gui-js/apps/minsky-web/src/assets/images/icons/log.gif deleted file mode 100644 index 9be135a0fce61f975f20d092960281d0b3434119..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 744 zcmVuFZ0YIgB_$=0kdR49 zN!Zxf6ciMZk&!z)%XfFTTwGjkZf<~pw}60v>+9<$Cnu7Uk~%ufIXO9SaJZzTqyz*6 zfq{YS?Cgq)xQmOplarGL1qIvN+wJY`H#g2HDJhhclub=dUteEgVY}Me+y({)Vq&`( z7#QyE?oLilxw*MuU|`$Z-3JE;@9*znVPSJ~bMWx+K0ZFFsj1D)%?Sw!EiEmWn3$@n zs$*kg&d$yX3JT!h;2azrhlhtQE-smwnLt25Qc_Z6WMm5q3*q76h=_j*gBsH8r51pt7>E000000000000000000000000000000A^8LW001`tEC2ui z03HAs000O7fHyY}BpHT>h>40BYAk|+4-b!%l$Dcb4wI3O33ER#mZ2(Rnv#M#3__u+ zV=|AMH*Qc_8mplfZ?C2|b}J&bmMI^)k8?v5z?B}3kh^6#G|7}_7sNLsXf-!LM>{2P zf>AteF;umWDrwdS07O~>R$W|0BTGXV8VVZ)l&#HzQ&v3bL1n>>94q7)+41E@gCJTc z;re%j%nBe<#Edw&g3T2k8`mJ{K#7G1iecIWkg{cC1TYkSw4}iWPP9oTDJH2hV!#Xw zbd)f;kzj_22_e>0nmEXm6C~FRU}-S{l$j$+UaX)~$zRh)T^d+gBIr&C7?jdkyTJj) z36hURI@BTJqkC>oFOK8F@5CA*tOgD@G diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/log.png b/gui-js/apps/minsky-web/src/assets/images/icons/log.png new file mode 100644 index 0000000000000000000000000000000000000000..c4c0c125fdf26dd676b31c5776338936411e4362 GIT binary patch literal 535 zcmV+y0_gpTP)@2OUQdmep)I!k&L=tQiynuy*>NCU1`1R4gm@gmQ|IyA^*9`G#QV`GKDK}i1# z4~NyjZG6WkOr__WFpXb$f}dy=o5^|zgjU|B8P*goily%m?ur%Z6ee*bJwIMzhZNQ_ z4=3?V{P?HiDji6W=Xi@*{22k*9R--D>>uU~R0f>G2{GXp()c%6Ku0VL9kC3SX&l|M z9M0gVSn0pv3O?fj&fryo2P~J^YNMOy;S3(7`(<3iHtb3u*dpd|4<4h3AH}RNhKy{f zD5N`aM+{@08aR!QxSZPWVqgqse`21#;5rT$y#I>x*owV)x(bXG&eee1#WQiC#L%c3 zcv!S)E>#5TtBw1tUo9;SX@v@7@tQ5I6L2MetmJTlaHA&RK|}vWO|klK#*UhRAH*XJ Z`~@>qVA-|7#`*vN002ovPDHLkV1jLS@N578 literal 0 HcmV?d00001 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/lt.gif b/gui-js/apps/minsky-web/src/assets/images/icons/lt.gif deleted file mode 100644 index 15941e827a270f742c9423e55e13840d04cf893c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 715 zcmZ?wbhEHblw*)!c*Xz%*REZA@#4ki&6^z@PDVvVF)}g=3k%oP)xCWAQdL!T!h{JT zA|ewfPPDc@U0%LDCMG5?FR!6t`^}p-MMXtlzkY3Hb;i=tvY=qck|j&Ly}h?>+s4Ae z^5)H(uC5*3-8)!WS(}=g-oAZnZhkH?ardoTci7n2l9F~878bsH_wM%XyX@@jEiEnY z-@n(^)}A(Pnysy^zrTNCVj>3z$A=FeR<2yRd-v|MXU}qSa^Amxzpbq;Ffee>o;}IQ z$>+|UeZ`LQc}vw$~rna{QVE=>+8>&H7htcc;CK#7cN}j z;o+G*d-mG3Yk7HjD=I4F<>kA&x)W`1t0|ohu~tIwK?F^5x4_RaJ_LiW@f` z5)^#n>gu{-!-nwi@I!|Vxw;;^a^;GEfIxM1^|NQsHf=iG+uQ5r<|Zg8SW{D@tgIXv z8F}Q$5pbXqODO(iVPs%1VbB3-0L2Ld`~Lf9OPLAW7 zJh7iU*H&}dLejjdpr z*eD_rl!yocQ&^~t7IvZm!B>;`Kq3JflLd=F+FeDlv(d4*ce4x5>w}Bk_7y5^N84U@pe#c(}?^dWdwk6;(1uB)EY-+{eNyiHoSU zf^}Jsgr^uneU&gIjW}&J513#C^ATEv>Y~f6l%_ae5U3Nl8#7rB%g{<4*9y3j(*MHY z1m0pjUSYE1zilx-6USVRzu(1!d|uK(N?OeVP70l2Lg*4Vu^m(Rj9vJM$2f)!IEd-) zCPP}YR_V70nZhMB;^g~q6d&TapBTph3}B`Qa1ph<8uknOaZ`-1;5}aA4t8Q0pKuLt z@S_J1*)`mXQC!41A-xMYEu1R-IE>$TA~>HG_HQ@U1ebp`?^}2#G=)dFC%ElYD;~mk zZ0Y5U^b2VPM%&g%r zEaABJp_!$t!giVO0VDL$Tp+waQ&{>%sH?*SC-AT!7{Otk{Nw3*fv^^^Yf1}LIv75a z<{AOp^`o8AVbTjF0r%>7H>wElqZ_fgB;XRBw}L;vAa3Nbht(GV0000|$jG#}x9jQYIXE~31qJQhyO*1r`{Bcf{{9E`_4Q}X znze7=z6%#F@bK`ImzO_!^l0|%*=yIXm6w+{G&GzuXO6S8^ML~g6ciMMgkHP2xLm$` zxvHv4QBiT@#zV%&#)5)x4jnq=>Uu0QGxN%oD*^%n)z#HXN=lnH9d>hb+qiLKL_~z3 zpkPf+&GYBam6eqjELgxm98mnp!pOj2!Jq?D4vG^7_WunQ7Q6}~ZS5VMT_P!JO-;PK z{gbCmot(fkdE&G=(^R5oO`5y7KU%wg_L3#SSt}N;nyW0mZo^`!z6tBMPE8QrVj&nB zQOJ|GwBJleiP@4<&p5y(NWxv#Sxet2J1*T}+0G_A)kq6_ zAxS~=i~>z3eYf0#08K|{M!v8Q1ttq0@_Vz&=tjicT)2pfn<>9w#=<}qW3 ki!0vQV{vU0>mN;#1jiXBoDBzdY>HJb*fD`i#yRa8iGyYDmEidOSv_rG(%deqchEcj?_iFAh7D?K3y&Z1lz)8N#I0D z;87h4)Fm~SjHO+;dMM0s(MKArvA0@=kOKdxQ}1B zj@#G|SSR44c!E`2!ncUOqjlUzS|{B)DWyH^;bZil@HyO_#}>x$4zn@d3)ljl#~l6Y zqCIF0=Wz`;@VM{#NZ+FVsX>7kV&WF=#`p>zU=jD^1G`^sbO!~#kQcj!b8`I_@gC2x zhDWiGS`%_woBmorYLR|WZXdQ~cg28pI#0L5?b5(f4pSU))ovl+pZbx16QM(T*bwlh ns9z1-z_5G(H=!?hRR_NTStwa$G<>h700000NkvXXu0mjf2)4y) literal 0 HcmV?d00001 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/mean.gif b/gui-js/apps/minsky-web/src/assets/images/icons/mean.gif deleted file mode 100644 index fb99f028ddfa450ab758cd32a8bc639a80a976b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 634 zcmZ?wbhEHblw*)!c*ekR?b+_?b~RS0p$#Z&>+r5&Xnj(IVGfX%u9JZ{uxY$Gf%mGmj25SHU`prZD diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/mean.png b/gui-js/apps/minsky-web/src/assets/images/icons/mean.png new file mode 100644 index 0000000000000000000000000000000000000000..797168ae6de0b8e5cf96a65d696a19d75dfafbc2 GIT binary patch literal 457 zcmV;)0XF`LP)c5~|!`TVqh1ao$Z4BWXo=P2K zMd}`_Io^jKc!l9Ehp*ClW~X_BJ>2ey&*B6N9q~bY&)}M@#plG?I)zL4f)99sn>pT# zfGgRrGVvArn89()o~XYxzwlW4MSAf71DL}irls`W&(KGh#OE%oQR(trsCfrG!#gQu zuko_WfzPmbL~NaROWUg@b(KwB90ai+fpA#r9aiZq_V7na1OJJ_t2 z3nK%ADuWJ48004gwiO40GAA}l^q*KF)byI8wfktX*IK{auFNZ^wiabXWtRV0Qadl& z=;uP`?yGlwkMha~&$;luWJ<--6kWbpGyalLVOU;pDW+7ztfd zX2tAW=c*6`CW9a2#V)+~w9)7Q~bShO~TL7YX%k}YM{*3y{%i6=r@PM`5F nKYu~B=<t~J~zv2|1c+Wo~ijnvEi#oqXs{MO~IhSV9;U^ zzl5K_pkPrkn8dOR27^h~U{H%`40G>V?}R%(FboIo!=Go);cyGWA{I2OTZ#u5#%g)) z8-mSY1`lN&4&!M`VVQ7KRYT2z2I``d5m@x&9a@=ypr=fk6WGoP9Q3g+a1YR_xlfD={(g%$YMB931!V z-IJ1%`tad{o}S+7)vM2+KmYLILs?l_fB%ECX3e^A;ewo;oPmMC?Af#V`1p*BjD&<< zKYjXi4VY}2O0CMG6_4<9x)HDw?K6o0ZXGBC(8=ztW0{KUYv;(%ZK z0}qM*6HAO3Cv&v294hu&>lfXedF9krx3H+p@;@db8NH6eScwg}A4MaEYodS;DI%rKuk>Z$YxE zoDQpa=v3#b7)c|3VTQ1t?O_^AmDCwy1)J72_}4a{@h?ArLAL1fg>46~q^6%f6Q6k7 VDI$uA{rQWRuU@k&S2!|Q0{}6+nmhmi diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/meld.png b/gui-js/apps/minsky-web/src/assets/images/icons/meld.png new file mode 100644 index 0000000000000000000000000000000000000000..d3a0ccf3588a12f9759011cc8d82cf7b2c796cb4 GIT binary patch literal 387 zcmV-}0et?6P)O$iu@UCnv|p$ETp6ASCp9ISvZ}L8En95;!giT-R|Qz$xy3SyTK<_v$c1VTni_4l;LK z;T4Bla>tluoYA1l1%BXcM{b&VM*SDyC0=ZIcp}dsQuEHyC(d`|avfH9F7--DAHOaH zj3WfXD)&l%(nH3YN_sTKKK{5g@LwD@rGcd!#!;HXst|BfKQ^6aLVWBAc&)8p2b|+b g>WO{m3vXTU4NFWhRu@P%l>h($07*qoM6N<$f~}{9Y5)KL literal 0 HcmV?d00001 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/min.gif b/gui-js/apps/minsky-web/src/assets/images/icons/min.gif deleted file mode 100644 index 199e1b62bc66c8296d19ac3178e3f05d7dd7ae62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 709 zcmZ?wbhEHblw*)!c*ekxot-TtB=q9N3l9$u2ZxhKj~=~#{rbz7FDFcx5FH)O#Ke@F zoBQh3D>XGWYwOcqUS8$p+Z!6TzkdB%U0vPE>P$hw4sUPoH*el_b?xZx-l3tPaq{HJ zf`WqEw{O3F`_|n2oTjGclqpkueSH%Xci*~ohmDObDQWl4ojY&ezRS+ee)sO(mX?9L2@O_wL=3l9KxH;luRl)9vi+I5{~>N=okEzptyS zyJydy^ThqJP>l$Dj; z-Q72B+H~Z|5e8C#;!hSv1_m<*9grqaoG`HeZ!j|xkQZ%h@969jO;&4a5)kO0JZ0+S zc)rOKr_GtB5oastbuN&pmpEOF1k|S2Z?M>8{@-(eQN(T5{jsG6)TSw>+Rq WKJk)^Les;;9m3ju6H>wz7_0&2kQHwL diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/min.png b/gui-js/apps/minsky-web/src/assets/images/icons/min.png new file mode 100644 index 0000000000000000000000000000000000000000..2a5f4a6856e3eda0c13a3fd2aa02f7a470cd482f GIT binary patch literal 378 zcmV-=0fqjFP)kR7Sf2oq?36lMFN7hJY`H^B_^=H$KL`sa4q|-#?hZg zdWA!Lj@kcX!Yw@IP476tB|dPB1T~z>5^m!jH+aL|_fIAr1VU+4!UQX*V;4Kv%zb`H z|1{RIj{{5%>1iV!wSx{`ahv;H?g?gx^gpAE2h15hxfaq`x3sUAz!a^Rz=~|FMZXph z%7hoHzj^a!Lqo&s*RQRt&RAMn78LA=jg38V;>4RbZ@Rj6 zba(Gqx^$_JkI(k)+fSZ6$;!%FP*5N)F8=oITXXYsQ>IKwOx%6z)}5rJ-4YTK@7}$e zI(4d_pWo@zr*GfB`~LlVTU%RyfB!RQ&Tw#Ww6?Z>`0znTM<*a4Kw4V5t*y=8-u~RV zb6i|p4<0;dZ*O0{diDA9=N~?NC@U-L?|*RCtXUT>T$nw3c3N86j57okK%I z)6>%x6cmJnUc0!sT)up{s;cVg)2ACZ9_s1oF*Y_96nx|A>KYy%?&^B1y1M$=vu8?5 zN}Dzvo0JTy<~}4 z{E9`Z=4!~U+t8$H6gx$xZ^HV?CU(hFxWuKWgoW$z4=s`kLR-L@Xhys@Y9$g0k8>NcR6WIhA7D;6|K5?BS+ppkf6uLoddDitka^BZM*XYIh rp7om~8upfVS*GOOdk>q>!@y{JYA|iPs8`MNSF^VkAP$uc+$ZbI-oNHa>fhJ`PYbyk1@8UDmDguIWsmdyW z^?wO$VOt0LP(1%ZWgu!ILj8oW} zg3ZNgoWVyNz>#z>eW`&^D*{*J2Cm>)bg~sB@JK|UZ<=xT*KSs+e+0x!1|vGIE2sWC0rsLELL~|3&p+K#7Znn z8Na~?Y)-!OFh`v6Vcf@djA9M0<2a6`L@{-SZEV5W)QTpaViA_&acWy%3VILwO_fH1 z)Nuh{#dePAu)Mp(_J+b4#Z?SpBVJ;D;oWR%xbU7(>z)Rb%Qx)oV9%v@n!8X?dtwsV zL{+OTZ)at@v|csvzf?G0HL$7*Lr;8W6BPk}%#Zk+2>pbil7O3}`Q^Y7aUm}*3HS=P aa^*XHfUrY`3yH zQ&6yD+qP{dPMqlK+R@#;WBc~)Z{NN(H$Rt{xckn%=YisL= z4(+I5cMA!<-nj8lPfw4a z;2T%hW1BV|?(OZ}xN#!`DM0Zj3nK%A41*3x6Ua{tY}Xz5*bNgU`cEvGba4|$E60&y zueE-m?U^AnA~{uAdbdV-W-dK+*)6D`XRYR$;@@97^zvUHGIcLj;ndft3>6Wmjn9=) zlnzr1Dw&nblM5#&FE!XyS-mZJ zE;D0`82{d|{Rb-#9}U^GV|R^n-HHw8wiI0q-Q|BZWX8*f{+McMT)-oy%Ov74$7ACnS5_4jRz?PE E0J=o9hX4Qo diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/multiply.png b/gui-js/apps/minsky-web/src/assets/images/icons/multiply.png new file mode 100644 index 0000000000000000000000000000000000000000..8ee863bfeb72be3089d09b35febe5587ae65e0bd GIT binary patch literal 549 zcmV+=0^0qFP){>-iDTGGakw9^c`2+BIz_ZEvtj`^#^U|Bi^i119@H^E4HDM#@ zFT!G(OaE6F7ey0Y#UH#*=%Za1SU@l1Rf;d6vxnz1Fg2B~syM$t5NfK_g+3H{d=xs)Eoi8OAC&b)_DnYD$HUZ`&TBAr>_F0PBe zeLryDHa0e=PoKVh`)+Y@@rMr|+S=NC-XE?p85dd<(z zzj5OsLBThN4jpoJJ+^7nVFp?P#h)yU3=BdHIv`6xeqvzja_CH%U?9t3!GzB>U`I`mhznZ zJXA;ZKs$A41A%GNpLr4l1ZyQ_B(RAD?&kP!TN<4(ZIH>6sDzZZeh0k4NAV{fM*zE@ z03UE#e69a`N9mB3zT$oat3`Lnjo*uZs|H=r(&Q-;X&bert$u039)1%I{F8+1Xkb*r zJnhf44Fc}x$NsCDk#8#jFO~TXz$H#_Rtflqr=j=)_j57zo({zg00000NkvXXu0mjf D#6^FR literal 0 HcmV?d00001 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/one.gif b/gui-js/apps/minsky-web/src/assets/images/icons/one.gif deleted file mode 100644 index cbfc9c654587531afcf15ec8d137e31386dd76f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 387 zcmZ?wbhEHblw*)!xXQrr;>8OGhm&=6b=KCW%geVPKYlzfFR!6t`|H=Qt*p)z6zo{C zWXY{tx4OD^ba(GyWo3Q)_N}@3xx~cXw{G1@O4>bj>eQV(ciz5zmz|yc?%liZ-@k8d zZT;}!11Be^uCDI+^XL8j56+r3%gM=!mzP&wUf$5qP)O+Y!Gi}gGBTb%eY$buA!B1> zLBTiS;o+{X$2M&`EGQ_rY11YKqJiR17DfgJ83rAY4v?Q1*cLeOwF?AF^q*J~^l%YJ zE6br`ueE-m&6!tDZT0hs$}In55<4&2$nv98_u3xcm&Vg9?%cVsn3=gp+AknK#86#B zTOe7Bvm!=HNjF7Ur#Fm4g()koDOOT~J1b{SjF<##mI&|SFi~aA6|0<^L)hdxvvW6P z%}U?3J9hHa{h{554hJ_JJML6=>hz-3r&IUtyW|v~c+Ec|ijn>PgNKhEvnw<@GFSru DeixTH diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/one.png b/gui-js/apps/minsky-web/src/assets/images/icons/one.png new file mode 100644 index 0000000000000000000000000000000000000000..1e2375ebde9302fd74b14a02df73c0350ab2a248 GIT binary patch literal 316 zcmV-C0mJ@@P)Cd3rR)! zfU6_u_5+YCV((~W?~)xR*=$x!US?-Do5)vKs2lI36-;p3tz{+b0%urt=loDst;pBp zxBhfg5BiH1^FT0d%ATh|AXw|Fj0BsZ;5i=gGBA(5J|3Dl#|Q3kIuK*Tm3}F2>3Iak zUWJnb6TU}6U8D^;lc!NbLwBu_U>gl0?j2HwrX31C;RZh=z-A0MGV%@AaK_|cE81fd|wH?)b+0impH~rCGZok{oxmnelgE8uUx1A O0000_tV! zva-Vf0000000000A^8LW000sIEC2ui03HAs000G+pd=B?VV-EJ9@`^|1o6&vJ!irk z+q~^yI$3Y{!a!a-BGJG>3YEP^!U-KBT(D=gmN8IklUcau(0peDOGFg01ct_}?ZOZ# zDC-_mUc0a9L=OmjHFSP~gCklq3>Fr3OHGPAZE8w!lROHLLuF?*5qU#hpIb9mrKTcM fsj7Q~szpbzu|GkvH#tZE1--t%z`+F-SRnvAMY(k7 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/or_.png b/gui-js/apps/minsky-web/src/assets/images/icons/or_.png new file mode 100644 index 0000000000000000000000000000000000000000..6952340253de0c858fdf34a35d6bb5cb0122eba0 GIT binary patch literal 365 zcmV-z0h0cSP)(&{_)&3j)Kk-ebQI5PV54O9HEsz;z%0ZAlMW=5{H|;Thf$wsIlm&fD?A z5|P+%1DxU)S6jL31f8}6B9*mmNuMybae0^Gm;qem0AKK@n+B4n70Rmx_1BBPi`;CU`p~>nY`F(3tHNa9|+uC6% zV5NTeMS-Op#zDP@RUzP}e{807M7-??cp~+$0nV_G!;XO8cx!?`Cl@{LTDCnl00000 LNkvXXu0mjfHM*l? literal 0 HcmV?d00001 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/outerProduct.gif b/gui-js/apps/minsky-web/src/assets/images/icons/outerProduct.gif deleted file mode 100644 index 061f71ef4c549a636ca3e2334e123933b7cb1adc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 648 zcmZ?wbhEHblw*)!c*Xz%LPA2dwY4u^yl`+hnUj+e|uWy~E1N%E!m2sj2Dh+qdTC=d7)* zPn|lIn7I4atvg9cyYJk&^X}cd<;#~RBqZFveHRGczkjc-tvzkpv|YP)B_<}`yLa!y zhYtY(0lRnaE-5K#YinDzYSo@Sdy+gTi(a}*(POh`F)4;$W zEiLWh#fu6G3PM7!!@|OzK7FdFsJL2@1Xm4-a>BJ(ii7dF9F#0Re&P>gs3D zo+&9QZQ69$&CPA&#*Ko4f_;5`-~bp%Lh&aHBLjmjgAT|Mpg3V*f7+m{%Ofq&*51+C zCE%&h)WpNnKY7a3$*$a!Cr+C)P2O?Vq`8ax9aZ~hFImDLuwv1wxpHFb7F!6)m>bOz z?VGTEs*MAiv74=l(o|ReEz`98C4+Q@e7Q8I%DbPLDj1^a!)YoUBz|JbvVGH(%=C4c z7(CR~tU0Exc`;2w+1^E*(O6bPBZMjNVcb%dK#w&S1f1I^F-_x;TGDc$O+ZYS?LdLR zp-Fok_iONeG~mU2$17 b-$`)q6i(4bwt&T6bG^1Y_Qf?aFjxZsN)z1% diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/outerProduct.png b/gui-js/apps/minsky-web/src/assets/images/icons/outerProduct.png new file mode 100644 index 0000000000000000000000000000000000000000..9748d3ca3cc18c6084228d19041ca3031aedadba GIT binary patch literal 430 zcmV;f0a5;mP)DZM6r8e~(=frdIpt01sC%`q(&0)oD9SrWK1j5&KJhwpHLBXsZ-A0t1(=J=!4 zDH3V%w!lgre>-@Kzxa+zY(%{s-;GlrtvU{`<#sN}qv|JCBANhBz$9QY{wScrl zx}e->8?>_+aJ4k>K^*o=14}tfOF33&g@B{`WAr?=Ngo;lz7+R20QT?*j~fF1kmoG; Y4_sMUetI$0egFUf07*qoM6N<$f?lx0E&u=k literal 0 HcmV?d00001 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/percent.gif b/gui-js/apps/minsky-web/src/assets/images/icons/percent.gif deleted file mode 100644 index 44b3c58def5670cd2717a9c4fb5b470cbbd0dde5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 392 zcmZ?wbhEHblw*)!xXQqA?b@{$FJ3q}oVsDz zyG2DsckkYP|Ni}l4uEW;$1ti@Ln$|5SMCcvC5uG1Q#sHe$cn3Yx;Cd*?|mz6U!Mq5{gO)yzPXknrqJ$qTlYCeJu?Y#QWswv*#~(RVy4BtN~3lt#JSV diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/percent.png b/gui-js/apps/minsky-web/src/assets/images/icons/percent.png new file mode 100644 index 0000000000000000000000000000000000000000..fc612b96e3e3cb6736b743add924f899cc40eb54 GIT binary patch literal 373 zcmV-*0gC>KP)ufyH|nLo*W)OvNs90y{Z@i#cYOv{A9(5C_Two?ruC z_^DW*++iO>e4~j|tX8ZQH#HENRe{$y!y9(-h|lUkL|Lm!I*z`Ma|{w;L|IdpW`J8< z;UXR&$x?t@5zxksQlgY!ri)1m@E4bO!m)B|pA+gkm{gr1yvF!}ql7wy77B`4u8ZGQ zE={(Vrjr}^FC9*E19Np4T4gL|nSjgrvHYHTgkep<9dUkh;0SBjtO@vnyLs{lHV;4M T4lere00000NkvXXu0mjf&E1%> literal 0 HcmV?d00001 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/pi.gif b/gui-js/apps/minsky-web/src/assets/images/icons/pi.gif deleted file mode 100644 index 8036d1bdfeda621ea26e2921d4fbe916e8f2f8d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 401 zcmV;C0dD?BNk%w1VIBY&0M!5h0000;NJv0H$u~DQTU%RgZEe`t*gHGRcXzkP$HxN$ z1Au_H>+9>1l9D<)%y4kHwzjtH?Cgq)xQmOprKP3G$;kx;1?}zaH#g2_tV!va-XCjg3Y|M(5|}prD`t00000 z00000A^8LW001QbEC2ui03HAs000KAz)}f;c^Hq#r1Ej&2!#m5b4smFX@_al%C%}> zT4{Iugngb{GTDJci`CuC#0?)yoY41_2k7?|EL=1WbX6b(GcGk2Bn(^{HicCl0VO#v zJ7Z>fRuLivB{3)$V{DvNGAj)sIwoWs5~oxN8xS1>BNbz?vQrcr1|=;gDWz>gdUaKs v$jXnAz0OaAlG0Ci)z&3)+194f*38Y?LSJFzLReY?3+?Xj@bL>OctHR=4bZCL diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/pi.png b/gui-js/apps/minsky-web/src/assets/images/icons/pi.png new file mode 100644 index 0000000000000000000000000000000000000000..a2d6ab4cab94ef241cf3ad45b59c032e82984d87 GIT binary patch literal 339 zcmV-Z0j&OsP)xn+?P(O!aHegar(7-T1sG*ac3pX!7`wyf2G0 z;?p`C^at8li6SE~EK`i5Oh8a+s>}(TN6)1--7k}bp zE5GXiTH6F=CJo~lfw0OoG=(%Y*>0LiZs4C(Smg%hsxXdI4697QU;RkWM3@rqdjei+ l^jibxIK**Jz*p%S1V7n9fO=H}*$ z7A>l;uYdLGm4$_cwe{)6ix-!dZ*OSWE-EV8(9rPu^=m7uGX(`Zwr$&X;>3wJZ{Bou z?da~_F?sUjrAwD?-@g6i$&;+CtZ(1GH8($}sj0bR$Bx9r-M4PtVPj)UO4|MI-8(HU zEk8fM)2C10zI~USoxP={<^B8jyLRp3;NU1OE|!v#YHe-(@Zp1Y%-{c@zP|p23m15Jcnk~- zX3w7OU<^y$-$ z8xQsL^au*R*|1?lczC$0>#@wt%S&dSOX6cl{^{CQtr z-+~1TA|oS@9616GSE2~TpDc_F3>FMJAl0BaVPOB?U|}JoBGJ~~(b*-Dtku*cB-B57 z%GAkm0+T0Bn=?%#YSyGCJHNSeqxAb{TZlO)E}J8swrbIaW$Ln9wpn<`_q!|f%k)jy zI#<~(#+pBvk5#)VPJCCto@R!kCNr-pbEK=GO_Gr=XOl+4l_q=5KzU8}bSGQpXi2pI zZU1LYD~?WfxuN2aaQKk4M8UKrg@ubfn6#ATPX79S!l9ElwCKbNheY0Kn%reu3S-+yDrou@msgZ%f8UXU_C5!+7 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/polygamma.png b/gui-js/apps/minsky-web/src/assets/images/icons/polygamma.png new file mode 100644 index 0000000000000000000000000000000000000000..6ece6819d3a6998c0b88e5b5d0738387de916e5f GIT binary patch literal 553 zcmV+^0@nSBP)sdbztF47;-pNr~6z#3-&LfUR0&+fNb5fcNj~XcjFFjq_s1mXJ7HXz}~{& zfFH1D9dt|#-(%dueH?6CKZS=_>twVnq>pe^EQTQ*5G!yRpK)Dm%DFPE;$8=PbU!f>t;Sb2yAkIG5(DxPrz8 zfVCXhDWpqcrDgagc9M;#E~TRgxF(i-FIB?>2J^?yfgN+$V};Rp%^Cv&wkniX4#x>o reFE+mdv6mshb>~q?}y&vNj~`nNt|hk!VuZ%00000NkvXXu0mjfJP!B= literal 0 HcmV?d00001 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/pow.gif b/gui-js/apps/minsky-web/src/assets/images/icons/pow.gif deleted file mode 100644 index 43871521aa2ff862de1946e167ab4bc670b23c52..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 634 zcmZ?wbhEHblw*)!c*el+;>C;p{(c9ClP_PsoG@X+v17+3PMm0MecH>*tGs;s@#Dwy z^70xQw!eP;+RExoLBS4hZ|`l}w!L}trmJg5clVByCr=g>6uf==*4+HuvSrH>6L;Ub zb%%|OEh%YtVPWCBckgcBzWe_Dds|yue}Dg7yLNGKaD4di;q2M7oSd9(ZEfeyo#W!- zDlILQk&)5U(<>`0^Y=ffudhFQ_UyH5*FJgjL`dj$Mn=Zv%a^OFsuUF!H*P%C)6*j; z_{P=Mb;E`YuCB*2Gc&JTxgsDSP+eWUY13g76B9Q#w~ZS&3JMBt+O&yb&;!MvEQ|~c zY79CcmxAJif&F@eni{7Be_MM;XBWS{Y*P~_XaD3WQzu)oPo6k!&NOM$S(BPHjpoiZ zRp_6s#;aquY!08xszn=?Nr`OPwn4aW!qzzs?q-s6toU|KHrF;{FjQjEw-uiwZF90; zQQ6JHNlV4abJ>dhQ;lU*+0k{{Pe|02YlE!t$9{PMkFYy8Qj_BC9oYh0 zG7MW3_Bb90;rN)4J6hRmO@ZWfeq%eg|qG`0g!_GoTnuI(;3g1BN0ui;a zut}kiVCM_?4j}2o1yVJC*MnBB`2cYAxs?tL)K4#V){n?K(M;tH14 z8*Rcd%wRohM>Sy&a1Y1XIKED;u83>I!+dn3KByNRw2HuhXLwwV7rLpB3&TKY6wFN$ zC$cPO224i0sSwM-CO%E$4Cy<^alr;YV+kMdsN}ldmW~Tv;Um^?AKyx@E1lsszF-yy z*ufs2;s^eg^FkMqxG)Obk*dVDR59M-JMLn?9M+2yv_^ryGGq(y(8WI~yY`r1rwjUDz<1b?GJ8@X*en9Ca1%c(1Pe0^_=B$%f=%h+5B)v8uMo?@p&3>j zaWVDbVoKok`Ek9a%fuHofe&TpmxD)`!|j^DGwGKG{sXpbR6O712C)DD002ovPDHLk FV1o6N%|-wK literal 0 HcmV?d00001 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/product.gif b/gui-js/apps/minsky-web/src/assets/images/icons/product.gif deleted file mode 100644 index 5db71e6961603859c5514bf978df82b06b8484ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 388 zcmZ?wbhEHblw*)!xXQrb;BfNg%a^ZSy|T7G?d9cFUcSAdVf*XXudS@k6cp@u^X5%g z*N*P)9dF;hH8($(n7I4atvg9cyKmpV`{BcffPes9U0nwU2Y>&ALPD>fK7G1z;~`^X zV?n_;t{`yi*|TSxHXV+PjAWo0Q2fcl$iN`XpaZf2SPd=S^npU$Gm7GNk*sct9RKC^UCYbx$xb@LGgz(SF99ANvNbW zuP~D+Q>=hYYe;)%cW-Q3W!U7dp5&aFZ5?x_#RzgQn6zkW^0F1dvscH?cdqi6m+fR1 zV^5y3rL=Ftx&z@YhmSawPdwpYboz|&=KU8^(~lpCPrTw35yimv;NhdkPuRpO92u+u D3Gs)7 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/product.png b/gui-js/apps/minsky-web/src/assets/images/icons/product.png new file mode 100644 index 0000000000000000000000000000000000000000..e9f054942a6af3fa0c7c87eb27f0673c561cef6c GIT binary patch literal 322 zcmeAS@N?(olHy`uVBq!ia0vp^GC(ZF!3HFkgxGWfDYhhUcNd2LAh=-f^2tDv@18D> zAs(GauWI|TI0`g8T%X7)W~}|unS*V+Mw6?OpbSIrQy&Q(742!vXRJiJ6z4SLNEzDx z4&X`Z^3s|rbhY00a%WB7%)+OwTN*g^y3e^c&3(Yp{pfkS-|M&QvYs#!{66+v6Xm`LVIxd2lPQN%H-U!>^|Qc3{nAhdbv`f0a!klaVbLG5U_g{Qpd+Rezp_Q^#?bW99l-r~kU(Px?I!O|>u&h(%CZlZj@pT#El*>&dU76%@B95A=}dX8VQ#ggGD S_XJP~F?hQAxvXgwt^I5;~y%eA$&cXzj3TwKS; z$AEyhfPjGO>+2^cCptRJaB#SRfr0Go?23xGi;K8AIy$ALrMI`Y7Z(?Tf`aYs?Kd~h zrlzK0VY}Me+y({)Vq&}Q?(QloDqvt>+uPmm@9zi*2;Sb_@bK`LmzSxjsVyxn3JMBj zWMm5q3r|nM3=9k~Fff~&n?gcD4Gj(B_tV!va-Vf00000 z00000A^8LW001ZeEC2ui03HAs000KIKoknGff$d-q!O|N355v6b4smFbB1Zu%C&lM zT4{Iu#F3s`GWo$ni`Cr@#SI@%oX~f@ntRZ>Hv=#>7hN7Ye^n(34k|M-8eL|2TmUW{ zC^9BBU2K$A7A7YsDVtp&6Q5NKHVr5vA`+*mLwZw!G6F0aW1h8EAq5pHG%c=@XTMbh z7!h!XiBkX{m}-5|PX`|gaCg{yPjcVjD89<%QD#g)0-@PRfaSQv5jJs!dwfpWKR}V8J_mJ<4rp5Z#S zae_rWC-fHRr({TUc8d+1W0cUF&jNhMo;c0~g%&chQC;t_5HC$qhSz9Ic87ADsla(O zlf!wGix0n6U|kMFEAH8-Cg5Lw#BU;W2xk=m+sgdLz%Ev>RuS+8cjMw03_?Ebelgf9 P00000NkvXXu0mjfd*+=l literal 0 HcmV?d00001 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/runmode.gif b/gui-js/apps/minsky-web/src/assets/images/icons/runmode.gif deleted file mode 100644 index c40d0cbe82e6aef3049b87bdd883e4c5ffb814a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 139 zcmZ?wbhEHb6lIWNn8*MEAt52FR;~K~|G(l-7DfgJW(FOQC`g`xDP~T--~oZAq^vED znk%G|whC1C9jSFc7W3pmW6mz6d)CK{j_laR@?P=rWSx?OoEt5)=QW&iUT4YZ;JtOi pE0MiH+DE3X`DD{6XEbrzH$l@d*$v7vuQg%{R5okQ_u^u(1_1FtGyebp diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/runningProduct.gif b/gui-js/apps/minsky-web/src/assets/images/icons/runningProduct.gif deleted file mode 100644 index d0fcfa9a4be27b266f313e9b8598d80824aa5d24..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 408 zcmZ?wbhEHblw*)!xXQrb;BfNg%a^&ixvyTmvbH|$<>gggzC9);rlDbbLqo&s*RQRt z&J+~vc=P5>SJ#g2?j3L6zBM;LmzcQw)~!29NxR>@dzX-qaQpV%_wV0pYik!57k~Kh zAs`??S66q&j2R9N4*vcJ)6&u^Dk|p8nX_))Iw7IgPoF;Bxbcv&v9X}w8&?oG_UzfS zO`8sH+_>@i^XHL~kqo2&#h)yU3=Gl?Iv`CTKQXXvJ#hAzK%zwdi6xUZF5+lqJ6!Cw z*3Z8s^UA5MeqK?T<$rWy=S3S;UUcfd8hi3Eue|k~3)>A2X#Pm#O;P7A30Bh(kY<); zbP|mb)@=1}@9b7);$qi}NvjN*+SS7($te+&Grz54k-nIQ)bcP9zExA!bjv9TD5}J4 z+2*vcn>lNxbCtA?RwtJ{SJu1}rLhwyUkPcxe#5`~_8sY>`*)6Ceh_@=*>mam#Me#{ TQ4AbkzJB}ugF~Uhk--`O$#|uw diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/runningProduct.png b/gui-js/apps/minsky-web/src/assets/images/icons/runningProduct.png new file mode 100644 index 0000000000000000000000000000000000000000..2e40dc8735ec13e60db1b0a8dfcc77dd522086d1 GIT binary patch literal 387 zcmV-}0et?6P)m1fk9E|hg7a} z+!e%ks{-e-j3=qYrQTHqxQA;`jLR6{xSMJtrJda0nH#K002ovPDHLkV1lH+r2hZ_ literal 0 HcmV?d00001 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/runningSum.gif b/gui-js/apps/minsky-web/src/assets/images/icons/runningSum.gif deleted file mode 100644 index 1eae8af5d33ffe448fe02f4bde027521aad82644..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 401 zcmZ?wbhEHblw*)!xXQp#TU+bkaPr2D8?RoyvbH|$<>gggzC9);=J@gB4Gr5TO`2q7 zb*7+TM_1R5?(Q8{R#rYfK5yT?H8($}sj2Df>zkOk`_`>HNlClky?b~2_TBgI-`m>S zu2`|c-{1ekhY$Df-!CmKeemExdwaWsgTupz5B>cQmY0_s7#O6brCq#uk(ZZu-MV$5 zp`k)TuQzTyWNd6KDEMZ>h7GQ+$2M&`%s>QC{K>+|z#zw<15yj}69d~ihyLRVi4y%M zmP}II&C$wsxY%p0Uu;X}l~Y@zqM|a(|Kz03i#Dn>bnd=-x9c#ky!o69+t~wNlsgsZ zahLdOi!l33u&X4C8MOFwX-GK<^2?{BRfb3@D9NemYpJs)=gbZ<6p)acHX~V_cZENP za>Lr`DH}J-F-dEd`Y(5`(h;s@l_{Ndg-TMz8IaMnh8LR;|3ZLKr diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/runningSum.png b/gui-js/apps/minsky-web/src/assets/images/icons/runningSum.png new file mode 100644 index 0000000000000000000000000000000000000000..7c5520c486aff62cc2e53eb8562e4eac39ceb8f8 GIT binary patch literal 421 zcmV;W0b2fvP)8+aHvpTa3-CgWvy2!z>DB|TKQ*@+L>(RY{Ov*8u` zms-e20R#5%1)Br;1N_1~E^$5~xQTq+#YfyIhWlB3#BKyMu#WZwu%5>K(hbz{Bf|bi zIhvy!E@3-DAF+a4#c%Ck@rA(JC}0K0xW`G%&Es1HzEGixjI2Ej*fB8S-$1$I(`O9I~Fq8mH|6Ut3vyEhn2 P00000NkvXXu0mjf`PH|B literal 0 HcmV?d00001 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/shape.gif b/gui-js/apps/minsky-web/src/assets/images/icons/shape.gif deleted file mode 100644 index 0825a8ee0827368c8a9bcad15fbafa2ce03475ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 677 zcmZ?wbhEHblw*)!c*ekxot^#S#f$#_{)Gz{dU$v^IGj9s^r*0~@Pr8y7A;y79UXn+ z#tk(!wTTlaT3eqkFW=tKu>I!En+**O>gwuNR%a|NEei^EELpPT)~#EOjg4>Kyy@!N z(cQhn%F1f#(xn9j1-EbCe*5;Vx%s&%Q>OU(`tI1VBR)PpF>&{;TX&L@b{7^FN=QgF zH#fg~_s+(~X8H2v2?+_eZ{L0Y{{6IR(`;>RSFBheB_-9`+WO(c2QDtI2M-?T>FEUp z1#xq8`}-f%*VmslYnGgxTxVyefq{XOlT%k$*PJbhaW23OZ(SFT*CuC9Le?3t31(xy#^dwYA`+}sWyK794+ zRY5_)=g*%nSg^p|-F?%hO_7n2M~)m}pf*ta$->CMV8NgRG8hym4DA0KEG+ny#M;_B zI=jR|G@F|E`THkNnL62@Z}P-xbEau{&zdxMalf}=|Li48L?Tx#S~XW)X5C~}Mw zigTpjOQ-f-(=;?nH1;l zCM+Rm#Ns-4%~K1PAYBd<-2iKDhZK&Ng{{F|yx&g9{9s~W<#Kg#8 F4FJ?K0ayS4 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/shape.png b/gui-js/apps/minsky-web/src/assets/images/icons/shape.png new file mode 100644 index 0000000000000000000000000000000000000000..a0c6d9b851d043bf4def639b1215de8e662f14d8 GIT binary patch literal 503 zcmV9nr#?_R<65&-Db(#YW)x%tiz@i_&VWuS@*pRAh6WGlG z58xq=Ws(%QkNGix!#P#~?_e5VGf4v0@D!6Zz-&u9IENS5sY&z_N8~%f7!^+7H*VlP z-r+lz|2emvF10t$EBXk8nNh$)IDyR+PvJ6d;#Nw2I_+)aGtTCLNNpVje4Jo!QoM-) zK8R-Oh%=kU79QXUj@AHsRlsXFF7LimSQ1;mjH~!k1H|YVe#55(t^RKfP&=-x9QJ6(RF{rBWUb=Oa5uV{X z&f^Mx<$mX-wtJC-b2lAoXd=FOX~t{vUoJ0?$_Y-MFt zP*7lQeoj+U)7RHGF>&{;TX&L@cE5Y~Zu#=%2?+_eZ{L0Y{=KcO?TQsET3cH`eE48z zXUE0GrKhL2diCm*l$7)5&zF^z`THO2?CgB}`0<=Mb3#Ky4;(na$H%9jpdcjlIwK>4 zpP#>~s!CB&apT5A^XAPH6nwK`!v2Pmvub`lyva)htU!S|X zdt_wfkt0VK1{qNN$->CMpv|BIau+C07}#$%XlwJxinO(NbasijC^a?l@bpifGIg>8 z_vDGw=1fzxo;7Li;(lwj{@F{G2zjhnv}&$`kbxOmMCZ4OogW^GY9PYq>9y~RorFSHH$ z9tp5BsD{b>OyIw-5U4XlAi`;pW0RUzn8m|{bypAO*!LXZ*l@6+NkmyKV?)`iBwfGb zEpykf_&h!3xjkl|h>G{KGsQpCxOPn|ezrWoNi#;Z5)fzB|D==6C0LGTh A%m4rY diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/sin.png b/gui-js/apps/minsky-web/src/assets/images/icons/sin.png new file mode 100644 index 0000000000000000000000000000000000000000..04732e911b505171d033a19e9421962ba7d3035d GIT binary patch literal 396 zcmV;70dxL|P)a%i^1kS z*p#dkB@2eDsJmIN3`UEN;oN&Ie_ZlEgI}FaPd%M)zvnsUIT>LZQ;O9Y*(G#hwz19& zf{kMcmyI~=#8s5S4B@mHbrc6`sftQMU{;TNC?x`dI}Mj9fukvbtvU^jDDjZ zm-Gr-c>5*rONV_p#w)Hdf@$oF4p(rGTfAWPdtO#YAe8ceizs0b7g);4>Bbz^u#T?p zp|Pxaz$%8Zha+s{qN1{S^JWK!lP_PsT(oGBr>EzZEnAKqJ9gv7jfoQ{T3eqk zFW-Lr`0>2FyoQGDlO|2FvN}^xuw&b{ZExPZ>FV0i-MvFYLu2XEr9M7B+qZAOefxG( zQq)YH>*aB%SVKd7&-UtV7R=+UFj&d%AhXYb#?zoMeT+1dHPfdiG5 zl|n+VH*P%C)6*j;_$E9&+|~8ircH-8ZrqramF4d4&MvVg1&rb^=>=&vV#+VCu4+Q-xWX`%Mjm=dL-f&90|zCZr@TtD_^yV5L7t zQRI?2DEF# diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/sinh.png b/gui-js/apps/minsky-web/src/assets/images/icons/sinh.png new file mode 100644 index 0000000000000000000000000000000000000000..e78f848adcb755e7afb18d5abb8648e574973ffe GIT binary patch literal 386 zcmV-|0e$|7P)m@!zl#1%+l+qTh*5BQ)L$A3!1+okmM^BGGGn z1(iZnv?MFhD0eGrp+Kb)S1~ilW_Bsem3Weqn{!U_&vVYb$xR3|m{zSWNUorUg*=)S z!6q<{t2__8SyZJkM>sFCzUn|9Y9WmXOzyKY)FS~wTkbL@un`mZvB!Tq(%24@djvxL zC%`pql+^dS)VryTv{urX#SZ#$h+z!nfEhgF5qDU{GH$Srw;sS2(lUn=c)~ueJ9@`h z!Mto8M_9rl2EK8K@*Q5{08`jP@}*ZeC~B{IyZWjWt+J7hVG}Pnm5uf{)aV90$)lIX zzsWlkMv;&_#CnIR?9xPg_>I`WKXKTO4UFY5jAm!@5DECXKeBHkOcS;%0#3^JR{)zB g#7ITJTbvciJ6ZTaPqS!sUH||907*qoM6N<$f|2&3bN~PV literal 0 HcmV?d00001 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/size.gif b/gui-js/apps/minsky-web/src/assets/images/icons/size.gif deleted file mode 100644 index 113d40b90718ba38cd03ddade7fe3499c13abe3f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 394 zcmZ?wbhEHblw*)!xXQqgot^#S#f$#_eg}t>M~@zzFk!-t8#mO{)Fw`xXl;GEynK5@ z!*+Fbbt|hgmX?+U1v_rty4Bd&*wwY8yL*R~mDSRvOA87L%+1gF`ufJl$0sK4zIE$P zQqt~s@7^UOB;3Az*Vfi{#flZJt*swEeBk2Z($mxP_dhsm)+{+WxjA#@95`@*kB?7C z=yg?9)zha>H*P#MZ{9pX!8fk1$F5wtQe9oWY13grLBRzJ7Pz~+Z`!meGBT0@6)65> zVPs%XX3zl%gZ#w6w*0_FkHSic{u4_+DL&?C2(P^NoD1c9e`Q_x9%oo@tYV?9+n}6Q>11i9rO6{8TAkCQ%&H)3pvtCR zEh99YK~C93f=O_}BIhIvC1ooyN%N_>Yn|8?W%)QnSgN~sgfMF8l}a~F?+mXyea5N0 l{(@7{VJOJRvX}$1}7N0l`S=G9|E+5;*JQzb)xfhZlIo3qEmKotKRf z2(3j9w{VUtTw@c*<=wg(AzuXizyxpD6D!fgP6c4G3^-3m=vM$@wV`QZw*o6ik!nhb zi$525haSH1j01dCV}&*{vPolwSNCPCqg))CWQ*TP4g3>_qtw7u4nsSh*(4G0w|~TM tB6JBiH33hR{hI;@*v5WMz;`@MlOJIeHxONT1h)VH002ovPDHLkV1n}Zh2{VN literal 0 HcmV?d00001 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/slice.gif b/gui-js/apps/minsky-web/src/assets/images/icons/slice.gif deleted file mode 100644 index 594f324ccb09b72cecbf84da2f1b01aaf681243d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 413 zcmZ?wbhEHblw*)!xXQrb;BfNg%a;=-OgMJz*u;qwt*uXQ-MY2Be0xkxOkQ4IL&Nsh zuU}hPow2mEEGXFV=FOX~t{vUoJC-h8`u6QxbMtdkrc6mp+;N-o3kh z`>wXO_J!(kj zZrpfCQ1Feb>#@wt%uSmPGmrulf3h$#Fvv3KfHZ;p#K5-efZub6LW%wpOD;V;#nIY+ zxY%p0Uu0|Ml~Y^eLZULu|Ageui=KEgL@`>@V2g-})Q+{&I`%kkzb`MN>LlP7P+VFr z+t4Jd!&6<`+3h5*JE5b#F*V(}y-rb`TUJ{`(@CFKc(PMLTg?n14t`liIW{LIPN~(h zk^<`{&g|K{fA0Faygh4=9XvV9Deb_Fb3Ich$V;#sa_Xz@jA^-dKeY1EJ`DQZ04z|^+JF+e;Vy`%znqZsQ zK(~m)Nj!Ba>=JHA(L#NoU-ghD1ZMqshh`!mcv56p1~%}HZyZ+)Y!h8t)&dT2RUz=V zk5!j+1#e=dCN;C9b*Z)tXDI6<5Spnnq$q1jU~gXFq4>JBB0j;r=XiGX8=GB(XN;ix9ymZElyQ>Pl;CdAN06G{%v;HU@JOBUy07*qoM6N<$f=()?TmS$7 literal 0 HcmV?d00001 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/sqrt.gif b/gui-js/apps/minsky-web/src/assets/images/icons/sqrt.gif deleted file mode 100644 index 2333a9585c138f35b1569bfc7b5eeabcbcf9105c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 388 zcmZ?wbhEHblw*)!xXQrr;>8OU6_w4KH#<0-R8>{Awmw~6zWw;|;|&elMMXs$8XDBq z)vc_~6cp^}>e|uWy~Eu6+>RYP;^X5J6L;Ubbtfrl_wCzv-@kvKn3#Cx%$e5K)(;;( zJbd`j-~S*F4^L-j=l=csySlnULqnfDc_JkAdgI1Jf`V^cU5{@kK+iT)EyHWjYoXk|NG?6uab`pSp2(7_eLdM*v-_~7$c%qAJfzvlU5lct{_v8(;LRls9Ye* zHzh<|OR;p;oM1_o8Iy9It0XwJh2*PyRs}OCad9utYHfFtlG{*PyGL43b7xlh;cEY) kQ>UdTFFx4<0^x{Decc!jZum04s@)#sB~S diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/sqrt.png b/gui-js/apps/minsky-web/src/assets/images/icons/sqrt.png new file mode 100644 index 0000000000000000000000000000000000000000..6da757b0503758092acbe80e871181b86996e185 GIT binary patch literal 370 zcmV-&0ge8NP)7k(MAC)|4zl)K61IsA zw6k%zN?Tb8`-IkLv{W86P6v&MVA4lqFuB^(KU_B-{-pA-mTFEha?~iY-8FOM+ znDh|{)kP{?$C}yI{Fg2oi-4E-%qHeZXAy82hd9oOjWh2a?qGmk0jq(|H1HOEY~ciV z_$~m}XMyLq#u<)qpWg~KBqW1rd-#PLyx4 Qy8r+H07*qoM6N<$g7ny%X8-^I literal 0 HcmV?d00001 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/stdDev.gif b/gui-js/apps/minsky-web/src/assets/images/icons/stdDev.gif deleted file mode 100644 index ac1446ab93af3ff049eb501b9c00e1adba830dbb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 387 zcmZ?wbhEHblw*)!xXJ(m{r&xBW@Zi!CxwNDCrp?S9UcAZ)hlc3(_UU)<>lKO8n%my zioSmR+RExoLBWn&w{D4viFI}D=`|hq? zyEr&FK79BP5D*X)6jWALCMzrJ?|;zA$tf)@?eXKs>FMc}m6cDPJP{Ily?*`rjT;XM z3chi5J+^7n;j34#y1ToB-9;3k_>+Z^fkBQz2c#P0CkD0!4*l+dl@k3YmVA16h@+M3 zXtCE?zsQcvE2p-`g+yhR{|U*R7j1O&qf__Q*waUN<-O-zDBpXk=)(6n-TE*_K?VjU z$=I~Y7%3JRR!+_2oZc{1HaQU<_GAg6>7nu(a@tC~^A|c-1uGgFsHkV>u89#~l2uSk z>Dks0D&Dl{fPZcCQK#|~CyUM;op$8pzWpcV;uEhqMMN=k-+%D%(PM7q3P%QO0MUt* ADF6Tf diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/stdDev.png b/gui-js/apps/minsky-web/src/assets/images/icons/stdDev.png new file mode 100644 index 0000000000000000000000000000000000000000..e690ada8271e0a4a4567180c75bbff256f695798 GIT binary patch literal 359 zcmV-t0hs=YP)D6`Zd9J zu!TX@hnrY+DI5`AX5C7Cpt*)9GXjfoJVP@R5R6nQa{}8rf%857+mZe%;VN$Ng((8= zma`V)_T!ydXg!DWJfgfb;z7ti8&?s0(41phD<_-(O*6>-Gt3I4fpS@m#; zZJgs1ZwdYq!;~F9;sLMtz=e2$mQ_0yIK@>}i3%+g6q8)8h%XfFTfPl9;I?QlzxQdFni;K87H_l;U zyV}~^Vq&{-adCr#gWKEP@9*!-%*^oc@J~;{K|w)xcX#9C<>j%l!VwYd zMMcK4vcmuX00000A^8LW000sIEC2ui03HAs000G)pd<~6VV-EJ8XO~v!|={@J!`@o z)0gc_3ye-StNeVJ$7?6aI2;rQ;7BWUmPClf(y(NxGX(-mGlFLa7mWCdoNop4+qc-r z=eFb;@3Zd96@h|+J`4wcMT3fkha+r!Gk%VcHF}ejFLigA8gYo2X>wXyUUOn{PES&E dl9!kgmaddRL$4AzIspW`yuH4^1QTi@06W8Wd>#M* diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/subtract.png b/gui-js/apps/minsky-web/src/assets/images/icons/subtract.png new file mode 100644 index 0000000000000000000000000000000000000000..e08c352bd7e6e9355bffd9e20614e4dd29f2cd39 GIT binary patch literal 387 zcmV-}0et?6P)y?cLm-R)Ecb9Xyo*13q*6=bv3ge|20|!@C+_%u~7)_+ArmaBR-vVB9OF(X9z#V@K?6D!3-%m_OeMgoR55|VMO2vb?p#JY!BIw^0O1lxtR zDJB(wDP9)=H*sEAtNJ~4aK8vR!F7eh7Xf3{FtoEd8Ak%nJCu1!yM(KTfQPb&`w!U1 h26h?(e&BKD`~tXZJ?YoUq)7k(002ovPDHLkV1n(mraJ%t literal 0 HcmV?d00001 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/sum.gif b/gui-js/apps/minsky-web/src/assets/images/icons/sum.gif deleted file mode 100644 index 3e893be49d352623033d8521731543cd9bf492d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 382 zcmZ?wbhEHblw*)!xXQp#TU+bkaPr2D8?RoyvbH|$<>gggzWw;|;|&elCrz4UWp$>Y zU`JQij_&RqK0ZF?=I1muHGO@36BBpex^*WhY4^K#?{43|`~LlVTU*-|D^~dX`+xZG zp|rI0!Gj0w?d=W@4*vcJ)6&u|Uc9(&-MY}wP$8k$8#f*j6nwK`!v++%v7~6?B92zJ!^K`}{d`+8ubkTI=M|M%{zoTr zUbIoy8a2U=o@Skta%$b7F$Ch?=PcecHcB>e+1Y5%j zMpYgzVzi~OL%6H6x%NO)jZtO<7O!y(-Aq6*QMt?s?BxVb>zMsWI|++BxWeMExfdMa zI}zB(;TIn9j6DqSkqD|(ydn^~sYiM#x;d#fa3bAZtqIChV8AIhu-_0=Yup3~pLh@( zeep+Vqgy&aALpXurYbQ`1#aRPhoaMMEH?!9Fiw3I*LcTGHMfcb@p&XDETN!yO96iQ z)$RYNQoJm9{)Gz{Iyjs>di3b^>(_;ag(pmy;OXfZ9UXn_ z*sgxk08zJLE-TU*=T-~Zmddmlc0(9zMcv$G2b2)KX$zP-IY7Z=y+)vNdJ-J6n< za{l~zZf@?fvNC`FgN}}lJUl#)9zE*p?7VpK;^W7Uot>RSLqiW7IFO#6e(BOBK0dz6 z%E~8Co+v0N2noG*adFAW$l&MaS5#EoxbaX=PmiGBn++Q_xVj$8%*?!U<%)oSfRd8Z zrcH-8ZrphI@L@qg!RODPD=RDa_4RGqwCTu^BMj67ia%Kx85oQibU;Re;)H?ye}l2H zu&PvBdq-!NRHSB8ldy3A`q2 zuvo5d!uqZH9xnZ%l3TX+dq($bgddU(N>uZ7bux1HiMP~t;&b!ip1f>lQ-nX8y-d8n zL_&;JVwx4Nb+F&$HTR9V*=<;jIV|*<4Z@sOym-jm)X6tFsA7fr;`UYpPl+uv1QVL4 z2^yc8kTI!Y(xEET6A}`KojiFAOmti}ZdB=D;u6!iD6PW9EvjcD*O76}m0_xKj1mI} zW78z_SxfRbR$kzoxxvr+P{&J_H!lsmwy%k+Rq=j(P11N`-P^LRhd2Be9{YEyrRzZJ S_5zN_r{-2Oa;$S;um%9KI|)+& diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/supIndex.png b/gui-js/apps/minsky-web/src/assets/images/icons/supIndex.png new file mode 100644 index 0000000000000000000000000000000000000000..1599ffb5c58a4c1141c7793308fb060a35ffb1ef GIT binary patch literal 486 zcmV@P)ugK~zYIz12T!R6!Jm@!yR>EEQxI0}?D!xT}>GLjFKBl^?)bh+<(W zqMfPiQlv{`Ym+7f#5REhLJCc@0mYPpyC7PM5XWL>H&O1*29i5343`-W=eh5knKK1p z3X|&92E{gvVlIu%nqW6Ej_ouL3vtw?aF?*&pN-T98mNPIMqts6-_Xbe1bdRpoWNF2 z;Gm9m0q ci;W%p1%BgKi`PCa-v9sr07*qoM6N<$f`SXu*Z=?k literal 0 HcmV?d00001 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/supremum.gif b/gui-js/apps/minsky-web/src/assets/images/icons/supremum.gif deleted file mode 100644 index 3fb7e8666b47ef4732b2d6dba85411ab1c1c6d89..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 662 zcmZ?wbhEHblw*)!c*ej`TU-0$#f$#_{)Gz{Iyjs>di3b^>(_;ag@duL-~vwZpTgoK3K zx9rAvH#d?KPi!d5I=HCI(`-G;@oeG}Gio$4pCW%s;*{W3n0Dz46shE5*g z7MhOy)0XXQ3iM>NlMeS3j|j1hjI-opoVwfII%JC20NX2p~Q4>UtP1y#Ro|V-CW8B8_ulQu;iGa0+-Ih?u@mZQ)LAlBvvae z;1tvnl=885Et=A+AYwIB;939VKAkA5ufJG(F6l0El|Sh;E9BUTS-z}+uV;P6AW4k-hpTt1f3K!ry=a#3A$V4fnk{0m-oBx`_8Da6lImbMwP(Z zI{vpQ?HS=PzTr21ViNDLo9yS%!4s_D1V^~QT0SppBM@qNz$Mf$iv8rYmj*G5xA=sS z0=q*r^MEak<1@bELm%K7&hb6LCkpIZMZkT$5>vH_jXuDx29WhL8p_#Q#|x~YE;iq7 zG3p7-|KoT}tn)0c@T-8;#C9HV6IG*c{7QjUMHuRF z&N>wV@9M{0rvED1Oz)vpWO!&Ajw{-HV%8$0*|W-w9X4;9t|00000NkvXXu0mjf D@e0oA literal 0 HcmV?d00001 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/switch.gif b/gui-js/apps/minsky-web/src/assets/images/icons/switch.gif deleted file mode 100644 index fedf47ab8b498cdfdbca60f4864c26aba78966c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 639 zcmZ?wbhEHblw*)!c*Xz%LPA2dwY4u^y!g++uzB<5!<#oBJ$f`JCue6)j=8xx6BE;` zSFipsF?o4;ojZPAR*+4+sc27!V*WEqzj2+TPxN&z?P8TwD(xJb3uv!E^@) zZf@>}4<9-@ItB*^U$}6gyuAF;qepUbas~zlAt531^73=$%t=pA=i}p3P*9jVcdmrOBp0I${g~{>l~I9IPVEbGqf^ zy0^4;I4Ub@?Ob}Gx#I}8syh49Wk%gcI*!@v+A;|-Pde1Jd+&ZDV+RQ?O;bx3`Bo!G zO9!6j4V#({*@+3dT3Jge8ZJAsXWx!9JsJycJWx2$%Xdz|@ke;q;Z`nAMhB0C2X~E9 ze{cDz;ajeoLja Wwp>wL7_0%DC%jGo diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/switch.png b/gui-js/apps/minsky-web/src/assets/images/icons/switch.png new file mode 100644 index 0000000000000000000000000000000000000000..b4416b1065d47e6f421f390ce2572d6c4bb8116f GIT binary patch literal 533 zcmV+w0_y#VP)X1^@s6RQmj^00006VoOIv0RI60 z0RN!9r;`8x0m?~4K~zYI#n!)TQ&AKL@K4%o3ev@01sy~Y1Q$g!h>MF3uKg3@=$g$% z+}*^{)q-F}f<{r?6www6MNk}UBe;krJcoCiUSD(bUSC@Cg~KI}^W&RyzVF;eJ**%r z*r%Ggz+BC^M-`v#J6d*jt9 zSeQ0h*<4$}Quq?in-hGx!6u??G-X6qgVl{6p@}st$>;oB-tHJ(bQ1B$BSPbliraxX z97P+;_=bmARBi5M9jT0>Miy`**brYsp;LIj7X_;l8Ha;-g%{|B^DTbuCy_p$+Sbh0 z+i(Tva2dC8Mt;e?4CJ0+BT=I*?{rFoBdp+#T-`-t9peRe02gp86!;+*{XMz9jzsbC zeY7c|!A6Q*lqfz^XyPo+<6<~}20NXI8RB*LBTLh)_!tAc!ChR#VO*7WsS=u5VUIK> z%y1XT@DcBDJ$hc$V1Go!_8w`YpGA&kbE}9A+z&Z>Qnz$QmaxGZpC7QCak3_fj*8oL zuQW0>Chn1AVUH~G;eQZW6<#6q8dH90)h5#5M2Sz!E^g5=vE3?;^EC@p#k!oxdYR*2 X(;ho)YPo4 zPcL4)xV(IOL&Nr)H*cz|t6N!}v9z=-DA=)W+qPS`Zgq9-=y}o?;a#dB;#*K&O&6_7E_-4a~4X&=ou3WiNU0uCt)8YB^=WpD&QBY8@ zrl!W!)YRSGJu)(qVK4#3pDc_F3_3sv1fV!!V87p>qr)pD+}7UF*(L0z(A31s+dp~A z)X7fVlP6A_GfmEZ)}*ozPF>zlCNn`i5E!7WVzihKLz zTn@0a%3CvV7`eI|`rA3qUAD7{Q%TFrz(L*L+sD>MVD6e5I*gX0`~fN)rfeF@&c<^U z#9oRRaq7!3nY~~LXkwkj`{N6*&{CE|%<8@x3JX4_uySiip4%Fwv4WLJ)_Dfcfrn0x zU4lXe5!Od1MyMtqi22o}8GJ!^mTBt4DV=(;zK+*xuKf{twOqkx7KcT|sVyrnFXzj9 Jz{SE~4FGH*%=`cV diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/tan.png b/gui-js/apps/minsky-web/src/assets/images/icons/tan.png new file mode 100644 index 0000000000000000000000000000000000000000..9c1aca794567e7784eef565a1e767aa28619edb1 GIT binary patch literal 410 zcmV;L0cHM)P)?pFb}MW=7^sp5ynstov7bnzNXDR1H+ z<qN38@-@keDW(S9pIXOAP!os<^xi@aym^g8wg@uK+_385R z?Rj~54Gr60zkWSw(j+UZGnST?1qD0aym`~rwWGUxhlYm6(xpqcZ{L3V_U)#ornhh3 znwy`~)YME&+U2le&!9UUEmgM%MEdQ?$S@%ZuMuC6X;XJ;Xy*DfwD z2M-?1$jI2Z@sP2xv7q1^SJz{kHXZKm?VUe={>F_PBO)RWA3j`DQ{(RL&M>%v;!hSv z1_mt#9gs6Yal*iUxj{>dTSlm@y`!^B$Vs88iJQBB@|3BQ?YSmToHl2gy!EU}a~Jnp zEBDV{vP8gn#iCVnvVg1&r_5xdW&vV>=VCu4+O~MYkbIc5c=d3xdWzNdz zVP)efE~~9A!C))!=%MW7+F}-QYsD{n6$C&h(@h|n(mXuaff|Y?U;IL$(m`3l1(8i fA3gS&Jm2YJNTcWF1~!LgE?KWFjXW`p3=Gx)Y6i{| diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/tanh.png b/gui-js/apps/minsky-web/src/assets/images/icons/tanh.png new file mode 100644 index 0000000000000000000000000000000000000000..700dc3d854d2527764d6d9ef1b9f0828b585144b GIT binary patch literal 415 zcmV;Q0bu@#P)=u#-Sofy5lQ=9Hb`j zwbn1ZE%VB$tx*9{ndN_6GUr7bMKU^fuhzWo65F_Ar{V>VzXeYBgMlV-vZiQrm4`|w zsWN4W>2!tgN%CenrPYV&s|n7K%b6W2E6uY&oPTkMypW9kjFqc{wbWUvvlclwEC`*o zdvDCd$p^zbHy?GXJ#td6^vua!2hOIZpEw$yc*Q9qikaiV!$*&waH!NdGFSrueAtyw diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/time.png b/gui-js/apps/minsky-web/src/assets/images/icons/time.png new file mode 100644 index 0000000000000000000000000000000000000000..096bbe511df36b4dbc56236d51546668bfa08ac8 GIT binary patch literal 334 zcmV-U0kQsxP)vD(AXrK+a{`Mlz&+fh*hiZ_wgv9vHpM>bRMKs{U>C3Y zx$NZd6X*EA3EsQ&!U~Z%&NVcovgQOs&)qs)r`qTUz7>{)@w9ZeT8laZ<;y&IJ7JAN4m8ro@|pfM-(w8sHo| gI2Z`{hFO#R05r@r$>-RR-2eap07*qoM6N<$f{{dz{r~^~ literal 0 HcmV?d00001 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/userFunction.gif b/gui-js/apps/minsky-web/src/assets/images/icons/userFunction.gif deleted file mode 100644 index fd28bb7a2b35894de6e3e7feb6d8d0b9a99ebaf8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1177 zcmZ?wbhEHblw*)!_|Cv^?bVydswrtrF9UUzq zBJ%3hD>XH>ii+)3RoidgyeTRw+R)JO`t@sdb#+Ti%Oy*e6cz0#DcP}Y+qV4t{5Nmj zXlQ6mo;*1&F7Ed2+i%~#_4V}?6kL7k)TxAo-GzmP@7}%B($dLk`^r3bN1}n`}gk$1_mZ4CofvG_rZe)GBPrOfd?EM98ywJ&YwRoD=XX4 z(Gd`EaMr9@j*gCN)~pd0esS{Th2Y@eQ>QMZrlwxFaDj)1r@XxU(W6H`K8NJwYJZXu!9nwmEEfD@A7J$3xA1mdk23I&50%An9(^r?~RS zBUfX|_%#zX1r7*{W)_sZ5PG(#Tcy!JD#GyLLU$RxmKKdoj9jc7lHDd78VeglmK#gn znbFM5r?5%6(&FHXr|dTb1-V=-E;llC*jMa%a3h(WwNI?nAgO>s?6{1waEwi&l0iVL zowoo-&0+S(J!-8p6$&RFJ*UuEaG_wuBc}yytPX!Yo#ATrY=cNGVsd_%SSTHqXD$BzEAy#D@piWDJ#Xx`}i4!9waQ5O~W~zGLBWk6cU9!vf75 zj7)seKRz(JsctZt6z=Cbv0cV?$CXP#M|n+-$u!AmB>7oesxnFDuJI7^u{r56$2(JdGHxlC0892l$t9}8q} diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/userFunction.png b/gui-js/apps/minsky-web/src/assets/images/icons/userFunction.png new file mode 100644 index 0000000000000000000000000000000000000000..1ce4d4ab3c051e76a8d7b5dd4f6637d7d14e2b53 GIT binary patch literal 1035 zcmV+m1oZofP)Ff@E3D2$4v{2oVRqzmge?0}*C6W@V})OEAo~#79|c^*Ffhw|)Bb?aKQ0 zt@@wzz3$KJe_z-2zwf6dviotO{|9zZS`H<$cC5iSW9rh#(S(O6O-gpwPIh`SN?3_i zIAbil8yT|QWRsz;*n`(_CO)sVTU9^@S{Y2Ngr(Rh$c;Dj5t~rx$Z%`T-Kidij94vj z0uHU>dQ)@1zcfN(N8?5Oj(h&ayv2A9%?G(}5%ogRFHd$~#1vHVpP+=N@HUP`V`{$y zpI{%hVPRq3e6*)I)x?G9L^D|<*&k#L4uV)CzQ{4{&brG3KX;Ken;C$@GU)Y0(MLKN8&AH9y<2U`a^dO#1YtBl2 zJ-9=V-h=&ktl;zwsl5wVV2()tKXGpwQ-^oamWaJUwxmd`Jm~J+;!E+9xY>z({t<^H zdrI1PMsCiv*dZczBz7B^ninK;Gn2DB(>_Ji<3l`<>_(C9D|2J&@DA=u#8#8F6~&_o z)3GVnc8;ixo@CF))|@?4oMLB%Ir~L=_Tv3q|9ZTPC-6LO5@J+DZ(8S65$$C-ssgde z;_yfUQY3a-BKK*s%c=9RNWZ+Dr7>q0h}Wet8`GG%*dj!wj0{hUC_j#uDv&B;i^z(J zxKpU`-dz7g@rZ9f5V2|a72hShLA*dV4PnFa_%;zIRPQXTOZF*3II`TFS)!iS;u^FZ zfY?@X_uYt}@noU@JaK57^NmGfbwXvPB!^dtJL`+of08(%Ex9?{)8fa8lz0ShVS|Wp zV{)jB*?1MV2|?%2DtOB2tC7ZDqM14IC!YX~8h#TJRYzO7;X%pBoIk zeu&7e5NThCV&w~Zv@qB3Z^}9YQ}9Yro2w1}3R#Hd29p}{NmVcE;X3hp7-z_)lXWn- z7<+{@FUAM8cB={~D`LgZmbF6N_EqTnuVbnqh?Q_Lo~gA*RYG6H)JQyPgzP=Cd5q1! z21XNo5i85+qEM7^jV9Dn+C>n1Q+yN68B4FKguV~ezX8bS2i6~F@H+qi002ovPDHLk FV1gxj?+gF{ literal 0 HcmV?d00001 diff --git a/gui-js/apps/minsky-web/src/assets/images/icons/zero.gif b/gui-js/apps/minsky-web/src/assets/images/icons/zero.gif deleted file mode 100644 index 1b0e5861d8ecba0517a921f5c0f6705b68ed8513..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 414 zcmV;P0b%|}Nk%w1VIBY&0M!5h=;-LPv$H@z$$ox*kdTn->gpyYCXtbmJ3Gs@wY7J5 zw}61R6%`edl9D<)%y4kH?Ck7{inxo5xCI3T+uPgi?d>-=&dSQlVPU)4+S~>P24Z5n z?(Xi}+ua8T2Xb<9@9*!HmX-(z2=MUmV`F1=b#;e_hpVfrPfx*9Q&Z5;(20qOt*xyM z4GoHlimtA%($dlr66>$8ud%Vh5fSV~MMbc%uti125D*aN=H{}p!vFvP0000000000 z00000A^8LW001KZEC2ui03HAs000KNz|lxyc^Hq#r1Ejw2!#s8b4smFXNYOk%C%-< zT4{IujCGz{GTEU+i>s9nt~CI4F%mb|g$oTtDqRsyP;XNZ1|=gD9xPom4tiB88Zsj= z9yVPWG?G*=8i4^C7h`6HRt+rxBLp}(V{E8Z1PlcuDK&Oo8xgZq2@?k-zAV%3$nMZ6xJ8udXx>7kVo41;2i%}gNZD_iCSmr}rhW4z%ByNTe>Jyr!b zaDW}0;0%)qVDc|r#RKkejyWtOfXNMK@PV&#hw18G7$6dxDUT*3eEVDaXjKK@6^$B- zwv3xrO)mw!#|qZ5hasL5K@`KgN^WtAE4*SKpNUor7wRA0qr{igNAnkK9)U2-HQHK= zN0V)qF69RQrC~oen5$u&FZM9Z1di{I@uX=J4{HL~l=n9RJD9?3P2eLgM~83gkV3Jc S1;Y9O0000 {return this.$callMethod('allocValue');} async atHCIndex(a1: number): Promise {return this.$callMethod('atHCIndex',a1);} async begin(): Promise {return this.$callMethod('begin');} + async cancel(a1: boolean): Promise {return this.$callMethod('cancel',a1);} async detailedText(...args: string[]): Promise {return this.$callMethod('detailedText',...args);} async end(): Promise {return this.$callMethod('end');} async exportAsCSV(a1: string,a2: string): Promise {return this.$callMethod('exportAsCSV',a1,a2);} @@ -2394,6 +2395,7 @@ export class civita__ITensor extends CppClass { super(prefix); } async atHCIndex(a1: number): Promise {return this.$callMethod('atHCIndex',a1);} + async cancel(a1: boolean): Promise {return this.$callMethod('cancel',a1);} async hypercube(...args: any[]): Promise {return this.$callMethod('hypercube',...args);} async imposeDimensions(a1: Container>): Promise {return this.$callMethod('imposeDimensions',a1);} async index(): Promise {return this.$callMethod('index');} @@ -2423,6 +2425,7 @@ export class civita__TensorVal extends CppClass { async allocVal(): Promise {return this.$callMethod('allocVal');} async atHCIndex(a1: number): Promise {return this.$callMethod('atHCIndex',a1);} async begin(): Promise {return this.$callMethod('begin');} + async cancel(a1: boolean): Promise {return this.$callMethod('cancel',a1);} async end(): Promise {return this.$callMethod('end');} async hypercube(...args: any[]): Promise {return this.$callMethod('hypercube',...args);} async imposeDimensions(a1: Container>): Promise {return this.$callMethod('imposeDimensions',a1);} diff --git a/gui-js/libs/ui-components/src/lib/wiring/available-operations/available-operations.component.html b/gui-js/libs/ui-components/src/lib/wiring/available-operations/available-operations.component.html index 177c33ee0..52de9999f 100644 --- a/gui-js/libs/ui-components/src/lib/wiring/available-operations/available-operations.component.html +++ b/gui-js/libs/ui-components/src/lib/wiring/available-operations/available-operations.component.html @@ -1,7 +1,7 @@