wip

2024-08-30 07:54:48 +01:00
parent 47e03694e4
commit 64cff38e84
9 changed files with 325 additions and 124 deletions
--- a/experiments/reaction_mining_mutex/bench_mutex_nonparam_mem.dat
+++ b/experiments/reaction_mining_mutex/bench_mutex_nonparam_mem.dat
@@ -1,20 +1,53 @@
-2 69.171875
-3 69.937500
-4 86.109375
-5 76.093750
-6 81.812500
-7 97.078125
-8 88.562500
-9 102.968750
-10 93.546875
-11 98.515625
-12 113.671875
-13 115.656250
-14 132.140625
-15 141.546875
-16 149.890625
-17 155.125000
-18 153.500000
-19 166.953125
-20 169.750000
-21 212.468750
+2 76.250000
+3 79.312500
+4 77.968750
+5 85.015625
+6 77.640625
+7 75.250000
+8 86.406250
+9 104.093750
+10 99.531250
+11 95.875000
+12 101.203125
+13 96.453125
+14 124.062500
+15 137.359375
+16 147.859375
+17 145.156250
+18 151.906250
+19 160.187500
+20 164.093750
+21 220.562500
+22 226.953125
+23 235.328125
+24 243.609375
+25 254.906250
+26 254.609375
+27 272.281250
+28 272.093750
+29 301.406250
+30 317.281250
+31 400.984375
+32 396.140625
+33 420.203125
+34 447.046875
+35 427.609375
+36 444.031250
+37 454.843750
+38 476.515625
+39 499.593750
+40 518.218750
+41 552.796875
+42 529.078125
+43 552.546875
+44 557.968750
+45 745.328125
+46 725.406250
+47 734.046875
+48 768.203125
+49 780.328125
+50 813.640625
+51 818.156250
+52 892.656250
+53 872.609375
+54 908.328125
--- a/experiments/reaction_mining_mutex/bench_mutex_nonparam_oldimpl_mem.dat
+++ b/experiments/reaction_mining_mutex/bench_mutex_nonparam_oldimpl_mem.dat
@@ -1,20 +1,53 @@
-2 68.765625
-3 73.140625
-4 71.625000
-5 73.359375
-6 79.234375
-7 75.578125
-8 79.812500
-9 85.828125
-10 81.718750
-11 79.828125
-12 83.984375
-13 80.406250
-14 75.859375
-15 85.812500
-16 89.093750
-17 84.296875
-18 89.078125
-19 87.609375
-20 88.281250
-21 85.406250
+2 78.343750
+3 67.890625
+4 68.156250
+5 88.281250
+6 74.656250
+7 71.125000
+8 68.359375
+9 89.718750
+10 74.468750
+11 70.703125
+12 79.281250
+13 84.437500
+14 73.656250
+15 75.765625
+16 79.437500
+17 85.296875
+18 78.921875
+19 78.000000
+20 91.734375
+21 97.406250
+22 83.203125
+23 96.328125
+24 83.609375
+25 92.281250
+26 107.812500
+27 99.125000
+28 90.984375
+29 102.984375
+30 95.109375
+31 121.046875
+32 108.328125
+33 111.281250
+34 113.843750
+35 128.312500
+36 139.218750
+37 137.015625
+38 143.656250
+39 151.015625
+40 146.625000
+41 146.546875
+42 145.328125
+43 154.156250
+44 152.796875
+45 154.812500
+46 173.562500
+47 165.281250
+48 169.046875
+49 167.812500
+50 180.140625
+51 185.156250
+52 188.093750
+53 193.328125
+54 230.906250
--- a/experiments/reaction_mining_mutex/bench_mutex_nonparam_oldimpl_time.dat
+++ b/experiments/reaction_mining_mutex/bench_mutex_nonparam_oldimpl_time.dat
@@ -1,20 +1,53 @@
-2 0.068995
-3 0.110615
-4 0.164639
-5 0.234950
-6 0.322793
-7 0.438878
-8 0.578109
-9 0.752163
-10 0.955217
-11 1.190432
-12 1.519409
-13 1.808177
-14 2.200211
-15 2.654874
-16 3.265984
-17 3.824895
-18 4.413004
-19 5.303216
-20 6.310782
-21 7.038971
+2 0.069993
+3 0.110170
+4 0.163429
+5 0.244400
+6 0.326078
+7 0.435454
+8 0.574694
+9 0.756575
+10 0.963447
+11 1.191023
+12 1.470870
+13 1.798271
+14 2.197759
+15 2.631427
+16 3.141419
+17 3.740803
+18 4.384615
+19 5.152433
+20 6.010524
+21 7.243524
+22 8.078336
+23 9.238295
+24 10.559381
+25 12.179168
+26 13.710365
+27 15.687868
+28 17.332903
+29 19.724463
+30 22.126382
+31 24.589532
+32 27.154556
+33 31.373249
+34 33.994433
+35 37.379087
+36 41.225560
+37 45.762647
+38 51.688572
+39 56.050724
+40 60.950837
+41 66.596064
+42 72.954418
+43 80.002494
+44 87.091461
+45 94.821222
+46 103.463929
+47 111.833996
+48 121.959099
+49 132.695562
+50 143.592254
+51 155.356145
+52 168.150716
+53 182.149439
+54 195.561342
--- a/experiments/reaction_mining_mutex/bench_mutex_nonparam_time.dat
+++ b/experiments/reaction_mining_mutex/bench_mutex_nonparam_time.dat
@@ -1,20 +1,53 @@
-2 0.095321
-3 0.171177
-4 0.272130
-5 0.417800
-6 0.584877
-7 0.766862
-8 1.009195
-9 1.295766
-10 1.741482
-11 2.354580
-12 2.949242
-13 3.127326
-14 4.074318
-15 4.978959
-16 6.690042
-17 8.114637
-18 12.006410
-19 11.929118
-20 14.044730
-21 15.673520
+2 0.098639
+3 0.170014
+4 0.258657
+5 0.428040
+6 0.567658
+7 0.757204
+8 0.988715
+9 1.306164
+10 1.717904
+11 2.258792
+12 2.773149
+13 3.094348
+14 4.023511
+15 4.920939
+16 6.314265
+17 8.055828
+18 11.772655
+19 11.908597
+20 13.386385
+21 16.485505
+22 16.426735
+23 19.598138
+24 24.279200
+25 30.844283
+26 41.947712
+27 49.029652
+28 52.730995
+29 62.182717
+30 80.739602
+31 92.558721
+32 90.915901
+33 106.330487
+34 124.018849
+35 140.898334
+36 169.364359
+37 195.812449
+38 228.988631
+39 279.308753
+40 318.391139
+41 329.966894
+42 347.502791
+43 325.462907
+44 415.405552
+45 446.760682
+46 503.181844
+47 438.949250
+48 491.478016
+49 531.635930
+50 572.840797
+51 614.272754
+52 708.048464
+53 808.337098
+54 912.016908
--- a/experiments/reaction_mining_mutex/bench_mutex_param_mem.dat
+++ b/experiments/reaction_mining_mutex/bench_mutex_param_mem.dat
@@ -1,20 +1,53 @@
-2 80.093750
-3 76.062500
-4 88.312500
-5 97.140625
-6 95.234375
-7 109.843750
-8 111.218750
-9 132.921875
-10 142.546875
-11 151.546875
-12 175.546875
-13 186.109375
-14 206.546875
-15 235.281250
-16 245.515625
-17 249.562500
-18 260.203125
-19 278.796875
-20 292.781250
-21 300.562500
+2 80.750000
+3 87.406250
+4 87.500000
+5 93.109375
+6 102.687500
+7 104.265625
+8 110.406250
+9 139.343750
+10 143.343750
+11 150.859375
+12 160.140625
+13 168.031250
+14 213.890625
+15 224.937500
+16 237.750000
+17 246.421875
+18 253.718750
+19 275.343750
+20 300.734375
+21 302.687500
+22 372.859375
+23 401.906250
+24 427.656250
+25 456.406250
+26 461.843750
+27 497.953125
+28 478.796875
+29 513.015625
+30 533.640625
+31 571.406250
+32 592.890625
+33 750.218750
+34 782.078125
+35 811.390625
+36 808.765625
+37 794.375000
+38 905.328125
+39 982.078125
+40 978.343750
+41 975.796875
+42 1029.250000
+43 1009.687500
+44 1013.093750
+45 1041.359375
+46 1093.828125
+47 1089.546875
+48 1138.359375
+49 1451.656250
+50 1441.484375
+51 1512.953125
+52 1538.062500
+53 1578.609375
+54 1649.859375
--- a/experiments/reaction_mining_mutex/bench_mutex_param_time.dat
+++ b/experiments/reaction_mining_mutex/bench_mutex_param_time.dat
@@ -1,20 +1,53 @@
-2 0.487115
-3 0.880007
-4 1.301547
-5 2.172839
-6 2.662308
-7 3.880329
-8 4.491871
-9 6.922392
-10 8.729740
-11 10.901971
-12 13.885037
-13 18.246820
-14 21.987255
-15 28.236579
-16 41.065607
-17 44.456013
-18 50.782835
-19 59.535617
-20 83.400427
-21 96.250559
+2 0.508933
+3 0.879902
+4 1.418845
+5 2.106777
+6 2.756248
+7 3.793924
+8 4.415345
+9 7.047859
+10 8.535108
+11 10.661580
+12 13.401431
+13 18.212656
+14 21.531385
+15 27.613322
+16 35.731410
+17 44.066128
+18 50.457741
+19 60.318705
+20 80.069948
+21 95.711940
+22 108.791204
+23 138.778133
+24 153.953532
+25 173.971168
+26 215.769325
+27 254.425827
+28 278.991195
+29 324.744295
+30 399.375139
+31 450.518082
+32 451.632128
+33 537.802476
+34 522.508473
+35 656.979903
+36 670.512593
+37 725.848807
+38 937.150826
+39 1092.140628
+40 1212.583719
+41 1269.231571
+42 1480.000170
+43 1564.529588
+44 1526.681093
+45 1617.824403
+46 2067.677182
+47 2047.749685
+48 2030.002665
+49 2111.684038
+50 2225.756949
+51 2843.665940
+52 3049.816252
+53 3121.489341
+54 3430.799971
--- a/experiments/reaction_mining_mutex/pmutex.py
+++ b/experiments/reaction_mining_mutex/pmutex.py
@@ -350,6 +350,8 @@ def mutex_nonparam_bench_oldimpl(cmd_args):
        [E("out", n_proc - 1)], [("s", 1)], [("done", 1), E("req", n_proc - 1)]
    )

+    r.rs_stats()
+
    ###################################################

    c = ContextAutomatonWithConcentrations(r)
--- a/experiments/reaction_mining_mutex/run_mutex_param.sh
+++ b/experiments/reaction_mining_mutex/run_mutex_param.sh
@@ -14,13 +14,11 @@ do
    for special_mode in "p" "np-p" "np-np"
    do
        echo "$i (sm=${special_mode})"
-        if [[ $special_mode -eq 1 ]]
+        if [[ $special_mode == "p" ]]
        then
-            $REACTICS_SCRIPT $i $special_mode
            $REACTICS_SCRIPT -o $i $special_mode
-        else
-            $REACTICS_SCRIPT $i $special_mode
        fi
+        $REACTICS_SCRIPT $i $special_mode
    done
 done

--- a/reactics-smt/rs/reaction_system.py
+++ b/reactics-smt/rs/reaction_system.py
@@ -26,6 +26,9 @@ class ReactionSystem(object):
    def ordered_list_of_bgset_ids(self):
        return list(range(self.background_set_size))

+    def rs_stats(self):
+        print(f"Reactions: {len(self.reactions)}") 
+
    def assume_not_in_bgset(self, name):
        if self.is_in_background_set(name):
            raise RuntimeError("The entity " + name + " is already on the list")