diff --git a/dfa/benchmark.org b/dfa/benchmark.org
index 0449f7f1742bdf4b0124ecce8c3ab8a8272ffca2..650148c5b25f0572cbfa41a69a877a37c272dba3 100644
--- a/dfa/benchmark.org
+++ b/dfa/benchmark.org
@@ -128,6 +128,38 @@ done
*** And running them
+#+begin_src sh :hlines yes :colnames '("N" "M" "i" "States" "Edges" "I" "Q" "Qs1" "Opts" "t (s)" "sdt" "tp (s)" "sdtp" "ta (s)" "sdta" "ti (s)" "sdti" "tr (s)" "sdtr" "tv (s)" "sdtv" "Qv")
+for n in 100000 110000 120000 130000 140000 150000 160000 170000 180000 190000 200000 210000 220000 230000 240000 250000 260000 270000 280000 290000 300000; do
+ python bench.py run ../../copar/bin/copar ../../valmari_cpp/mdpmin $n 1 --stddev --nofunctrans
+done
+#+end_src
+
+#+RESULTS:
+| N | M | i | States | Edges | I | Q | Qs1 | Opts | t (s) | sdt | tp (s) | sdtp | ta (s) | sdta | ti (s) | sdti | tr (s) | sdtr | tv (s) | sdtv | Qv |
+|--------+---+----+--------+--------+---+--------+--------+-------+--------------------+---------------------+--------------------+----------------------+--------------------+---------------------+---------------------+-----------------------+--------------------+---------------------+---------------------+-----------------------+--------|
+| 100000 | 1 | 10 | 100000 | 100000 | 2 | 65489 | 65489 | 8071 | 3.9017160891999993 | 0.05725542243446023 | 1.7041072878999999 | 0.007666172923625777 | 1.9023876757 | 0.06490987848505304 | 0.2628267297 | 0.003272320490714361 | 1.5989905591 | 0.0658406983383148 | 0.13759999169999998 | 0.0065012827508490615 | 65489 |
+| 110000 | 1 | 10 | 110000 | 110000 | 2 | 72513 | 72513 | 9297 | 4.313956430299999 | 0.0763833477465056 | 1.949160167 | 0.009027583663742882 | 2.1389264483 | 0.08096080778904134 | 0.30003091430000006 | 0.00510612940724545 | 1.7878511580999998 | 0.08900092769490782 | 0.1531381338 | 0.006417484978214387 | 72513 |
+| 120000 | 1 | 10 | 120000 | 120000 | 2 | 78444 | 78444 | 9790 | 4.8029536083 | 0.11912637839624582 | 2.1499455626999997 | 0.015364837081170035 | 2.3896450291 | 0.12655058491231658 | 0.3351564949 | 0.005116840454431979 | 1.9936482227999999 | 0.12438977802181102 | 0.1976445005 | 0.06662102777240582 | 78444 |
+| 130000 | 1 | 10 | 130000 | 130000 | 2 | 85315 | 85315 | 10567 | 5.2303333725000005 | 0.14216674785304523 | 2.3350624718999997 | 0.015434810994377981 | 2.5886367938 | 0.1231368250495237 | 0.3720805978 | 0.004435277321512478 | 2.1608228643000005 | 0.12243514299040262 | 0.20366009489999998 | 0.009002729886375587 | 85315 |
+| 140000 | 1 | 10 | 140000 | 140000 | 2 | 91961 | 91961 | 11636 | 5.7241506135 | 0.18089497938779125 | 2.5227946168999997 | 0.04041226205771596 | 2.8734782348 | 0.19157855600495133 | 0.37903946050000004 | 0.0055335089050379035 | 2.4276934805000003 | 0.194103518528028 | 0.2238437406 | 0.009396875043746323 | 91961 |
+| 150000 | 1 | 10 | 150000 | 150000 | 2 | 98627 | 98627 | 11706 | 6.187801929800001 | 0.14064425090177476 | 2.6582514965 | 0.009003423452304189 | 3.1697628569000003 | 0.13611337872223803 | 0.2999485256 | 0.004355764391675269 | 2.6839304120999996 | 0.1374033748576153 | 0.2515853332 | 0.014174216184394798 | 98627 |
+| 160000 | 1 | 10 | 160000 | 160000 | 2 | 104809 | 104809 | 12764 | 6.7382136996 | 0.15245636348209132 | 2.8366039933 | 0.015161039687297094 | 3.3935111766000006 | 0.15093821038539926 | 0.46547556329999995 | 0.006831967314617837 | 2.8632204123999996 | 0.1490646566678644 | 0.2813251122 | 0.011347243669986634 | 104809 |
+| 170000 | 1 | 10 | 170000 | 170000 | 2 | 111232 | 111232 | 14138 | 7.2908625285 | 0.10604295432427215 | 3.09530805 | 0.03603531460563363 | 3.7597713653 | 0.12118258888916565 | 0.5004929244 | 0.006790266960715258 | 3.1806287245999996 | 0.10781123989114733 | 0.3073801929 | 0.013086131717466363 | 111232 |
+| 180000 | 1 | 10 | 180000 | 180000 | 2 | 118197 | 118197 | 14269 | 7.7940563974 | 0.2543156188997473 | 3.2715667038 | 0.009360892657020248 | 4.092677974399999 | 0.2619800187273766 | 0.525093342 | 0.007190986044884863 | 3.4845772176000005 | 0.2651429743565608 | 0.3501228732 | 0.016837178135142662 | 118197 |
+| 190000 | 1 | 10 | 190000 | 190000 | 2 | 123893 | 123893 | 14728 | 8.269414321400001 | 0.19220873052742554 | 3.4378605475 | 0.020742001772012533 | 4.3756709237 | 0.1867233205842528 | 0.5445772935000001 | 0.02997447405159672 | 3.7418600049 | 0.16409710010971268 | 0.3724915993 | 0.016211865333268422 | 123893 |
+| 200000 | 1 | 10 | 200000 | 200000 | 2 | 131252 | 131252 | 16562 | 8.7204120381 | 0.260072753804474 | 3.6344360476 | 0.016315930797572084 | 4.6021848058999995 | 0.24376077112686112 | 0.5754112171 | 0.00753933981008275 | 3.9305835423 | 0.2554540636025266 | 0.4100586315 | 0.018201735614278045 | 131252 |
+| 210000 | 1 | 10 | 210000 | 210000 | 2 | 137501 | 137501 | 17008 | 9.2838852824 | 0.2636020019857964 | 3.8083384965000002 | 0.00953027592476456 | 4.9315308102 | 0.24319350760405056 | 0.5869515222999999 | 0.005476529581826432 | 4.2464882237 | 0.24324445568951442 | 0.441084476 | 0.023085429113395166 | 137501 |
+| 220000 | 1 | 10 | 220000 | 220000 | 2 | 144061 | 144061 | 17847 | 9.770356903799998 | 0.3423008046584935 | 4.0041314226 | 0.01303346631043801 | 5.2126720673 | 0.3285456949555346 | 0.6358050346999999 | 0.003022973889400297 | 4.469972052800001 | 0.3372079781421167 | 0.466137511 | 0.02001933439908453 | 144061 |
+| 230000 | 1 | 10 | 230000 | 230000 | 2 | 150310 | 150310 | 17731 | 10.437322718299999 | 0.22941617352716984 | 4.2013492154 | 0.05899131321541619 | 5.627988751199999 | 0.2635210887153482 | 0.6455574729 | 0.007678134687488006 | 4.868182401100001 | 0.25893084670217076 | 0.5156026173 | 0.022520583055545204 | 150310 |
+| 240000 | 1 | 10 | 240000 | 240000 | 2 | 157139 | 157139 | 18612 | 11.053093357799998 | 0.33411355973433937 | 4.3785478234 | 0.025313675755905325 | 6.043547060300001 | 0.3334691533111559 | 0.6885990058 | 0.004772154958912903 | 5.235913457100001 | 0.3284099648007952 | 0.5510596194 | 0.024897984793143372 | 157139 |
+| 250000 | 1 | 10 | 250000 | 250000 | 2 | 164155 | 164155 | 20499 | 11.5662374633 | 0.2625704687079291 | 4.5883679078 | 0.014908850614635781 | 6.3090031014 | 0.25471836122993463 | 0.7311154823999999 | 0.00533183466125695 | 5.459369843300001 | 0.2558493631410093 | 0.6040049302 | 0.009586109716559724 | 164155 |
+| 260000 | 1 | 10 | 260000 | 260000 | 2 | 170681 | 170681 | 20415 | 11.6456015015 | 0.511989377271459 | 4.7059698737 | 0.12513626926548418 | 6.2599540109 | 0.4130910662631789 | 0.6555105109 | 0.10337670349981325 | 5.4029216802 | 0.3887658337407677 | 0.6083744114 | 0.034852307242699845 | 170681 |
+| 270000 | 1 | 10 | 270000 | 270000 | 2 | 177419 | 177419 | 22189 | 12.120666825499999 | 0.3737239336482957 | 4.8034746198 | 0.01835509221979868 | 6.633201435299999 | 0.35387444814978264 | 0.7363434314 | 0.0031265120905228346 | 5.767584987699999 | 0.34512662981485487 | 0.6364424622 | 0.027411122932964365 | 177419 |
+| 280000 | 1 | 10 | 280000 | 280000 | 2 | 183598 | 183598 | 23254 | 12.940827799400001 | 0.3948481113814338 | 4.965828097099999 | 0.02554346533283756 | 7.025901951100001 | 0.37191392383248734 | 0.8191934889999999 | 0.007455230101518104 | 6.0883975169 | 0.3627755680944626 | 0.6621498792 | 0.033948444495518634 | 183598 |
+| 290000 | 1 | 10 | 290000 | 290000 | 2 | 190044 | 190044 | 22976 | 13.3304674734 | 0.36445051870292144 | 5.1312368327 | 0.013064971257863454 | 7.2310452817 | 0.36289207727580786 | 0.8502582112999999 | 0.0037351564859896816 | 6.2581376613 | 0.3563549113115732 | 0.7004045213 | 0.024056932759703036 | 190044 |
+| 300000 | 1 | 10 | 300000 | 300000 | 2 | 197133 | 197133 | 23844 | 14.146797660499999 | 0.31595827791135156 | 5.2838587488 | 0.018411110755737675 | 7.897829865599999 | 0.3353595236408498 | 0.8807967731999999 | 0.002439527016899235 | 6.8851801584 | 0.34025879458180663 | 0.7427352719 | 0.030209104626308197 | 197133 |
+
+
#+begin_src sh :hlines yes :colnames '("N" "M" "i" "States" "Edges" "I" "Q" "Qs1" "Opts" "t (s)" "sdt" "tp (s)" "sdtp" "ta (s)" "sdta" "ti (s)" "sdti" "tr (s)" "sdtr" "tv (s)" "sdtv" "Qv")
for n in 100000 110000 120000 130000 140000 150000 160000 170000 180000 190000 200000 210000 220000 230000 240000 250000 260000 270000 280000 290000 300000; do
python bench.py run ../../copar/bin/copar ../../valmari_cpp/mdpmin $n 1 --stddev
@@ -136,29 +168,29 @@ done
#+NAME: results1
#+RESULTS:
-| N | M | i | States | Edges | I | Q | Qs1 | Opts | t (s) | sdt | tp (s) | sdtp | ta (s) | sdta | ti (s) | sdti | tr (s) | sdtr | tv (s) | sdtv | Qv |
-|--------+---+----+--------+--------+---+--------+--------+-------+--------------------+---------------------+--------------------+----------------------+--------------------+---------------------+--------------------+----------------------+--------------------+---------------------+---------------------+----------------------+--------|
-| 100000 | 1 | 10 | 100000 | 100000 | 2 | 65407 | 65407 | 8066 | 4.5290850337 | 0.11864934189220436 | 1.2670609352 | 0.008980379315232729 | 2.8846108683000002 | 0.10597994596851053 | 0.523533524 | 0.012535445952974214 | 2.3008021567999997 | 0.1055769208893637 | 0.13519612100000003 | 0.013846578756400505 | 65407 |
-| 110000 | 1 | 10 | 110000 | 110000 | 2 | 72036 | 72036 | 8623 | 5.0699149869 | 0.07183568383526712 | 1.550735742 | 0.012781696128692933 | 3.2605090468 | 0.07796323372066957 | 0.5889638794 | 0.010617361192314432 | 2.5968446309 | 0.06931852161488808 | 0.1568809575 | 0.00901868889061136 | 72036 |
-| 120000 | 1 | 10 | 120000 | 120000 | 2 | 78722 | 78722 | 10038 | 5.6652413574 | 0.20637898857877984 | 1.523577259 | 0.0084005891907344 | 3.6769752172 | 0.20220102182563818 | 0.6413489954 | 0.01061210230379197 | 2.9675998923 | 0.20755563430437704 | 0.1708820727 | 0.006333066836038465 | 78722 |
-| 130000 | 1 | 10 | 130000 | 130000 | 2 | 84540 | 84540 | 10711 | 6.155189409099999 | 0.2498730904358588 | 1.6801251087 | 0.011079371947232368 | 3.9624965937 | 0.24717276999830637 | 0.7186280466 | 0.01787129650816384 | 3.1551785867999995 | 0.25247397197890625 | 0.1844166179 | 0.006399117434715656 | 84540 |
-| 140000 | 1 | 10 | 140000 | 140000 | 2 | 91314 | 91314 | 11292 | 6.8928926471 | 0.3869763935650305 | 2.0056164452 | 0.024803607728986293 | 4.5533410205000004 | 0.38060859032445055 | 0.7760390503 | 0.020530754890119275 | 3.6849088641 | 0.3603464592212336 | 0.22152070480000002 | 0.011713410540611872 | 91314 |
-| 150000 | 1 | 10 | 150000 | 150000 | 2 | 98130 | 98130 | 12103 | 7.1892871133 | 0.26882752258808607 | 2.0664406011999996 | 0.018577575378630386 | 4.761524056200001 | 0.27522281997278325 | 1.0023196130999998 | 0.0168395383007438 | 3.6536833853 | 0.26955296888379165 | 0.24513165289999997 | 0.0098519607601366 | 98130 |
-| 160000 | 1 | 10 | 160000 | 160000 | 2 | 104667 | 104667 | 13301 | 7.7042121983000005 | 0.3368186877504424 | 2.1893636440999997 | 0.016775070908835853 | 5.1237405769 | 0.3259827229869275 | 0.9438437005999999 | 0.013052837572290204 | 4.065045275399999 | 0.3293773664450977 | 0.26880464979999996 | 0.010019774112164618 | 104667 |
-| 170000 | 1 | 10 | 170000 | 170000 | 2 | 111441 | 111441 | 13610 | 8.523356352999999 | 0.22551547496172486 | 2.2702832193 | 0.015462354590002336 | 5.527408397299999 | 0.21641631918257642 | 0.9606208465 | 0.014418824957385735 | 4.4693703110000005 | 0.21927683619903873 | 0.3066240502 | 0.011562740597278725 | 111441 |
-| 180000 | 1 | 10 | 180000 | 180000 | 2 | 117527 | 117527 | 13716 | 9.0342931981 | 0.30171583923750933 | 2.508549816 | 0.14337287438998608 | 5.965023520499999 | 0.2990616866838848 | 1.0055327957 | 0.03247895472066015 | 4.841517208299999 | 0.2741765672999685 | 0.3435794639 | 0.02234378875361103 | 117527 |
-| 190000 | 1 | 10 | 190000 | 190000 | 2 | 125139 | 125139 | 15821 | 10.0954592225 | 0.3085596430961634 | 2.754129648 | 0.017515158610812293 | 6.876505441499999 | 0.31830539193676316 | 1.0902934869999998 | 0.011161747915795436 | 5.6548687162 | 0.31358564770564884 | 0.3690856953 | 0.014175738685518798 | 125139 |
-| 200000 | 1 | 10 | 200000 | 200000 | 2 | 130918 | 130918 | 15986 | 10.4757496425 | 0.22533439540768077 | 2.9252740033999993 | 0.02415745502875049 | 7.0661489696 | 0.23829972487490086 | 1.1495982269999998 | 0.023579909192671944 | 5.7629047678 | 0.2231899416219809 | 0.4043948325000001 | 0.01765757044883643 | 130918 |
-| 210000 | 1 | 10 | 210000 | 210000 | 2 | 137411 | 137411 | 16862 | 11.2745130532 | 0.24223686396523397 | 3.0470118383 | 0.04214982428360531 | 7.6967156052000005 | 0.22455158375302342 | 1.2213759546 | 0.0423074851512136 | 6.3267563017 | 0.2348502350646554 | 0.45049089979999996 | 0.020270958542198007 | 137411 |
-| 220000 | 1 | 10 | 220000 | 220000 | 2 | 144548 | 144548 | 18010 | 11.6568367058 | 0.37507557316666945 | 3.1978298028 | 0.015785463131040848 | 7.905704345100001 | 0.3892413697998992 | 1.2761892973 | 0.01205896715850773 | 6.4696442804 | 0.4029621478464203 | 0.4754177706999999 | 0.01785750755479795 | 144548 |
-| 230000 | 1 | 10 | 230000 | 230000 | 2 | 151039 | 151039 | 18722 | 12.332978446999999 | 0.45949278720338216 | 3.3296963674999995 | 0.01931156495026591 | 8.3912996697 | 0.4554112922834242 | 1.3118217757 | 0.02529730289936623 | 6.9276620626 | 0.4562822937482532 | 0.503946619 | 0.01707564691121278 | 151039 |
-| 240000 | 1 | 10 | 240000 | 240000 | 2 | 156612 | 156612 | 19180 | 12.885918998800003 | 0.46077805653697573 | 3.5158021212 | 0.03533533475267622 | 8.745929537 | 0.47164831525537076 | 1.3837022755000001 | 0.024756923385713905 | 7.1968549207 | 0.4967341049962083 | 0.5362665576000001 | 0.019188094888293705 | 156612 |
-| 250000 | 1 | 10 | 250000 | 250000 | 2 | 163138 | 163138 | 20345 | 13.754044441100001 | 0.5900368494068087 | 3.6878678812999994 | 0.02561377686830973 | 9.4097558968 | 0.5916504156293916 | 1.442515364 | 0.035527587392385866 | 7.7940542921 | 0.5961807595021335 | 0.5768693020999999 | 0.02478708703422776 | 163138 |
-| 260000 | 1 | 10 | 260000 | 260000 | 2 | 169815 | 169815 | 20812 | 14.318762113 | 0.43641933794007054 | 3.7940942547 | 0.02219417756155604 | 9.843946485 | 0.4319134695294516 | 1.5023389576 | 0.02639470246730954 | 8.1595752043 | 0.4695835501093594 | 0.6256955605 | 0.019737146399913738 | 169815 |
-| 270000 | 1 | 10 | 270000 | 270000 | 2 | 177075 | 177075 | 21866 | 15.132494756700002 | 0.4692937308602713 | 3.9927350449000003 | 0.06157568499841667 | 10.4383791474 | 0.43073889658118064 | 1.5723795329 | 0.028845182692196804 | 8.6743628688 | 0.42903404302592746 | 0.6545056504 | 0.025625836629098682 | 177075 |
-| 280000 | 1 | 10 | 280000 | 280000 | 2 | 183454 | 183454 | 20874 | 15.149952985999999 | 0.6248524708978799 | 4.041756857699999 | 0.029096827314996253 | 10.3739228112 | 0.6305485372230583 | 1.9820843660999998 | 0.01832347864488208 | 8.1631790438 | 0.6481129465916208 | 0.6787503918 | 0.030115951119949136 | 183454 |
-| 290000 | 1 | 10 | 290000 | 290000 | 2 | 189403 | 189403 | 23451 | 15.909151233500001 | 0.4952063500620966 | 4.167462127399999 | 0.0801315481312222 | 10.9693956524 | 0.4722572332137746 | 1.9568616338000002 | 0.034775908835633834 | 8.8057878826 | 0.4463810026376683 | 0.7275396431000001 | 0.051833540165174545 | 189403 |
-| 300000 | 1 | 10 | 300000 | 300000 | 2 | 196856 | 196856 | 23274 | 16.2512560443 | 0.6518491559101164 | 4.2287443279 | 0.04452343591811638 | 11.1972012534 | 0.6098903858382411 | 1.6720893186999999 | 0.02512268266760566 | 9.2872437867 | 0.592680455018582 | 0.7656593273 | 0.03068347134425448 | 196856 |
+| N | M | i | States | Edges | I | Q | Qs1 | Opts | t (s) | sdt | tp (s) | sdtp | ta (s) | sdta | ti (s) | sdti | tr (s) | sdtr | tv (s) | sdtv | Qv |
+|--------+---+----+--------+--------+---+--------+--------+-------+--------------------+---------------------+--------------------+-----------------------+--------------------+----------------------+---------------------+-----------------------+--------------------+---------------------+---------------------+-----------------------+--------|
+| 100000 | 1 | 10 | 100000 | 100000 | 2 | 65489 | 65489 | 8071 | 3.1723742583 | 0.06415135633353668 | 1.0352353053 | 0.008941562892079086 | 1.9350310748 | 0.059410960798478435 | 0.32343377709999993 | 0.006503732380012458 | 1.4825559133 | 0.06182975711003514 | 0.13457228840000002 | 0.0061834340026262645 | 65489 |
+| 110000 | 1 | 10 | 110000 | 110000 | 2 | 72513 | 72513 | 9297 | 3.6060606505000004 | 0.07120835312896302 | 1.1337366444 | 0.0066497616379870466 | 2.1326008449 | 0.06899518842479228 | 0.37291921390000005 | 0.009062006583398122 | 1.7116194235999997 | 0.07486105411993155 | 0.1531423643 | 0.009425071171266949 | 72513 |
+| 120000 | 1 | 10 | 120000 | 120000 | 2 | 78444 | 78444 | 9790 | 3.9819581869000005 | 0.08295924676715061 | 1.2491448927 | 0.008382980979176068 | 2.3497672478 | 0.08960022035531837 | 0.4194873646 | 0.008112127594262736 | 1.8800125135999999 | 0.09098119072406534 | 0.1770516467 | 0.007224653623244186 | 78444 |
+| 130000 | 1 | 10 | 130000 | 130000 | 2 | 85315 | 85315 | 10567 | 4.4078494884 | 0.11759337156384515 | 1.3737832236999998 | 0.009853487052357706 | 2.5904541815999997 | 0.12985226650810058 | 0.4653538676 | 0.009431514691067346 | 2.0676565862000005 | 0.12518907212331976 | 0.1988111277 | 0.004361050542692717 | 85315 |
+| 140000 | 1 | 10 | 140000 | 140000 | 2 | 91961 | 91961 | 11636 | 4.8345211587 | 0.18598447828239828 | 1.4702093769999998 | 0.00526703848044785 | 2.8969718773000004 | 0.18768478695801893 | 0.522174264 | 0.046844514809917 | 2.3171949742000004 | 0.231287985327397 | 0.22347404060000003 | 0.01314437739599008 | 91961 |
+| 150000 | 1 | 10 | 150000 | 150000 | 2 | 98627 | 98627 | 11706 | 5.1577071244 | 0.10743990008037858 | 1.6936769373 | 0.03179318810342249 | 3.1119092698 | 0.11610573189464778 | 0.5696047548000001 | 0.010090814422831586 | 2.4752281476 | 0.11124271004914135 | 0.24985176729999997 | 0.012456361594495972 | 98627 |
+| 160000 | 1 | 10 | 160000 | 160000 | 2 | 104809 | 104809 | 12764 | 5.4344598328 | 0.14671501495323758 | 1.7836474614 | 0.009964746328457117 | 3.2475654382999997 | 0.13978295339543426 | 0.5652916232 | 0.002392113968621664 | 2.609053951 | 0.1398729333907138 | 0.2762560884 | 0.006841057884760942 | 104809 |
+| 170000 | 1 | 10 | 170000 | 170000 | 2 | 111232 | 111232 | 14138 | 6.245343322000001 | 0.12009578467332085 | 1.8606334966999998 | 0.02741443041452057 | 3.7771725017 | 0.11137133528898206 | 0.6416360163999999 | 0.01595195544619899 | 3.0529216406 | 0.11120009895874813 | 0.3069283973 | 0.010424249298240946 | 111232 |
+| 180000 | 1 | 10 | 180000 | 180000 | 2 | 118197 | 118197 | 14269 | 6.6310759754 | 0.2253434734039179 | 1.9310191868 | 0.01289471358647633 | 4.0831294374 | 0.23827453971489956 | 0.6716207292 | 0.016394009117171423 | 3.3307862904000003 | 0.24442357796736197 | 0.3474492079 | 0.013999878438761125 | 118197 |
+| 190000 | 1 | 10 | 190000 | 190000 | 2 | 123893 | 123893 | 14728 | 7.0231597877 | 0.09399855550806477 | 2.2149782845 | 0.013126799196048424 | 4.356570219499999 | 0.09521435695870631 | 0.7373797438 | 0.0575174924076721 | 3.5380053205000004 | 0.10378347745460388 | 0.37080809929999997 | 0.01290979756291998 | 123893 |
+| 200000 | 1 | 10 | 200000 | 200000 | 2 | 131252 | 131252 | 16562 | 7.522432313 | 0.2633420321550606 | 2.3628339816 | 0.039989943606690156 | 4.6675009988 | 0.2132461130121612 | 0.7622307122 | 0.009604337545853697 | 3.8178427712 | 0.21696400809832647 | 0.4085155762 | 0.017721784682142964 | 131252 |
+| 210000 | 1 | 10 | 210000 | 210000 | 2 | 137501 | 137501 | 17008 | 7.9078188707 | 0.22101361497446462 | 2.4432533651999995 | 0.015650174443881663 | 4.9470993974 | 0.22727214564348047 | 0.9518358890000002 | 0.015518576165034272 | 3.9050474077000006 | 0.22542975036092622 | 0.44033106270000005 | 0.01727193852812063 | 137501 |
+| 220000 | 1 | 10 | 220000 | 220000 | 2 | 144061 | 144061 | 17847 | 8.4310485219 | 0.2898905581083682 | 2.5987084524 | 0.009502650210868985 | 5.2729674842000005 | 0.27919121144959574 | 0.8455970423 | 0.01824497086380857 | 4.327157211800001 | 0.28910724973041124 | 0.46449658029999996 | 0.01736415985291904 | 144061 |
+| 230000 | 1 | 10 | 230000 | 230000 | 2 | 150310 | 150310 | 17731 | 8.6320747989 | 0.33668340920034806 | 2.6197801442000004 | 0.05256162205418141 | 5.4315238363 | 0.2747458205147567 | 0.9960376444 | 0.028735197336432615 | 4.336221116799999 | 0.25835249305193325 | 0.5015617587 | 0.021268906232720087 | 150310 |
+| 240000 | 1 | 10 | 240000 | 240000 | 2 | 157139 | 157139 | 18612 | 9.009050490400002 | 0.3128766363819569 | 2.7155297847 | 0.023178125088956805 | 5.700408186600001 | 0.2879543985300683 | 1.0367297358000003 | 0.013734694710037488 | 4.5622825022 | 0.2876871470532377 | 0.5279500610000001 | 0.02206413574130229 | 157139 |
+| 250000 | 1 | 10 | 250000 | 250000 | 2 | 164155 | 164155 | 20499 | 9.4270514669 | 0.23225929149256214 | 2.8463226528 | 0.01506100528301562 | 5.951184781199999 | 0.2039882530457369 | 0.9299208275999999 | 0.057306714844376085 | 4.9170371191 | 0.18694913347225156 | 0.5725323586 | 0.012914493862261942 | 164155 |
+| 260000 | 1 | 10 | 260000 | 260000 | 2 | 170681 | 170681 | 20415 | 9.6284610064 | 0.27863865455263176 | 2.9354543054 | 0.011552204060273432 | 6.042820605099999 | 0.26088610696446574 | 1.0819876318000001 | 0.013253391610787106 | 4.8494240756 | 0.2592568608766787 | 0.5946690359 | 0.03364498517483961 | 170681 |
+| 270000 | 1 | 10 | 270000 | 270000 | 2 | 177419 | 177419 | 22189 | 10.3441837675 | 0.34038473596017615 | 3.0790200003 | 0.04722014457879415 | 6.5974961401000005 | 0.30192774188595645 | 1.1574601788999999 | 0.014557294361249015 | 5.3245052121 | 0.30141106044101496 | 0.6368050635000001 | 0.028727929151588963 | 177419 |
+| 280000 | 1 | 10 | 280000 | 280000 | 2 | 183598 | 183598 | 23254 | 10.591835607099998 | 0.35271658898500896 | 3.1467475046 | 0.02026936342148749 | 6.7210618943 | 0.3420285354390056 | 1.0249986697 | 0.005550453719610728 | 5.566262730699999 | 0.3325643977911153 | 0.6547289464999999 | 0.034210139168846056 | 183598 |
+| 290000 | 1 | 10 | 290000 | 290000 | 2 | 190044 | 190044 | 22976 | 10.8875411057 | 0.3231777853754279 | 3.2379748348 | 0.015718810790019754 | 6.9012326078 | 0.3570489487250581 | 1.0157828841 | 0.0067663978067151525 | 5.745269477999999 | 0.34550046535345835 | 0.6994596174 | 0.020991553070787917 | 190044 |
+| 300000 | 1 | 10 | 300000 | 300000 | 2 | 197133 | 197133 | 23844 | 11.6383832293 | 0.32088026618713805 | 3.3229065135 | 0.028968215816625995 | 7.5626338512 | 0.2829614452296093 | 0.9824864115 | 0.13146291683857875 | 6.3761597855 | 0.2835986824686698 | 0.74688904 | 0.030483611878687856 | 197133 |
*** And plotting
@@ -283,19 +315,19 @@ done
#+NAME: results1000
#+RESULTS:
-| N | M | i | States | Edges | I | Q | Qs1 | Opts | t (s) | sdt | tp (s) | sdtp | ta (s) | sdta | ti (s) | sdti | tr (s) | sdtr | tv (s) | sdtv | Qv |
-|------+------+----+--------+---------+---+------+------+---------+--------------------+----------------------+--------------------+----------------------+--------------------+----------------------+--------------------+----------------------+--------------------+----------------------+--------------------+----------------------+------|
-| 1000 | 1000 | 10 | 1000 | 1000000 | 2 | 1000 | 1000 | 997982 | 3.8373502685 | 0.015174461605035437 | 2.591597764 | 0.011229863661889014 | 1.2383507346 | 0.01446480760961174 | 0.6805879814999999 | 0.006748705139624894 | 0.437933027 | 0.009702847011948413 | 1.0275997653 | 0.009598236769049855 | 1000 |
-| 1100 | 1000 | 10 | 1100 | 1100000 | 2 | 1100 | 1100 | 1098023 | 4.2488772817000005 | 0.014597428962825853 | 2.8854373218 | 0.01287427233205351 | 1.3554140886 | 0.013316219602529851 | 0.7402706919 | 0.009871760712839102 | 0.4840249214 | 0.008333387034428208 | 1.2341773828 | 0.03787678073030963 | 1100 |
-| 1200 | 1000 | 10 | 1200 | 1200000 | 2 | 1200 | 1200 | 1198029 | 4.7003579195 | 0.06043912521462979 | 3.1770414804 | 0.03492046539334856 | 1.5144855165 | 0.029175733944289142 | 0.8426676643000001 | 0.010309628927644036 | 0.5272317381 | 0.01767072094199627 | 1.3681574322999999 | 0.021352356045212795 | 1200 |
-| 1300 | 1000 | 10 | 1300 | 1300000 | 2 | 1300 | 1300 | 1298077 | 5.047983263100001 | 0.026235866470036548 | 3.4165345704000005 | 0.014952724838272216 | 1.6219715386 | 0.018588683403204846 | 0.894345218 | 0.005954801683208235 | 0.5740737382 | 0.012774833394273198 | 1.5105516776 | 0.01875255171451376 | 1300 |
-| 1400 | 1000 | 10 | 1400 | 1400000 | 2 | 1400 | 1400 | 1397981 | 5.4420710588 | 0.019479244975604118 | 3.6842437975 | 0.013772045958955325 | 1.7475144492999999 | 0.01698161977795819 | 0.9594110840000001 | 0.012025658284439288 | 0.6212422066000001 | 0.013711328055190151 | 1.673954349 | 0.04844443524519077 | 1400 |
-| 1500 | 1000 | 10 | 1500 | 1500000 | 2 | 1500 | 1500 | 1497965 | 5.7501329807 | 0.03300372020172173 | 3.9006478475 | 0.00896445103768186 | 1.8384681266 | 0.029743589138494307 | 0.5551366447 | 0.009422861490066983 | 0.6773496381 | 0.0179867049013637 | 1.8219204044999997 | 0.04113965598212629 | 1500 |
-| 1600 | 1000 | 10 | 1600 | 1600000 | 2 | 1600 | 1600 | 1597931 | 6.233105688 | 0.08442781712738621 | 4.6373873123 | 0.0736638759698983 | 1.5845296098000001 | 0.02105562044356532 | 0.6152367058 | 0.01009674257608139 | 0.7826417468 | 0.01400690365197414 | 1.9857847996999998 | 0.025817674467167807 | 1600 |
-| 1700 | 1000 | 10 | 1700 | 1700000 | 2 | 1700 | 1700 | 1697947 | 6.4833607778 | 0.02759210429685194 | 4.7724509752 | 0.018170955911063047 | 1.6987045537 | 0.01889963343670561 | 0.6598235231999999 | 0.008672052042638318 | 0.8377218786 | 0.012452195298795403 | 2.1310011673 | 0.01728888835056865 | 1700 |
-| 1800 | 1000 | 10 | 1800 | 1800000 | 2 | 1800 | 1800 | 1798014 | 7.165185035700001 | 0.15555325613184437 | 4.868843677099999 | 0.11801431952829236 | 2.283728702 | 0.052058076254413 | 1.4014062405 | 0.032682719429667655 | 0.6732153566 | 0.017237764011201143 | 2.2437645975000007 | 0.04814642770962363 | 1800 |
-| 1900 | 1000 | 10 | 1900 | 1900000 | 2 | 1900 | 1900 | 1898003 | 7.366963106899999 | 0.0964537551038128 | 4.9913588767 | 0.05162913665889563 | 2.3624150594999995 | 0.04574109167509933 | 1.3172412862999998 | 0.026571927478253713 | 0.8300384666999999 | 0.016260999392110023 | 2.3961336063000003 | 0.04929270958193103 | 1900 |
-| 2000 | 1000 | 10 | 2000 | 2000000 | 2 | 2000 | 2000 | 1997987 | 7.9337119501 | 0.09293537039411622 | 5.3036763395 | 0.040919086554786224 | 2.6155055513999996 | 0.0536666633139863 | 1.4459093808 | 0.031565687834274145 | 0.9271364202999999 | 0.018330227145030374 | 2.5739282419 | 0.026857297210558885 | 2000 |
+| N | M | i | States | Edges | I | Q | Qs1 | Opts | t (s) | sdt | tp (s) | sdtp | ta (s) | sdta | ti (s) | sdti | tr (s) | sdtr | tv (s) | sdtv | Qv |
+|------+------+----+--------+---------+---+------+------+---------+--------------------+-----------------------+--------------------+----------------------+--------------------+----------------------+---------------------+-----------------------+---------------------+-----------------------+--------------------+----------------------+------|
+| 1000 | 1000 | 10 | 1000 | 1000000 | 2 | 1000 | 1000 | 997998 | 3.4170901261000006 | 0.0067332911363214626 | 2.4400518157 | 0.012751085512302314 | 0.9700435225999999 | 0.00970206397709066 | 0.41540584669999997 | 0.00506517945359832 | 0.4819094799 | 0.0066852566220028985 | 1.0732738749 | 0.032397918884447534 | 1000 |
+| 1100 | 1000 | 10 | 1100 | 1100000 | 2 | 1100 | 1100 | 1097961 | 3.7839400801999994 | 0.02054243005075528 | 2.6923810361 | 0.01430132872516138 | 1.0838880011 | 0.012209366463486233 | 0.45925104040000003 | 0.006389879793225777 | 0.5437107408000001 | 0.007094074865848301 | 1.2343653796 | 0.046358644222388744 | 1100 |
+| 1200 | 1000 | 10 | 1200 | 1200000 | 2 | 1200 | 1200 | 1198002 | 3.9745562989 | 0.02849241548298448 | 2.719424793 | 0.01675680154232307 | 1.246594623 | 0.015534617230713086 | 0.49883183249999996 | 0.00924928186737593 | 0.4107449004 | 0.009692795378012436 | 1.3924885328 | 0.045409804321302843 | 1200 |
+| 1300 | 1000 | 10 | 1300 | 1300000 | 2 | 1300 | 1300 | 1297980 | 4.4492492853000005 | 0.019011021239560805 | 2.935811995 | 0.01336577945727504 | 1.4779213829 | 0.08254178277905756 | 0.5365245862000001 | 0.007709042658200236 | 0.6079340167 | 0.008997140674001144 | 1.4928702701999998 | 0.022580296655694658 | 1300 |
+| 1400 | 1000 | 10 | 1400 | 1400000 | 2 | 1400 | 1400 | 1397912 | 4.753583547100002 | 0.01964103887049429 | 3.4506703865999997 | 0.017531483434986516 | 1.2932429607999998 | 0.015339050721789663 | 0.5846364146 | 0.010854382347369648 | 0.6054716699 | 0.01145623639581948 | 1.6770205635 | 0.0292648210010643 | 1400 |
+| 1500 | 1000 | 10 | 1500 | 1500000 | 2 | 1500 | 1500 | 1497965 | 5.2460979974 | 0.06296848781374169 | 3.6766706373 | 0.06038250665653121 | 1.5588874043999998 | 0.01104492509639117 | 1.0406573998000002 | 0.010493977730771424 | 0.40563505910000003 | 0.006857974236933447 | 1.8193636309000003 | 0.04728729571439115 | 1500 |
+| 1600 | 1000 | 10 | 1600 | 1600000 | 2 | 1600 | 1600 | 1597977 | 5.5934895831 | 0.020471690649198758 | 3.8378448388 | 0.01405062980592564 | 1.7442780326999998 | 0.016801329216519365 | 1.1766017755000002 | 0.010817165560994954 | 0.44630750559999993 | 0.010926126526067979 | 1.9773537042999998 | 0.021751180636291764 | 1600 |
+| 1700 | 1000 | 10 | 1700 | 1700000 | 2 | 1700 | 1700 | 1697999 | 5.8844434041 | 0.025355074221741828 | 4.0209844924 | 0.01936016953688846 | 1.8514450776000004 | 0.01098843935670959 | 1.1342198513999997 | 0.0066834373252539206 | 0.5865765241 | 0.010631404738858001 | 2.1336306657 | 0.0248035664484013 | 1700 |
+| 1800 | 1000 | 10 | 1800 | 1800000 | 2 | 1800 | 1800 | 1797969 | 6.0798966787 | 0.03714316285262671 | 4.1842880729 | 0.016958763574648844 | 1.8828436436 | 0.03186802850868568 | 0.7512876949 | 0.012112711545569563 | 0.6483303171999999 | 0.020828759639626687 | 2.2825130664999995 | 0.03591125038883075 | 1800 |
+| 1900 | 1000 | 10 | 1900 | 1900000 | 2 | 1900 | 1900 | 1898012 | 6.310596887999999 | 0.09207001119016445 | 4.323571235299999 | 0.04513265558681511 | 1.9738281792999999 | 0.051358992309827774 | 0.7882479636 | 0.017551971166439598 | 0.6708881243 | 0.021509786422262756 | 2.4061289706 | 0.049279654362565456 | 1900 |
+| 2000 | 1000 | 10 | 2000 | 2000000 | 2 | 2000 | 2000 | 1997904 | 6.793026988199999 | 0.0405905959258501 | 4.606611127900001 | 0.018356435490485965 | 2.1718201212 | 0.02686927001218402 | 0.8559822423 | 0.012914019713495746 | 0.7510526754999999 | 0.01756542404255711 | 2.6220723597999998 | 0.05447934428571054 | 2000 |
#+CALL: plot(results1000, "results1000.png")
@@ -319,11 +351,11 @@ python bench.py run ../../copar/bin/copar ../../valmari_cpp/mdpmin 1000 1000 --i
#+end_src
#+RESULTS:
-| N | M | i | States | Edges | I | Q | Qs1 | Opts | t (s) | tp (s) | ta (s) | ti (s) | tr (s) | tv (s) | Qv |
-|------+------+---+--------+---------+---+------+------+--------+-------------+-------------+-------------+-------------+-------------+-------------+------|
-| 1000 | 1000 | 0 | 1000 | 1000000 | 2 | 1000 | 1000 | 997982 | 3.866906845 | 2.601089718 | 1.258417869 | 0.689461687 | 0.449069605 | 1.036311146 | 1000 |
-| 1000 | 1000 | 0 | 1000 | 1000000 | 2 | 1000 | 1000 | 997982 | 3.848351055 | 2.589219225 | 1.2517901 | 0.685918061 | 0.446261266 | 1.041243359 | 1000 |
-| 1000 | 1000 | 0 | 1000 | 1000000 | 2 | 1000 | 1000 | 997982 | 3.846534761 | 2.589810158 | 1.249553884 | 0.689444876 | 0.444917202 | 1.037644478 | 1000 |
+| N | M | i | States | Edges | I | Q | Qs1 | Opts | t (s) | tp (s) | ta (s) | ti (s) | tr (s) | tv (s) | Qv |
+|------+------+---+--------+---------+---+------+------+--------+-------------+-------------+-------------+------------+-------------+-------------+------|
+| 1000 | 1000 | 0 | 1000 | 1000000 | 2 | 1000 | 1000 | 997998 | 3.383607631 | 2.411237126 | 0.965339368 | 0.41912495 | 0.47268751 | 1.033199354 | 1000 |
+| 1000 | 1000 | 0 | 1000 | 1000000 | 2 | 1000 | 1000 | 997998 | 3.376645064 | 2.418911399 | 0.950839868 | 0.40786911 | 0.471998229 | 1.027284446 | 1000 |
+| 1000 | 1000 | 0 | 1000 | 1000000 | 2 | 1000 | 1000 | 997998 | 3.414375022 | 2.420305364 | 0.986983928 | 0.41751667 | 0.494874166 | 1.021144704 | 1000 |
**** Without any optimization
:PROPERTIES:
@@ -339,9 +371,9 @@ python bench.py run ../../copar/bin/copar ../../valmari_cpp/mdpmin 1000 1000 --i
#+RESULTS:
| N | M | i | States | Edges | I | Q | Qs1 | Opts | t (s) | tp (s) | ta (s) | ti (s) | tr (s) | tv (s) | Qv |
|------+------+---+--------+---------+---+------+------+------+--------------+-------------+--------------+-------------+--------------+-------------+------|
-| 1000 | 1000 | 0 | 2000 | 1001000 | 3 | 2000 | 1000 | 0 | 22.716993826 | 2.996486418 | 19.713233011 | 0.271277235 | 19.31749482 | 1.033514133 | 1000 |
-| 1000 | 1000 | 0 | 2000 | 1001000 | 3 | 2000 | 1000 | 0 | 22.693253807 | 2.995186053 | 19.690824379 | 0.269969309 | 19.296590895 | 1.030162095 | 1000 |
-| 1000 | 1000 | 0 | 2000 | 1001000 | 3 | 2000 | 1000 | 0 | 22.692318679 | 2.989628484 | 19.695377591 | 0.268973904 | 19.302224649 | 1.035794395 | 1000 |
+| 1000 | 1000 | 0 | 1000 | 1000000 | 2 | 1000 | 1000 | 0 | 22.870625628 | 3.26410958 | 19.599263489 | 0.384769247 | 19.137524603 | 1.038918053 | 1000 |
+| 1000 | 1000 | 0 | 1000 | 1000000 | 2 | 1000 | 1000 | 0 | 22.738491632 | 3.160893761 | 19.570250212 | 0.364611475 | 19.130150657 | 1.033282541 | 1000 |
+| 1000 | 1000 | 0 | 1000 | 1000000 | 2 | 1000 | 1000 | 0 | 22.679763636 | 3.160448145 | 19.511865875 | 0.354412205 | 19.082196797 | 1.036891031 | 1000 |
**** With just the functor rewrite
:PROPERTIES:
@@ -357,9 +389,9 @@ python bench.py run ../../copar/bin/copar ../../valmari_cpp/mdpmin 1000 1000 --i
#+RESULTS:
| N | M | i | States | Edges | I | Q | Qs1 | Opts | t (s) | tp (s) | ta (s) | ti (s) | tr (s) | tv (s) | Qv |
|------+------+---+--------+---------+---+------+------+------+--------------+-------------+--------------+-------------+--------------+-------------+------|
-| 1000 | 1000 | 0 | 1000 | 1000000 | 2 | 1000 | 1000 | 0 | 47.069980524 | 2.59410701 | 44.468123622 | 0.6814711 | 43.667274113 | 1.022416082 | 1000 |
-| 1000 | 1000 | 0 | 1000 | 1000000 | 2 | 1000 | 1000 | 0 | 47.119304629 | 2.583690664 | 44.527869444 | 0.671973322 | 43.736577452 | 1.046332487 | 1000 |
-| 1000 | 1000 | 0 | 1000 | 1000000 | 2 | 1000 | 1000 | 0 | 47.093997916 | 2.602191313 | 44.484268354 | 0.682576042 | 43.687090969 | 1.031004159 | 1000 |
+| 1000 | 1000 | 0 | 1000 | 1000000 | 2 | 1000 | 1000 | 0 | 46.8651896 | 2.412941424 | 44.44513298 | 0.424391142 | 43.94959211 | 1.026554102 | 1000 |
+| 1000 | 1000 | 0 | 1000 | 1000000 | 2 | 1000 | 1000 | 0 | 46.922508866 | 2.421724742 | 44.493428228 | 0.42204586 | 43.997902631 | 1.045297534 | 1000 |
+| 1000 | 1000 | 0 | 1000 | 1000000 | 2 | 1000 | 1000 | 0 | 46.938332303 | 2.40965665 | 44.521220406 | 0.423164636 | 44.024494492 | 1.057795996 | 1000 |
**** With just the 1-elem optimization
:PROPERTIES:
@@ -373,11 +405,11 @@ python bench.py run ../../copar/bin/copar ../../valmari_cpp/mdpmin 1000 1000 --i
#+end_src
#+RESULTS:
-| N | M | i | States | Edges | I | Q | Qs1 | Opts | t (s) | tp (s) | ta (s) | ti (s) | tr (s) | tv (s) | Qv |
-|------+------+---+--------+---------+---+------+------+---------+-------------+-------------+-------------+-------------+-------------+-------------+------|
-| 1000 | 1000 | 0 | 2000 | 1001000 | 3 | 2000 | 1000 | 1497791 | 3.69951183 | 2.995813312 | 0.696292008 | 0.281623635 | 0.285086162 | 1.011353231 | 1000 |
-| 1000 | 1000 | 0 | 2000 | 1001000 | 3 | 2000 | 1000 | 1497791 | 3.694332219 | 2.994494171 | 0.692652535 | 0.280869596 | 0.280522528 | 1.040548865 | 1000 |
-| 1000 | 1000 | 0 | 2000 | 1001000 | 3 | 2000 | 1000 | 1497791 | 3.674371501 | 2.987738591 | 0.679263792 | 0.280875871 | 0.269943904 | 1.038760097 | 1000 |
+| N | M | i | States | Edges | I | Q | Qs1 | Opts | t (s) | tp (s) | ta (s) | ti (s) | tr (s) | tv (s) | Qv |
+|------+------+---+--------+---------+---+------+------+--------+-------------+-------------+-------------+-------------+-------------+-------------+------|
+| 1000 | 1000 | 0 | 1000 | 1000000 | 2 | 1000 | 1000 | 997998 | 3.94096034 | 3.165165728 | 0.768631927 | 0.370675945 | 0.322635608 | 1.038751677 | 1000 |
+| 1000 | 1000 | 0 | 1000 | 1000000 | 2 | 1000 | 1000 | 997998 | 3.931081861 | 3.165428193 | 0.758455026 | 0.362660808 | 0.321140039 | 1.03408497 | 1000 |
+| 1000 | 1000 | 0 | 1000 | 1000000 | 2 | 1000 | 1000 | 997998 | 3.943894123 | 3.168918757 | 0.767851417 | 0.370105624 | 0.322636156 | 1.049683413 | 1000 |
** For m = 10000
diff --git a/dfa/results1.png b/dfa/results1.png
index ace6d584fdf1e55298af266c00b4f1c0b00b7fc8..6bbcbe38a2bd9e0c5b0b2a3400ef4e9eb5a788e1 100644
Binary files a/dfa/results1.png and b/dfa/results1.png differ
diff --git a/dfa/results1000.png b/dfa/results1000.png
index 339951b8bfe4b570dda1053b50f66dab4e4cfe07..fe3f84a7e9c378cab81335ea7c583dc86bd459bb 100644
Binary files a/dfa/results1000.png and b/dfa/results1000.png differ