From 9dadcddac8bfbdbc08b12b3bab34f5c9ca0d47a5 Mon Sep 17 00:00:00 2001 From: Fabien Chaix Date: Sat, 27 Feb 2016 00:49:43 +0200 Subject: [PATCH] Adding robustness to logging --- teshsuite/surf/maxmin_bench/maxmin_bench.c | 11 +- .../surf/maxmin_bench/maxmin_bench_large.tesh | 1 - .../maxmin_bench/maxmin_bench_medium.tesh | 282 +++++++++--------- .../surf/maxmin_bench/maxmin_bench_small.tesh | 22 +- 4 files changed, 158 insertions(+), 158 deletions(-) diff --git a/teshsuite/surf/maxmin_bench/maxmin_bench.c b/teshsuite/surf/maxmin_bench/maxmin_bench.c index a7e6f36bd0..e40e0b39c7 100644 --- a/teshsuite/surf/maxmin_bench/maxmin_bench.c +++ b/teshsuite/surf/maxmin_bench/maxmin_bench.c @@ -46,6 +46,8 @@ void test(int nb_cnst, int nb_var, int nb_elem, int pw_base_limit, int pw_max_li int *used = xbt_new0(int, nb_cnst); int i, j, k,l; int concurrency_share; + + char buf[1000]; Sys = lmm_system_new(1); @@ -89,17 +91,20 @@ void test(int nb_cnst, int nb_var, int nb_elem, int pw_base_limit, int pw_max_li if(mode==1){ printf("Max concurrency:\n"); l=0; + buf[0]=0; for (i = 0; i < nb_cnst; i++) { j=lmm_constraint_concurrency_maximum_get(cnst[i]); k=lmm_constraint_concurrency_limit_get(cnst[i]); xbt_assert(k<0 || j<=k); if(j>l) l=j; - printf("(%i):%i/%i ",i,j,k); + sprintf(buf,"(%i):%i/%i ",i,j,k); lmm_constraint_concurrency_maximum_reset(cnst[i]); xbt_assert(!lmm_constraint_concurrency_maximum_get(cnst[i])); - if(i%10==9) - printf("\n"); + if(i%10==9) { + printf("%s\n",buf); + buf[0]=0; + } } printf("\nTotal maximum concurrency is %i\n",l); diff --git a/teshsuite/surf/maxmin_bench/maxmin_bench_large.tesh b/teshsuite/surf/maxmin_bench/maxmin_bench_large.tesh index 5e043d7240..6f41b37797 100644 --- a/teshsuite/surf/maxmin_bench/maxmin_bench_large.tesh +++ b/teshsuite/surf/maxmin_bench/maxmin_bench_large.tesh @@ -1,6 +1,5 @@ #! ./tesh -! timeout 60 ! expect return 0 $ ./maxmin_bench big 1 > Starting 0: (807) diff --git a/teshsuite/surf/maxmin_bench/maxmin_bench_medium.tesh b/teshsuite/surf/maxmin_bench/maxmin_bench_medium.tesh index 77630da4a5..6c027bce53 100644 --- a/teshsuite/surf/maxmin_bench/maxmin_bench_medium.tesh +++ b/teshsuite/surf/maxmin_bench/maxmin_bench_medium.tesh @@ -1,8 +1,6 @@ #! ./tesh -! timeout 60 ! expect return 0 -! output sort $ ./maxmin_bench medium 10 test > [0.000000]: [surf_maxmin/DEBUG] Setting selective_update_active flag to 1 > [0.000000]: [surf_maxmin/DEBUG] Active constraints : 100 @@ -2913,61 +2911,7 @@ $ ./maxmin_bench medium 10 test > [0.000000]: [surf_maxmin/DEBUG] '398'(0.000000) : 0.000000 > [0.000000]: [surf_maxmin/DEBUG] '399'(0.000000) : 0.000000 > [0.000000]: [surf_maxmin/DEBUG] '400'(0.000000) : 0.000000 -> Starting 0: (807) -> Starting to solve(261) -> Max concurrency: -> (0):11/-1 (1):9/10 (2):5/40 (3):9/9 (4):6/-1 (5):9/10 (6):8/16 (7):5/-1 (8):13/-1 (9):9/9 -> (10):8/12 (11):10/16 (12):6/16 (13):13/-1 (14):13/40 (15):12/12 (16):8/10 (17):5/-1 (18):6/-1 (19):13/40 -> (20):4/9 (21):9/40 (22):4/16 (23):8/40 (24):6/10 (25):9/40 (26):9/-1 (27):7/9 (28):10/24 (29):12/-1 -> (30):9/16 (31):8/-1 (32):10/10 (33):3/-1 (34):5/24 (35):9/12 (36):11/-1 (37):6/40 (38):13/-1 (39):6/-1 -> (40):6/40 (41):9/24 (42):3/10 (43):6/40 (44):6/16 (45):8/-1 (46):5/9 (47):6/-1 (48):6/12 (49):11/24 -> (50):11/24 (51):14/16 (52):7/9 (53):11/16 (54):9/9 (55):7/-1 (56):11/12 (57):5/24 (58):11/-1 (59):9/24 -> (60):9/9 (61):5/12 (62):6/12 (63):10/40 (64):6/9 (65):4/12 (66):14/16 (67):8/12 (68):11/12 (69):7/24 -> (70):6/16 (71):3/-1 (72):8/-1 (73):5/24 (74):7/24 (75):11/-1 (76):9/16 (77):6/10 (78):13/24 (79):8/16 -> (80):9/40 (81):9/12 (82):5/16 (83):7/16 (84):8/24 (85):6/9 (86):7/24 (87):12/16 (88):10/24 (89):9/10 -> (90):6/24 (91):4/40 (92):12/16 (93):9/24 (94):11/-1 (95):9/9 (96):8/16 (97):8/10 (98):7/16 (99):6/16 -> -> Total maximum concurrency is 14 -> Starting 1: (614) -> Starting to solve(807) -> Max concurrency: -> (0):10/10 (1):6/9 (2):8/-1 (3):7/24 (4):8/-1 (5):5/9 (6):10/10 (7):8/24 (8):10/10 (9):8/16 -> (10):9/9 (11):8/40 (12):9/16 (13):12/40 (14):11/-1 (15):10/12 (16):10/12 (17):10/10 (18):11/12 (19):13/24 -> (20):5/24 (21):9/9 (22):7/40 (23):15/40 (24):8/10 (25):9/-1 (26):7/9 (27):7/16 (28):4/12 (29):7/16 -> (30):7/40 (31):7/9 (32):6/12 (33):9/-1 (34):7/12 (35):5/16 (36):10/-1 (37):8/40 (38):6/24 (39):11/16 -> (40):7/24 (41):8/16 (42):11/-1 (43):10/10 (44):10/-1 (45):9/10 (46):13/-1 (47):5/16 (48):8/24 (49):6/9 -> (50):6/-1 (51):10/10 (52):7/9 (53):10/10 (54):4/24 (55):7/9 (56):9/9 (57):9/12 (58):9/24 (59):5/-1 -> (60):9/-1 (61):8/24 (62):8/-1 (63):7/40 (64):9/40 (65):7/24 (66):7/-1 (67):5/-1 (68):8/24 (69):6/9 -> (70):8/12 (71):12/40 (72):10/-1 (73):9/12 (74):6/24 (75):12/16 (76):6/24 (77):6/-1 (78):5/9 (79):15/16 -> (80):7/9 (81):8/-1 (82):8/-1 (83):7/40 (84):5/24 (85):6/40 (86):6/24 (87):9/9 (88):10/40 (89):9/10 -> (90):4/10 (91):13/24 (92):9/10 (93):9/-1 (94):8/24 (95):12/12 (96):7/12 (97):8/12 (98):8/24 (99):6/40 -> -> Total maximum concurrency is 15 -> Starting 2: (421) -> Starting to solve(585) -> Max concurrency: -> (0):10/10 (1):6/16 (2):7/24 (3):9/10 (4):13/40 (5):8/-1 (6):5/10 (7):5/10 (8):7/-1 (9):8/-1 -> (10):12/40 (11):8/24 (12):9/10 (13):6/24 (14):6/40 (15):7/10 (16):7/16 (17):10/24 (18):8/12 (19):10/10 -> (20):9/40 (21):7/-1 (22):12/-1 (23):10/10 (24):10/10 (25):12/24 (26):16/40 (27):8/24 (28):9/40 (29):9/40 -> (30):9/9 (31):11/12 (32):11/16 (33):6/24 (34):7/40 (35):8/12 (36):10/10 (37):9/9 (38):8/16 (39):9/16 -> (40):10/-1 (41):14/24 (42):8/12 (43):6/9 (44):11/-1 (45):11/12 (46):13/16 (47):4/9 (48):9/9 (49):8/10 -> (50):9/40 (51):8/-1 (52):9/9 (53):5/12 (54):8/16 (55):5/-1 (56):7/24 (57):8/40 (58):8/24 (59):7/40 -> (60):12/16 (61):12/12 (62):13/-1 (63):7/-1 (64):7/9 (65):13/-1 (66):11/40 (67):10/16 (68):11/40 (69):9/12 -> (70):8/16 (71):9/24 (72):7/12 (73):8/9 (74):7/12 (75):8/9 (76):10/40 (77):7/12 (78):9/-1 (79):14/24 -> (80):9/10 (81):10/40 (82):6/-1 (83):9/16 (84):8/24 (85):7/10 (86):10/10 (87):14/16 (88):9/-1 (89):9/40 -> (90):3/16 (91):8/9 (92):9/12 (93):12/-1 (94):11/40 (95):7/40 (96):11/24 (97):9/9 (98):10/10 (99):8/-1 -> -> Total maximum concurrency is 16 -> Starting 3: (228) -> Starting to solve(116) -> Max concurrency: -> (0):14/40 (1):7/-1 (2):9/12 (3):11/-1 (4):5/-1 (5):12/24 (6):12/24 (7):11/12 (8):10/10 (9):10/24 -> (10):13/-1 (11):12/12 (12):6/40 (13):11/12 (14):5/24 (15):11/16 (16):8/12 (17):9/9 (18):9/9 (19):10/40 -> (20):12/-1 (21):8/12 (22):8/10 (23):7/16 (24):12/40 (25):6/9 (26):7/10 (27):12/24 (28):8/16 (29):10/-1 -> (30):10/-1 (31):10/10 (32):12/12 (33):9/10 (34):7/9 (35):6/40 (36):10/16 (37):8/16 (38):11/12 (39):9/24 -> (40):7/16 (41):5/16 (42):10/12 (43):7/16 (44):4/-1 (45):10/24 (46):8/9 (47):9/9 (48):11/16 (49):6/16 -> (50):8/16 (51):15/24 (52):12/12 (53):9/10 (54):16/-1 (55):9/16 (56):6/16 (57):7/12 (58):8/16 (59):10/16 -> (60):9/12 (61):6/16 (62):10/-1 (63):9/9 (64):14/16 (65):11/40 (66):9/16 (67):6/16 (68):7/24 (69)[0.000000]: [surf_maxmin/DEBUG] MAX-MIN ( '370'(1.000000) '368'(1.000000) '365'(1.000000) '355'(1.000000) '352'(1.000000) '350'(1.000000) '346'(1.000000) '345'(1.000000) '344'(1.000000) '343'(1.000000) '342'(1.000000) '339'(1.000000) '338'(1.000000) '336'(1.000000) '335'(1.000000) '334'(1.000000) '333'(1.000000) '332'(1.000000) '329'(1.000000) '328'(1.000000) '327'(1.000000) '326'(1.000000) '324'(1.000000) '323'(1.000000) '322'(1.000000) '321'(1.000000) '320'(1.000000) '319'(1.000000) '318'(1.000000) '317'(1.000000) '316'(1.000000) '315'(1.000000) '314'(1.000000) '313'(1.000000) '312'(1.000000) '311'(1.000000) '310'(1.000000) '309'(1.000000) '308'(1.000000) '307'(1.000000) '306'(1.000000) '305'(1.000000) '304'(1.000000) '303'(1.000000) '302'(1.000000) '301'(1.000000) '325'(0.000000) '330'(0.000000) '331'(0.000000) '337'(0.000000) '340'(0.000000) '341'(0.000000) '347'(0.000000) '348'(0.000000) '349'(0.000000) '351'(0.000000) '353'(0.000000) '354'(0.000000) '356'(0.000000) '357'(0.000000) '358'(0.000000) '359'(0.000000) '360'(0.000000) '361'(0.000000) '362'(0.000000) '363'(0.000000) '364'(0.000000) '366'(0.000000) '367'(0.000000) '369'(0.000000) '371'(0.000000) '372'(0.000000) '373'(0.000000) '374'(0.000000) '375'(0.000000) '376'(0.000000) '377'(0.000000) '378'(0.000000) '379'(0.000000) '380'(0.000000) '381'(0.000000) '382'(0.000000) '383'(0.000000) '384'(0.000000) '385'(0.000000) '386'(0.000000) '387'(0.000000) '388'(0.000000) '389'(0.000000) '390'(0.000000) '391'(0.000000) '392'(0.000000) '393'(0.000000) '394'(0.000000) '395'(0.000000) '396'(0.000000) '397'(0.000000) '398'(0.000000) '399'(0.000000) '400'(0.000000) ) +> [0.000000]: [surf_maxmin/DEBUG] MAX-MIN ( '370'(1.000000) '368'(1.000000) '365'(1.000000) '355'(1.000000) '352'(1.000000) '350'(1.000000) '346'(1.000000) '345'(1.000000) '344'(1.000000) '343'(1.000000) '342'(1.000000) '339'(1.000000) '338'(1.000000) '336'(1.000000) '335'(1.000000) '334'(1.000000) '333'(1.000000) '332'(1.000000) '329'(1.000000) '328'(1.000000) '327'(1.000000) '326'(1.000000) '324'(1.000000) '323'(1.000000) '322'(1.000000) '321'(1.000000) '320'(1.000000) '319'(1.000000) '318'(1.000000) '317'(1.000000) '316'(1.000000) '315'(1.000000) '314'(1.000000) '313'(1.000000) '312'(1.000000) '311'(1.000000) '310'(1.000000) '309'(1.000000) '308'(1.000000) '307'(1.000000) '306'(1.000000) '305'(1.000000) '304'(1.000000) '303'(1.000000) '302'(1.000000) '301'(1.000000) '325'(0.000000) '330'(0.000000) '331'(0.000000) '337'(0.000000) '340'(0.000000) '341'(0.000000) '347'(0.000000) '348'(0.000000) '349'(0.000000) '351'(0.000000) '353'(0.000000) '354'(0.000000) '356'(0.000000) '357'(0.000000) '358'(0.000000) '359'(0.000000) '360'(0.000000) '361'(0.000000) '362'(0.000000) '363'(0.000000) '364'(0.000000) '366'(0.000000) '367'(0.000000) '369'(0.000000) '371'(0.000000) '372'(0.000000) '373'(0.000000) '374'(0.000000) '375'(0.000000) '376'(0.000000) '377'(0.000000) '378'(0.000000) '379'(0.000000) '380'(0.000000) '381'(0.000000) '382'(0.000000) '383'(0.000000) '384'(0.000000) '385'(0.000000) '386'(0.000000) '387'(0.000000) '388'(0.000000) '389'(0.000000) '390'(0.000000) '391'(0.000000) '392'(0.000000) '393'(0.000000) '394'(0.000000) '395'(0.000000) '396'(0.000000) '397'(0.000000) '398'(0.000000) '399'(0.000000) '400'(0.000000) ) > [0.000000]: [surf_maxmin/DEBUG] Constraints > [0.000000]: [surf_maxmin/DEBUG] (2.205794.'368'(0.018582) + 1.458042.'343'(0.011252) + 1.453546.'338'(0.007198) + 1.702298.'335'(0.007198) + 0.818182.'322'(0.011252) + 1.766733.'321'(0.047771) + 2.012488.'316'(0.288945) + 2.246254.'313'(0.018582) + 2.099401.'312'(0.007198) + 2.931069.'311'(0.007198) + 1.108891.'309'(0.007198) + 2.223776.'302'(0.007198) + 0.897602.'301'(0.011252) + 2.904096.'347'(0.000000) + 0.344655.'347'(0.000000) + 1.841658.'351'(0.000000) + 2.435065.'361'(0.000000) + 2.288212.'364'(0.000000) + 0.750749.'366'(0.000000) + 2.713786.'367'(0.000000) + 1.146354.'372'(0.000000) + 0.999500.'374'(0.000000) + 1.119381.'381'(0.000000) + 1.153846.'389'(0.000000) + 2.838162.'398'(0.000000) + 0.806194.'398'(0.000000) + 0) <= 9.700300 ('325') > [0.000000]: [surf_maxmin/DEBUG] (1.981019.'355'(0.142202) + 1.291708.'350'(0.018582) + 1.276723.'336'(0.288945) + 2.220779.'333'(0.011252) + 1.255744.'320'(0.201077) + 1.646853.'302'(0.007198) + 1.245255.'301'(0.011252) + 1.494006.'341'(0.000000) + 1.251249.'357'(0.000000) + 2.151848.'362'(0.000000) + 1.171828.'369'(0.000000) + 1.564436.'373'(0.000000) + 2.307692.'377'(0.000000) + 0.935065.'378'(0.000000) + 2.844156.'386'(0.000000) + 1.311189.'386'(0.000000) + 0.262238.'392'(0.000000) + 1.612388.'396'(0.000000) + 0) <= 9.520480 ('400') @@ -6063,64 +6007,7 @@ $ ./maxmin_bench medium 10 test > [0.000000]: [surf_maxmin/DEBUG] '798'(0.000000) : 0.000000 > [0.000000]: [surf_maxmin/DEBUG] '799'(0.000000) : 0.000000 > [0.000000]: [surf_maxmin/DEBUG] '800'(0.000000) : 0.000000 -> :9/24 -> (70):7/16 (71):12/24 (72):4/40 (73):10/16 (74):11/16 (75):8/24 (76):6/10 (77):9/-1 (78):13/-1 (79):11/-1 -> (80):11/16 (81):10/-1 (82):9/10 (83):8/9 (84):10/10 (85):4/-1 (86):13/-1 (87):8/24 (88):14/16 (89):6/40 -> (90):6/16 (91):9/-1 (92):11/-1 (93):12/24 (94):9/9 (95):10/10 (96):6/-1 (97):8/24 (98):11/16 (99):7/16 -> -> Total maximum concurrency is 16 -> Starting 4: (35) -> Starting to solve(210) -> Max concurrency: -> (0):7/40 (1):7/24 (2):7/40 (3):10/40 (4):10/10 (5):8/16 (6):9/40 (7):9/-1 (8):12/12 (9):8/24 -> (10):7/-1 (11):9/9 (12):6/24 (13):6/10 (14):9/-1 (15):6/24 (16):7/10 (17):10/-1 (18):9/9 (19):6/10 -> (20):8/-1 (21):11/-1 (22):9/12 (23):8/10 (24):6/16 (25):11/16 (26):9/-1 (27):11/24 (28):4/40 (29):10/-1 -> (30):9/9 (31):9/-1 (32):2/10 (33):8/9 (34):6/10 (35):5/12 (36):8/-1 (37):7/-1 (38):6/10 (39):9/-1 -> (40):7/10 (41):7/10 (42):4/12 (43):6/-1 (44):10/-1 (45):5/40 (46):9/9 (47):12/-1 (48):6/12 (49):10/-1 -> (50):9/-1 (51):9/-1 (52):7/16 (53):7/12 (54):6/-1 (55):7/-1 (56):9/40 (57):8/16 (58):8/40 (59):9/-1 -> (60):8/12 (61):7/-1 (62):10/10 (63):9/9 (64):15/24 (65):9/9 (66):9/-1 (67):6/24 (68):8/-1 (69):10/16 -> (70):6/16 (71):8/24 (72):3/-1 (73):7/9 (74):6/-1 (75):8/16 (76):12/12 (77):12/12 (78):9/9 (79):6/-1 -> (80):12/-1 (81):12/40 (82):6/-1 (83):10/40 (84):8/12 (85):10/40 (86):8/10 (87):8/12 (88):10/10 (89):7/40 -> (90):9/10 (91):7/16 (92):6/10 (93):7/-1 (94):9/40 (95):8/9 (96):11/-1 (97):7/-1 (98):8/10 (99):8/24 -> -> Total maximum concurrency is 15 -> Starting 5: (842) -> Starting to solve(452) -> Max concurrency: -> (0):3/16 (1):10/10 (2):8/9 (3):7/-1 (4):10/40 (5):8/12 (6):8/16 (7):11/24 (8):8/16 (9):7/12 -> (10):7/12 (11):7/9 (12):9/10 (13):6/-1 (14):5/12 (15):11/12 (16):7/40 (17):5/16 (18):11/40 (19):7/40 -> (20):7/-1 (21):12/12 (22):9/10 (23):5/-1 (24):12/16 (25):10/10 (26):10/-1 (27):9/12 (28):9/24 (29):8/10 -> (30):9/12 (31):9/9 (32):11/16 (33):9/-1 (34):9/16 (35):10/-1 (36):3/24 (37):6/12 (38):9/-1 (39):11/16 -> (40):8/16 (41):9/10 (42):7/24 (43):4/12 (44):9/16 (45):10/-1 (46):8/12 (47):14/16 (48):8/9 (49):7/24 -> (50):7/12 (51):6/9 (52):7/16 (53):5/10 (54):9/24 (55):7/10 (56):7/16 (57):10/10 (58):11/-1 (59):7/12 -> (60):12/-1 (61):8/-1 (62):8/40 (63):9/9 (64):14/-1 (65):10/16 (66):9/-1 (67):10/16 (68):6/40 (69):9/9 -> (70):5/10 (71):11/-1 (72):9/-1 (73):9/9 (74):10/-1 (75):7/9 (76):11/24 (77):11/24 (78):6/24 (79):4/16 -> (80):15/16 (81):7/16 (82):13/-1 (83):7/10 (84):6/24 (85):8/40 (86):6/12 (87):5/24 (88):7/9 (89):10/10 -> (90):8/24 (91):12/16 (92):9/9 (93):7/-1 (94):15/24 (95):11/40 (96):7/40 (97):9/40 (98):5/9 (99):8/12 -> -> Total maximum concurrency is 15 -> Starting 6: (649) -> Starting to solve(430) -> Max concurrency: -> (0):14/16 (1):8/24 (2):7/9 (3):5/10 (4):5/16 (5):6/-1 (6):16/24 (7):10/10 (8):5/24 (9):9/24 -> (10):6/40 (11):9/9 (12):7/10 (13):10/-1 (14):6/9 (15):6/9 (16):8/16 (17):10/-1 (18):12/12 (19):9/12 -> (20):9/10 (21):7/40 (22):5/-1 (23):11/24 (24):8/-1 (25):10/10 (26):10/16 (27):10/12 (28):7/12 (29):6/24 -> (30):9/10 (31):13/16 (32):3/24 (33):8/9 (34):9/16 (35):9/9 (36):4/9 (37):9/-1 (38):6/12 (39):6/40 -> (40):8/9 (41):7/24 (42):7/-1 (43):8/10 (44):8/-1 (45):12/24 (46):8/12 (47):6/40 (48):9/-1 (49):11/40 -> (50):8/12 (51):14/24 (52):13/-1 (53):10/16 (54):6/40 (55):4/24 (56):6/16 (57):7/16 (58):8/40 (59):5/16 -> (60):5/16 (61):8/10 (62):11/-1 (63):8/16 (64):9/9 (65):9/10 (66):14/-1 (67):8/16 (68):9/-1 (69):8/12 -> (70):8/9 (71):4/40 (72):7/40 (73):10/12 (74):12/24 (75):10/10 (76):9/-1 (77):8/12 (78):14/-1 (79):6/9 -> (80):10/10 (81):3/9 (82):12/12 (83):7/9 (84):8/40 (85):7/-1 (86):9/40 (87):9/-1 (88):9/40 (89):7/24 -> (90):5/24 (91):5/-1 (92):10/10 (93):10/10 (94):10/10 (95):10/12 (96):10/-1 (97):9/16 (98):7/16 (99):11/-1 -> -> Total maximum concurrency is 16 -> Starting 7: (456) -> Starting to solve(692) -> Max concurrency: -> (0):5/10 (1):7/12 (2):9/-1 (3):12/24 (4):7/40 (5):6/24 (6):8/12 (7):8/-1 (8):9/40 (9):8/16 -> (10):14/24 (11):13/-1 (12):9/16 (13):7/-1 (14):8/-1 (15):11/24 (16):13/16 (17):8/40 (18):7/9 (19):9/-1 -> (20):9/-1 (21):8/10 (22):7/24 (23):9/40 (24):7/10 (25):4/40 (26):9/10 (27):10/10 (28):9/9 (29):7/-1 -> (30):10/10 (31):9/9 (32):8/24 (33):9/12 (34):10/24 (35):9/12 (36):6[0.000000]: [surf_maxmin/DEBUG] MAX-MIN ( '794'(1.000000) '783'(1.000000) '782'(1.000000) '775'(1.000000) '774'(1.000000) '767'(1.000000) '751'(1.000000) '749'(1.000000) '738'(1.000000) '737'(1.000000) '736'(1.000000) '734'(1.000000) '733'(1.000000) '732'(1.000000) '731'(1.000000) '730'(1.000000) '729'(1.000000) '728'(1.000000) '725'(1.000000) '724'(1.000000) '723'(1.000000) '722'(1.000000) '721'(1.000000) '720'(1.000000) '719'(1.000000) '718'(1.000000) '717'(1.000000) '716'(1.000000) '715'(1.000000) '714'(1.000000) '713'(1.000000) '712'(1.000000) '711'(1.000000) '710'(1.000000) '709'(1.000000) '708'(1.000000) '707'(1.000000) '706'(1.000000) '705'(1.000000) '704'(1.000000) '703'(1.000000) '702'(1.000000) '701'(1.000000) '726'(0.000000) '727'(0.000000) '735'(0.000000) '739'(0.000000) '740'(0.000000) '741'(0.000000) '742'(0.000000) '743'(0.000000) '744'(0.000000) '745'(0.000000) '746'(0.000000) '747'(0.000000) '748'(0.000000) '750'(0.000000) '752'(0.000000) '753'(0.000000) '754'(0.000000) '755'(0.000000) '756'(0.000000) '757'(0.000000) '758'(0.000000) '759'(0.000000) '760'(0.000000) '761'(0.000000) '762'(0.000000) '763'(0.000000) '764'(0.000000) '765'(0.000000) '766'(0.000000) '768'(0.000000) '769'(0.000000) '770'(0.000000) '771'(0.000000) '772'(0.000000) '773'(0.000000) '776'(0.000000) '777'(0.000000) '778'(0.000000) '779'(0.000000) '780'(0.000000) '781'(0.000000) '784'(0.000000) '785'(0.000000) '786'(0.000000) '787'(0.000000) '788'(0.000000) '789'(0.000000) '790'(0.000000) '791'(0.000000) '792'(0.000000) '793'(0.000000) '795'(0.000000) '796'(0.000000) '797'(0.000000) '798'(0.000000) '799'(0.000000) '800'(0.000000) ) +> [0.000000]: [surf_maxmin/DEBUG] MAX-MIN ( '794'(1.000000) '783'(1.000000) '782'(1.000000) '775'(1.000000) '774'(1.000000) '767'(1.000000) '751'(1.000000) '749'(1.000000) '738'(1.000000) '737'(1.000000) '736'(1.000000) '734'(1.000000) '733'(1.000000) '732'(1.000000) '731'(1.000000) '730'(1.000000) '729'(1.000000) '728'(1.000000) '725'(1.000000) '724'(1.000000) '723'(1.000000) '722'(1.000000) '721'(1.000000) '720'(1.000000) '719'(1.000000) '718'(1.000000) '717'(1.000000) '716'(1.000000) '715'(1.000000) '714'(1.000000) '713'(1.000000) '712'(1.000000) '711'(1.000000) '710'(1.000000) '709'(1.000000) '708'(1.000000) '707'(1.000000) '706'(1.000000) '705'(1.000000) '704'(1.000000) '703'(1.000000) '702'(1.000000) '701'(1.000000) '726'(0.000000) '727'(0.000000) '735'(0.000000) '739'(0.000000) '740'(0.000000) '741'(0.000000) '742'(0.000000) '743'(0.000000) '744'(0.000000) '745'(0.000000) '746'(0.000000) '747'(0.000000) '748'(0.000000) '750'(0.000000) '752'(0.000000) '753'(0.000000) '754'(0.000000) '755'(0.000000) '756'(0.000000) '757'(0.000000) '758'(0.000000) '759'(0.000000) '760'(0.000000) '761'(0.000000) '762'(0.000000) '763'(0.000000) '764'(0.000000) '765'(0.000000) '766'(0.000000) '768'(0.000000) '769'(0.000000) '770'(0.000000) '771'(0.000000) '772'(0.000000) '773'(0.000000) '776'(0.000000) '777'(0.000000) '778'(0.000000) '779'(0.000000) '780'(0.000000) '781'(0.000000) '784'(0.000000) '785'(0.000000) '786'(0.000000) '787'(0.000000) '788'(0.000000) '789'(0.000000) '790'(0.000000) '791'(0.000000) '792'(0.000000) '793'(0.000000) '795'(0.000000) '796'(0.000000) '797'(0.000000) '798'(0.000000) '799'(0.000000) '800'(0.000000) ) > [0.000000]: [surf_maxmin/DEBUG] Constraints > [0.000000]: [surf_maxmin/DEBUG] (1.015984.'775'(0.031029) + 0.875125.'737'(0.072751) + 1.345654.'736'(0.031029) + 0.950050.'731'(0.078342) + 0.398601.'723'(0.016265) + 0.777722.'720'(0.544618) + 2.370629.'719'(0.078342) + 1.525475.'710'(0.016265) + 0.648851.'707'(0.078342) + 0.741758.'705'(0.078342) + 2.763237.'705'(0.078342) + 1.242258.'702'(0.138842) + 1.287213.'702'(0.138842) + 0.753746.'701'(0.072751) + 1.507493.'741'(0.000000) + 1.861139.'744'(0.000000) + 0.094406.'744'(0.000000) + 1.012987.'748'(0.000000) + 1.918082.'753'(0.000000) + 1.369630.'757'(0.000000) + 1.802697.'760'(0.000000) + 2.127872.'762'(0.000000) + 0.326673.'764'(0.000000) + 1.988511.'768'(0.000000) + 2.946054.'772'(0.000000) + 0.368631.'772'(0.000000) + 2.010989.'773'(0.000000) + 2.303197.'779'(0.000000) + 1.831169.'780'(0.000000) + 2.082917.'785'(0.000000) + 1.825175.'789'(0.000000) + 1.732268.'797'(0.000000) + 0) <= 1.758242 ('739') > [0.000000]: [surf_maxmin/DEBUG] (1.669331.'734'(0.031029) + 1.195804.'733'(0.031029) + 0.344655.'724'(0.196284) + 2.662837.'720'(0.544618) + 0.593407.'716'(0.196284) + 1.930070.'714'(0.091186) + 1.846154.'708'(0.072751) + 2.166833.'707'(0.078342) + 2.423077.'705'(0.078342) + 1.846154.'703'(0.016265) + 2.103896.'702'(0.138842) + 2.069431.'701'(0.072751) + 2.234266.'739'(0.000000) + 2.373626.'744'(0.000000) + 2.477023.'746'(0.000000) + 1.850649.'752'(0.000000) + 1.696304.'753'(0.000000) + 0.301199.'758'(0.000000) + 2.297203.'768'(0.000000) + 1.816184.'772'(0.000000) + 2.394605.'773'(0.000000) + 1.360639.'777'(0.000000) + 2.358641.'786'(0.000000) + 1.030969.'789'(0.000000) + 1.601898.'790'(0.000000) + 1.477522.'796'(0.000000) + 0) <= 5.624376 ('758') @@ -7875,43 +7762,154 @@ $ ./maxmin_bench medium 10 test > [0.000000]: [surf_maxmin/DEBUG] '998'(0.000000) : 0.000000 > [0.000000]: [surf_maxmin/DEBUG] '999'(0.000000) : 0.000000 > [0.000000]: [surf_maxmin/DEBUG] '1000'(0.000000) : 0.000000 -> /40 (37):8/16 (38):8/10 (39):10/12 -> (40):9/16 (41):7/16 (42):5/-1 (43):6/9 (44):6/12 (45):5/12 (46):2/9 (47):11/-1 (48):6/9 (49):9/9 -> (50):12/24 (51):8/12 (52):3/9 (53):5/9 (54):6/16 (55):9/16 (56):9/9 (57):11/40 (58):8/9 (59):9/9 -> (60):7/10 (61):8/9 (62):9/-1 (63):6/24 (64):12/24 (65):8/16 (66):8/10 (67):9/12 (68):8/24 (69):7/12 -> (70):7/-1 (71):6/16 (72):9/24 (73):11/40 (74):7/12 (75):9/16 (76):9/9 (77):9/9 (78):10/16 (79):10/24 -> (80):10/-1 (81):8/-1 (82):9/-1 (83):6/10 (84):10/40 (85):8/9 (86):7/40 (87):8/9 (88):10/-1 (89):11/40 -> (90):13/16 (91):8/9 (92):8/-1 (93):10/16 (94):8/40 (95):9/-1 (96):5/24 (97):8/10 (98):7/40 (99):7/24 +> Starting 0: (807) +> Starting to solve(261) +> Max concurrency: +> (9):9/9 +> (19):13/40 +> (29):12/-1 +> (39):6/-1 +> (49):11/24 +> (59):9/24 +> (69):7/24 +> (79):8/16 +> (89):9/10 +> (99):6/16 +> +> Total maximum concurrency is 14 +> Starting 1: (614) +> Starting to solve(807) +> Max concurrency: +> (9):8/16 +> (19):13/24 +> (29):7/16 +> (39):11/16 +> (49):6/9 +> (59):5/-1 +> (69):6/9 +> (79):15/16 +> (89):9/10 +> (99):6/40 +> +> Total maximum concurrency is 15 +> Starting 2: (421) +> Starting to solve(585) +> Max concurrency: +> (9):8/-1 +> (19):10/10 +> (29):9/40 +> (39):9/16 +> (49):8/10 +> (59):7/40 +> (69):9/12 +> (79):14/24 +> (89):9/40 +> (99):8/-1 +> +> Total maximum concurrency is 16 +> Starting 3: (228) +> Starting to solve(116) +> Max concurrency: +> (9):10/24 +> (19):10/40 +> (29):10/-1 +> (39):9/24 +> (49):6/16 +> (59):10/16 +> (69):9/24 +> (79):11/-1 +> (89):6/40 +> (99):7/16 +> +> Total maximum concurrency is 16 +> Starting 4: (35) +> Starting to solve(210) +> Max concurrency: +> (9):8/24 +> (19):6/10 +> (29):10/-1 +> (39):9/-1 +> (49):10/-1 +> (59):9/-1 +> (69):10/16 +> (79):6/-1 +> (89):7/40 +> (99):8/24 +> +> Total maximum concurrency is 15 +> Starting 5: (842) +> Starting to solve(452) +> Max concurrency: +> (9):7/12 +> (19):7/40 +> (29):8/10 +> (39):11/16 +> (49):7/24 +> (59):7/12 +> (69):9/9 +> (79):4/16 +> (89):10/10 +> (99):8/12 +> +> Total maximum concurrency is 15 +> Starting 6: (649) +> Starting to solve(430) +> Max concurrency: +> (9):9/24 +> (19):9/12 +> (29):6/24 +> (39):6/40 +> (49):11/40 +> (59):5/16 +> (69):8/12 +> (79):6/9 +> (89):7/24 +> (99):11/-1 +> +> Total maximum concurrency is 16 +> Starting 7: (456) +> Starting to solve(692) +> Max concurrency: +> (9):8/16 +> (19):9/-1 +> (29):7/-1 +> (39):10/12 +> (49):9/9 +> (59):9/9 +> (69):7/12 +> (79):10/24 +> (89):11/40 +> (99):7/24 > > Total maximum concurrency is 14 > Starting 8: (263) > Starting to solve(455) > Max concurrency: -> (0):8/12 (1):7/40 (2):10/10 (3):12/40 (4):8/40 (5):11/16 (6):8/16 (7):8/16 (8):9/10 (9):8/-1 -> (10):4/10 (11):8/12 (12):8/9 (13):6/40 (14):4/-1 (15):3/24 (16):9/10 (17):8/9 (18):9/-1 (19):9/16 -> (20):8/-1 (21):5/12 (22):13/-1 (23):9/24 (24):9/9 (25):7/40 (26):11/12 (27):9/9 (28):4/-1 (29):4/9 -> (30):8/-1 (31):9/9 (32):14/16 (33):7/16 (34):9/16 (35):9/12 (36):11/16 (37):8/-1 (38):7/-1 (39):9/10 -> (40):11/12 (41):4/40 (42):9/-1 (43):10/12 (44):7/24 (45):9/12 (46):6/9 (47):14/40 (48):8/24 (49):8/9 -> (50):12/40 (51):9/-1 (52):8/24 (53):4/-1 (54):9/10 (55):5/40 (56):8/16 (57):11/12 (58):8/-1 (59):10/-1 -> (60):13/-1 (61):9/9 (62):10/16 (63):14/24 (64):8/16 (65):7/24 (66):10/16 (67):10/10 (68):11/-1 (69):4/24 -> (70):6/40 (71):10/10 (72):8/-1 (73):3/9 (74):9/9 (75):8/12 (76):6/-1 (77):7/-1 (78):11/40 (79):7/10 -> (80):9/9 (81):7/9 (82):7/10 (83):10/10 (84):9/9 (85):5/10 (86):6/-1 (87):8/-1 (88):5/40 (89):7/-1 -> (90):4/24 (91):12/-1 (92):9/40 (93):5/-1 (94):10/12 (95):11/12 (96):9/24 (97):6/24 (98):6/9 (99):11/-1 +> (9):8/-1 +> (19):9/16 +> (29):4/9 +> (39):9/10 +> (49):8/9 +> (59):10/-1 +> (69):4/24 +> (79):7/10 +> (89):7/-1 +> (99):11/-1 > > Total maximum concurrency is 14 > Starting 9: (70) > Starting to solve(496) > Max concurrency: -> (0):5/40 (1):10/12 (2):5/10 (3):6/24 (4):5/24 (5):11/12 (6):10/24 (7):9/12 (8):4/40 (9):7/9 -> (10):10/24 (11):8/40 (12):6/10 (13):10/12 (14):3/12 (15):14/16 (16):9/40 (17):6/-1 (18):7/16 (19):5/9 -> (20):8/10 (21):8/-1 (22):4/9 (23):10/24 (24):7/-1 (25):8/16 (26):6/24 (27):9/10 (28):11/-1 (29):3/-1 -> (30):7/24 (31):7/10 (32):10/10 (33):10/10 (34):6/24 (35):8/16 (36):11/16 (37):6/12 (38):8/10 (39):11/24 -> (40):7/9 (41):10/10 (42):9/40 (43):9/9 (44):9/10 (45):10/-1 (46):6/10 (47):9/12 (48):8/12 (49):3/12 -> (50):8/16 (51):9/9 (52):12/16 (53):10/10 (54):9/-1 (55):8/12 (56):7/12 (57):10/24 (58):9/16 (59):10/24 -> (60):8/10 (61):6/40 (62):11/16 (63):15/16 (64):10/-1 (65):11/-1 (66):5/12 (67):12/24 (68):6/10 (69):8/12 -> (70):10/-1 (71):10/24 (72):10/-1 (73):9/10 (74):11/12 (75):8/10 (76):10/10 (77):10/24 (78):10/40 (79):10/10 -> (80):12/24 (81):9/9 (82):9/40 (83):5/40 (84):13/24 (85):10/12 (86):10/12 (87):11/12 (88):8/9 (89):8/-1 -> (90):7/16 (91):6/24 (92):10/10 (93):12/12 (94):11/-1 (95):7/24 (96):5/40 (97):10/-1 (98):9/9 (99):12/24 +> (9):7/9 +> (19):5/9 +> (29):3/-1 +> (39):11/24 +> (49):3/12 +> (59):10/24 +> (69):8/12 +> (79):10/10 +> (89):8/-1 +> (99):12/24 > > Total maximum concurrency is 15 > 10x One shot execution time for a total of 100 constraints, 100 variables with 24 active constraint each, concurrency in [8,72] and max concurrency share 2 diff --git a/teshsuite/surf/maxmin_bench/maxmin_bench_small.tesh b/teshsuite/surf/maxmin_bench/maxmin_bench_small.tesh index c9a468fec7..abff38b2a8 100644 --- a/teshsuite/surf/maxmin_bench/maxmin_bench_small.tesh +++ b/teshsuite/surf/maxmin_bench/maxmin_bench_small.tesh @@ -1,8 +1,6 @@ #! ./tesh -! timeout 10 ! expect return 0 -! output sort $ ./maxmin_bench small 10 test > [0.000000]: [surf_maxmin/DEBUG] Setting selective_update_active flag to 1 > [0.000000]: [surf_maxmin/DEBUG] Active constraints : 10 @@ -965,61 +963,61 @@ $ ./maxmin_bench small 10 test > Starting 0: (807) > Starting to solve(813) > Max concurrency: -> (0):1/-1 (1):2/3 (2):1/4 (3):1/3 (4):2/-1 (5):3/3 (6):2/4 (7):1/-1 (8):2/-1 (9):2/3 +> (9):2/3 > > Total maximum concurrency is 3 > Starting 1: (614) > Starting to solve(68) > Max concurrency: -> (0):3/3 (1):0/3 (2):3/-1 (3):1/4 (4):2/-1 (5):2/3 (6):3/3 (7):3/4 (8):2/3 (9):4/4 +> (9):4/4 > > Total maximum concurrency is 4 > Starting 2: (421) > Starting to solve(310) > Max concurrency: -> (0):2/3 (1):1/4 (2):4/4 (3):2/3 (4):3/4 (5):2/-1 (6):1/3 (7):1/3 (8):1/-1 (9):2/-1 +> (9):2/-1 > > Total maximum concurrency is 4 > Starting 3: (228) > Starting to solve(952) > Max concurrency: -> (0):1/4 (1):3/-1 (2):2/3 (3):6/-1 (4):4/-1 (5):3/4 (6):1/4 (7):2/3 (8):2/3 (9):4/4 +> (9):4/4 > > Total maximum concurrency is 6 > Starting 4: (35) > Starting to solve(203) > Max concurrency: -> (0):1/4 (1):4/4 (2):1/4 (3):0/4 (4):3/3 (5):2/4 (6):2/4 (7):3/-1 (8):2/3 (9):2/4 +> (9):2/4 > > Total maximum concurrency is 4 > Starting 5: (842) > Starting to solve(329) > Max concurrency: -> (0):1/4 (1):3/3 (2):3/3 (3):3/-1 (4):3/4 (5):2/3 (6):4/4 (7):3/4 (8):3/4 (9):1/3 +> (9):1/3 > > Total maximum concurrency is 4 > Starting 6: (649) > Starting to solve(908) > Max concurrency: -> (0):1/4 (1):4/4 (2):2/3 (3):1/3 (4):3/4 (5):4/-1 (6):0/4 (7):3/3 (8):0/4 (9):2/4 +> (9):2/4 > > Total maximum concurrency is 4 > Starting 7: (456) > Starting to solve(563) > Max concurrency: -> (0):2/3 (1):2/3 (2):2/-1 (3):1/4 (4):3/4 (5):2/4 (6):3/3 (7):1/-1 (8):3/4 (9):3/4 +> (9):3/4 > > Total maximum concurrency is 3 > Starting 8: (263) > Starting to solve(118) > Max concurrency: -> (0):2/3 (1):2/4 (2):1/3 (3):3/4 (4):3/4 (5):4/4 (6):2/4 (7):3/4 (8):2/3 (9):2/-1 +> (9):2/-1 > > Total maximum concurrency is 4 > Starting 9: (70) > Starting to solve(117) > Max concurrency: -> (0):1/4 (1):2/3 (2):3/3 (3):3/4 (4):4/4 (5):1/3 (6):1/4 (7):1/3 (8):2/4 (9):1/3 +> (9):1/3 > > Total maximum concurrency is 4 > 10x One shot execution time for a total of 10 constraints, 10 variables with 4 active constraint each, concurrency in [2,6] and max concurrency share 2 -- 2.20.1