diff --git a/.idea/misc.xml b/.idea/misc.xml index 608ff4778..cad463ba5 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + diff --git a/.idea/research-project.iml b/.idea/research-project.iml index 2ac552949..d6bae725f 100644 --- a/.idea/research-project.iml +++ b/.idea/research-project.iml @@ -26,8 +26,9 @@ + - + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 511e2bc31..86c26b841 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -16,11 +16,48 @@ + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - - - - + + + - + @@ -593,16 +636,6 @@ 77 - + - - - - + + + + - - + - + + + + + - - - - - + + + + + - - - - - - + - + + + \ No newline at end of file diff --git a/python/bcp.py b/python/bcp.py new file mode 100644 index 000000000..ddfe099e3 --- /dev/null +++ b/python/bcp.py @@ -0,0 +1,109 @@ +from mapf_branch_and_bound.bbsolver import solve_bb +from mapfmclient import MapfBenchmarker, ProgressiveDescriptor, BenchmarkDescriptor, MarkedLocation, \ + Problem as cProblem, Solution +from python.algorithm import MapfAlgorithm +import subprocess +import os +import re + +# with open("token", "r") as f: +# token = f.read() +# token = "bx6nC0HsVMJQFHtd" #koos +token = "ayTmSdJAUeVz2om3" # jesse +bcp_mapf_path = "/home/jessemulderij/bcp-mapf/build/bcp-mapf" + + +# bcp_mapf_path = "/home/koos/bcp-mapf/build/bcp-mapf" + +def solve(problem: cProblem, bound) -> Solution: + print("Starts: ", problem.starts) + print("Goals: ", problem.goals) + print("Grid: ", problem.grid) + print("width, height: ", problem.width, problem.height) + + version_info = "version 1 graph" + map_path = "temp.map" + num_of_agents = len(problem.starts) + + types = {} + starts = [] + goals = [] + for i, start in enumerate(problem.starts): + x = start.x + y = start.y + c = start.color + start_node = "({},{})".format(x, y) + starts.append(start_node) + if not c in types: types[c] = [] + types[c].append(i) + for i, goal in enumerate(problem.goals): + x = goal.x + y = goal.y + c = goal.color + goal_node = "({},{})".format(x, y) + goals.append((goal_node, c)) + + scenario_path = "temp.scen" + with open(scenario_path, "w") as f: + f.write(version_info + "\n") + f.write(map_path + "\n") + f.write("Num_of_Agents {}\n".format(num_of_agents)) + f.write("types\n") + for key, val in types.items(): + f.write("{} {}\n".format(key, " ".join([str(v) for v in val]))) + f.write("agents starts\n") + for i, start in enumerate(starts): + f.write("{} {}\n".format(i, start)) + f.write("goals\n") + for goal in goals: + f.write("{} {}\n".format(goal[1], goal[0])) + + with open(map_path, "w") as f: + f.write("type octile\nheight {}\nwidth {}\nmap\n".format(problem.height, problem.width)) + for line in problem.grid: + for cell in line: + f.write("@" if cell else ".") + f.write("\n") + + args = [bcp_mapf_path, "-f", os.path.join(os.path.dirname(os.path.realpath(__file__)), "temp.scen")] + if bound is not None: + args += ["-u", str(bound + len(problem.starts))] + subprocess.run(args) + + paths = [] + with open("outputs/temp.sol", "r") as f: + sol_val = int(f.readline()) + f.readline() + re_p = re.compile("(\(\d+,\d+\))") + while True: + line = f.readline() + if not line: break + path = [] + for node in re_p.findall(line): + node = node.replace("(", "").replace(")", "") + x, y = node.split(",") + path.append((int(x), int(y))) + paths.append(path) + # print(paths) + + print(Solution.from_paths(paths).serialize()) + return Solution.from_paths(paths) + +def submit(instanceID): + benchmarker = MapfBenchmarker( + token, + instanceID, + "BCP-MAPFM", + "1", + False, + solver=lambda problem: solve_bb(problem,solve), + cores=1, + baseURL="https://mapf.nl", + ) + benchmarker.run() + + +for instanceID in range(95): + if instanceID not in range(94): + submit(instanceID) + diff --git a/python/benchmarks/comparison/Astar-OD-ID b/python/benchmarks/comparison/Astar-OD-ID index eef3b64e8..e26311c24 160000 --- a/python/benchmarks/comparison/Astar-OD-ID +++ b/python/benchmarks/comparison/Astar-OD-ID @@ -1 +1 @@ -Subproject commit eef3b64e8a17cc89985517090e4737d6e59ad934 +Subproject commit e26311c24ee597ea74d2e15441bad9fe43a90a32 diff --git a/python/benchmarks/comparison/CSE3000-RP b/python/benchmarks/comparison/CSE3000-RP index 42fa63607..6d342041b 160000 --- a/python/benchmarks/comparison/CSE3000-RP +++ b/python/benchmarks/comparison/CSE3000-RP @@ -1 +1 @@ -Subproject commit 42fa63607f7dbf52a3329036ad6cb8aee716bf91 +Subproject commit 6d342041b6de8a8e3e2cf8e5caaf7ed80ed4b9bf diff --git a/python/benchmarks/comparison/icts-m b/python/benchmarks/comparison/icts-m index 5cbe74ae6..58ad9c4a7 160000 --- a/python/benchmarks/comparison/icts-m +++ b/python/benchmarks/comparison/icts-m @@ -1 +1 @@ -Subproject commit 5cbe74ae6fc298594a130dfa319f2ee71cf3c658 +Subproject commit 58ad9c4a7c27eb84c50d68ab718c68f4849e22ae diff --git a/python/benchmarks/comparison/matching-epea-star b/python/benchmarks/comparison/matching-epea-star index 85ee6769d..13d8716f9 160000 --- a/python/benchmarks/comparison/matching-epea-star +++ b/python/benchmarks/comparison/matching-epea-star @@ -1 +1 @@ -Subproject commit 85ee6769df5888da2d0169ff385bca9b7224ddd6 +Subproject commit 13d8716f932bb98398fe8e190e668ee65bcf0f34 diff --git a/python/benchmarks/paper/map_size_25percent/map_size_25percent.eps b/python/benchmarks/paper/map_size_25percent/map_size_25percent.eps index 37aacbade..923002781 100644 --- a/python/benchmarks/paper/map_size_25percent/map_size_25percent.eps +++ b/python/benchmarks/paper/map_size_25percent/map_size_25percent.eps @@ -1,10 +1,10 @@ %!PS-Adobe-3.0 EPSF-3.0 %%Title: map_size_25percent.eps -%%Creator: Matplotlib v3.4.2, https://matplotlib.org/ -%%CreationDate: Wed Aug 25 01:08:22 2021 +%%Creator: Matplotlib v3.4.3, https://matplotlib.org/ +%%CreationDate: Wed Aug 25 12:05:36 2021 %%Orientation: portrait -%%BoundingBox: 67 302 545 490 -%%HiResBoundingBox: 67.255288 302.636875 544.744712 489.363125 +%%BoundingBox: 69 303 543 489 +%%HiResBoundingBox: 69.238238 303.540625 542.761762 488.459375 %%EndComments %%BeginProlog /mpldict 11 dict def @@ -32,957 +32,976 @@ mpldict begin %!PS-Adobe-3.0 Resource-Font %%Creator: Converted from TrueType to Type 3 by Matplotlib. 10 dict begin -/FontName /LiberationSans def +/FontName /ArialMT def /PaintType 0 def /FontMatrix [0.00048828125 0 0 0.00048828125 0 0] def -/FontBBox [-1114 -621 2666 2007] def +/FontBBox [-1361 -665 4154 2124] def /FontType 3 def /Encoding [/space /percent /parenleft /parenright /asterisk /zero /one /two /three /four /five /six /seven /eight /nine /A /B /C /E /I /M /P /S /T /a /d /e /g /h /i /l /n /o /r /s /t /v /w /x /y /z] def /CharStrings 42 dict dup begin /.notdef 0 def /space{569 0 0 0 0 0 sc ce} _d -/percent{1821 0 73 -12 1748 1421 sc -1748 434 m -1748 291 1721 180 1667 103 c -1613 26 1533 -12 1428 -12 c -1324 -12 1245 25 1192 100 c -1139 175 1113 287 1113 434 c -1113 586 1138 699 1189 773 c -1240 848 1321 885 1432 885 c -1541 885 1621 847 1672 770 c -1723 694 1748 582 1748 434 c - -527 0 m -372 0 l -1294 1409 l -1451 1409 l -527 0 l - -394 1421 m -500 1421 579 1384 630 1309 c -681 1234 707 1123 707 975 c -707 830 680 719 627 641 c -574 563 495 524 390 524 c -285 524 205 563 152 640 c -99 717 73 829 73 975 c -73 1124 99 1235 150 1309 c -201 1384 283 1421 394 1421 c - -1600 434 m -1600 553 1587 640 1561 693 c -1536 747 1493 774 1432 774 c -1371 774 1327 748 1300 695 c -1273 642 1260 555 1260 434 c -1260 320 1273 235 1299 180 c -1326 125 1369 98 1430 98 c -1489 98 1532 126 1559 181 c -1586 237 1600 321 1600 434 c - -560 975 m -560 1092 547 1178 522 1232 c -497 1286 454 1313 394 1313 c -331 1313 287 1286 260 1233 c -233 1180 220 1094 220 975 c -220 860 233 774 260 719 c -287 664 331 637 392 637 c -450 637 492 665 519 721 c -546 777 560 862 560 975 c +/percent{1821 0 119 -54 1695 1491 sc +119 1114 m +119 1219 145 1308 198 1381 c +251 1454 327 1491 427 1491 c +519 1491 595 1458 655 1392 c +716 1327 746 1230 746 1103 c +746 979 715 883 654 816 c +593 749 518 716 429 716 c +340 716 266 749 207 815 c +148 881 119 981 119 1114 c + +432 1367 m +387 1367 350 1348 320 1309 c +291 1270 276 1199 276 1096 c +276 1002 291 936 321 897 c +351 859 388 840 432 840 c +477 840 515 859 544 898 c +574 937 589 1007 589 1110 c +589 1205 574 1271 544 1309 c +514 1348 477 1367 432 1367 c + +433 -54 m +1235 1491 l +1381 1491 l +582 -54 l +433 -54 l + +1067 344 m +1067 449 1093 538 1146 611 c +1199 684 1275 721 1376 721 c +1468 721 1544 688 1604 622 c +1665 557 1695 460 1695 333 c +1695 209 1664 113 1603 46 c +1542 -21 1467 -54 1377 -54 c +1288 -54 1214 -21 1155 45 c +1096 112 1067 211 1067 344 c + +1381 597 m +1336 597 1298 578 1268 539 c +1239 500 1224 429 1224 326 c +1224 233 1239 167 1269 128 c +1299 89 1336 70 1380 70 c +1426 70 1464 89 1493 128 c +1523 167 1538 237 1538 340 c +1538 435 1523 501 1493 539 c +1463 578 1426 597 1381 597 c ce} _d -/parenleft{682 0 127 -424 670 1484 sc -127 532 m -127 725 157 898 217 1051 c -278 1204 371 1349 496 1484 c -670 1484 l -545 1345 454 1198 395 1042 c -337 886 308 715 308 530 c -308 345 337 175 394 20 c -452 -135 544 -283 670 -424 c -496 -424 l -370 -288 277 -143 217 10 c -157 164 127 337 127 528 c -127 532 l +/parenleft{682 0 124 -431 608 1491 sc +479 -431 m +380 -306 296 -159 227 9 c +158 177 124 351 124 531 c +124 690 150 842 201 987 c +261 1156 354 1324 479 1491 c +608 1491 l +527 1352 474 1253 448 1194 c +407 1102 375 1006 352 906 c +323 781 309 656 309 530 c +309 209 409 -111 608 -431 c +479 -431 l ce} _d -/parenright{682 0 12 -424 555 1484 sc -555 528 m -555 335 525 162 464 9 c -404 -144 311 -289 186 -424 c -12 -424 l -137 -284 229 -137 287 18 c -345 173 374 344 374 530 c -374 716 345 887 286 1042 c -228 1197 137 1345 12 1484 c -186 1484 l -312 1348 405 1203 465 1049 c -525 896 555 723 555 532 c -555 528 l +/parenright{682 0 124 -431 608 1491 sc +253 -431 m +124 -431 l +323 -111 423 209 423 530 c +423 655 409 780 380 903 c +357 1003 326 1099 285 1191 c +259 1251 205 1351 124 1491 c +253 1491 l +378 1324 471 1156 531 987 c +582 842 608 690 608 531 c +608 351 573 177 504 9 c +435 -159 352 -306 253 -431 c ce} _d -/asterisk{797 0 33 690 765 1409 sc -456 1114 m -720 1217 l -765 1085 l -483 1012 l -668 762 l -549 690 l -399 948 l -243 692 l -124 764 l -313 1012 l -33 1085 l -78 1219 l -345 1112 l -333 1409 l -469 1409 l -456 1114 l +/asterisk{797 0 64 867 725 1491 sc +64 1197 m +110 1339 l +216 1302 293 1269 341 1242 c +328 1363 322 1446 321 1491 c +466 1491 l +464 1425 456 1342 443 1243 c +512 1278 590 1310 679 1339 c +725 1197 l +640 1169 557 1150 476 1141 c +517 1106 574 1043 648 952 c +528 867 l +489 920 444 991 391 1082 c +342 988 298 916 261 867 c +143 952 l +220 1047 276 1110 309 1141 c +223 1158 141 1176 64 1197 c ce} _d -/zero{1139 0 80 -20 1059 1430 sc -1059 705 m -1059 470 1017 290 934 166 c -851 42 729 -20 567 -20 c -405 -20 283 42 202 165 c -121 288 80 468 80 705 c -80 947 119 1128 198 1249 c -277 1370 402 1430 573 1430 c -739 1430 861 1369 940 1247 c -1019 1125 1059 944 1059 705 c - -876 705 m -876 908 852 1056 805 1147 c -758 1238 681 1284 573 1284 c -462 1284 383 1239 334 1149 c -286 1059 262 911 262 705 c -262 505 286 359 335 266 c -384 173 462 127 569 127 c -675 127 753 174 802 269 c -851 364 876 509 876 705 c +/zero{1139 0 85 -25 1041 1472 sc +85 723 m +85 896 103 1036 138 1141 c +174 1247 227 1329 297 1386 c +368 1443 456 1472 563 1472 c +642 1472 711 1456 770 1424 c +829 1393 878 1347 917 1287 c +956 1228 986 1155 1008 1069 c +1030 984 1041 868 1041 723 c +1041 551 1023 412 988 306 c +953 201 900 119 829 61 c +759 4 670 -25 563 -25 c +422 -25 311 26 230 127 c +133 249 85 448 85 723 c + +270 723 m +270 482 298 322 354 242 c +411 163 480 123 563 123 c +646 123 715 163 771 243 c +828 323 856 483 856 723 c +856 964 828 1125 771 1204 c +715 1283 645 1323 561 1323 c +478 1323 412 1288 363 1218 c +301 1129 270 964 270 723 c ce} _d -/one{1139 0 156 0 1039 1409 sc -156 0 m -156 153 l -515 153 l -515 1237 l -197 1010 l -197 1180 l -530 1409 l -696 1409 l -696 153 l -1039 153 l -1039 0 l -156 0 l +/one{1139 0 223 0 763 1472 sc +763 0 m +583 0 l +583 1147 l +540 1106 483 1064 412 1023 c +342 982 279 951 223 930 c +223 1104 l +324 1151 412 1209 487 1276 c +562 1343 616 1409 647 1472 c +763 1472 l +763 0 l ce} _d -/two{1139 0 103 0 1036 1430 sc -103 0 m -103 127 l -137 205 178 274 227 333 c -276 393 328 447 382 495 c -436 544 489 589 542 630 c -595 671 643 713 686 754 c -729 795 763 839 789 884 c -816 929 829 981 829 1038 c -829 1115 806 1175 761 1218 c -716 1261 653 1282 572 1282 c -495 1282 432 1261 382 1219 c -333 1178 304 1119 295 1044 c -111 1061 l -124 1174 172 1263 254 1330 c -337 1397 443 1430 572 1430 c -714 1430 823 1396 899 1329 c -976 1262 1014 1167 1014 1044 c -1014 989 1001 935 976 881 c -951 827 914 773 865 719 c -816 665 721 581 582 468 c -505 405 444 349 399 298 c -354 248 321 200 301 153 c -1036 153 l -1036 0 l -103 0 l +/two{1139 0 60 0 1031 1472 sc +1031 173 m +1031 0 l +62 0 l +61 43 68 85 83 125 c +108 191 147 256 201 320 c +256 384 334 458 437 542 c +596 673 704 776 760 852 c +816 929 844 1001 844 1069 c +844 1140 818 1200 767 1249 c +716 1298 650 1323 568 1323 c +481 1323 412 1297 360 1245 c +308 1193 282 1121 281 1029 c +96 1048 l +109 1186 156 1291 239 1363 c +322 1436 433 1472 572 1472 c +713 1472 824 1433 906 1355 c +988 1277 1029 1180 1029 1065 c +1029 1006 1017 949 993 892 c +969 835 929 776 873 713 c +818 650 725 564 596 455 c +488 364 419 303 388 270 c +357 238 332 206 312 173 c +1031 173 l ce} _d -/three{1139 0 78 -20 1049 1430 sc -1049 389 m -1049 259 1008 158 925 87 c -842 16 724 -20 571 -20 c -428 -20 314 12 229 76 c -144 141 94 236 78 362 c -264 379 l -288 212 390 129 571 129 c -662 129 733 151 784 196 c -836 241 862 307 862 395 c -862 472 832 531 773 574 c -714 617 629 639 518 639 c -416 639 l -416 795 l -514 795 l -613 795 689 816 743 859 c -798 902 825 962 825 1038 c -825 1113 803 1173 758 1216 c -714 1260 648 1282 561 1282 c -482 1282 417 1262 368 1221 c -319 1180 291 1123 283 1049 c -102 1063 l -115 1178 163 1268 245 1333 c -328 1398 434 1430 563 1430 c -704 1430 814 1397 892 1331 c -971 1266 1010 1174 1010 1057 c -1010 967 985 894 934 837 c -884 781 811 743 715 723 c -715 719 l -820 708 902 672 961 613 c -1020 554 1049 479 1049 389 c +/three{1139 0 86 -26 1046 1472 sc +86 387 m +266 411 l +287 309 322 235 371 190 c +421 145 482 123 553 123 c +638 123 709 152 767 211 c +826 270 855 342 855 429 c +855 512 828 580 774 633 c +720 687 651 714 568 714 c +534 714 492 707 441 694 c +461 852 l +473 851 483 850 490 850 c +567 850 636 870 697 910 c +758 950 789 1012 789 1095 c +789 1161 767 1216 722 1259 c +677 1302 620 1324 549 1324 c +479 1324 421 1302 374 1258 c +327 1214 297 1148 284 1060 c +104 1092 l +126 1213 176 1306 254 1372 c +332 1439 429 1472 545 1472 c +625 1472 699 1455 766 1420 c +833 1386 885 1339 920 1280 c +956 1221 974 1158 974 1091 c +974 1028 957 970 923 918 c +889 866 839 825 772 794 c +859 774 926 732 974 669 c +1022 606 1046 528 1046 433 c +1046 305 999 196 906 107 c +813 18 695 -26 552 -26 c +423 -26 316 12 231 89 c +146 166 98 265 86 387 c ce} _d -/four{1139 0 47 0 1079 1409 sc -881 319 m -881 0 l -711 0 l -711 319 l -47 319 l -47 459 l -692 1409 l -881 1409 l -881 461 l -1079 461 l -1079 319 l -881 319 l - -711 1206 m -710 1202 700 1184 683 1153 c -666 1122 653 1100 644 1087 c -283 555 l -229 481 l -213 461 l -711 461 l -711 1206 l +/four{1139 0 26 0 1040 1466 sc +662 0 m +662 351 l +26 351 l +26 516 l +695 1466 l +842 1466 l +842 516 l +1040 516 l +1040 351 l +842 351 l +842 0 l +662 0 l + +662 516 m +662 1177 l +203 516 l +662 516 l ce} _d -/five{1139 0 82 -20 1053 1409 sc -1053 459 m -1053 310 1009 193 920 108 c -832 23 710 -20 553 -20 c -422 -20 316 9 235 66 c -154 123 103 206 82 315 c -264 336 l -302 197 400 127 557 127 c -654 127 729 156 784 214 c -839 273 866 353 866 455 c -866 544 838 615 783 670 c -728 725 654 752 561 752 c -512 752 467 744 425 729 c -383 714 341 688 299 651 c -123 651 l -170 1409 l -971 1409 l -971 1256 l -334 1256 l -307 809 l -385 869 482 899 598 899 c -737 899 847 858 929 777 c -1012 696 1053 590 1053 459 c +/five{1139 0 85 -25 1057 1446 sc +85 384 m +274 400 l +288 308 320 239 371 192 c +422 146 484 123 556 123 c +643 123 716 156 776 221 c +836 286 866 373 866 481 c +866 584 837 665 779 724 c +722 783 646 813 553 813 c +495 813 443 800 396 773 c +349 747 313 713 286 671 c +117 693 l +259 1446 l +988 1446 l +988 1274 l +403 1274 l +324 880 l +412 941 504 972 601 972 c +729 972 837 928 925 839 c +1013 750 1057 636 1057 497 c +1057 364 1018 250 941 153 c +847 34 719 -25 556 -25 c +423 -25 314 12 229 87 c +145 162 97 261 85 384 c ce} _d -/six{1139 0 104 -20 1049 1430 sc -1049 461 m -1049 312 1009 195 928 109 c -847 23 736 -20 594 -20 c -435 -20 314 39 230 157 c -146 275 104 447 104 672 c -104 916 148 1103 235 1234 c -322 1365 447 1430 608 1430 c -821 1430 955 1334 1010 1143 c -838 1112 l -803 1227 725 1284 606 1284 c -503 1284 424 1236 367 1140 c -311 1045 283 906 283 725 c -316 786 362 832 421 863 c -480 895 548 911 625 911 c -755 911 858 870 934 789 c -1011 708 1049 598 1049 461 c - -866 453 m -866 555 841 634 791 689 c -741 744 671 772 582 772 c -498 772 430 747 378 698 c -327 649 301 582 301 496 c -301 387 328 298 381 229 c -435 160 504 125 588 125 c -675 125 743 154 792 212 c -841 271 866 351 866 453 c +/six{1139 0 77 -25 1045 1472 sc +1019 1107 m +840 1093 l +824 1164 801 1215 772 1247 c +723 1298 663 1324 592 1324 c +535 1324 484 1308 441 1276 c +384 1235 340 1174 307 1095 c +274 1016 257 903 256 756 c +299 822 352 871 415 903 c +478 935 543 951 612 951 c +732 951 834 907 918 818 c +1003 730 1045 616 1045 476 c +1045 384 1025 298 985 219 c +946 140 891 80 822 38 c +753 -4 674 -25 586 -25 c +436 -25 314 30 219 140 c +124 251 77 433 77 686 c +77 969 129 1175 234 1304 c +325 1416 448 1472 603 1472 c +718 1472 813 1440 886 1375 c +960 1310 1004 1221 1019 1107 c + +284 475 m +284 413 297 354 323 297 c +350 240 387 197 434 167 c +481 138 531 123 583 123 c +659 123 724 154 779 215 c +834 276 861 360 861 465 c +861 566 834 646 780 704 c +726 763 658 792 576 792 c +495 792 426 763 369 704 c +312 646 284 570 284 475 c ce} _d -/seven{1139 0 105 0 1036 1409 sc -1036 1263 m -892 1043 790 871 731 746 c -672 621 627 498 597 377 c -568 256 553 130 553 0 c -365 0 l -365 180 403 369 479 568 c -556 767 683 997 862 1256 c -105 1256 l -105 1409 l -1036 1409 l -1036 1263 l +/seven{1139 0 97 0 1046 1447 sc +97 1274 m +97 1447 l +1046 1447 l +1046 1307 l +953 1208 860 1076 768 911 c +677 746 606 577 556 403 c +520 280 497 146 487 0 c +302 0 l +304 115 327 255 370 418 c +413 581 475 739 556 890 c +637 1042 724 1170 815 1274 c +97 1274 l ce} _d -/eight{1139 0 89 -20 1050 1430 sc -1050 393 m -1050 263 1009 162 926 89 c -843 16 725 -20 570 -20 c -419 -20 301 16 216 87 c -131 158 89 260 89 391 c -89 483 115 560 168 623 c -221 686 288 724 370 737 c -370 741 l -293 759 233 798 188 858 c -144 918 122 988 122 1069 c -122 1176 162 1263 242 1330 c -323 1397 431 1430 566 1430 c -705 1430 814 1397 894 1332 c -975 1267 1015 1178 1015 1067 c -1015 986 993 916 948 856 c -903 796 842 758 765 743 c -765 739 l -855 724 925 686 975 624 c -1025 563 1050 486 1050 393 c - -828 1057 m -828 1216 741 1296 566 1296 c -481 1296 417 1276 372 1236 c -328 1196 306 1136 306 1057 c -306 976 329 915 374 872 c -420 830 485 809 568 809 c -653 809 717 828 761 867 c -806 906 828 970 828 1057 c - -863 410 m -863 497 837 563 785 607 c -733 652 660 674 566 674 c -475 674 403 650 352 602 c -301 555 275 489 275 406 c -275 212 374 115 572 115 c -670 115 743 138 791 185 c -839 232 863 307 863 410 c +/eight{1139 0 83 -25 1049 1472 sc +362 795 m +287 822 232 861 196 912 c +160 963 142 1023 142 1094 c +142 1201 180 1290 257 1363 c +334 1436 436 1472 563 1472 c +691 1472 794 1435 872 1360 c +950 1286 989 1196 989 1089 c +989 1021 971 962 935 911 c +900 861 846 822 773 795 c +863 766 931 718 978 653 c +1025 588 1049 510 1049 419 c +1049 294 1005 188 916 103 c +827 18 711 -25 566 -25 c +421 -25 305 18 216 103 c +127 189 83 296 83 424 c +83 519 107 599 155 663 c +204 728 273 772 362 795 c + +326 1100 m +326 1031 348 974 393 930 c +438 886 496 864 567 864 c +636 864 693 886 737 929 c +782 973 804 1027 804 1090 c +804 1156 781 1211 735 1256 c +690 1301 633 1324 565 1324 c +496 1324 439 1302 394 1258 c +349 1214 326 1161 326 1100 c + +268 423 m +268 372 280 322 304 274 c +329 226 365 189 413 162 c +461 136 513 123 568 123 c +654 123 725 151 781 206 c +837 261 865 332 865 417 c +865 504 836 575 778 632 c +721 689 649 717 562 717 c +477 717 407 689 351 633 c +296 577 268 507 268 423 c ce} _d -/nine{1139 0 96 -20 1042 1430 sc -1042 733 m -1042 491 998 305 909 175 c -821 45 695 -20 532 -20 c -422 -20 334 3 267 49 c -201 96 154 171 125 274 c -297 301 l -333 184 412 125 535 125 c -638 125 718 173 775 269 c -832 365 861 502 864 680 c -837 620 792 572 727 535 c -662 499 591 481 514 481 c -387 481 286 524 210 611 c -134 698 96 813 96 956 c -96 1103 137 1219 220 1303 c -303 1388 418 1430 565 1430 c -722 1430 840 1372 921 1256 c -1002 1140 1042 966 1042 733 c - -846 907 m -846 1020 820 1111 768 1180 c -716 1249 646 1284 559 1284 c -472 1284 404 1254 354 1195 c -304 1136 279 1057 279 956 c -279 853 304 772 354 712 c -404 653 472 623 557 623 c -609 623 657 635 702 658 c -747 682 782 716 807 759 c -833 802 846 852 846 907 c +/nine{1139 0 85 -25 1049 1472 sc +112 339 m +285 355 l +300 274 328 215 369 178 c +410 141 463 123 528 123 c +583 123 632 136 673 161 c +715 186 749 220 776 262 c +803 305 825 362 843 434 c +861 506 870 579 870 654 c +870 662 870 674 869 690 c +833 633 784 586 721 550 c +659 515 592 497 519 497 c +398 497 295 541 211 629 c +127 717 85 833 85 977 c +85 1126 129 1245 216 1336 c +304 1427 414 1472 546 1472 c +641 1472 728 1446 807 1395 c +886 1344 946 1270 987 1175 c +1028 1080 1049 943 1049 763 c +1049 576 1029 426 988 315 c +947 204 887 120 806 62 c +726 4 632 -25 524 -25 c +409 -25 316 7 243 70 c +170 134 127 224 112 339 c + +849 986 m +849 1089 821 1171 766 1232 c +711 1293 645 1323 568 1323 c +488 1323 418 1290 359 1225 c +300 1160 270 1075 270 971 c +270 878 298 802 354 743 c +411 685 480 656 563 656 c +646 656 715 685 768 743 c +822 802 849 883 849 986 c ce} _d -/A{1366 0 4 0 1362 1409 sc -1167 0 m -1006 412 l -364 412 l -202 0 l -4 0 l -579 1409 l -796 1409 l -1362 0 l -1167 0 l - -685 1265 m -676 1237 l -659 1182 635 1111 602 1024 c -422 561 l -949 561 l -768 1026 l -749 1072 731 1124 712 1182 c -685 1265 l +/A{1366 0 -3 0 1369 1466 sc +-3 0 m +560 1466 l +769 1466 l +1369 0 l +1148 0 l +977 444 l +364 444 l +203 0 l +-3 0 l + +420 602 m +917 602 l +764 1008 l +717 1131 683 1233 660 1312 c +641 1218 615 1125 581 1032 c +420 602 l ce} _d -/B{1366 0 168 0 1258 1409 sc -1258 397 m -1258 272 1212 174 1121 104 c -1030 35 903 0 740 0 c -168 0 l -168 1409 l -680 1409 l -1011 1409 1176 1295 1176 1067 c -1176 984 1153 914 1106 857 c -1059 800 993 762 908 743 c -1020 730 1106 692 1167 630 c -1228 569 1258 491 1258 397 c - -984 1044 m -984 1120 958 1174 906 1207 c -854 1240 779 1256 680 1256 c -359 1256 l -359 810 l -680 810 l -782 810 858 829 908 867 c -959 906 984 965 984 1044 c - -1065 412 m -1065 578 948 661 715 661 c -359 661 l -359 153 l -730 153 l -847 153 932 175 985 218 c -1038 261 1065 326 1065 412 c +/B{1366 0 150 0 1257 1466 sc +150 0 m +150 1466 l +700 1466 l +812 1466 902 1451 969 1421 c +1037 1392 1090 1346 1128 1284 c +1167 1223 1186 1158 1186 1091 c +1186 1028 1169 969 1135 914 c +1101 859 1050 814 981 780 c +1070 754 1138 710 1185 647 c +1233 584 1257 510 1257 425 c +1257 356 1242 292 1213 233 c +1184 174 1149 129 1106 97 c +1063 65 1010 41 945 24 c +881 8 802 0 709 0 c +150 0 l + +344 850 m +661 850 l +747 850 809 856 846 867 c +895 882 932 906 957 940 c +982 974 995 1017 995 1068 c +995 1117 983 1159 960 1196 c +937 1233 903 1259 860 1272 c +817 1286 742 1293 637 1293 c +344 1293 l +344 850 l + +344 173 m +709 173 l +772 173 816 175 841 180 c +886 188 923 201 953 220 c +983 239 1008 266 1027 301 c +1046 337 1056 378 1056 425 c +1056 480 1042 527 1014 567 c +986 608 947 636 897 652 c +848 669 776 677 683 677 c +344 677 l +344 173 l ce} _d -/C{1479 0 104 -20 1401 1430 sc -792 1274 m -636 1274 515 1224 428 1123 c -341 1023 298 886 298 711 c -298 538 343 399 433 294 c -524 189 646 137 800 137 c -997 137 1146 235 1245 430 c -1401 352 l -1343 231 1261 138 1156 75 c -1051 12 930 -20 791 -20 c -649 -20 526 9 422 68 c -319 127 240 212 185 321 c -131 431 104 561 104 711 c -104 936 165 1112 286 1239 c -407 1366 575 1430 790 1430 c -940 1430 1065 1401 1166 1342 c -1267 1283 1341 1196 1388 1081 c -1207 1021 l -1174 1103 1122 1166 1049 1209 c -977 1252 891 1274 792 1274 c +/C{1479 0 102 -25 1398 1491 sc +1204 514 m +1398 465 l +1357 306 1284 184 1178 100 c +1073 17 944 -25 791 -25 c +633 -25 504 7 405 71 c +306 136 231 229 179 351 c +128 473 102 604 102 744 c +102 897 131 1030 189 1143 c +248 1257 331 1343 438 1402 c +546 1461 665 1491 794 1491 c +941 1491 1064 1454 1164 1379 c +1264 1304 1334 1199 1373 1064 c +1182 1019 l +1148 1126 1099 1203 1034 1252 c +969 1301 888 1325 790 1325 c +677 1325 583 1298 507 1244 c +432 1190 379 1117 348 1026 c +317 935 302 842 302 745 c +302 620 320 511 356 418 c +393 325 449 256 526 210 c +603 164 686 141 775 141 c +884 141 976 172 1051 235 c +1126 298 1177 391 1204 514 c ce} _d -/E{1366 0 168 0 1278 1409 sc -168 0 m -168 1409 l -1237 1409 l -1237 1253 l -359 1253 l -359 801 l -1177 801 l -1177 647 l -359 647 l -359 156 l -1278 156 l -1278 0 l -168 0 l +/E{1366 0 162 0 1256 1466 sc +162 0 m +162 1466 l +1222 1466 l +1222 1293 l +356 1293 l +356 844 l +1167 844 l +1167 672 l +356 672 l +356 173 l +1256 173 l +1256 0 l +162 0 l ce} _d -/I{569 0 189 0 380 1409 sc -189 0 m -189 1409 l -380 1409 l -380 0 l -189 0 l +/I{569 0 191 0 385 1466 sc +191 0 m +191 1466 l +385 1466 l +385 0 l +191 0 l ce} _d -/M{1706 0 168 0 1538 1409 sc -1366 0 m -1366 940 l -1366 1044 1369 1144 1375 1240 c -1342 1121 1313 1027 1287 960 c -923 0 l -789 0 l -420 960 l -364 1130 l -331 1240 l -334 1129 l -338 940 l -338 0 l -168 0 l -168 1409 l -419 1409 l -794 432 l -807 393 820 350 832 305 c -845 260 853 228 857 208 c -862 235 873 275 890 329 c -907 384 919 418 925 432 c -1293 1409 l -1538 1409 l -1538 0 l -1366 0 l +/M{1706 0 152 0 1551 1466 sc +152 0 m +152 1466 l +444 1466 l +791 428 l +823 331 846 259 861 211 c +878 264 904 343 939 446 c +1290 1466 l +1551 1466 l +1551 0 l +1364 0 l +1364 1227 l +938 0 l +763 0 l +339 1248 l +339 0 l +152 0 l ce} _d -/P{1366 0 168 0 1258 1409 sc -1258 985 m -1258 852 1214 746 1127 667 c -1040 588 922 549 773 549 c -359 549 l -359 0 l -168 0 l -168 1409 l -761 1409 l -919 1409 1041 1372 1128 1298 c -1215 1224 1258 1120 1258 985 c - -1066 983 m -1066 1165 957 1256 738 1256 c -359 1256 l -359 700 l -746 700 l -959 700 1066 794 1066 983 c +/P{1366 0 158 0 1277 1466 sc +158 0 m +158 1466 l +711 1466 l +808 1466 883 1461 934 1452 c +1006 1440 1066 1417 1115 1383 c +1164 1350 1203 1303 1232 1242 c +1262 1181 1277 1115 1277 1042 c +1277 917 1237 812 1158 725 c +1079 639 935 596 728 596 c +352 596 l +352 0 l +158 0 l + +352 769 m +731 769 l +856 769 945 792 998 839 c +1051 886 1077 951 1077 1036 c +1077 1097 1061 1150 1030 1193 c +999 1237 959 1266 908 1280 c +875 1289 815 1293 727 1293 c +352 1293 l +352 769 l ce} _d -/S{1366 0 93 -20 1272 1430 sc -1272 389 m -1272 259 1221 158 1119 87 c -1018 16 875 -20 690 -20 c -347 -20 148 99 93 338 c -278 375 l -299 290 345 228 414 188 c -483 149 578 129 697 129 c -820 129 915 150 982 192 c -1049 235 1083 297 1083 379 c -1083 425 1072 462 1051 491 c -1030 520 1001 543 963 562 c -925 581 880 596 827 609 c -774 622 716 635 652 650 c -541 675 456 699 398 724 c -341 749 295 776 262 806 c -229 837 203 872 185 913 c -168 954 159 1000 159 1053 c -159 1174 205 1267 297 1332 c -390 1397 522 1430 694 1430 c -854 1430 976 1405 1061 1356 c -1146 1307 1205 1224 1239 1106 c -1051 1073 l -1030 1148 991 1202 933 1235 c -875 1269 795 1286 692 1286 c -579 1286 493 1267 434 1230 c -375 1193 345 1137 345 1063 c -345 1020 356 984 379 955 c -402 927 436 903 479 883 c -522 864 609 840 738 811 c -781 801 824 791 867 780 c -910 770 952 758 991 743 c -1030 729 1067 712 1101 693 c -1136 674 1166 650 1191 622 c -1216 594 1236 561 1250 523 c -1265 485 1272 440 1272 389 c +/S{1366 0 92 -25 1259 1491 sc +92 471 m +275 487 l +284 414 304 353 335 306 c +367 259 416 221 483 192 c +550 163 625 149 708 149 c +782 149 847 160 904 182 c +961 204 1003 234 1030 272 c +1058 311 1072 353 1072 398 c +1072 444 1059 484 1032 518 c +1005 553 961 582 900 605 c +861 620 774 644 639 676 c +504 709 410 739 356 768 c +286 805 234 850 199 904 c +165 959 148 1020 148 1087 c +148 1161 169 1230 211 1294 c +253 1359 314 1408 395 1441 c +476 1474 565 1491 664 1491 c +773 1491 868 1473 951 1438 c +1034 1403 1098 1352 1143 1284 c +1188 1216 1212 1139 1215 1053 c +1029 1039 l +1019 1132 985 1202 927 1249 c +870 1296 785 1320 672 1320 c +555 1320 469 1298 415 1255 c +362 1212 335 1161 335 1100 c +335 1047 354 1004 392 970 c +429 936 527 901 684 865 c +842 830 950 799 1009 772 c +1094 733 1157 683 1198 622 c +1239 562 1259 493 1259 414 c +1259 336 1237 262 1192 193 c +1147 124 1083 71 999 32 c +916 -6 822 -25 717 -25 c +584 -25 473 -6 383 33 c +294 72 223 130 172 207 c +121 285 95 373 92 471 c ce} _d -/T{1251 0 46 0 1204 1409 sc -720 1253 m -720 0 l -530 0 l -530 1253 l -46 1253 l -46 1409 l -1204 1409 l -1204 1253 l -720 1253 l +/T{1251 0 48 0 1210 1466 sc +531 0 m +531 1293 l +48 1293 l +48 1466 l +1210 1466 l +1210 1293 l +725 1293 l +725 0 l +531 0 l ce} _d -/a{1139 0 87 -20 1139 1102 sc -414 -20 m -305 -20 224 9 169 66 c -114 123 87 202 87 302 c -87 414 124 500 197 560 c -271 620 390 652 554 656 c -797 660 l -797 719 l -797 807 778 870 741 908 c -704 946 645 965 565 965 c -484 965 426 951 389 924 c -352 897 330 853 323 793 c -135 810 l -166 1005 310 1102 569 1102 c -705 1102 807 1071 876 1008 c -945 946 979 856 979 738 c -979 272 l -979 219 986 178 1000 151 c -1014 124 1041 111 1080 111 c -1097 111 1117 113 1139 118 c -1139 6 l -1094 -5 1047 -10 1000 -10 c -933 -10 885 7 854 42 c -824 77 807 132 803 207 c -797 207 l -751 124 697 66 636 31 c -575 -3 501 -20 414 -20 c - -455 115 m -521 115 580 130 631 160 c -682 190 723 231 752 283 c -782 336 797 390 797 445 c -797 534 l -600 530 l -515 529 451 520 407 504 c -364 488 330 463 307 430 c -284 397 272 353 272 299 c -272 240 288 195 319 163 c -351 131 396 115 455 115 c +/a{1139 0 74 -24 1052 1086 sc +828 131 m +761 74 697 34 635 11 c +574 -12 508 -24 437 -24 c +320 -24 231 4 168 61 c +105 118 74 191 74 280 c +74 332 86 379 109 422 c +133 465 164 500 202 526 c +241 552 284 572 332 585 c +367 594 421 603 492 612 c +637 629 744 650 813 674 c +814 699 814 714 814 721 c +814 794 797 846 763 876 c +717 917 649 937 558 937 c +473 937 411 922 370 892 c +330 863 300 810 281 735 c +105 759 l +121 834 147 895 184 941 c +221 988 274 1023 343 1048 c +412 1073 493 1086 584 1086 c +675 1086 748 1075 805 1054 c +862 1033 903 1006 930 973 c +957 941 975 900 986 851 c +992 820 995 765 995 685 c +995 445 l +995 278 999 172 1006 127 c +1014 83 1029 41 1052 0 c +864 0 l +845 37 833 81 828 131 c + +813 533 m +748 506 650 484 519 465 c +445 454 393 442 362 429 c +331 416 308 396 291 370 c +274 345 266 316 266 285 c +266 237 284 197 320 165 c +357 133 410 117 480 117 c +549 117 611 132 665 162 c +719 193 759 234 784 287 c +803 328 813 388 813 467 c +813 533 l ce} _d -/d{1139 0 86 -20 1007 1484 sc -821 174 m -788 105 743 55 688 25 c -633 -5 565 -20 484 -20 c -347 -20 247 26 182 118 c -118 210 86 349 86 536 c -86 913 219 1102 484 1102 c -566 1102 634 1087 689 1057 c -744 1027 788 979 821 914 c -823 914 l -821 1035 l -821 1484 l -1001 1484 l -1001 223 l -1001 110 1003 36 1007 0 c -835 0 l -833 11 831 35 828 74 c -826 113 825 146 825 174 c -821 174 l - -275 542 m -275 391 295 282 335 217 c -375 152 440 119 530 119 c -632 119 706 154 752 225 c -798 296 821 405 821 554 c -821 697 798 802 752 869 c -706 936 633 969 532 969 c -441 969 376 935 335 868 c -295 801 275 693 275 542 c +/d{1139 0 70 -24 991 1466 sc +824 0 m +824 134 l +757 29 658 -24 527 -24 c +442 -24 364 -1 293 46 c +222 93 167 158 128 241 c +89 325 70 421 70 530 c +70 636 88 732 123 818 c +158 905 211 971 282 1017 c +353 1063 432 1086 519 1086 c +583 1086 640 1072 690 1045 c +740 1018 781 983 812 940 c +812 1466 l +991 1466 l +991 0 l +824 0 l + +255 530 m +255 394 284 292 341 225 c +398 158 466 124 544 124 c +623 124 689 156 744 220 c +799 285 827 383 827 515 c +827 660 799 767 743 835 c +687 903 618 937 536 937 c +456 937 389 904 335 839 c +282 774 255 671 255 530 c ce} _d -/e{1139 0 87 -20 1048 1102 sc -276 503 m -276 379 302 283 353 216 c -404 149 479 115 578 115 c -656 115 718 131 765 162 c -812 193 844 233 861 281 c -1019 236 l -954 65 807 -20 578 -20 c -418 -20 296 28 212 123 c -129 218 87 360 87 548 c -87 727 129 864 212 959 c -296 1054 416 1102 571 1102 c -889 1102 1048 910 1048 527 c -1048 503 l -276 503 l - -862 641 m -852 755 823 838 775 890 c -727 943 658 969 568 969 c -481 969 411 940 360 881 c -309 823 282 743 278 641 c -862 641 l +/e{1139 0 75 -24 1054 1086 sc +862 342 m +1048 319 l +1019 210 964 126 885 66 c +806 6 704 -24 581 -24 c +426 -24 302 24 211 119 c +120 215 75 349 75 522 c +75 701 121 839 213 938 c +305 1037 424 1086 571 1086 c +713 1086 829 1038 919 941 c +1009 844 1054 708 1054 533 c +1054 522 1054 506 1053 485 c +261 485 l +268 368 301 279 360 217 c +419 155 493 124 582 124 c +648 124 704 141 751 176 c +798 211 835 266 862 342 c + +271 633 m +864 633 l +856 722 833 789 796 834 c +739 903 664 938 573 938 c +490 938 421 910 364 855 c +308 800 277 726 271 633 c ce} _d -/g{1139 0 86 -425 1007 1099 sc -548 -425 m -430 -425 336 -402 266 -355 c -196 -309 151 -243 131 -158 c -312 -132 l -324 -182 350 -220 391 -247 c -432 -274 486 -288 553 -288 c -732 -288 822 -183 822 27 c -822 201 l -820 201 l -786 132 739 79 680 44 c -621 9 551 -8 472 -8 c -339 -8 242 36 179 124 c -117 212 86 350 86 539 c -86 730 119 871 186 962 c -253 1053 355 1099 492 1099 c -569 1099 635 1081 691 1046 c -748 1011 791 962 822 897 c -824 897 l -824 917 825 952 828 1001 c -831 1050 833 1077 836 1082 c -1007 1082 l -1003 1046 1001 971 1001 858 c -1001 31 l -1001 -273 850 -425 548 -425 c - -822 541 m -822 629 810 705 786 768 c -762 832 728 881 684 914 c -641 948 591 965 536 965 c -444 965 377 932 335 865 c -293 798 272 690 272 541 c -272 393 292 287 331 222 c -370 157 438 125 533 125 c -590 125 640 142 684 175 c -728 208 762 256 786 318 c -810 381 822 455 822 541 c +/g{1139 0 66 -431 1002 1086 sc +102 -88 m +277 -114 l +284 -168 305 -207 338 -232 c +383 -265 444 -282 521 -282 c +604 -282 669 -265 714 -232 c +759 -199 790 -152 806 -92 c +815 -55 820 22 819 139 c +740 46 642 0 525 0 c +379 0 266 53 186 158 c +106 263 66 390 66 537 c +66 638 84 732 121 817 c +158 903 211 969 280 1016 c +350 1063 432 1086 526 1086 c +651 1086 755 1035 836 934 c +836 1062 l +1002 1062 l +1002 144 l +1002 -21 985 -138 951 -207 c +918 -276 864 -331 791 -371 c +718 -411 629 -431 522 -431 c +395 -431 293 -402 215 -345 c +137 -288 99 -203 102 -88 c + +251 550 m +251 411 279 309 334 245 c +389 181 459 149 542 149 c +625 149 694 181 750 244 c +806 308 834 408 834 544 c +834 674 805 772 747 838 c +690 904 620 937 539 937 c +459 937 391 904 335 839 c +279 774 251 678 251 550 c ce} _d -/h{1139 0 142 0 1006 1484 sc -317 897 m -356 968 402 1019 456 1052 c -511 1085 580 1102 663 1102 c -780 1102 867 1073 922 1014 c -978 956 1006 858 1006 721 c -1006 0 l -825 0 l -825 686 l -825 762 818 818 804 855 c -790 892 767 920 735 937 c -703 954 659 963 602 963 c -517 963 449 934 398 875 c -347 816 322 737 322 638 c -322 0 l -142 0 l -142 1484 l -322 1484 l -322 1098 l -322 1057 321 1015 318 972 c -316 929 315 904 314 897 c -317 897 l +/h{1139 0 135 0 1000 1466 sc +135 0 m +135 1466 l +315 1466 l +315 940 l +399 1037 505 1086 633 1086 c +712 1086 780 1070 838 1039 c +896 1008 937 966 962 911 c +987 856 1000 777 1000 673 c +1000 0 l +820 0 l +820 673 l +820 763 800 828 761 869 c +722 910 667 931 596 931 c +543 931 492 917 445 889 c +398 862 365 824 345 777 c +325 730 315 664 315 581 c +315 0 l +135 0 l ce} _d -/i{455 0 137 0 317 1484 sc -137 1312 m -137 1484 l -317 1484 l -317 1312 l -137 1312 l - -137 0 m -137 1082 l -317 1082 l -317 0 l -137 0 l +/i{455 0 136 0 316 1466 sc +136 1259 m +136 1466 l +316 1466 l +316 1259 l +136 1259 l + +136 0 m +136 1062 l +316 1062 l +316 0 l +136 0 l ce} _d -/l{455 0 138 0 318 1484 sc -138 0 m -138 1484 l -318 1484 l -318 0 l -138 0 l +/l{455 0 131 0 311 1466 sc +131 0 m +131 1466 l +311 1466 l +311 0 l +131 0 l ce} _d -/n{1139 0 136 0 1006 1102 sc -825 0 m -825 686 l -825 757 818 813 804 852 c -790 891 768 920 737 937 c -706 954 661 963 602 963 c -515 963 447 933 397 874 c -347 815 322 732 322 627 c -322 0 l -142 0 l -142 851 l -142 977 140 1054 136 1082 c -306 1082 l -307 1079 307 1070 308 1055 c -309 1040 309 1023 310 1004 c -311 985 313 950 314 897 c -317 897 l -358 972 406 1024 460 1055 c -515 1086 582 1102 663 1102 c -782 1102 868 1072 923 1013 c -978 954 1006 857 1006 721 c -1006 0 l -825 0 l +/n{1139 0 135 0 998 1086 sc +135 0 m +135 1062 l +297 1062 l +297 911 l +375 1028 488 1086 635 1086 c +699 1086 758 1074 811 1051 c +865 1028 905 998 932 961 c +959 924 977 879 988 828 c +995 795 998 736 998 653 c +998 0 l +818 0 l +818 646 l +818 719 811 774 797 810 c +783 847 758 876 722 897 c +687 919 645 930 597 930 c +520 930 454 906 398 857 c +343 808 315 716 315 580 c +315 0 l +135 0 l ce} _d -/o{1139 0 86 -20 1053 1102 sc -1053 542 m -1053 353 1011 212 928 119 c -845 26 724 -20 565 -20 c -407 -20 288 28 207 124 c -126 221 86 360 86 542 c -86 915 248 1102 571 1102 c -736 1102 858 1056 936 965 c -1014 874 1053 733 1053 542 c - -864 542 m -864 691 842 800 797 867 c -753 935 679 969 574 969 c -469 969 392 934 345 865 c -298 796 275 689 275 542 c -275 399 298 292 344 220 c -391 149 464 113 563 113 c -671 113 748 148 794 217 c -841 286 864 395 864 542 c +/o{1139 0 68 -24 1063 1086 sc +68 531 m +68 728 123 873 232 968 c +323 1047 435 1086 566 1086 c +712 1086 831 1038 924 942 c +1017 847 1063 715 1063 546 c +1063 409 1042 302 1001 223 c +960 145 901 84 822 41 c +744 -2 659 -24 566 -24 c +417 -24 297 24 205 119 c +114 214 68 352 68 531 c + +253 531 m +253 395 283 293 342 225 c +401 158 476 124 566 124 c +655 124 730 158 789 226 c +848 294 878 398 878 537 c +878 668 848 768 788 835 c +729 903 655 937 566 937 c +476 937 401 903 342 836 c +283 769 253 667 253 531 c ce} _d -/r{682 0 136 0 648 1102 sc -142 0 m -142 830 l -142 906 140 990 136 1082 c -306 1082 l -311 959 314 886 314 861 c -318 861 l -347 954 380 1017 417 1051 c -454 1085 507 1102 575 1102 c -599 1102 623 1099 648 1092 c -648 927 l -624 934 592 937 552 937 c -477 937 420 905 381 840 c -342 776 322 684 322 564 c -322 0 l -142 0 l +/r{682 0 133 0 710 1086 sc +133 0 m +133 1062 l +295 1062 l +295 901 l +336 976 374 1026 409 1050 c +444 1074 483 1086 525 1086 c +586 1086 647 1067 710 1028 c +648 861 l +604 887 560 900 516 900 c +477 900 441 888 410 864 c +379 841 356 808 343 766 c +323 702 313 632 313 556 c +313 0 l +133 0 l ce} _d -/s{1024 0 57 -20 950 1099 sc -950 299 m -950 197 911 118 834 63 c -757 8 650 -20 511 -20 c -376 -20 272 2 199 46 c -126 91 79 160 57 254 c -216 285 l -231 227 263 184 311 157 c -359 130 426 117 511 117 c -602 117 669 131 711 159 c -754 187 775 229 775 285 c -775 328 760 362 731 389 c -702 416 654 438 589 455 c -460 489 l -357 516 283 542 239 567 c -196 593 162 624 137 661 c -112 698 100 743 100 796 c -100 895 135 970 205 1021 c -276 1073 378 1099 513 1099 c -632 1099 727 1078 797 1036 c -868 994 912 927 931 834 c -769 814 l -759 862 732 899 688 924 c -645 950 586 963 513 963 c -432 963 372 951 333 926 c -294 901 275 864 275 814 c -275 783 283 758 299 738 c -315 718 339 701 370 687 c -401 673 467 654 568 629 c -663 605 732 583 774 562 c -816 542 849 520 873 495 c -898 470 917 442 930 409 c -943 377 950 340 950 299 c +/s{1024 0 63 -24 945 1086 sc +63 317 m +241 345 l +251 274 279 219 324 181 c +370 143 434 124 516 124 c +599 124 660 141 700 174 c +740 208 760 248 760 293 c +760 334 742 366 707 389 c +682 405 621 425 523 450 c +391 483 299 512 248 536 c +197 561 159 594 132 637 c +106 680 93 728 93 780 c +93 827 104 871 125 911 c +147 952 177 985 214 1012 c +242 1033 280 1050 328 1064 c +377 1079 429 1086 484 1086 c +567 1086 640 1074 703 1050 c +766 1026 813 993 843 952 c +873 911 894 857 905 788 c +729 764 l +721 819 698 861 659 892 c +621 923 567 938 497 938 c +414 938 355 924 320 897 c +285 870 267 838 267 801 c +267 778 274 757 289 738 c +304 719 327 703 358 690 c +376 683 429 668 517 644 c +644 610 733 582 783 560 c +834 539 873 507 902 466 c +931 425 945 373 945 312 c +945 252 927 195 892 142 c +857 89 807 48 741 19 c +675 -10 600 -24 517 -24 c +379 -24 274 5 201 62 c +129 119 83 204 63 317 c ce} _d -/t{569 0 31 -16 554 1324 sc -554 8 m -495 -8 434 -16 372 -16 c -228 -16 156 66 156 229 c -156 951 l -31 951 l -31 1082 l -163 1082 l -216 1324 l -336 1324 l -336 1082 l -536 1082 l -536 951 l -336 951 l -336 268 l -336 216 344 179 361 158 c -378 137 408 127 450 127 c -474 127 509 132 554 141 c -554 8 l +/t{569 0 36 -14 554 1433 sc +528 161 m +554 2 l +503 -9 458 -14 418 -14 c +353 -14 302 -4 266 17 c +230 38 205 65 190 98 c +175 132 168 203 168 311 c +168 922 l +36 922 l +36 1062 l +168 1062 l +168 1325 l +347 1433 l +347 1062 l +528 1062 l +528 922 l +347 922 l +347 301 l +347 250 350 217 356 202 c +363 187 373 176 387 167 c +402 158 422 154 449 154 c +469 154 495 156 528 161 c ce} _d -/v{1024 0 7 0 1017 1082 sc -613 0 m -400 0 l -7 1082 l -199 1082 l -437 378 l -446 351 469 272 506 141 c -541 258 l -580 376 l -826 1082 l -1017 1082 l -613 0 l +/v{1024 0 26 0 1000 1062 sc +430 0 m +26 1062 l +216 1062 l +444 426 l +469 357 491 286 512 212 c +528 268 550 335 579 414 c +815 1062 l +1000 1062 l +598 0 l +430 0 l ce} _d -/w{1479 0 -3 0 1484 1082 sc -1174 0 m -965 0 l -776 765 l -740 934 l -734 904 725 861 712 804 c -699 748 631 480 508 0 c -300 0 l --3 1082 l -175 1082 l -358 347 l -363 331 377 265 401 149 c -418 223 l -644 1082 l -837 1082 l -1026 339 l -1072 149 l -1103 288 l -1308 1082 l -1484 1082 l -1174 0 l +/w{1479 0 6 0 1463 1062 sc +331 0 m +6 1062 l +192 1062 l +361 449 l +424 221 l +427 232 445 305 479 440 c +648 1062 l +833 1062 l +992 446 l +1045 243 l +1106 448 l +1288 1062 l +1463 1062 l +1131 0 l +944 0 l +775 636 l +734 817 l +519 0 l +331 0 l ce} _d -/x{1024 0 23 0 1002 1082 sc -801 0 m -510 444 l -217 0 l -23 0 l -408 556 l -41 1082 l -240 1082 l -510 661 l -778 1082 l -979 1082 l -612 558 l -1002 0 l -801 0 l +/x{1024 0 15 0 1009 1062 sc +15 0 m +403 552 l +44 1062 l +269 1062 l +432 813 l +463 766 487 726 506 694 c +535 738 562 777 587 811 c +766 1062 l +981 1062 l +614 562 l +1009 0 l +788 0 l +570 330 l +512 419 l +233 0 l +15 0 l ce} _d -/y{1024 0 5 -425 1020 1082 sc -191 -425 m -142 -425 100 -421 67 -414 c -67 -279 l -92 -283 120 -285 151 -285 c -263 -285 352 -203 417 -38 c -434 5 l -5 1082 l -197 1082 l -425 484 l -428 475 432 463 437 450 c -442 437 457 394 482 320 c -507 246 521 205 523 196 c -593 393 l -830 1082 l -1020 1082 l -604 0 l -559 -115 518 -201 479 -257 c -440 -314 397 -356 350 -383 c -303 -411 250 -425 191 -425 c +/y{1024 0 33 -431 1006 1062 sc +127 -409 m +107 -240 l +146 -251 181 -256 210 -256 c +250 -256 282 -249 306 -236 c +330 -223 350 -204 365 -180 c +376 -162 395 -117 420 -46 c +423 -36 429 -21 436 -2 c +33 1062 l +227 1062 l +448 447 l +477 369 502 287 525 201 c +546 284 570 364 599 443 c +826 1062 l +1006 1062 l +602 -18 l +559 -135 525 -215 501 -259 c +469 -318 432 -362 391 -389 c +350 -417 300 -431 243 -431 c +208 -431 170 -424 127 -409 c ce} _d -/z{1024 0 83 0 922 1082 sc -83 0 m -83 137 l -688 943 l -117 943 l -117 1082 l -901 1082 l -901 945 l -295 139 l -922 139 l -922 0 l -83 0 l +/z{1024 0 40 0 980 1062 sc +40 0 m +40 146 l +716 922 l +639 918 572 916 513 916 c +80 916 l +80 1062 l +948 1062 l +948 943 l +373 269 l +262 146 l +343 152 418 155 489 155 c +980 155 l +980 0 l +40 0 l ce} _d end readonly def @@ -1004,22 +1023,22 @@ FontName currentdict end definefont pop end %%EndProlog mpldict begin -67.255 302.637 translate -477.489 186.726 0 0 clipbox +69.238 303.541 translate +473.524 184.919 0 0 clipbox gsave 0 0 m -477.489423 0 l -477.489423 186.72625 l -0 186.72625 l +473.523523 0 l +473.523523 184.91875 l +0 184.91875 l cl 1.000 setgray fill grestore gsave -43.890625 33.59375 m -470.505625 33.59375 l -470.505625 168.41375 l -43.890625 168.41375 l +33.328125 26.03125 m +469.978125 26.03125 l +469.978125 166.54375 l +33.328125 166.54375 l cl 1.000 setgray fill @@ -1030,307 +1049,337 @@ grestore [] 0 setdash 0.800 setgray gsave -426.615 134.82 43.891 33.594 clipbox -43.890625 33.59375 m -43.890625 168.41375 l +436.65 140.512 33.328 26.031 clipbox +33.328125 26.03125 m +33.328125 166.54375 l stroke grestore 0.150 setgray -/LiberationSans 14.000 selectfont +/ArialMT 10.000 selectfont gsave -36.109375 19.953125 translate +27.765625 15.375000 translate 0.000000 rotate 0.000000 0 m /one glyphshow -7.786133 0 m /zero glyphshow +5.561523 0 m /zero glyphshow grestore 0.800 setgray gsave -426.615 134.82 43.891 33.594 clipbox -90.771394 33.59375 m -90.771394 168.41375 l +436.65 140.512 33.328 26.031 clipbox +81.311641 26.03125 m +81.311641 166.54375 l stroke grestore 0.150 setgray gsave -82.990144 19.953125 translate +75.749141 15.375000 translate 0.000000 rotate 0.000000 0 m /two glyphshow -7.786133 0 m /zero glyphshow +5.561523 0 m /zero glyphshow grestore 0.800 setgray gsave -426.615 134.82 43.891 33.594 clipbox -137.652163 33.59375 m -137.652163 168.41375 l +436.65 140.512 33.328 26.031 clipbox +129.295158 26.03125 m +129.295158 166.54375 l stroke grestore 0.150 setgray gsave -129.870913 19.953125 translate +123.732658 15.375000 translate 0.000000 rotate 0.000000 0 m /three glyphshow -7.786133 0 m /zero glyphshow +5.561523 0 m /zero glyphshow grestore 0.800 setgray gsave -426.615 134.82 43.891 33.594 clipbox -184.532933 33.59375 m -184.532933 168.41375 l +436.65 140.512 33.328 26.031 clipbox +177.278674 26.03125 m +177.278674 166.54375 l stroke grestore 0.150 setgray gsave -176.751683 19.953125 translate +171.716174 15.375000 translate 0.000000 rotate 0.000000 0 m /four glyphshow -7.786133 0 m /zero glyphshow +5.561523 0 m /zero glyphshow grestore 0.800 setgray gsave -426.615 134.82 43.891 33.594 clipbox -231.413702 33.59375 m -231.413702 168.41375 l +436.65 140.512 33.328 26.031 clipbox +225.262191 26.03125 m +225.262191 166.54375 l stroke grestore 0.150 setgray gsave -223.632452 19.953125 translate +219.699691 15.375000 translate 0.000000 rotate 0.000000 0 m /five glyphshow -7.786133 0 m /zero glyphshow +5.561523 0 m /zero glyphshow grestore 0.800 setgray gsave -426.615 134.82 43.891 33.594 clipbox -278.294471 33.59375 m -278.294471 168.41375 l +436.65 140.512 33.328 26.031 clipbox +273.245707 26.03125 m +273.245707 166.54375 l stroke grestore 0.150 setgray gsave -270.513221 19.953125 translate +267.683207 15.375000 translate 0.000000 rotate 0.000000 0 m /six glyphshow -7.786133 0 m /zero glyphshow +5.561523 0 m /zero glyphshow grestore 0.800 setgray gsave -426.615 134.82 43.891 33.594 clipbox -325.17524 33.59375 m -325.17524 168.41375 l +436.65 140.512 33.328 26.031 clipbox +321.229224 26.03125 m +321.229224 166.54375 l stroke grestore 0.150 setgray gsave -317.393990 19.953125 translate +315.666724 15.375000 translate 0.000000 rotate 0.000000 0 m /seven glyphshow -7.786133 0 m /zero glyphshow +5.561523 0 m /zero glyphshow grestore 0.800 setgray gsave -426.615 134.82 43.891 33.594 clipbox -372.05601 33.59375 m -372.05601 168.41375 l +436.65 140.512 33.328 26.031 clipbox +369.21274 26.03125 m +369.21274 166.54375 l stroke grestore 0.150 setgray gsave -364.274760 19.953125 translate +363.650240 15.375000 translate 0.000000 rotate 0.000000 0 m /eight glyphshow -7.786133 0 m /zero glyphshow +5.561523 0 m /zero glyphshow grestore 0.800 setgray gsave -426.615 134.82 43.891 33.594 clipbox -418.936779 33.59375 m -418.936779 168.41375 l +436.65 140.512 33.328 26.031 clipbox +417.196257 26.03125 m +417.196257 166.54375 l stroke grestore 0.150 setgray gsave -411.155529 19.953125 translate +411.633757 15.375000 translate 0.000000 rotate 0.000000 0 m /nine glyphshow -7.786133 0 m /zero glyphshow +5.561523 0 m /zero glyphshow grestore 0.800 setgray gsave -426.615 134.82 43.891 33.594 clipbox -465.817548 33.59375 m -465.817548 168.41375 l +436.65 140.512 33.328 26.031 clipbox +465.179773 26.03125 m +465.179773 166.54375 l stroke grestore 0.150 setgray gsave -454.145673 19.953125 translate +456.836023 15.375000 translate 0.000000 rotate 0.000000 0 m /one glyphshow -7.786133 0 m /zero glyphshow -15.572266 0 m /zero glyphshow +5.561523 0 m /zero glyphshow +11.123047 0 m /zero glyphshow grestore gsave -209.370000 2.906250 translate +217.473437 2.109375 translate 0.000000 rotate 0.000000 0 m /g glyphshow -7.786133 0 m /r glyphshow -12.448242 0 m /i glyphshow -15.558594 0 m /d glyphshow -23.344727 0 m /space glyphshow -27.234375 0 m /s glyphshow -34.234375 0 m /i glyphshow -37.344727 0 m /z glyphshow -44.344727 0 m /e glyphshow -52.130859 0 m /space glyphshow -56.020508 0 m /parenleft glyphshow -60.682617 0 m /n glyphshow -68.468750 0 m /space glyphshow -72.358398 0 m /x glyphshow -79.358398 0 m /space glyphshow -83.248047 0 m /n glyphshow -91.034180 0 m /parenright glyphshow +5.561523 0 m /r glyphshow +8.891602 0 m /i glyphshow +11.113281 0 m /d glyphshow +16.674805 0 m /space glyphshow +19.453125 0 m /s glyphshow +24.453125 0 m /i glyphshow +26.674805 0 m /z glyphshow +31.674805 0 m /e glyphshow +37.236328 0 m /space glyphshow +40.014648 0 m /parenleft glyphshow +43.344727 0 m /n glyphshow +48.906250 0 m /space glyphshow +51.684570 0 m /x glyphshow +56.684570 0 m /space glyphshow +59.462891 0 m /n glyphshow +65.024414 0 m /parenright glyphshow grestore 0.800 setgray gsave -426.615 134.82 43.891 33.594 clipbox -43.890625 33.59375 m -470.505625 33.59375 l +436.65 140.512 33.328 26.031 clipbox +33.328125 26.03125 m +469.978125 26.03125 l stroke grestore 0.150 setgray gsave -32.609375 28.523438 translate +24.265625 22.453125 translate 0.000000 rotate 0.000000 0 m /zero glyphshow grestore 0.800 setgray gsave -426.615 134.82 43.891 33.594 clipbox -43.890625 97.79375 m -470.505625 97.79375 l +436.65 140.512 33.328 26.031 clipbox +33.328125 59.486607 m +469.978125 59.486607 l stroke grestore 0.150 setgray gsave -24.828125 92.723438 translate +18.703125 55.908482 translate +0.000000 rotate +0.000000 0 m /two glyphshow +5.561523 0 m /five glyphshow +grestore +0.800 setgray +gsave +436.65 140.512 33.328 26.031 clipbox +33.328125 92.941964 m +469.978125 92.941964 l +stroke +grestore +0.150 setgray +gsave + +18.703125 89.363839 translate 0.000000 rotate 0.000000 0 m /five glyphshow -7.786133 0 m /zero glyphshow +5.561523 0 m /zero glyphshow +grestore +0.800 setgray +gsave +436.65 140.512 33.328 26.031 clipbox +33.328125 126.397321 m +469.978125 126.397321 l +stroke +grestore +0.150 setgray +gsave + +18.703125 122.819196 translate +0.000000 rotate +0.000000 0 m /seven glyphshow +5.561523 0 m /five glyphshow grestore 0.800 setgray gsave -426.615 134.82 43.891 33.594 clipbox -43.890625 161.99375 m -470.505625 161.99375 l +436.65 140.512 33.328 26.031 clipbox +33.328125 159.852679 m +469.978125 159.852679 l stroke grestore 0.150 setgray gsave -17.046875 156.923438 translate +13.140625 156.274554 translate 0.000000 rotate 0.000000 0 m /one glyphshow -7.786133 0 m /zero glyphshow -15.572266 0 m /zero glyphshow +5.561523 0 m /zero glyphshow +11.123047 0 m /zero glyphshow grestore gsave -10.140625 72.605312 translate +7.156250 75.998437 translate 90.000000 rotate 0.000000 0 m /percent glyphshow -12.448242 0 m /space glyphshow -16.337891 0 m /s glyphshow -23.337891 0 m /o glyphshow -31.124023 0 m /l glyphshow -34.234375 0 m /v glyphshow -41.234375 0 m /e glyphshow -49.020508 0 m /d glyphshow +8.891602 0 m /space glyphshow +11.669922 0 m /s glyphshow +16.669922 0 m /o glyphshow +22.231445 0 m /l glyphshow +24.453125 0 m /v glyphshow +29.453125 0 m /e glyphshow +35.014648 0 m /d glyphshow grestore 2.000 setlinewidth 0.800 0.267 0.322 setrgbcolor gsave -426.615 134.82 43.891 33.594 clipbox -43.890625 132.46175 m -67.33101 136.31375 l -90.771394 135.02975 l -114.211779 145.30175 l -137.652163 138.88175 l -161.092548 146.58575 l -184.532933 141.44975 l -207.973317 132.46175 l -231.413702 138.88175 l -254.854087 123.47375 l -278.294471 122.18975 l -301.734856 126.04175 l -325.17524 104.21375 l -348.615625 104.21375 l -372.05601 86.23775 l -395.496394 86.23775 l -418.936779 70.82975 l -442.377163 72.11375 l -465.817548 84.95375 l +436.65 140.512 33.328 26.031 clipbox +33.328125 129.07375 m +57.319883 133.088393 l +81.311641 131.750179 l +105.3034 142.455893 l +129.295158 135.764821 l +153.286916 143.794107 l +177.278674 138.44125 l +201.270433 129.07375 l +225.262191 135.764821 l +249.253949 119.70625 l +273.245707 118.368036 l +297.237466 122.382679 l +321.229224 99.633036 l +345.220982 99.633036 l +369.21274 80.898036 l +393.204499 80.898036 l +417.196257 64.839464 l +441.188015 66.177679 l +465.179773 79.559821 l stroke grestore 0.141 0.380 0.502 setrgbcolor gsave -426.615 134.82 43.891 33.594 clipbox -43.890625 147.86975 m -67.33101 146.58575 l -90.771394 156.85775 l -114.211779 158.14175 l -137.652163 160.70975 l -161.092548 158.14175 l -184.532933 159.42575 l -207.973317 147.86975 l -231.413702 120.90575 l -254.854087 33.59375 l -278.294471 33.59375 l -301.734856 33.59375 l -325.17524 33.59375 l -348.615625 33.59375 l -372.05601 33.59375 l -395.496394 33.59375 l -418.936779 33.59375 l -442.377163 33.59375 l -465.817548 33.59375 l +436.65 140.512 33.328 26.031 clipbox +33.328125 145.132321 m +57.319883 143.794107 l +81.311641 154.499821 l +105.3034 155.838036 l +129.295158 158.514464 l +153.286916 155.838036 l +177.278674 157.17625 l +201.270433 145.132321 l +225.262191 117.029821 l +249.253949 26.03125 l +273.245707 26.03125 l +297.237466 26.03125 l +321.229224 26.03125 l +345.220982 26.03125 l +369.21274 26.03125 l +393.204499 26.03125 l +417.196257 26.03125 l +441.188015 26.03125 l +465.179773 26.03125 l stroke grestore 0.502 0.114 0.153 setrgbcolor gsave -426.615 134.82 43.891 33.594 clipbox -43.890625 33.59375 m -67.33101 33.59375 l -90.771394 33.59375 l -114.211779 33.59375 l -137.652163 33.59375 l -161.092548 33.59375 l -184.532933 33.59375 l -207.973317 33.59375 l -231.413702 33.59375 l -254.854087 33.59375 l -278.294471 33.59375 l -301.734856 33.59375 l -325.17524 33.59375 l -348.615625 33.59375 l -372.05601 33.59375 l -395.496394 33.59375 l -418.936779 33.59375 l -442.377163 33.59375 l -465.817548 33.59375 l +436.65 140.512 33.328 26.031 clipbox +33.328125 26.03125 m +57.319883 26.03125 l +81.311641 26.03125 l +105.3034 26.03125 l +129.295158 26.03125 l +153.286916 26.03125 l +177.278674 26.03125 l +201.270433 26.03125 l +225.262191 26.03125 l +249.253949 26.03125 l +273.245707 26.03125 l +297.237466 26.03125 l +321.229224 26.03125 l +345.220982 26.03125 l +369.21274 26.03125 l +393.204499 26.03125 l +417.196257 26.03125 l +441.188015 26.03125 l +465.179773 26.03125 l stroke grestore 1.000 setlinewidth @@ -1338,30 +1387,30 @@ grestore 2 setlinecap 0.800 setgray gsave -43.890625 33.59375 m -43.890625 168.41375 l +33.328125 26.03125 m +33.328125 166.54375 l stroke grestore gsave -470.505625 33.59375 m -470.505625 168.41375 l +469.978125 26.03125 m +469.978125 166.54375 l stroke grestore gsave -43.890625 33.59375 m -470.505625 33.59375 l +33.328125 26.03125 m +469.978125 26.03125 l stroke grestore gsave -43.890625 168.41375 m -470.505625 168.41375 l +33.328125 166.54375 m +469.978125 166.54375 l stroke grestore 0.150 setgray -/LiberationSans 16.800 selectfont +/ArialMT 16.800 selectfont gsave -138.987188 174.413750 translate +133.442187 172.543750 translate 0.000000 rotate 0.000000 0 m /percent glyphshow 14.893433 0 m /space glyphshow @@ -1401,15 +1450,15 @@ grestore 1 setlinecap 0.800 0.267 0.322 setrgbcolor gsave -375.8775 150.573125 m -403.8775 150.573125 l +375.35 148.828125 m +403.35 148.828125 l stroke grestore 0.150 setgray -/LiberationSans 14.000 selectfont +/ArialMT 14.000 selectfont gsave -415.077500 145.673125 translate +414.550000 143.928125 translate 0.000000 rotate 0.000000 0 m /E glyphshow 9.337891 0 m /P glyphshow @@ -1419,14 +1468,14 @@ gsave grestore 0.141 0.380 0.502 setrgbcolor gsave -375.8775 130.52625 m -403.8775 130.52625 l +375.35 129.03125 m +403.35 129.03125 l stroke grestore 0.150 setgray gsave -415.077500 125.626250 translate +414.550000 124.131250 translate 0.000000 rotate 0.000000 0 m /C glyphshow 10.110352 0 m /B glyphshow @@ -1434,14 +1483,14 @@ gsave grestore 0.502 0.114 0.153 setrgbcolor gsave -375.8775 110.479375 m -403.8775 110.479375 l +375.35 109.234375 m +403.35 109.234375 l stroke grestore 0.150 setgray gsave -415.077500 105.579375 translate +414.550000 104.334375 translate 0.000000 rotate 0.000000 0 m /I glyphshow 3.889648 0 m /C glyphshow diff --git a/python/benchmarks/paper/map_size_25percent/map_size_25percent.png b/python/benchmarks/paper/map_size_25percent/map_size_25percent.png index c6b1ddbe8..60fbfb522 100644 Binary files a/python/benchmarks/paper/map_size_25percent/map_size_25percent.png and b/python/benchmarks/paper/map_size_25percent/map_size_25percent.png differ diff --git a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt b/python/benchmarks/paper/map_size_25percent/results_ICTS.txt deleted file mode 100644 index 4d44667e2..000000000 --- a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt +++ /dev/null @@ -1,19 +0,0 @@ -1: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -2: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -3: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -4: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -5: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -6: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -7: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -8: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -9: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -10: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -11: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -12: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -13: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -14: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -15: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -16: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -17: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -18: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -19: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] diff --git a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part1 b/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part1 deleted file mode 100644 index 12b498889..000000000 --- a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part1 +++ /dev/null @@ -1 +0,0 @@ -1: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] diff --git a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part10 b/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part10 deleted file mode 100644 index 57f90d658..000000000 --- a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part10 +++ /dev/null @@ -1,10 +0,0 @@ -1: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -2: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -3: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -4: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -5: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -6: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -7: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -8: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -9: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -10: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] diff --git a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part11 b/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part11 deleted file mode 100644 index 1786da68a..000000000 --- a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part11 +++ /dev/null @@ -1,11 +0,0 @@ -1: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -2: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -3: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -4: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -5: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -6: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -7: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -8: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -9: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -10: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -11: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] diff --git a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part12 b/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part12 deleted file mode 100644 index 97945e426..000000000 --- a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part12 +++ /dev/null @@ -1,12 +0,0 @@ -1: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -2: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -3: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -4: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -5: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -6: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -7: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -8: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -9: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -10: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -11: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -12: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] diff --git a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part13 b/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part13 deleted file mode 100644 index 71d7fdb00..000000000 --- a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part13 +++ /dev/null @@ -1,13 +0,0 @@ -1: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -2: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -3: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -4: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -5: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -6: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -7: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -8: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -9: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -10: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -11: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -12: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -13: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] diff --git a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part14 b/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part14 deleted file mode 100644 index ad037c08d..000000000 --- a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part14 +++ /dev/null @@ -1,14 +0,0 @@ -1: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -2: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -3: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -4: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -5: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -6: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -7: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -8: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -9: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -10: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -11: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -12: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -13: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -14: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] diff --git a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part15 b/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part15 deleted file mode 100644 index f7387e9a5..000000000 --- a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part15 +++ /dev/null @@ -1,15 +0,0 @@ -1: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -2: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -3: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -4: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -5: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -6: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -7: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -8: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -9: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -10: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -11: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -12: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -13: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -14: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -15: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] diff --git a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part16 b/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part16 deleted file mode 100644 index 454d5f091..000000000 --- a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part16 +++ /dev/null @@ -1,16 +0,0 @@ -1: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -2: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -3: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -4: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -5: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -6: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -7: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -8: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -9: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -10: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -11: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -12: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -13: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -14: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -15: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -16: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] diff --git a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part17 b/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part17 deleted file mode 100644 index 17acfb7cc..000000000 --- a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part17 +++ /dev/null @@ -1,17 +0,0 @@ -1: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -2: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -3: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -4: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -5: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -6: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -7: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -8: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -9: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -10: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -11: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -12: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -13: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -14: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -15: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -16: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -17: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] diff --git a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part18 b/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part18 deleted file mode 100644 index 9cc0a3135..000000000 --- a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part18 +++ /dev/null @@ -1,18 +0,0 @@ -1: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -2: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -3: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -4: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -5: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -6: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -7: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -8: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -9: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -10: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -11: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -12: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -13: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -14: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -15: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -16: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -17: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -18: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] diff --git a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part19 b/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part19 deleted file mode 100644 index 4d44667e2..000000000 --- a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part19 +++ /dev/null @@ -1,19 +0,0 @@ -1: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -2: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -3: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -4: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -5: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -6: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -7: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -8: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -9: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -10: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -11: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -12: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -13: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -14: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -15: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -16: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -17: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -18: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -19: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] diff --git a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part2 b/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part2 deleted file mode 100644 index 4561414ec..000000000 --- a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part2 +++ /dev/null @@ -1,2 +0,0 @@ -1: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -2: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] diff --git a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part3 b/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part3 deleted file mode 100644 index bbcc5b7a3..000000000 --- a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part3 +++ /dev/null @@ -1,3 +0,0 @@ -1: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -2: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -3: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] diff --git a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part4 b/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part4 deleted file mode 100644 index 8559086a2..000000000 --- a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part4 +++ /dev/null @@ -1,4 +0,0 @@ -1: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -2: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -3: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -4: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] diff --git a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part5 b/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part5 deleted file mode 100644 index 20c38cf8b..000000000 --- a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part5 +++ /dev/null @@ -1,5 +0,0 @@ -1: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -2: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -3: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -4: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -5: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] diff --git a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part6 b/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part6 deleted file mode 100644 index ea752ab24..000000000 --- a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part6 +++ /dev/null @@ -1,6 +0,0 @@ -1: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -2: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -3: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -4: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -5: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -6: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] diff --git a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part7 b/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part7 deleted file mode 100644 index 7687b5675..000000000 --- a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part7 +++ /dev/null @@ -1,7 +0,0 @@ -1: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -2: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -3: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -4: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -5: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -6: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -7: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] diff --git a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part8 b/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part8 deleted file mode 100644 index 9ea1273e7..000000000 --- a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part8 +++ /dev/null @@ -1,8 +0,0 @@ -1: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -2: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -3: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -4: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -5: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -6: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -7: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -8: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] diff --git a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part9 b/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part9 deleted file mode 100644 index 4bf4c529e..000000000 --- a/python/benchmarks/paper/map_size_25percent/results_ICTS.txt.part9 +++ /dev/null @@ -1,9 +0,0 @@ -1: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -2: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -3: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -4: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -5: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -6: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -7: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -8: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -9: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] diff --git a/python/benchmarks/paper/num_agents_inmatch_1_team_25_percent/num_agents_inmatch_1_team_25_percent.eps b/python/benchmarks/paper/num_agents_inmatch_1_team_25_percent/num_agents_inmatch_1_team_25_percent.eps index 493673d03..76c168e22 100644 --- a/python/benchmarks/paper/num_agents_inmatch_1_team_25_percent/num_agents_inmatch_1_team_25_percent.eps +++ b/python/benchmarks/paper/num_agents_inmatch_1_team_25_percent/num_agents_inmatch_1_team_25_percent.eps @@ -1,10 +1,10 @@ %!PS-Adobe-3.0 EPSF-3.0 %%Title: num_agents_inmatch_1_team_25_percent.eps -%%Creator: Matplotlib v3.4.2, https://matplotlib.org/ -%%CreationDate: Wed Aug 25 01:07:09 2021 +%%Creator: Matplotlib v3.4.3, https://matplotlib.org/ +%%CreationDate: Wed Aug 25 11:54:00 2021 %%Orientation: portrait -%%BoundingBox: 66 302 546 490 -%%HiResBoundingBox: 66.856562 302.636875 545.143438 489.363125 +%%BoundingBox: 67 302 545 490 +%%HiResBoundingBox: 67.251563 302.717500 544.748437 489.282500 %%EndComments %%BeginProlog /mpldict 11 dict def @@ -32,1066 +32,1079 @@ mpldict begin %!PS-Adobe-3.0 Resource-Font %%Creator: Converted from TrueType to Type 3 by Matplotlib. 10 dict begin -/FontName /LiberationSans def +/FontName /ArialMT def /PaintType 0 def /FontMatrix [0.00048828125 0 0 0.00048828125 0 0] def -/FontBBox [-1114 -621 2666 2007] def +/FontBBox [-1361 -665 4154 2124] def /FontType 3 def /Encoding [/space /percent /asterisk /hyphen /zero /one /two /three /four /five /six /seven /eight /nine /A /B /C /D /E /I /M /O /P /S /T /a /b /d /e /f /g /h /i /l /m /n /o /r /s /t /u /v /w /y] def /CharStrings 45 dict dup begin /.notdef 0 def /space{569 0 0 0 0 0 sc ce} _d -/percent{1821 0 73 -12 1748 1421 sc -1748 434 m -1748 291 1721 180 1667 103 c -1613 26 1533 -12 1428 -12 c -1324 -12 1245 25 1192 100 c -1139 175 1113 287 1113 434 c -1113 586 1138 699 1189 773 c -1240 848 1321 885 1432 885 c -1541 885 1621 847 1672 770 c -1723 694 1748 582 1748 434 c - -527 0 m -372 0 l -1294 1409 l -1451 1409 l -527 0 l - -394 1421 m -500 1421 579 1384 630 1309 c -681 1234 707 1123 707 975 c -707 830 680 719 627 641 c -574 563 495 524 390 524 c -285 524 205 563 152 640 c -99 717 73 829 73 975 c -73 1124 99 1235 150 1309 c -201 1384 283 1421 394 1421 c - -1600 434 m -1600 553 1587 640 1561 693 c -1536 747 1493 774 1432 774 c -1371 774 1327 748 1300 695 c -1273 642 1260 555 1260 434 c -1260 320 1273 235 1299 180 c -1326 125 1369 98 1430 98 c -1489 98 1532 126 1559 181 c -1586 237 1600 321 1600 434 c - -560 975 m -560 1092 547 1178 522 1232 c -497 1286 454 1313 394 1313 c -331 1313 287 1286 260 1233 c -233 1180 220 1094 220 975 c -220 860 233 774 260 719 c -287 664 331 637 392 637 c -450 637 492 665 519 721 c -546 777 560 862 560 975 c +/percent{1821 0 119 -54 1695 1491 sc +119 1114 m +119 1219 145 1308 198 1381 c +251 1454 327 1491 427 1491 c +519 1491 595 1458 655 1392 c +716 1327 746 1230 746 1103 c +746 979 715 883 654 816 c +593 749 518 716 429 716 c +340 716 266 749 207 815 c +148 881 119 981 119 1114 c + +432 1367 m +387 1367 350 1348 320 1309 c +291 1270 276 1199 276 1096 c +276 1002 291 936 321 897 c +351 859 388 840 432 840 c +477 840 515 859 544 898 c +574 937 589 1007 589 1110 c +589 1205 574 1271 544 1309 c +514 1348 477 1367 432 1367 c + +433 -54 m +1235 1491 l +1381 1491 l +582 -54 l +433 -54 l + +1067 344 m +1067 449 1093 538 1146 611 c +1199 684 1275 721 1376 721 c +1468 721 1544 688 1604 622 c +1665 557 1695 460 1695 333 c +1695 209 1664 113 1603 46 c +1542 -21 1467 -54 1377 -54 c +1288 -54 1214 -21 1155 45 c +1096 112 1067 211 1067 344 c + +1381 597 m +1336 597 1298 578 1268 539 c +1239 500 1224 429 1224 326 c +1224 233 1239 167 1269 128 c +1299 89 1336 70 1380 70 c +1426 70 1464 89 1493 128 c +1523 167 1538 237 1538 340 c +1538 435 1523 501 1493 539 c +1463 578 1426 597 1381 597 c ce} _d -/asterisk{797 0 33 690 765 1409 sc -456 1114 m -720 1217 l -765 1085 l -483 1012 l -668 762 l -549 690 l -399 948 l -243 692 l -124 764 l -313 1012 l -33 1085 l -78 1219 l -345 1112 l -333 1409 l -469 1409 l -456 1114 l +/asterisk{797 0 64 867 725 1491 sc +64 1197 m +110 1339 l +216 1302 293 1269 341 1242 c +328 1363 322 1446 321 1491 c +466 1491 l +464 1425 456 1342 443 1243 c +512 1278 590 1310 679 1339 c +725 1197 l +640 1169 557 1150 476 1141 c +517 1106 574 1043 648 952 c +528 867 l +489 920 444 991 391 1082 c +342 988 298 916 261 867 c +143 952 l +220 1047 276 1110 309 1141 c +223 1158 141 1176 64 1197 c ce} _d -/hyphen{682 0 91 464 591 624 sc -91 464 m -91 624 l -591 624 l -591 464 l -91 464 l +/hyphen{682 0 65 440 618 621 sc +65 440 m +65 621 l +618 621 l +618 440 l +65 440 l ce} _d -/zero{1139 0 80 -20 1059 1430 sc -1059 705 m -1059 470 1017 290 934 166 c -851 42 729 -20 567 -20 c -405 -20 283 42 202 165 c -121 288 80 468 80 705 c -80 947 119 1128 198 1249 c -277 1370 402 1430 573 1430 c -739 1430 861 1369 940 1247 c -1019 1125 1059 944 1059 705 c - -876 705 m -876 908 852 1056 805 1147 c -758 1238 681 1284 573 1284 c -462 1284 383 1239 334 1149 c -286 1059 262 911 262 705 c -262 505 286 359 335 266 c -384 173 462 127 569 127 c -675 127 753 174 802 269 c -851 364 876 509 876 705 c +/zero{1139 0 85 -25 1041 1472 sc +85 723 m +85 896 103 1036 138 1141 c +174 1247 227 1329 297 1386 c +368 1443 456 1472 563 1472 c +642 1472 711 1456 770 1424 c +829 1393 878 1347 917 1287 c +956 1228 986 1155 1008 1069 c +1030 984 1041 868 1041 723 c +1041 551 1023 412 988 306 c +953 201 900 119 829 61 c +759 4 670 -25 563 -25 c +422 -25 311 26 230 127 c +133 249 85 448 85 723 c + +270 723 m +270 482 298 322 354 242 c +411 163 480 123 563 123 c +646 123 715 163 771 243 c +828 323 856 483 856 723 c +856 964 828 1125 771 1204 c +715 1283 645 1323 561 1323 c +478 1323 412 1288 363 1218 c +301 1129 270 964 270 723 c ce} _d -/one{1139 0 156 0 1039 1409 sc -156 0 m -156 153 l -515 153 l -515 1237 l -197 1010 l -197 1180 l -530 1409 l -696 1409 l -696 153 l -1039 153 l -1039 0 l -156 0 l +/one{1139 0 223 0 763 1472 sc +763 0 m +583 0 l +583 1147 l +540 1106 483 1064 412 1023 c +342 982 279 951 223 930 c +223 1104 l +324 1151 412 1209 487 1276 c +562 1343 616 1409 647 1472 c +763 1472 l +763 0 l ce} _d -/two{1139 0 103 0 1036 1430 sc -103 0 m -103 127 l -137 205 178 274 227 333 c -276 393 328 447 382 495 c -436 544 489 589 542 630 c -595 671 643 713 686 754 c -729 795 763 839 789 884 c -816 929 829 981 829 1038 c -829 1115 806 1175 761 1218 c -716 1261 653 1282 572 1282 c -495 1282 432 1261 382 1219 c -333 1178 304 1119 295 1044 c -111 1061 l -124 1174 172 1263 254 1330 c -337 1397 443 1430 572 1430 c -714 1430 823 1396 899 1329 c -976 1262 1014 1167 1014 1044 c -1014 989 1001 935 976 881 c -951 827 914 773 865 719 c -816 665 721 581 582 468 c -505 405 444 349 399 298 c -354 248 321 200 301 153 c -1036 153 l -1036 0 l -103 0 l +/two{1139 0 60 0 1031 1472 sc +1031 173 m +1031 0 l +62 0 l +61 43 68 85 83 125 c +108 191 147 256 201 320 c +256 384 334 458 437 542 c +596 673 704 776 760 852 c +816 929 844 1001 844 1069 c +844 1140 818 1200 767 1249 c +716 1298 650 1323 568 1323 c +481 1323 412 1297 360 1245 c +308 1193 282 1121 281 1029 c +96 1048 l +109 1186 156 1291 239 1363 c +322 1436 433 1472 572 1472 c +713 1472 824 1433 906 1355 c +988 1277 1029 1180 1029 1065 c +1029 1006 1017 949 993 892 c +969 835 929 776 873 713 c +818 650 725 564 596 455 c +488 364 419 303 388 270 c +357 238 332 206 312 173 c +1031 173 l ce} _d -/three{1139 0 78 -20 1049 1430 sc -1049 389 m -1049 259 1008 158 925 87 c -842 16 724 -20 571 -20 c -428 -20 314 12 229 76 c -144 141 94 236 78 362 c -264 379 l -288 212 390 129 571 129 c -662 129 733 151 784 196 c -836 241 862 307 862 395 c -862 472 832 531 773 574 c -714 617 629 639 518 639 c -416 639 l -416 795 l -514 795 l -613 795 689 816 743 859 c -798 902 825 962 825 1038 c -825 1113 803 1173 758 1216 c -714 1260 648 1282 561 1282 c -482 1282 417 1262 368 1221 c -319 1180 291 1123 283 1049 c -102 1063 l -115 1178 163 1268 245 1333 c -328 1398 434 1430 563 1430 c -704 1430 814 1397 892 1331 c -971 1266 1010 1174 1010 1057 c -1010 967 985 894 934 837 c -884 781 811 743 715 723 c -715 719 l -820 708 902 672 961 613 c -1020 554 1049 479 1049 389 c +/three{1139 0 86 -26 1046 1472 sc +86 387 m +266 411 l +287 309 322 235 371 190 c +421 145 482 123 553 123 c +638 123 709 152 767 211 c +826 270 855 342 855 429 c +855 512 828 580 774 633 c +720 687 651 714 568 714 c +534 714 492 707 441 694 c +461 852 l +473 851 483 850 490 850 c +567 850 636 870 697 910 c +758 950 789 1012 789 1095 c +789 1161 767 1216 722 1259 c +677 1302 620 1324 549 1324 c +479 1324 421 1302 374 1258 c +327 1214 297 1148 284 1060 c +104 1092 l +126 1213 176 1306 254 1372 c +332 1439 429 1472 545 1472 c +625 1472 699 1455 766 1420 c +833 1386 885 1339 920 1280 c +956 1221 974 1158 974 1091 c +974 1028 957 970 923 918 c +889 866 839 825 772 794 c +859 774 926 732 974 669 c +1022 606 1046 528 1046 433 c +1046 305 999 196 906 107 c +813 18 695 -26 552 -26 c +423 -26 316 12 231 89 c +146 166 98 265 86 387 c ce} _d -/four{1139 0 47 0 1079 1409 sc -881 319 m -881 0 l -711 0 l -711 319 l -47 319 l -47 459 l -692 1409 l -881 1409 l -881 461 l -1079 461 l -1079 319 l -881 319 l - -711 1206 m -710 1202 700 1184 683 1153 c -666 1122 653 1100 644 1087 c -283 555 l -229 481 l -213 461 l -711 461 l -711 1206 l +/four{1139 0 26 0 1040 1466 sc +662 0 m +662 351 l +26 351 l +26 516 l +695 1466 l +842 1466 l +842 516 l +1040 516 l +1040 351 l +842 351 l +842 0 l +662 0 l + +662 516 m +662 1177 l +203 516 l +662 516 l ce} _d -/five{1139 0 82 -20 1053 1409 sc -1053 459 m -1053 310 1009 193 920 108 c -832 23 710 -20 553 -20 c -422 -20 316 9 235 66 c -154 123 103 206 82 315 c -264 336 l -302 197 400 127 557 127 c -654 127 729 156 784 214 c -839 273 866 353 866 455 c -866 544 838 615 783 670 c -728 725 654 752 561 752 c -512 752 467 744 425 729 c -383 714 341 688 299 651 c -123 651 l -170 1409 l -971 1409 l -971 1256 l -334 1256 l -307 809 l -385 869 482 899 598 899 c -737 899 847 858 929 777 c -1012 696 1053 590 1053 459 c +/five{1139 0 85 -25 1057 1446 sc +85 384 m +274 400 l +288 308 320 239 371 192 c +422 146 484 123 556 123 c +643 123 716 156 776 221 c +836 286 866 373 866 481 c +866 584 837 665 779 724 c +722 783 646 813 553 813 c +495 813 443 800 396 773 c +349 747 313 713 286 671 c +117 693 l +259 1446 l +988 1446 l +988 1274 l +403 1274 l +324 880 l +412 941 504 972 601 972 c +729 972 837 928 925 839 c +1013 750 1057 636 1057 497 c +1057 364 1018 250 941 153 c +847 34 719 -25 556 -25 c +423 -25 314 12 229 87 c +145 162 97 261 85 384 c ce} _d -/six{1139 0 104 -20 1049 1430 sc -1049 461 m -1049 312 1009 195 928 109 c -847 23 736 -20 594 -20 c -435 -20 314 39 230 157 c -146 275 104 447 104 672 c -104 916 148 1103 235 1234 c -322 1365 447 1430 608 1430 c -821 1430 955 1334 1010 1143 c -838 1112 l -803 1227 725 1284 606 1284 c -503 1284 424 1236 367 1140 c -311 1045 283 906 283 725 c -316 786 362 832 421 863 c -480 895 548 911 625 911 c -755 911 858 870 934 789 c -1011 708 1049 598 1049 461 c - -866 453 m -866 555 841 634 791 689 c -741 744 671 772 582 772 c -498 772 430 747 378 698 c -327 649 301 582 301 496 c -301 387 328 298 381 229 c -435 160 504 125 588 125 c -675 125 743 154 792 212 c -841 271 866 351 866 453 c +/six{1139 0 77 -25 1045 1472 sc +1019 1107 m +840 1093 l +824 1164 801 1215 772 1247 c +723 1298 663 1324 592 1324 c +535 1324 484 1308 441 1276 c +384 1235 340 1174 307 1095 c +274 1016 257 903 256 756 c +299 822 352 871 415 903 c +478 935 543 951 612 951 c +732 951 834 907 918 818 c +1003 730 1045 616 1045 476 c +1045 384 1025 298 985 219 c +946 140 891 80 822 38 c +753 -4 674 -25 586 -25 c +436 -25 314 30 219 140 c +124 251 77 433 77 686 c +77 969 129 1175 234 1304 c +325 1416 448 1472 603 1472 c +718 1472 813 1440 886 1375 c +960 1310 1004 1221 1019 1107 c + +284 475 m +284 413 297 354 323 297 c +350 240 387 197 434 167 c +481 138 531 123 583 123 c +659 123 724 154 779 215 c +834 276 861 360 861 465 c +861 566 834 646 780 704 c +726 763 658 792 576 792 c +495 792 426 763 369 704 c +312 646 284 570 284 475 c ce} _d -/seven{1139 0 105 0 1036 1409 sc -1036 1263 m -892 1043 790 871 731 746 c -672 621 627 498 597 377 c -568 256 553 130 553 0 c -365 0 l -365 180 403 369 479 568 c -556 767 683 997 862 1256 c -105 1256 l -105 1409 l -1036 1409 l -1036 1263 l +/seven{1139 0 97 0 1046 1447 sc +97 1274 m +97 1447 l +1046 1447 l +1046 1307 l +953 1208 860 1076 768 911 c +677 746 606 577 556 403 c +520 280 497 146 487 0 c +302 0 l +304 115 327 255 370 418 c +413 581 475 739 556 890 c +637 1042 724 1170 815 1274 c +97 1274 l ce} _d -/eight{1139 0 89 -20 1050 1430 sc -1050 393 m -1050 263 1009 162 926 89 c -843 16 725 -20 570 -20 c -419 -20 301 16 216 87 c -131 158 89 260 89 391 c -89 483 115 560 168 623 c -221 686 288 724 370 737 c -370 741 l -293 759 233 798 188 858 c -144 918 122 988 122 1069 c -122 1176 162 1263 242 1330 c -323 1397 431 1430 566 1430 c -705 1430 814 1397 894 1332 c -975 1267 1015 1178 1015 1067 c -1015 986 993 916 948 856 c -903 796 842 758 765 743 c -765 739 l -855 724 925 686 975 624 c -1025 563 1050 486 1050 393 c - -828 1057 m -828 1216 741 1296 566 1296 c -481 1296 417 1276 372 1236 c -328 1196 306 1136 306 1057 c -306 976 329 915 374 872 c -420 830 485 809 568 809 c -653 809 717 828 761 867 c -806 906 828 970 828 1057 c - -863 410 m -863 497 837 563 785 607 c -733 652 660 674 566 674 c -475 674 403 650 352 602 c -301 555 275 489 275 406 c -275 212 374 115 572 115 c -670 115 743 138 791 185 c -839 232 863 307 863 410 c +/eight{1139 0 83 -25 1049 1472 sc +362 795 m +287 822 232 861 196 912 c +160 963 142 1023 142 1094 c +142 1201 180 1290 257 1363 c +334 1436 436 1472 563 1472 c +691 1472 794 1435 872 1360 c +950 1286 989 1196 989 1089 c +989 1021 971 962 935 911 c +900 861 846 822 773 795 c +863 766 931 718 978 653 c +1025 588 1049 510 1049 419 c +1049 294 1005 188 916 103 c +827 18 711 -25 566 -25 c +421 -25 305 18 216 103 c +127 189 83 296 83 424 c +83 519 107 599 155 663 c +204 728 273 772 362 795 c + +326 1100 m +326 1031 348 974 393 930 c +438 886 496 864 567 864 c +636 864 693 886 737 929 c +782 973 804 1027 804 1090 c +804 1156 781 1211 735 1256 c +690 1301 633 1324 565 1324 c +496 1324 439 1302 394 1258 c +349 1214 326 1161 326 1100 c + +268 423 m +268 372 280 322 304 274 c +329 226 365 189 413 162 c +461 136 513 123 568 123 c +654 123 725 151 781 206 c +837 261 865 332 865 417 c +865 504 836 575 778 632 c +721 689 649 717 562 717 c +477 717 407 689 351 633 c +296 577 268 507 268 423 c ce} _d -/nine{1139 0 96 -20 1042 1430 sc -1042 733 m -1042 491 998 305 909 175 c -821 45 695 -20 532 -20 c -422 -20 334 3 267 49 c -201 96 154 171 125 274 c -297 301 l -333 184 412 125 535 125 c -638 125 718 173 775 269 c -832 365 861 502 864 680 c -837 620 792 572 727 535 c -662 499 591 481 514 481 c -387 481 286 524 210 611 c -134 698 96 813 96 956 c -96 1103 137 1219 220 1303 c -303 1388 418 1430 565 1430 c -722 1430 840 1372 921 1256 c -1002 1140 1042 966 1042 733 c - -846 907 m -846 1020 820 1111 768 1180 c -716 1249 646 1284 559 1284 c -472 1284 404 1254 354 1195 c -304 1136 279 1057 279 956 c -279 853 304 772 354 712 c -404 653 472 623 557 623 c -609 623 657 635 702 658 c -747 682 782 716 807 759 c -833 802 846 852 846 907 c +/nine{1139 0 85 -25 1049 1472 sc +112 339 m +285 355 l +300 274 328 215 369 178 c +410 141 463 123 528 123 c +583 123 632 136 673 161 c +715 186 749 220 776 262 c +803 305 825 362 843 434 c +861 506 870 579 870 654 c +870 662 870 674 869 690 c +833 633 784 586 721 550 c +659 515 592 497 519 497 c +398 497 295 541 211 629 c +127 717 85 833 85 977 c +85 1126 129 1245 216 1336 c +304 1427 414 1472 546 1472 c +641 1472 728 1446 807 1395 c +886 1344 946 1270 987 1175 c +1028 1080 1049 943 1049 763 c +1049 576 1029 426 988 315 c +947 204 887 120 806 62 c +726 4 632 -25 524 -25 c +409 -25 316 7 243 70 c +170 134 127 224 112 339 c + +849 986 m +849 1089 821 1171 766 1232 c +711 1293 645 1323 568 1323 c +488 1323 418 1290 359 1225 c +300 1160 270 1075 270 971 c +270 878 298 802 354 743 c +411 685 480 656 563 656 c +646 656 715 685 768 743 c +822 802 849 883 849 986 c ce} _d -/A{1366 0 4 0 1362 1409 sc -1167 0 m -1006 412 l -364 412 l -202 0 l -4 0 l -579 1409 l -796 1409 l -1362 0 l -1167 0 l - -685 1265 m -676 1237 l -659 1182 635 1111 602 1024 c -422 561 l -949 561 l -768 1026 l -749 1072 731 1124 712 1182 c -685 1265 l +/A{1366 0 -3 0 1369 1466 sc +-3 0 m +560 1466 l +769 1466 l +1369 0 l +1148 0 l +977 444 l +364 444 l +203 0 l +-3 0 l + +420 602 m +917 602 l +764 1008 l +717 1131 683 1233 660 1312 c +641 1218 615 1125 581 1032 c +420 602 l ce} _d -/B{1366 0 168 0 1258 1409 sc -1258 397 m -1258 272 1212 174 1121 104 c -1030 35 903 0 740 0 c -168 0 l -168 1409 l -680 1409 l -1011 1409 1176 1295 1176 1067 c -1176 984 1153 914 1106 857 c -1059 800 993 762 908 743 c -1020 730 1106 692 1167 630 c -1228 569 1258 491 1258 397 c - -984 1044 m -984 1120 958 1174 906 1207 c -854 1240 779 1256 680 1256 c -359 1256 l -359 810 l -680 810 l -782 810 858 829 908 867 c -959 906 984 965 984 1044 c - -1065 412 m -1065 578 948 661 715 661 c -359 661 l -359 153 l -730 153 l -847 153 932 175 985 218 c -1038 261 1065 326 1065 412 c +/B{1366 0 150 0 1257 1466 sc +150 0 m +150 1466 l +700 1466 l +812 1466 902 1451 969 1421 c +1037 1392 1090 1346 1128 1284 c +1167 1223 1186 1158 1186 1091 c +1186 1028 1169 969 1135 914 c +1101 859 1050 814 981 780 c +1070 754 1138 710 1185 647 c +1233 584 1257 510 1257 425 c +1257 356 1242 292 1213 233 c +1184 174 1149 129 1106 97 c +1063 65 1010 41 945 24 c +881 8 802 0 709 0 c +150 0 l + +344 850 m +661 850 l +747 850 809 856 846 867 c +895 882 932 906 957 940 c +982 974 995 1017 995 1068 c +995 1117 983 1159 960 1196 c +937 1233 903 1259 860 1272 c +817 1286 742 1293 637 1293 c +344 1293 l +344 850 l + +344 173 m +709 173 l +772 173 816 175 841 180 c +886 188 923 201 953 220 c +983 239 1008 266 1027 301 c +1046 337 1056 378 1056 425 c +1056 480 1042 527 1014 567 c +986 608 947 636 897 652 c +848 669 776 677 683 677 c +344 677 l +344 173 l ce} _d -/C{1479 0 104 -20 1401 1430 sc -792 1274 m -636 1274 515 1224 428 1123 c -341 1023 298 886 298 711 c -298 538 343 399 433 294 c -524 189 646 137 800 137 c -997 137 1146 235 1245 430 c -1401 352 l -1343 231 1261 138 1156 75 c -1051 12 930 -20 791 -20 c -649 -20 526 9 422 68 c -319 127 240 212 185 321 c -131 431 104 561 104 711 c -104 936 165 1112 286 1239 c -407 1366 575 1430 790 1430 c -940 1430 1065 1401 1166 1342 c -1267 1283 1341 1196 1388 1081 c -1207 1021 l -1174 1103 1122 1166 1049 1209 c -977 1252 891 1274 792 1274 c +/C{1479 0 102 -25 1398 1491 sc +1204 514 m +1398 465 l +1357 306 1284 184 1178 100 c +1073 17 944 -25 791 -25 c +633 -25 504 7 405 71 c +306 136 231 229 179 351 c +128 473 102 604 102 744 c +102 897 131 1030 189 1143 c +248 1257 331 1343 438 1402 c +546 1461 665 1491 794 1491 c +941 1491 1064 1454 1164 1379 c +1264 1304 1334 1199 1373 1064 c +1182 1019 l +1148 1126 1099 1203 1034 1252 c +969 1301 888 1325 790 1325 c +677 1325 583 1298 507 1244 c +432 1190 379 1117 348 1026 c +317 935 302 842 302 745 c +302 620 320 511 356 418 c +393 325 449 256 526 210 c +603 164 686 141 775 141 c +884 141 976 172 1051 235 c +1126 298 1177 391 1204 514 c ce} _d -/D{1479 0 168 0 1381 1409 sc -1381 719 m -1381 574 1353 446 1296 337 c -1239 228 1159 145 1055 87 c -951 29 831 0 695 0 c -168 0 l -168 1409 l -634 1409 l -873 1409 1057 1349 1186 1229 c -1316 1110 1381 940 1381 719 c - -1189 719 m -1189 894 1141 1027 1045 1118 c -950 1210 811 1256 630 1256 c -359 1256 l -359 153 l -673 153 l -776 153 867 176 945 221 c -1024 266 1084 332 1126 417 c -1168 502 1189 603 1189 719 c +/D{1479 0 158 0 1370 1466 sc +158 0 m +158 1466 l +663 1466 l +777 1466 864 1459 924 1445 c +1008 1426 1080 1391 1139 1340 c +1216 1275 1274 1191 1312 1089 c +1351 988 1370 872 1370 741 c +1370 630 1357 531 1331 445 c +1305 359 1272 288 1231 231 c +1190 175 1146 131 1097 98 c +1049 66 991 42 922 25 c +854 8 776 0 687 0 c +158 0 l + +352 173 m +665 173 l +762 173 837 182 892 200 c +947 218 991 243 1024 276 c +1070 322 1106 384 1131 461 c +1157 539 1170 633 1170 744 c +1170 897 1145 1015 1094 1097 c +1044 1180 983 1235 911 1263 c +859 1283 775 1293 660 1293 c +352 1293 l +352 173 l ce} _d -/E{1366 0 168 0 1278 1409 sc -168 0 m -168 1409 l -1237 1409 l -1237 1253 l -359 1253 l -359 801 l -1177 801 l -1177 647 l -359 647 l -359 156 l -1278 156 l -1278 0 l -168 0 l +/E{1366 0 162 0 1256 1466 sc +162 0 m +162 1466 l +1222 1466 l +1222 1293 l +356 1293 l +356 844 l +1167 844 l +1167 672 l +356 672 l +356 173 l +1256 173 l +1256 0 l +162 0 l ce} _d -/I{569 0 189 0 380 1409 sc -189 0 m -189 1409 l -380 1409 l -380 0 l -189 0 l +/I{569 0 191 0 385 1466 sc +191 0 m +191 1466 l +385 1466 l +385 0 l +191 0 l ce} _d -/M{1706 0 168 0 1538 1409 sc -1366 0 m -1366 940 l -1366 1044 1369 1144 1375 1240 c -1342 1121 1313 1027 1287 960 c -923 0 l -789 0 l -420 960 l -364 1130 l -331 1240 l -334 1129 l -338 940 l -338 0 l -168 0 l -168 1409 l -419 1409 l -794 432 l -807 393 820 350 832 305 c -845 260 853 228 857 208 c -862 235 873 275 890 329 c -907 384 919 418 925 432 c -1293 1409 l -1538 1409 l -1538 0 l -1366 0 l +/M{1706 0 152 0 1551 1466 sc +152 0 m +152 1466 l +444 1466 l +791 428 l +823 331 846 259 861 211 c +878 264 904 343 939 446 c +1290 1466 l +1551 1466 l +1551 0 l +1364 0 l +1364 1227 l +938 0 l +763 0 l +339 1248 l +339 0 l +152 0 l ce} _d -/O{1593 0 97 -20 1495 1430 sc -1495 711 m -1495 564 1467 435 1410 324 c -1354 213 1273 128 1168 69 c -1063 10 938 -20 795 -20 c -650 -20 525 9 420 68 c -315 127 235 211 180 322 c -125 433 97 563 97 711 c -97 936 159 1112 282 1239 c -405 1366 577 1430 797 1430 c -940 1430 1065 1401 1170 1344 c -1275 1287 1356 1205 1411 1096 c -1467 987 1495 859 1495 711 c - -1300 711 m -1300 886 1256 1024 1168 1124 c -1081 1224 957 1274 797 1274 c -636 1274 511 1225 423 1126 c -335 1027 291 889 291 711 c -291 534 335 394 424 290 c -513 187 637 135 795 135 c -958 135 1082 185 1169 285 c -1256 386 1300 528 1300 711 c +/O{1593 0 99 -25 1501 1492 sc +99 714 m +99 957 164 1148 295 1285 c +426 1423 594 1492 801 1492 c +936 1492 1058 1460 1167 1395 c +1276 1330 1358 1240 1415 1124 c +1472 1009 1501 878 1501 731 c +1501 582 1471 449 1411 332 c +1351 215 1266 126 1156 65 c +1046 5 927 -25 800 -25 c +662 -25 539 8 430 75 c +321 142 239 233 183 348 c +127 463 99 585 99 714 c + +299 711 m +299 534 346 395 441 293 c +536 192 656 141 799 141 c +945 141 1065 192 1159 295 c +1254 398 1301 543 1301 732 c +1301 851 1281 955 1240 1044 c +1200 1133 1141 1202 1063 1251 c +986 1300 899 1325 802 1325 c +665 1325 546 1278 447 1183 c +348 1089 299 932 299 711 c ce} _d -/P{1366 0 168 0 1258 1409 sc -1258 985 m -1258 852 1214 746 1127 667 c -1040 588 922 549 773 549 c -359 549 l -359 0 l -168 0 l -168 1409 l -761 1409 l -919 1409 1041 1372 1128 1298 c -1215 1224 1258 1120 1258 985 c - -1066 983 m -1066 1165 957 1256 738 1256 c -359 1256 l -359 700 l -746 700 l -959 700 1066 794 1066 983 c +/P{1366 0 158 0 1277 1466 sc +158 0 m +158 1466 l +711 1466 l +808 1466 883 1461 934 1452 c +1006 1440 1066 1417 1115 1383 c +1164 1350 1203 1303 1232 1242 c +1262 1181 1277 1115 1277 1042 c +1277 917 1237 812 1158 725 c +1079 639 935 596 728 596 c +352 596 l +352 0 l +158 0 l + +352 769 m +731 769 l +856 769 945 792 998 839 c +1051 886 1077 951 1077 1036 c +1077 1097 1061 1150 1030 1193 c +999 1237 959 1266 908 1280 c +875 1289 815 1293 727 1293 c +352 1293 l +352 769 l ce} _d -/S{1366 0 93 -20 1272 1430 sc -1272 389 m -1272 259 1221 158 1119 87 c -1018 16 875 -20 690 -20 c -347 -20 148 99 93 338 c -278 375 l -299 290 345 228 414 188 c -483 149 578 129 697 129 c -820 129 915 150 982 192 c -1049 235 1083 297 1083 379 c -1083 425 1072 462 1051 491 c -1030 520 1001 543 963 562 c -925 581 880 596 827 609 c -774 622 716 635 652 650 c -541 675 456 699 398 724 c -341 749 295 776 262 806 c -229 837 203 872 185 913 c -168 954 159 1000 159 1053 c -159 1174 205 1267 297 1332 c -390 1397 522 1430 694 1430 c -854 1430 976 1405 1061 1356 c -1146 1307 1205 1224 1239 1106 c -1051 1073 l -1030 1148 991 1202 933 1235 c -875 1269 795 1286 692 1286 c -579 1286 493 1267 434 1230 c -375 1193 345 1137 345 1063 c -345 1020 356 984 379 955 c -402 927 436 903 479 883 c -522 864 609 840 738 811 c -781 801 824 791 867 780 c -910 770 952 758 991 743 c -1030 729 1067 712 1101 693 c -1136 674 1166 650 1191 622 c -1216 594 1236 561 1250 523 c -1265 485 1272 440 1272 389 c +/S{1366 0 92 -25 1259 1491 sc +92 471 m +275 487 l +284 414 304 353 335 306 c +367 259 416 221 483 192 c +550 163 625 149 708 149 c +782 149 847 160 904 182 c +961 204 1003 234 1030 272 c +1058 311 1072 353 1072 398 c +1072 444 1059 484 1032 518 c +1005 553 961 582 900 605 c +861 620 774 644 639 676 c +504 709 410 739 356 768 c +286 805 234 850 199 904 c +165 959 148 1020 148 1087 c +148 1161 169 1230 211 1294 c +253 1359 314 1408 395 1441 c +476 1474 565 1491 664 1491 c +773 1491 868 1473 951 1438 c +1034 1403 1098 1352 1143 1284 c +1188 1216 1212 1139 1215 1053 c +1029 1039 l +1019 1132 985 1202 927 1249 c +870 1296 785 1320 672 1320 c +555 1320 469 1298 415 1255 c +362 1212 335 1161 335 1100 c +335 1047 354 1004 392 970 c +429 936 527 901 684 865 c +842 830 950 799 1009 772 c +1094 733 1157 683 1198 622 c +1239 562 1259 493 1259 414 c +1259 336 1237 262 1192 193 c +1147 124 1083 71 999 32 c +916 -6 822 -25 717 -25 c +584 -25 473 -6 383 33 c +294 72 223 130 172 207 c +121 285 95 373 92 471 c ce} _d -/T{1251 0 46 0 1204 1409 sc -720 1253 m -720 0 l -530 0 l -530 1253 l -46 1253 l -46 1409 l -1204 1409 l -1204 1253 l -720 1253 l +/T{1251 0 48 0 1210 1466 sc +531 0 m +531 1293 l +48 1293 l +48 1466 l +1210 1466 l +1210 1293 l +725 1293 l +725 0 l +531 0 l ce} _d -/a{1139 0 87 -20 1139 1102 sc -414 -20 m -305 -20 224 9 169 66 c -114 123 87 202 87 302 c -87 414 124 500 197 560 c -271 620 390 652 554 656 c -797 660 l -797 719 l -797 807 778 870 741 908 c -704 946 645 965 565 965 c -484 965 426 951 389 924 c -352 897 330 853 323 793 c -135 810 l -166 1005 310 1102 569 1102 c -705 1102 807 1071 876 1008 c -945 946 979 856 979 738 c -979 272 l -979 219 986 178 1000 151 c -1014 124 1041 111 1080 111 c -1097 111 1117 113 1139 118 c -1139 6 l -1094 -5 1047 -10 1000 -10 c -933 -10 885 7 854 42 c -824 77 807 132 803 207 c -797 207 l -751 124 697 66 636 31 c -575 -3 501 -20 414 -20 c - -455 115 m -521 115 580 130 631 160 c -682 190 723 231 752 283 c -782 336 797 390 797 445 c -797 534 l -600 530 l -515 529 451 520 407 504 c -364 488 330 463 307 430 c -284 397 272 353 272 299 c -272 240 288 195 319 163 c -351 131 396 115 455 115 c +/a{1139 0 74 -24 1052 1086 sc +828 131 m +761 74 697 34 635 11 c +574 -12 508 -24 437 -24 c +320 -24 231 4 168 61 c +105 118 74 191 74 280 c +74 332 86 379 109 422 c +133 465 164 500 202 526 c +241 552 284 572 332 585 c +367 594 421 603 492 612 c +637 629 744 650 813 674 c +814 699 814 714 814 721 c +814 794 797 846 763 876 c +717 917 649 937 558 937 c +473 937 411 922 370 892 c +330 863 300 810 281 735 c +105 759 l +121 834 147 895 184 941 c +221 988 274 1023 343 1048 c +412 1073 493 1086 584 1086 c +675 1086 748 1075 805 1054 c +862 1033 903 1006 930 973 c +957 941 975 900 986 851 c +992 820 995 765 995 685 c +995 445 l +995 278 999 172 1006 127 c +1014 83 1029 41 1052 0 c +864 0 l +845 37 833 81 828 131 c + +813 533 m +748 506 650 484 519 465 c +445 454 393 442 362 429 c +331 416 308 396 291 370 c +274 345 266 316 266 285 c +266 237 284 197 320 165 c +357 133 410 117 480 117 c +549 117 611 132 665 162 c +719 193 759 234 784 287 c +803 328 813 388 813 467 c +813 533 l ce} _d -/b{1139 0 132 -20 1053 1484 sc -1053 546 m -1053 169 920 -20 655 -20 c -573 -20 505 -5 450 24 c -396 54 352 102 318 168 c -316 168 l -316 147 315 116 312 73 c -309 31 307 7 306 0 c -132 0 l -136 36 138 110 138 223 c -138 1484 l -318 1484 l -318 1061 l -318 1018 317 967 314 908 c -318 908 l -351 977 395 1027 450 1057 c -505 1087 574 1102 655 1102 c -792 1102 892 1056 956 964 c -1021 872 1053 733 1053 546 c - -864 540 m -864 691 844 800 804 865 c -764 930 699 963 609 963 c -508 963 434 928 387 859 c -341 790 318 680 318 529 c -318 387 341 282 386 214 c -431 147 505 113 607 113 c -698 113 763 146 803 213 c -844 280 864 389 864 540 c +/b{1139 0 134 -24 1055 1466 sc +301 0 m +134 0 l +134 1466 l +314 1466 l +314 943 l +390 1038 487 1086 605 1086 c +670 1086 732 1073 790 1046 c +849 1020 897 983 934 935 c +972 888 1002 830 1023 763 c +1044 696 1055 624 1055 547 c +1055 365 1010 224 920 125 c +830 26 722 -24 596 -24 c +471 -24 372 28 301 133 c +301 0 l + +299 539 m +299 412 316 320 351 263 c +408 170 484 124 581 124 c +660 124 728 158 785 226 c +842 295 871 397 871 532 c +871 671 843 773 788 839 c +733 905 667 938 589 938 c +510 938 442 904 385 835 c +328 767 299 668 299 539 c ce} _d -/d{1139 0 86 -20 1007 1484 sc -821 174 m -788 105 743 55 688 25 c -633 -5 565 -20 484 -20 c -347 -20 247 26 182 118 c -118 210 86 349 86 536 c -86 913 219 1102 484 1102 c -566 1102 634 1087 689 1057 c -744 1027 788 979 821 914 c -823 914 l -821 1035 l -821 1484 l -1001 1484 l -1001 223 l -1001 110 1003 36 1007 0 c -835 0 l -833 11 831 35 828 74 c -826 113 825 146 825 174 c -821 174 l - -275 542 m -275 391 295 282 335 217 c -375 152 440 119 530 119 c -632 119 706 154 752 225 c -798 296 821 405 821 554 c -821 697 798 802 752 869 c -706 936 633 969 532 969 c -441 969 376 935 335 868 c -295 801 275 693 275 542 c +/d{1139 0 70 -24 991 1466 sc +824 0 m +824 134 l +757 29 658 -24 527 -24 c +442 -24 364 -1 293 46 c +222 93 167 158 128 241 c +89 325 70 421 70 530 c +70 636 88 732 123 818 c +158 905 211 971 282 1017 c +353 1063 432 1086 519 1086 c +583 1086 640 1072 690 1045 c +740 1018 781 983 812 940 c +812 1466 l +991 1466 l +991 0 l +824 0 l + +255 530 m +255 394 284 292 341 225 c +398 158 466 124 544 124 c +623 124 689 156 744 220 c +799 285 827 383 827 515 c +827 660 799 767 743 835 c +687 903 618 937 536 937 c +456 937 389 904 335 839 c +282 774 255 671 255 530 c ce} _d -/e{1139 0 87 -20 1048 1102 sc -276 503 m -276 379 302 283 353 216 c -404 149 479 115 578 115 c -656 115 718 131 765 162 c -812 193 844 233 861 281 c -1019 236 l -954 65 807 -20 578 -20 c -418 -20 296 28 212 123 c -129 218 87 360 87 548 c -87 727 129 864 212 959 c -296 1054 416 1102 571 1102 c -889 1102 1048 910 1048 527 c -1048 503 l -276 503 l - -862 641 m -852 755 823 838 775 890 c -727 943 658 969 568 969 c -481 969 411 940 360 881 c -309 823 282 743 278 641 c -862 641 l +/e{1139 0 75 -24 1054 1086 sc +862 342 m +1048 319 l +1019 210 964 126 885 66 c +806 6 704 -24 581 -24 c +426 -24 302 24 211 119 c +120 215 75 349 75 522 c +75 701 121 839 213 938 c +305 1037 424 1086 571 1086 c +713 1086 829 1038 919 941 c +1009 844 1054 708 1054 533 c +1054 522 1054 506 1053 485 c +261 485 l +268 368 301 279 360 217 c +419 155 493 124 582 124 c +648 124 704 141 751 176 c +798 211 835 266 862 342 c + +271 633 m +864 633 l +856 722 833 789 796 834 c +739 903 664 938 573 938 c +490 938 421 910 364 855 c +308 800 277 726 271 633 c ce} _d -/f{569 0 29 0 572 1482 sc -361 951 m -361 0 l -181 0 l -181 951 l -29 951 l -29 1082 l -181 1082 l -181 1204 l -181 1303 203 1374 246 1417 c -289 1460 356 1482 445 1482 c -495 1482 537 1478 572 1470 c -572 1333 l -542 1338 515 1341 492 1341 c -446 1341 413 1329 392 1306 c -371 1283 361 1240 361 1179 c -361 1082 l -572 1082 l -572 951 l -361 951 l +/f{569 0 19 0 640 1491 sc +178 0 m +178 922 l +19 922 l +19 1062 l +178 1062 l +178 1175 l +178 1246 184 1299 197 1334 c +214 1381 245 1418 288 1447 c +332 1476 393 1491 472 1491 c +523 1491 579 1485 640 1473 c +613 1316 l +576 1323 540 1326 507 1326 c +452 1326 414 1314 391 1291 c +368 1268 357 1224 357 1160 c +357 1062 l +564 1062 l +564 922 l +357 922 l +357 0 l +178 0 l ce} _d -/g{1139 0 86 -425 1007 1099 sc -548 -425 m -430 -425 336 -402 266 -355 c -196 -309 151 -243 131 -158 c -312 -132 l -324 -182 350 -220 391 -247 c -432 -274 486 -288 553 -288 c -732 -288 822 -183 822 27 c -822 201 l -820 201 l -786 132 739 79 680 44 c -621 9 551 -8 472 -8 c -339 -8 242 36 179 124 c -117 212 86 350 86 539 c -86 730 119 871 186 962 c -253 1053 355 1099 492 1099 c -569 1099 635 1081 691 1046 c -748 1011 791 962 822 897 c -824 897 l -824 917 825 952 828 1001 c -831 1050 833 1077 836 1082 c -1007 1082 l -1003 1046 1001 971 1001 858 c -1001 31 l -1001 -273 850 -425 548 -425 c - -822 541 m -822 629 810 705 786 768 c -762 832 728 881 684 914 c -641 948 591 965 536 965 c -444 965 377 932 335 865 c -293 798 272 690 272 541 c -272 393 292 287 331 222 c -370 157 438 125 533 125 c -590 125 640 142 684 175 c -728 208 762 256 786 318 c -810 381 822 455 822 541 c +/g{1139 0 66 -431 1002 1086 sc +102 -88 m +277 -114 l +284 -168 305 -207 338 -232 c +383 -265 444 -282 521 -282 c +604 -282 669 -265 714 -232 c +759 -199 790 -152 806 -92 c +815 -55 820 22 819 139 c +740 46 642 0 525 0 c +379 0 266 53 186 158 c +106 263 66 390 66 537 c +66 638 84 732 121 817 c +158 903 211 969 280 1016 c +350 1063 432 1086 526 1086 c +651 1086 755 1035 836 934 c +836 1062 l +1002 1062 l +1002 144 l +1002 -21 985 -138 951 -207 c +918 -276 864 -331 791 -371 c +718 -411 629 -431 522 -431 c +395 -431 293 -402 215 -345 c +137 -288 99 -203 102 -88 c + +251 550 m +251 411 279 309 334 245 c +389 181 459 149 542 149 c +625 149 694 181 750 244 c +806 308 834 408 834 544 c +834 674 805 772 747 838 c +690 904 620 937 539 937 c +459 937 391 904 335 839 c +279 774 251 678 251 550 c ce} _d -/h{1139 0 142 0 1006 1484 sc -317 897 m -356 968 402 1019 456 1052 c -511 1085 580 1102 663 1102 c -780 1102 867 1073 922 1014 c -978 956 1006 858 1006 721 c -1006 0 l -825 0 l -825 686 l -825 762 818 818 804 855 c -790 892 767 920 735 937 c -703 954 659 963 602 963 c -517 963 449 934 398 875 c -347 816 322 737 322 638 c -322 0 l -142 0 l -142 1484 l -322 1484 l -322 1098 l -322 1057 321 1015 318 972 c -316 929 315 904 314 897 c -317 897 l +/h{1139 0 135 0 1000 1466 sc +135 0 m +135 1466 l +315 1466 l +315 940 l +399 1037 505 1086 633 1086 c +712 1086 780 1070 838 1039 c +896 1008 937 966 962 911 c +987 856 1000 777 1000 673 c +1000 0 l +820 0 l +820 673 l +820 763 800 828 761 869 c +722 910 667 931 596 931 c +543 931 492 917 445 889 c +398 862 365 824 345 777 c +325 730 315 664 315 581 c +315 0 l +135 0 l ce} _d -/i{455 0 137 0 317 1484 sc -137 1312 m -137 1484 l -317 1484 l -317 1312 l -137 1312 l - -137 0 m -137 1082 l -317 1082 l -317 0 l -137 0 l +/i{455 0 136 0 316 1466 sc +136 1259 m +136 1466 l +316 1466 l +316 1259 l +136 1259 l + +136 0 m +136 1062 l +316 1062 l +316 0 l +136 0 l ce} _d -/l{455 0 138 0 318 1484 sc -138 0 m -138 1484 l -318 1484 l -318 0 l -138 0 l +/l{455 0 131 0 311 1466 sc +131 0 m +131 1466 l +311 1466 l +311 0 l +131 0 l ce} _d -/m{1706 0 136 0 1571 1102 sc -768 0 m -768 686 l -768 791 754 863 725 903 c -696 943 645 963 570 963 c -493 963 433 934 388 875 c -343 816 321 734 321 627 c -321 0 l -142 0 l -142 851 l -142 977 140 1054 136 1082 c -306 1082 l -307 1079 307 1070 308 1055 c -309 1040 309 1023 310 1004 c -311 985 313 950 314 897 c -317 897 l -356 974 400 1027 450 1057 c -500 1087 561 1102 633 1102 c -715 1102 780 1086 827 1053 c -875 1020 908 968 927 897 c -930 897 l -967 970 1012 1022 1065 1054 c -1118 1086 1183 1102 1258 1102 c -1367 1102 1447 1072 1496 1013 c -1546 954 1571 856 1571 721 c -1571 0 l -1393 0 l -1393 686 l -1393 791 1379 863 1350 903 c -1321 943 1270 963 1195 963 c -1116 963 1055 934 1011 875 c -968 817 946 734 946 627 c +/m{1706 0 135 0 1574 1086 sc +135 0 m +135 1062 l +296 1062 l +296 913 l +329 965 374 1007 429 1038 c +484 1070 547 1086 618 1086 c +697 1086 761 1070 811 1037 c +862 1004 897 959 918 900 c +1002 1024 1111 1086 1246 1086 c +1351 1086 1432 1057 1489 998 c +1546 940 1574 850 1574 729 c +1574 0 l +1395 0 l +1395 669 l +1395 741 1389 793 1377 824 c +1366 856 1345 882 1314 901 c +1283 920 1247 930 1206 930 c +1131 930 1069 905 1020 855 c +971 806 946 726 946 617 c 946 0 l -768 0 l +766 0 l +766 690 l +766 770 751 830 722 870 c +693 910 645 930 578 930 c +527 930 480 917 437 890 c +394 863 363 824 344 773 c +325 722 315 648 315 551 c +315 0 l +135 0 l ce} _d -/n{1139 0 136 0 1006 1102 sc -825 0 m -825 686 l -825 757 818 813 804 852 c -790 891 768 920 737 937 c -706 954 661 963 602 963 c -515 963 447 933 397 874 c -347 815 322 732 322 627 c -322 0 l -142 0 l -142 851 l -142 977 140 1054 136 1082 c -306 1082 l -307 1079 307 1070 308 1055 c -309 1040 309 1023 310 1004 c -311 985 313 950 314 897 c -317 897 l -358 972 406 1024 460 1055 c -515 1086 582 1102 663 1102 c -782 1102 868 1072 923 1013 c -978 954 1006 857 1006 721 c -1006 0 l -825 0 l +/n{1139 0 135 0 998 1086 sc +135 0 m +135 1062 l +297 1062 l +297 911 l +375 1028 488 1086 635 1086 c +699 1086 758 1074 811 1051 c +865 1028 905 998 932 961 c +959 924 977 879 988 828 c +995 795 998 736 998 653 c +998 0 l +818 0 l +818 646 l +818 719 811 774 797 810 c +783 847 758 876 722 897 c +687 919 645 930 597 930 c +520 930 454 906 398 857 c +343 808 315 716 315 580 c +315 0 l +135 0 l ce} _d -/o{1139 0 86 -20 1053 1102 sc -1053 542 m -1053 353 1011 212 928 119 c -845 26 724 -20 565 -20 c -407 -20 288 28 207 124 c -126 221 86 360 86 542 c -86 915 248 1102 571 1102 c -736 1102 858 1056 936 965 c -1014 874 1053 733 1053 542 c - -864 542 m -864 691 842 800 797 867 c -753 935 679 969 574 969 c -469 969 392 934 345 865 c -298 796 275 689 275 542 c -275 399 298 292 344 220 c -391 149 464 113 563 113 c -671 113 748 148 794 217 c -841 286 864 395 864 542 c +/o{1139 0 68 -24 1063 1086 sc +68 531 m +68 728 123 873 232 968 c +323 1047 435 1086 566 1086 c +712 1086 831 1038 924 942 c +1017 847 1063 715 1063 546 c +1063 409 1042 302 1001 223 c +960 145 901 84 822 41 c +744 -2 659 -24 566 -24 c +417 -24 297 24 205 119 c +114 214 68 352 68 531 c + +253 531 m +253 395 283 293 342 225 c +401 158 476 124 566 124 c +655 124 730 158 789 226 c +848 294 878 398 878 537 c +878 668 848 768 788 835 c +729 903 655 937 566 937 c +476 937 401 903 342 836 c +283 769 253 667 253 531 c ce} _d -/r{682 0 136 0 648 1102 sc -142 0 m -142 830 l -142 906 140 990 136 1082 c -306 1082 l -311 959 314 886 314 861 c -318 861 l -347 954 380 1017 417 1051 c -454 1085 507 1102 575 1102 c -599 1102 623 1099 648 1092 c -648 927 l -624 934 592 937 552 937 c -477 937 420 905 381 840 c -342 776 322 684 322 564 c -322 0 l -142 0 l +/r{682 0 133 0 710 1086 sc +133 0 m +133 1062 l +295 1062 l +295 901 l +336 976 374 1026 409 1050 c +444 1074 483 1086 525 1086 c +586 1086 647 1067 710 1028 c +648 861 l +604 887 560 900 516 900 c +477 900 441 888 410 864 c +379 841 356 808 343 766 c +323 702 313 632 313 556 c +313 0 l +133 0 l ce} _d -/s{1024 0 57 -20 950 1099 sc -950 299 m -950 197 911 118 834 63 c -757 8 650 -20 511 -20 c -376 -20 272 2 199 46 c -126 91 79 160 57 254 c -216 285 l -231 227 263 184 311 157 c -359 130 426 117 511 117 c -602 117 669 131 711 159 c -754 187 775 229 775 285 c -775 328 760 362 731 389 c -702 416 654 438 589 455 c -460 489 l -357 516 283 542 239 567 c -196 593 162 624 137 661 c -112 698 100 743 100 796 c -100 895 135 970 205 1021 c -276 1073 378 1099 513 1099 c -632 1099 727 1078 797 1036 c -868 994 912 927 931 834 c -769 814 l -759 862 732 899 688 924 c -645 950 586 963 513 963 c -432 963 372 951 333 926 c -294 901 275 864 275 814 c -275 783 283 758 299 738 c -315 718 339 701 370 687 c -401 673 467 654 568 629 c -663 605 732 583 774 562 c -816 542 849 520 873 495 c -898 470 917 442 930 409 c -943 377 950 340 950 299 c +/s{1024 0 63 -24 945 1086 sc +63 317 m +241 345 l +251 274 279 219 324 181 c +370 143 434 124 516 124 c +599 124 660 141 700 174 c +740 208 760 248 760 293 c +760 334 742 366 707 389 c +682 405 621 425 523 450 c +391 483 299 512 248 536 c +197 561 159 594 132 637 c +106 680 93 728 93 780 c +93 827 104 871 125 911 c +147 952 177 985 214 1012 c +242 1033 280 1050 328 1064 c +377 1079 429 1086 484 1086 c +567 1086 640 1074 703 1050 c +766 1026 813 993 843 952 c +873 911 894 857 905 788 c +729 764 l +721 819 698 861 659 892 c +621 923 567 938 497 938 c +414 938 355 924 320 897 c +285 870 267 838 267 801 c +267 778 274 757 289 738 c +304 719 327 703 358 690 c +376 683 429 668 517 644 c +644 610 733 582 783 560 c +834 539 873 507 902 466 c +931 425 945 373 945 312 c +945 252 927 195 892 142 c +857 89 807 48 741 19 c +675 -10 600 -24 517 -24 c +379 -24 274 5 201 62 c +129 119 83 204 63 317 c ce} _d -/t{569 0 31 -16 554 1324 sc -554 8 m -495 -8 434 -16 372 -16 c -228 -16 156 66 156 229 c -156 951 l -31 951 l -31 1082 l -163 1082 l -216 1324 l -336 1324 l -336 1082 l -536 1082 l -536 951 l -336 951 l -336 268 l -336 216 344 179 361 158 c -378 137 408 127 450 127 c -474 127 509 132 554 141 c -554 8 l +/t{569 0 36 -14 554 1433 sc +528 161 m +554 2 l +503 -9 458 -14 418 -14 c +353 -14 302 -4 266 17 c +230 38 205 65 190 98 c +175 132 168 203 168 311 c +168 922 l +36 922 l +36 1062 l +168 1062 l +168 1325 l +347 1433 l +347 1062 l +528 1062 l +528 922 l +347 922 l +347 301 l +347 250 350 217 356 202 c +363 187 373 176 387 167 c +402 158 422 154 449 154 c +469 154 495 156 528 161 c ce} _d -/u{1139 0 133 -20 1003 1082 sc -314 1082 m -314 396 l -314 325 321 269 335 230 c -349 191 371 162 402 145 c -433 128 478 119 537 119 c -624 119 692 149 742 208 c -792 267 817 350 817 455 c -817 1082 l -997 1082 l -997 231 l -997 105 999 28 1003 0 c -833 0 l -832 3 832 12 831 27 c -830 42 829 58 828 77 c -827 96 826 132 825 185 c -822 185 l -781 110 733 57 678 26 c -624 -5 557 -20 476 -20 c -357 -20 270 9 215 68 c -160 127 133 225 133 361 c -133 1082 l -314 1082 l +/u{1139 0 131 -24 992 1062 sc +831 0 m +831 156 l +748 36 636 -24 494 -24 c +431 -24 373 -12 318 12 c +264 36 224 66 197 102 c +171 139 153 183 142 236 c +135 271 131 327 131 404 c +131 1062 l +311 1062 l +311 473 l +311 379 315 316 322 283 c +333 236 357 198 394 171 c +431 144 476 131 530 131 c +584 131 635 145 682 172 c +729 200 763 238 782 285 c +802 333 812 402 812 493 c +812 1062 l +992 1062 l +992 0 l +831 0 l ce} _d -/v{1024 0 7 0 1017 1082 sc -613 0 m -400 0 l -7 1082 l -199 1082 l -437 378 l -446 351 469 272 506 141 c -541 258 l -580 376 l -826 1082 l -1017 1082 l -613 0 l +/v{1024 0 26 0 1000 1062 sc +430 0 m +26 1062 l +216 1062 l +444 426 l +469 357 491 286 512 212 c +528 268 550 335 579 414 c +815 1062 l +1000 1062 l +598 0 l +430 0 l ce} _d -/w{1479 0 -3 0 1484 1082 sc -1174 0 m -965 0 l -776 765 l -740 934 l -734 904 725 861 712 804 c -699 748 631 480 508 0 c -300 0 l --3 1082 l -175 1082 l -358 347 l -363 331 377 265 401 149 c -418 223 l -644 1082 l -837 1082 l -1026 339 l -1072 149 l -1103 288 l -1308 1082 l -1484 1082 l -1174 0 l +/w{1479 0 6 0 1463 1062 sc +331 0 m +6 1062 l +192 1062 l +361 449 l +424 221 l +427 232 445 305 479 440 c +648 1062 l +833 1062 l +992 446 l +1045 243 l +1106 448 l +1288 1062 l +1463 1062 l +1131 0 l +944 0 l +775 636 l +734 817 l +519 0 l +331 0 l ce} _d -/y{1024 0 5 -425 1020 1082 sc -191 -425 m -142 -425 100 -421 67 -414 c -67 -279 l -92 -283 120 -285 151 -285 c -263 -285 352 -203 417 -38 c -434 5 l -5 1082 l -197 1082 l -425 484 l -428 475 432 463 437 450 c -442 437 457 394 482 320 c -507 246 521 205 523 196 c -593 393 l -830 1082 l -1020 1082 l -604 0 l -559 -115 518 -201 479 -257 c -440 -314 397 -356 350 -383 c -303 -411 250 -425 191 -425 c +/y{1024 0 33 -431 1006 1062 sc +127 -409 m +107 -240 l +146 -251 181 -256 210 -256 c +250 -256 282 -249 306 -236 c +330 -223 350 -204 365 -180 c +376 -162 395 -117 420 -46 c +423 -36 429 -21 436 -2 c +33 1062 l +227 1062 l +448 447 l +477 369 502 287 525 201 c +546 284 570 364 599 443 c +826 1062 l +1006 1062 l +602 -18 l +559 -135 525 -215 501 -259 c +469 -318 432 -362 391 -389 c +350 -417 300 -431 243 -431 c +208 -431 170 -424 127 -409 c ce} _d end readonly def @@ -1113,22 +1126,22 @@ FontName currentdict end definefont pop end %%EndProlog mpldict begin -66.857 302.637 translate -478.287 186.726 0 0 clipbox +67.252 302.717 translate +477.497 186.565 0 0 clipbox gsave 0 0 m -478.286875 0 l -478.286875 186.72625 l -0 186.72625 l +477.496875 0 l +477.496875 186.565 l +0 186.565 l cl 1.000 setgray fill grestore gsave -43.890625 33.59375 m -470.505625 33.59375 l -470.505625 168.41375 l -43.890625 168.41375 l +43.640625 33.4375 m +469.715625 33.4375 l +469.715625 168.19 l +43.640625 168.19 l cl 1.000 setgray fill @@ -1139,301 +1152,301 @@ grestore [] 0 setdash 0.800 setgray gsave -426.615 134.82 43.891 33.594 clipbox -43.890625 33.59375 m -43.890625 168.41375 l +426.075 134.752 43.641 33.438 clipbox +43.640625 33.4375 m +43.640625 168.19 l stroke grestore 0.150 setgray -/LiberationSans 14.000 selectfont +/ArialMT 14.000 selectfont gsave -40.000000 19.953125 translate +39.750000 19.921875 translate 0.000000 rotate 0.000000 0 m /three glyphshow grestore 0.800 setgray gsave -426.615 134.82 43.891 33.594 clipbox -66.344046 33.59375 m -66.344046 168.41375 l +426.075 134.752 43.641 33.438 clipbox +66.065625 33.4375 m +66.065625 168.19 l stroke grestore 0.150 setgray gsave -62.453421 19.953125 translate +62.175000 19.921875 translate 0.000000 rotate 0.000000 0 m /four glyphshow grestore 0.800 setgray gsave -426.615 134.82 43.891 33.594 clipbox -88.797467 33.59375 m -88.797467 168.41375 l +426.075 134.752 43.641 33.438 clipbox +88.490625 33.4375 m +88.490625 168.19 l stroke grestore 0.150 setgray gsave -84.906842 19.953125 translate +84.600000 19.921875 translate 0.000000 rotate 0.000000 0 m /five glyphshow grestore 0.800 setgray gsave -426.615 134.82 43.891 33.594 clipbox -111.250888 33.59375 m -111.250888 168.41375 l +426.075 134.752 43.641 33.438 clipbox +110.915625 33.4375 m +110.915625 168.19 l stroke grestore 0.150 setgray gsave -107.360263 19.953125 translate +107.025000 19.921875 translate 0.000000 rotate 0.000000 0 m /six glyphshow grestore 0.800 setgray gsave -426.615 134.82 43.891 33.594 clipbox -133.704309 33.59375 m -133.704309 168.41375 l +426.075 134.752 43.641 33.438 clipbox +133.340625 33.4375 m +133.340625 168.19 l stroke grestore 0.150 setgray gsave -129.813684 19.953125 translate +129.450000 19.921875 translate 0.000000 rotate 0.000000 0 m /seven glyphshow grestore 0.800 setgray gsave -426.615 134.82 43.891 33.594 clipbox -156.15773 33.59375 m -156.15773 168.41375 l +426.075 134.752 43.641 33.438 clipbox +155.765625 33.4375 m +155.765625 168.19 l stroke grestore 0.150 setgray gsave -152.267105 19.953125 translate +151.875000 19.921875 translate 0.000000 rotate 0.000000 0 m /eight glyphshow grestore 0.800 setgray gsave -426.615 134.82 43.891 33.594 clipbox -178.611151 33.59375 m -178.611151 168.41375 l +426.075 134.752 43.641 33.438 clipbox +178.190625 33.4375 m +178.190625 168.19 l stroke grestore 0.150 setgray gsave -174.720526 19.953125 translate +174.300000 19.921875 translate 0.000000 rotate 0.000000 0 m /nine glyphshow grestore 0.800 setgray gsave -426.615 134.82 43.891 33.594 clipbox -201.064572 33.59375 m -201.064572 168.41375 l +426.075 134.752 43.641 33.438 clipbox +200.615625 33.4375 m +200.615625 168.19 l stroke grestore 0.150 setgray gsave -193.283322 19.953125 translate +192.834375 19.921875 translate 0.000000 rotate 0.000000 0 m /one glyphshow 7.786133 0 m /zero glyphshow grestore 0.800 setgray gsave -426.615 134.82 43.891 33.594 clipbox -223.517993 33.59375 m -223.517993 168.41375 l +426.075 134.752 43.641 33.438 clipbox +223.040625 33.4375 m +223.040625 168.19 l stroke grestore 0.150 setgray gsave -216.236743 19.953125 translate +215.759375 19.921875 translate 0.000000 rotate 0.000000 0 m /one glyphshow 6.786133 0 m /one glyphshow grestore 0.800 setgray gsave -426.615 134.82 43.891 33.594 clipbox -245.971414 33.59375 m -245.971414 168.41375 l +426.075 134.752 43.641 33.438 clipbox +245.465625 33.4375 m +245.465625 168.19 l stroke grestore 0.150 setgray gsave -238.190164 19.953125 translate +237.684375 19.921875 translate 0.000000 rotate 0.000000 0 m /one glyphshow 7.786133 0 m /two glyphshow grestore 0.800 setgray gsave -426.615 134.82 43.891 33.594 clipbox -268.424836 33.59375 m -268.424836 168.41375 l +426.075 134.752 43.641 33.438 clipbox +267.890625 33.4375 m +267.890625 168.19 l stroke grestore 0.150 setgray gsave -260.643586 19.953125 translate +260.109375 19.921875 translate 0.000000 rotate 0.000000 0 m /one glyphshow 7.786133 0 m /three glyphshow grestore 0.800 setgray gsave -426.615 134.82 43.891 33.594 clipbox -290.878257 33.59375 m -290.878257 168.41375 l +426.075 134.752 43.641 33.438 clipbox +290.315625 33.4375 m +290.315625 168.19 l stroke grestore 0.150 setgray gsave -283.097007 19.953125 translate +282.534375 19.921875 translate 0.000000 rotate 0.000000 0 m /one glyphshow 7.786133 0 m /four glyphshow grestore 0.800 setgray gsave -426.615 134.82 43.891 33.594 clipbox -313.331678 33.59375 m -313.331678 168.41375 l +426.075 134.752 43.641 33.438 clipbox +312.740625 33.4375 m +312.740625 168.19 l stroke grestore 0.150 setgray gsave -305.550428 19.953125 translate +304.959375 19.921875 translate 0.000000 rotate 0.000000 0 m /one glyphshow 7.786133 0 m /five glyphshow grestore 0.800 setgray gsave -426.615 134.82 43.891 33.594 clipbox -335.785099 33.59375 m -335.785099 168.41375 l +426.075 134.752 43.641 33.438 clipbox +335.165625 33.4375 m +335.165625 168.19 l stroke grestore 0.150 setgray gsave -328.003849 19.953125 translate +327.384375 19.921875 translate 0.000000 rotate 0.000000 0 m /one glyphshow 7.786133 0 m /six glyphshow grestore 0.800 setgray gsave -426.615 134.82 43.891 33.594 clipbox -358.23852 33.59375 m -358.23852 168.41375 l +426.075 134.752 43.641 33.438 clipbox +357.590625 33.4375 m +357.590625 168.19 l stroke grestore 0.150 setgray gsave -350.457270 19.953125 translate +349.809375 19.921875 translate 0.000000 rotate 0.000000 0 m /one glyphshow 7.786133 0 m /seven glyphshow grestore 0.800 setgray gsave -426.615 134.82 43.891 33.594 clipbox -380.691941 33.59375 m -380.691941 168.41375 l +426.075 134.752 43.641 33.438 clipbox +380.015625 33.4375 m +380.015625 168.19 l stroke grestore 0.150 setgray gsave -372.910691 19.953125 translate +372.234375 19.921875 translate 0.000000 rotate 0.000000 0 m /one glyphshow 7.786133 0 m /eight glyphshow grestore 0.800 setgray gsave -426.615 134.82 43.891 33.594 clipbox -403.145362 33.59375 m -403.145362 168.41375 l +426.075 134.752 43.641 33.438 clipbox +402.440625 33.4375 m +402.440625 168.19 l stroke grestore 0.150 setgray gsave -395.364112 19.953125 translate +394.659375 19.921875 translate 0.000000 rotate 0.000000 0 m /one glyphshow 7.786133 0 m /nine glyphshow grestore 0.800 setgray gsave -426.615 134.82 43.891 33.594 clipbox -425.598783 33.59375 m -425.598783 168.41375 l +426.075 134.752 43.641 33.438 clipbox +424.865625 33.4375 m +424.865625 168.19 l stroke grestore 0.150 setgray gsave -417.817533 19.953125 translate +417.084375 19.921875 translate 0.000000 rotate 0.000000 0 m /two glyphshow 7.786133 0 m /zero glyphshow grestore 0.800 setgray gsave -426.615 134.82 43.891 33.594 clipbox -448.052204 33.59375 m -448.052204 168.41375 l +426.075 134.752 43.641 33.438 clipbox +447.290625 33.4375 m +447.290625 168.19 l stroke grestore 0.150 setgray gsave -440.270954 19.953125 translate +439.509375 19.921875 translate 0.000000 rotate 0.000000 0 m /two glyphshow 7.786133 0 m /one glyphshow grestore 0.800 setgray gsave -426.615 134.82 43.891 33.594 clipbox -470.505625 33.59375 m -470.505625 168.41375 l +426.075 134.752 43.641 33.438 clipbox +469.715625 33.4375 m +469.715625 168.19 l stroke grestore 0.150 setgray gsave -462.724375 19.953125 translate +461.934375 19.921875 translate 0.000000 rotate 0.000000 0 m /two glyphshow 7.786133 0 m /two glyphshow grestore gsave -151.791875 2.906250 translate +151.271875 2.953125 translate 0.000000 rotate 0.000000 0 m /n glyphshow 7.786133 0 m /u glyphshow @@ -1471,44 +1484,44 @@ gsave grestore 0.800 setgray gsave -426.615 134.82 43.891 33.594 clipbox -43.890625 33.59375 m -470.505625 33.59375 l +426.075 134.752 43.641 33.438 clipbox +43.640625 33.4375 m +469.715625 33.4375 l stroke grestore 0.150 setgray gsave -32.609375 28.523438 translate +32.359375 28.429688 translate 0.000000 rotate 0.000000 0 m /zero glyphshow grestore 0.800 setgray gsave -426.615 134.82 43.891 33.594 clipbox -43.890625 97.79375 m -470.505625 97.79375 l +426.075 134.752 43.641 33.438 clipbox +43.640625 97.605357 m +469.715625 97.605357 l stroke grestore 0.150 setgray gsave -24.828125 92.723438 translate +24.578125 92.597545 translate 0.000000 rotate 0.000000 0 m /five glyphshow 7.786133 0 m /zero glyphshow grestore 0.800 setgray gsave -426.615 134.82 43.891 33.594 clipbox -43.890625 161.99375 m -470.505625 161.99375 l +426.075 134.752 43.641 33.438 clipbox +43.640625 161.773214 m +469.715625 161.773214 l stroke grestore 0.150 setgray gsave -17.046875 156.923438 translate +16.796875 156.765402 translate 0.000000 rotate 0.000000 0 m /one glyphshow 7.786133 0 m /zero glyphshow @@ -1516,7 +1529,7 @@ gsave grestore gsave -10.140625 72.605312 translate +10.015625 72.415312 translate 90.000000 rotate 0.000000 0 m /percent glyphshow 12.448242 0 m /space glyphshow @@ -1530,106 +1543,106 @@ grestore 2.000 setlinewidth 0.800 0.267 0.322 setrgbcolor gsave -426.615 134.82 43.891 33.594 clipbox --1 119.593929 m -21.437204 81.10175 l -43.890625 75.96575 l -66.344046 55.42175 l -88.797467 45.14975 l -111.250888 45.14975 l -133.704309 38.72975 l -156.15773 34.87775 l -178.611151 38.72975 l -201.064572 37.44575 l -223.517993 34.87775 l -245.971414 33.59375 l -268.424836 33.59375 l -290.878257 33.59375 l -313.331678 33.59375 l -335.785099 33.59375 l -358.23852 33.59375 l -380.691941 33.59375 l -403.145362 33.59375 l -425.598783 33.59375 l -448.052204 33.59375 l +426.075 134.752 43.641 33.438 clipbox +-1 119.06296 m +21.215625 80.921714 l +43.640625 75.788286 l +66.065625 55.254571 l +88.490625 44.987714 l +110.915625 44.987714 l +133.340625 38.570929 l +155.765625 34.720857 l +178.190625 38.570929 l +200.615625 37.287571 l +223.040625 34.720857 l +245.465625 33.4375 l +267.890625 33.4375 l +290.315625 33.4375 l +312.740625 33.4375 l +335.165625 33.4375 l +357.590625 33.4375 l +380.015625 33.4375 l +402.440625 33.4375 l +424.865625 33.4375 l +447.290625 33.4375 l stroke grestore 0.141 0.380 0.502 setrgbcolor gsave -426.615 134.82 43.891 33.594 clipbox --1 161.992823 m -21.437204 160.70975 l -43.890625 155.57375 l -66.344046 155.57375 l -88.797467 155.57375 l -111.250888 158.14175 l -133.704309 154.28975 l -156.15773 132.46175 l -178.611151 33.59375 l -201.064572 33.59375 l -223.517993 33.59375 l -245.971414 33.59375 l -268.424836 33.59375 l -290.878257 33.59375 l -313.331678 33.59375 l -335.785099 33.59375 l -358.23852 33.59375 l -380.691941 33.59375 l -403.145362 33.59375 l -425.598783 33.59375 l -448.052204 33.59375 l +426.075 134.752 43.641 33.438 clipbox +-1 161.761232 m +21.215625 160.489857 l +43.640625 155.356429 l +66.065625 155.356429 l +88.490625 155.356429 l +110.915625 157.923143 l +133.340625 154.073071 l +155.765625 132.256 l +178.190625 33.4375 l +200.615625 33.4375 l +223.040625 33.4375 l +245.465625 33.4375 l +267.890625 33.4375 l +290.315625 33.4375 l +312.740625 33.4375 l +335.165625 33.4375 l +357.590625 33.4375 l +380.015625 33.4375 l +402.440625 33.4375 l +424.865625 33.4375 l +447.290625 33.4375 l stroke grestore 0.502 0.114 0.153 setrgbcolor gsave -426.615 134.82 43.891 33.594 clipbox --1 131.151783 m -21.437204 95.22575 l -43.890625 84.95375 l -66.344046 66.97775 l -88.797467 51.56975 l -111.250888 51.56975 l -133.704309 47.71775 l -156.15773 36.16175 l -178.611151 41.29775 l -201.064572 37.44575 l -223.517993 36.16175 l -245.971414 33.59375 l -268.424836 33.59375 l -290.878257 33.59375 l -313.331678 33.59375 l -335.785099 33.59375 l -358.23852 33.59375 l -380.691941 33.59375 l -403.145362 33.59375 l -425.598783 33.59375 l -448.052204 33.59375 l +426.075 134.752 43.641 33.438 clipbox +-1 130.637139 m +21.215625 95.038643 l +43.640625 84.771786 l +66.065625 66.804786 l +88.490625 51.4045 l +110.915625 51.4045 l +133.340625 47.554429 l +155.765625 36.004214 l +178.190625 41.137643 l +200.615625 37.287571 l +223.040625 36.004214 l +245.465625 33.4375 l +267.890625 33.4375 l +290.315625 33.4375 l +312.740625 33.4375 l +335.165625 33.4375 l +357.590625 33.4375 l +380.015625 33.4375 l +402.440625 33.4375 l +424.865625 33.4375 l +447.290625 33.4375 l stroke grestore 0.184 0.596 0.800 setrgbcolor gsave -426.615 134.82 43.891 33.594 clipbox --1 33.59375 m -21.437204 33.59375 l -43.890625 33.59375 l -66.344046 33.59375 l -88.797467 33.59375 l -111.250888 33.59375 l -133.704309 33.59375 l -156.15773 33.59375 l -178.611151 33.59375 l -201.064572 33.59375 l -223.517993 33.59375 l -245.971414 33.59375 l -268.424836 33.59375 l -290.878257 33.59375 l -313.331678 33.59375 l -335.785099 33.59375 l -358.23852 33.59375 l -380.691941 33.59375 l -403.145362 33.59375 l -425.598783 33.59375 l -448.052204 33.59375 l +426.075 134.752 43.641 33.438 clipbox +-1 33.4375 m +21.215625 33.4375 l +43.640625 33.4375 l +66.065625 33.4375 l +88.490625 33.4375 l +110.915625 33.4375 l +133.340625 33.4375 l +155.765625 33.4375 l +178.190625 33.4375 l +200.615625 33.4375 l +223.040625 33.4375 l +245.465625 33.4375 l +267.890625 33.4375 l +290.315625 33.4375 l +312.740625 33.4375 l +335.165625 33.4375 l +357.590625 33.4375 l +380.015625 33.4375 l +402.440625 33.4375 l +424.865625 33.4375 l +447.290625 33.4375 l stroke grestore 1.000 setlinewidth @@ -1637,30 +1650,30 @@ grestore 2 setlinecap 0.800 setgray gsave -43.890625 33.59375 m -43.890625 168.41375 l +43.640625 33.4375 m +43.640625 168.19 l stroke grestore gsave -470.505625 33.59375 m -470.505625 168.41375 l +469.715625 33.4375 m +469.715625 168.19 l stroke grestore gsave -43.890625 33.59375 m -470.505625 33.59375 l +43.640625 33.4375 m +469.715625 33.4375 l stroke grestore gsave -43.890625 168.41375 m -470.505625 168.41375 l +43.640625 168.19 m +469.715625 168.19 l stroke grestore 0.150 setgray -/LiberationSans 16.800 selectfont +/ArialMT 16.800 selectfont gsave -109.182500 174.413750 translate +108.662500 174.190000 translate 0.000000 rotate 0.000000 0 m /percent glyphshow 14.893433 0 m /space glyphshow @@ -1706,15 +1719,15 @@ grestore 1 setlinecap 0.800 0.267 0.322 setrgbcolor gsave -359.59625 150.573125 m -387.59625 150.573125 l +358.80625 150.474375 m +386.80625 150.474375 l stroke grestore 0.150 setgray -/LiberationSans 14.000 selectfont +/ArialMT 14.000 selectfont gsave -398.796250 145.673125 translate +398.006250 145.574375 translate 0.000000 rotate 0.000000 0 m /E glyphshow 9.337891 0 m /P glyphshow @@ -1724,14 +1737,14 @@ gsave grestore 0.141 0.380 0.502 setrgbcolor gsave -359.59625 130.52625 m -387.59625 130.52625 l +358.80625 130.6775 m +386.80625 130.6775 l stroke grestore 0.150 setgray gsave -398.796250 125.626250 translate +398.006250 125.777500 translate 0.000000 rotate 0.000000 0 m /C glyphshow 10.110352 0 m /B glyphshow @@ -1739,14 +1752,14 @@ gsave grestore 0.502 0.114 0.153 setrgbcolor gsave -359.59625 110.479375 m -387.59625 110.479375 l +358.80625 110.880625 m +386.80625 110.880625 l stroke grestore 0.150 setgray gsave -398.796250 105.579375 translate +398.006250 105.980625 translate 0.000000 rotate 0.000000 0 m /A glyphshow 9.337891 0 m /asterisk glyphshow @@ -1759,14 +1772,14 @@ gsave grestore 0.184 0.596 0.800 setrgbcolor gsave -359.59625 90.4325 m -387.59625 90.4325 l +358.80625 91.08375 m +386.80625 91.08375 l stroke grestore 0.150 setgray gsave -398.796250 85.532500 translate +398.006250 86.183750 translate 0.000000 rotate 0.000000 0 m /I glyphshow 3.889648 0 m /C glyphshow diff --git a/python/benchmarks/paper/num_agents_inmatch_1_team_25_percent/num_agents_inmatch_1_team_25_percent.png b/python/benchmarks/paper/num_agents_inmatch_1_team_25_percent/num_agents_inmatch_1_team_25_percent.png index 0e03998dd..ee0b06f76 100644 Binary files a/python/benchmarks/paper/num_agents_inmatch_1_team_25_percent/num_agents_inmatch_1_team_25_percent.png and b/python/benchmarks/paper/num_agents_inmatch_1_team_25_percent/num_agents_inmatch_1_team_25_percent.png differ diff --git a/python/benchmarks/paper/team_size_0percent/results_ICTS.txt b/python/benchmarks/paper/team_size_0percent/results_ICTS.txt deleted file mode 100644 index ea752ab24..000000000 --- a/python/benchmarks/paper/team_size_0percent/results_ICTS.txt +++ /dev/null @@ -1,6 +0,0 @@ -1: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -2: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -3: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -4: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -5: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -6: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] diff --git a/python/benchmarks/paper/team_size_0percent/results_ICTS.txt.part1 b/python/benchmarks/paper/team_size_0percent/results_ICTS.txt.part1 deleted file mode 100644 index 12b498889..000000000 --- a/python/benchmarks/paper/team_size_0percent/results_ICTS.txt.part1 +++ /dev/null @@ -1 +0,0 @@ -1: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] diff --git a/python/benchmarks/paper/team_size_0percent/results_ICTS.txt.part2 b/python/benchmarks/paper/team_size_0percent/results_ICTS.txt.part2 deleted file mode 100644 index 4561414ec..000000000 --- a/python/benchmarks/paper/team_size_0percent/results_ICTS.txt.part2 +++ /dev/null @@ -1,2 +0,0 @@ -1: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -2: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] diff --git a/python/benchmarks/paper/team_size_0percent/results_ICTS.txt.part3 b/python/benchmarks/paper/team_size_0percent/results_ICTS.txt.part3 deleted file mode 100644 index bbcc5b7a3..000000000 --- a/python/benchmarks/paper/team_size_0percent/results_ICTS.txt.part3 +++ /dev/null @@ -1,3 +0,0 @@ -1: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -2: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -3: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] diff --git a/python/benchmarks/paper/team_size_0percent/results_ICTS.txt.part4 b/python/benchmarks/paper/team_size_0percent/results_ICTS.txt.part4 deleted file mode 100644 index 8559086a2..000000000 --- a/python/benchmarks/paper/team_size_0percent/results_ICTS.txt.part4 +++ /dev/null @@ -1,4 +0,0 @@ -1: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -2: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -3: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -4: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] diff --git a/python/benchmarks/paper/team_size_0percent/results_ICTS.txt.part5 b/python/benchmarks/paper/team_size_0percent/results_ICTS.txt.part5 deleted file mode 100644 index 20c38cf8b..000000000 --- a/python/benchmarks/paper/team_size_0percent/results_ICTS.txt.part5 +++ /dev/null @@ -1,5 +0,0 @@ -1: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -2: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -3: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -4: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -5: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] diff --git a/python/benchmarks/paper/team_size_0percent/results_ICTS.txt.part6 b/python/benchmarks/paper/team_size_0percent/results_ICTS.txt.part6 deleted file mode 100644 index ea752ab24..000000000 --- a/python/benchmarks/paper/team_size_0percent/results_ICTS.txt.part6 +++ /dev/null @@ -1,6 +0,0 @@ -1: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -2: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -3: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -4: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -5: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] -6: [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None] diff --git a/python/benchmarks/paper/team_size_0percent/team_size_0percent.eps b/python/benchmarks/paper/team_size_0percent/team_size_0percent.eps index 5292254c6..d063bedba 100644 --- a/python/benchmarks/paper/team_size_0percent/team_size_0percent.eps +++ b/python/benchmarks/paper/team_size_0percent/team_size_0percent.eps @@ -1,10 +1,10 @@ %!PS-Adobe-3.0 EPSF-3.0 %%Title: team_size_0percent.eps -%%Creator: Matplotlib v3.4.2, https://matplotlib.org/ -%%CreationDate: Wed Aug 25 01:08:20 2021 +%%Creator: Matplotlib v3.4.3, https://matplotlib.org/ +%%CreationDate: Wed Aug 25 11:55:03 2021 %%Orientation: portrait -%%BoundingBox: 70 304 542 488 -%%HiResBoundingBox: 70.849688 304.195625 541.150312 487.804375 +%%BoundingBox: 71 303 541 489 +%%HiResBoundingBox: 71.010938 303.665625 540.989062 488.334375 %%EndComments %%BeginProlog /mpldict 11 dict def @@ -32,917 +32,946 @@ mpldict begin %!PS-Adobe-3.0 Resource-Font %%Creator: Converted from TrueType to Type 3 by Matplotlib. 10 dict begin -/FontName /LiberationSans def +/FontName /ArialMT def /PaintType 0 def /FontMatrix [0.00048828125 0 0 0.00048828125 0 0] def -/FontBBox [-1114 -621 2666 2007] def +/FontBBox [-1361 -665 4154 2124] def /FontType 3 def -/Encoding [/space /percent /asterisk /hyphen /zero /one /two /three /four /five /six /A /B /C /D /E /I /M /O /P /S /T /a /d /e /g /h /i /l /m /n /o /r /s /t /v /w /y /z] def -/CharStrings 40 dict dup begin +/Encoding [/space /percent /asterisk /hyphen /zero /one /two /three /four /five /six /seven /A /B /C /D /E /I /M /O /P /S /T /a /d /e /g /h /i /l /m /n /o /r /s /t /v /w /y /z] def +/CharStrings 41 dict dup begin /.notdef 0 def /space{569 0 0 0 0 0 sc ce} _d -/percent{1821 0 73 -12 1748 1421 sc -1748 434 m -1748 291 1721 180 1667 103 c -1613 26 1533 -12 1428 -12 c -1324 -12 1245 25 1192 100 c -1139 175 1113 287 1113 434 c -1113 586 1138 699 1189 773 c -1240 848 1321 885 1432 885 c -1541 885 1621 847 1672 770 c -1723 694 1748 582 1748 434 c - -527 0 m -372 0 l -1294 1409 l -1451 1409 l -527 0 l - -394 1421 m -500 1421 579 1384 630 1309 c -681 1234 707 1123 707 975 c -707 830 680 719 627 641 c -574 563 495 524 390 524 c -285 524 205 563 152 640 c -99 717 73 829 73 975 c -73 1124 99 1235 150 1309 c -201 1384 283 1421 394 1421 c - -1600 434 m -1600 553 1587 640 1561 693 c -1536 747 1493 774 1432 774 c -1371 774 1327 748 1300 695 c -1273 642 1260 555 1260 434 c -1260 320 1273 235 1299 180 c -1326 125 1369 98 1430 98 c -1489 98 1532 126 1559 181 c -1586 237 1600 321 1600 434 c - -560 975 m -560 1092 547 1178 522 1232 c -497 1286 454 1313 394 1313 c -331 1313 287 1286 260 1233 c -233 1180 220 1094 220 975 c -220 860 233 774 260 719 c -287 664 331 637 392 637 c -450 637 492 665 519 721 c -546 777 560 862 560 975 c +/percent{1821 0 119 -54 1695 1491 sc +119 1114 m +119 1219 145 1308 198 1381 c +251 1454 327 1491 427 1491 c +519 1491 595 1458 655 1392 c +716 1327 746 1230 746 1103 c +746 979 715 883 654 816 c +593 749 518 716 429 716 c +340 716 266 749 207 815 c +148 881 119 981 119 1114 c + +432 1367 m +387 1367 350 1348 320 1309 c +291 1270 276 1199 276 1096 c +276 1002 291 936 321 897 c +351 859 388 840 432 840 c +477 840 515 859 544 898 c +574 937 589 1007 589 1110 c +589 1205 574 1271 544 1309 c +514 1348 477 1367 432 1367 c + +433 -54 m +1235 1491 l +1381 1491 l +582 -54 l +433 -54 l + +1067 344 m +1067 449 1093 538 1146 611 c +1199 684 1275 721 1376 721 c +1468 721 1544 688 1604 622 c +1665 557 1695 460 1695 333 c +1695 209 1664 113 1603 46 c +1542 -21 1467 -54 1377 -54 c +1288 -54 1214 -21 1155 45 c +1096 112 1067 211 1067 344 c + +1381 597 m +1336 597 1298 578 1268 539 c +1239 500 1224 429 1224 326 c +1224 233 1239 167 1269 128 c +1299 89 1336 70 1380 70 c +1426 70 1464 89 1493 128 c +1523 167 1538 237 1538 340 c +1538 435 1523 501 1493 539 c +1463 578 1426 597 1381 597 c ce} _d -/asterisk{797 0 33 690 765 1409 sc -456 1114 m -720 1217 l -765 1085 l -483 1012 l -668 762 l -549 690 l -399 948 l -243 692 l -124 764 l -313 1012 l -33 1085 l -78 1219 l -345 1112 l -333 1409 l -469 1409 l -456 1114 l +/asterisk{797 0 64 867 725 1491 sc +64 1197 m +110 1339 l +216 1302 293 1269 341 1242 c +328 1363 322 1446 321 1491 c +466 1491 l +464 1425 456 1342 443 1243 c +512 1278 590 1310 679 1339 c +725 1197 l +640 1169 557 1150 476 1141 c +517 1106 574 1043 648 952 c +528 867 l +489 920 444 991 391 1082 c +342 988 298 916 261 867 c +143 952 l +220 1047 276 1110 309 1141 c +223 1158 141 1176 64 1197 c ce} _d -/hyphen{682 0 91 464 591 624 sc -91 464 m -91 624 l -591 624 l -591 464 l -91 464 l +/hyphen{682 0 65 440 618 621 sc +65 440 m +65 621 l +618 621 l +618 440 l +65 440 l ce} _d -/zero{1139 0 80 -20 1059 1430 sc -1059 705 m -1059 470 1017 290 934 166 c -851 42 729 -20 567 -20 c -405 -20 283 42 202 165 c -121 288 80 468 80 705 c -80 947 119 1128 198 1249 c -277 1370 402 1430 573 1430 c -739 1430 861 1369 940 1247 c -1019 1125 1059 944 1059 705 c - -876 705 m -876 908 852 1056 805 1147 c -758 1238 681 1284 573 1284 c -462 1284 383 1239 334 1149 c -286 1059 262 911 262 705 c -262 505 286 359 335 266 c -384 173 462 127 569 127 c -675 127 753 174 802 269 c -851 364 876 509 876 705 c +/zero{1139 0 85 -25 1041 1472 sc +85 723 m +85 896 103 1036 138 1141 c +174 1247 227 1329 297 1386 c +368 1443 456 1472 563 1472 c +642 1472 711 1456 770 1424 c +829 1393 878 1347 917 1287 c +956 1228 986 1155 1008 1069 c +1030 984 1041 868 1041 723 c +1041 551 1023 412 988 306 c +953 201 900 119 829 61 c +759 4 670 -25 563 -25 c +422 -25 311 26 230 127 c +133 249 85 448 85 723 c + +270 723 m +270 482 298 322 354 242 c +411 163 480 123 563 123 c +646 123 715 163 771 243 c +828 323 856 483 856 723 c +856 964 828 1125 771 1204 c +715 1283 645 1323 561 1323 c +478 1323 412 1288 363 1218 c +301 1129 270 964 270 723 c ce} _d -/one{1139 0 156 0 1039 1409 sc -156 0 m -156 153 l -515 153 l -515 1237 l -197 1010 l -197 1180 l -530 1409 l -696 1409 l -696 153 l -1039 153 l -1039 0 l -156 0 l +/one{1139 0 223 0 763 1472 sc +763 0 m +583 0 l +583 1147 l +540 1106 483 1064 412 1023 c +342 982 279 951 223 930 c +223 1104 l +324 1151 412 1209 487 1276 c +562 1343 616 1409 647 1472 c +763 1472 l +763 0 l ce} _d -/two{1139 0 103 0 1036 1430 sc -103 0 m -103 127 l -137 205 178 274 227 333 c -276 393 328 447 382 495 c -436 544 489 589 542 630 c -595 671 643 713 686 754 c -729 795 763 839 789 884 c -816 929 829 981 829 1038 c -829 1115 806 1175 761 1218 c -716 1261 653 1282 572 1282 c -495 1282 432 1261 382 1219 c -333 1178 304 1119 295 1044 c -111 1061 l -124 1174 172 1263 254 1330 c -337 1397 443 1430 572 1430 c -714 1430 823 1396 899 1329 c -976 1262 1014 1167 1014 1044 c -1014 989 1001 935 976 881 c -951 827 914 773 865 719 c -816 665 721 581 582 468 c -505 405 444 349 399 298 c -354 248 321 200 301 153 c -1036 153 l -1036 0 l -103 0 l +/two{1139 0 60 0 1031 1472 sc +1031 173 m +1031 0 l +62 0 l +61 43 68 85 83 125 c +108 191 147 256 201 320 c +256 384 334 458 437 542 c +596 673 704 776 760 852 c +816 929 844 1001 844 1069 c +844 1140 818 1200 767 1249 c +716 1298 650 1323 568 1323 c +481 1323 412 1297 360 1245 c +308 1193 282 1121 281 1029 c +96 1048 l +109 1186 156 1291 239 1363 c +322 1436 433 1472 572 1472 c +713 1472 824 1433 906 1355 c +988 1277 1029 1180 1029 1065 c +1029 1006 1017 949 993 892 c +969 835 929 776 873 713 c +818 650 725 564 596 455 c +488 364 419 303 388 270 c +357 238 332 206 312 173 c +1031 173 l ce} _d -/three{1139 0 78 -20 1049 1430 sc -1049 389 m -1049 259 1008 158 925 87 c -842 16 724 -20 571 -20 c -428 -20 314 12 229 76 c -144 141 94 236 78 362 c -264 379 l -288 212 390 129 571 129 c -662 129 733 151 784 196 c -836 241 862 307 862 395 c -862 472 832 531 773 574 c -714 617 629 639 518 639 c -416 639 l -416 795 l -514 795 l -613 795 689 816 743 859 c -798 902 825 962 825 1038 c -825 1113 803 1173 758 1216 c -714 1260 648 1282 561 1282 c -482 1282 417 1262 368 1221 c -319 1180 291 1123 283 1049 c -102 1063 l -115 1178 163 1268 245 1333 c -328 1398 434 1430 563 1430 c -704 1430 814 1397 892 1331 c -971 1266 1010 1174 1010 1057 c -1010 967 985 894 934 837 c -884 781 811 743 715 723 c -715 719 l -820 708 902 672 961 613 c -1020 554 1049 479 1049 389 c +/three{1139 0 86 -26 1046 1472 sc +86 387 m +266 411 l +287 309 322 235 371 190 c +421 145 482 123 553 123 c +638 123 709 152 767 211 c +826 270 855 342 855 429 c +855 512 828 580 774 633 c +720 687 651 714 568 714 c +534 714 492 707 441 694 c +461 852 l +473 851 483 850 490 850 c +567 850 636 870 697 910 c +758 950 789 1012 789 1095 c +789 1161 767 1216 722 1259 c +677 1302 620 1324 549 1324 c +479 1324 421 1302 374 1258 c +327 1214 297 1148 284 1060 c +104 1092 l +126 1213 176 1306 254 1372 c +332 1439 429 1472 545 1472 c +625 1472 699 1455 766 1420 c +833 1386 885 1339 920 1280 c +956 1221 974 1158 974 1091 c +974 1028 957 970 923 918 c +889 866 839 825 772 794 c +859 774 926 732 974 669 c +1022 606 1046 528 1046 433 c +1046 305 999 196 906 107 c +813 18 695 -26 552 -26 c +423 -26 316 12 231 89 c +146 166 98 265 86 387 c ce} _d -/four{1139 0 47 0 1079 1409 sc -881 319 m -881 0 l -711 0 l -711 319 l -47 319 l -47 459 l -692 1409 l -881 1409 l -881 461 l -1079 461 l -1079 319 l -881 319 l - -711 1206 m -710 1202 700 1184 683 1153 c -666 1122 653 1100 644 1087 c -283 555 l -229 481 l -213 461 l -711 461 l -711 1206 l +/four{1139 0 26 0 1040 1466 sc +662 0 m +662 351 l +26 351 l +26 516 l +695 1466 l +842 1466 l +842 516 l +1040 516 l +1040 351 l +842 351 l +842 0 l +662 0 l + +662 516 m +662 1177 l +203 516 l +662 516 l ce} _d -/five{1139 0 82 -20 1053 1409 sc -1053 459 m -1053 310 1009 193 920 108 c -832 23 710 -20 553 -20 c -422 -20 316 9 235 66 c -154 123 103 206 82 315 c -264 336 l -302 197 400 127 557 127 c -654 127 729 156 784 214 c -839 273 866 353 866 455 c -866 544 838 615 783 670 c -728 725 654 752 561 752 c -512 752 467 744 425 729 c -383 714 341 688 299 651 c -123 651 l -170 1409 l -971 1409 l -971 1256 l -334 1256 l -307 809 l -385 869 482 899 598 899 c -737 899 847 858 929 777 c -1012 696 1053 590 1053 459 c +/five{1139 0 85 -25 1057 1446 sc +85 384 m +274 400 l +288 308 320 239 371 192 c +422 146 484 123 556 123 c +643 123 716 156 776 221 c +836 286 866 373 866 481 c +866 584 837 665 779 724 c +722 783 646 813 553 813 c +495 813 443 800 396 773 c +349 747 313 713 286 671 c +117 693 l +259 1446 l +988 1446 l +988 1274 l +403 1274 l +324 880 l +412 941 504 972 601 972 c +729 972 837 928 925 839 c +1013 750 1057 636 1057 497 c +1057 364 1018 250 941 153 c +847 34 719 -25 556 -25 c +423 -25 314 12 229 87 c +145 162 97 261 85 384 c ce} _d -/six{1139 0 104 -20 1049 1430 sc -1049 461 m -1049 312 1009 195 928 109 c -847 23 736 -20 594 -20 c -435 -20 314 39 230 157 c -146 275 104 447 104 672 c -104 916 148 1103 235 1234 c -322 1365 447 1430 608 1430 c -821 1430 955 1334 1010 1143 c -838 1112 l -803 1227 725 1284 606 1284 c -503 1284 424 1236 367 1140 c -311 1045 283 906 283 725 c -316 786 362 832 421 863 c -480 895 548 911 625 911 c -755 911 858 870 934 789 c -1011 708 1049 598 1049 461 c - -866 453 m -866 555 841 634 791 689 c -741 744 671 772 582 772 c -498 772 430 747 378 698 c -327 649 301 582 301 496 c -301 387 328 298 381 229 c -435 160 504 125 588 125 c -675 125 743 154 792 212 c -841 271 866 351 866 453 c +/six{1139 0 77 -25 1045 1472 sc +1019 1107 m +840 1093 l +824 1164 801 1215 772 1247 c +723 1298 663 1324 592 1324 c +535 1324 484 1308 441 1276 c +384 1235 340 1174 307 1095 c +274 1016 257 903 256 756 c +299 822 352 871 415 903 c +478 935 543 951 612 951 c +732 951 834 907 918 818 c +1003 730 1045 616 1045 476 c +1045 384 1025 298 985 219 c +946 140 891 80 822 38 c +753 -4 674 -25 586 -25 c +436 -25 314 30 219 140 c +124 251 77 433 77 686 c +77 969 129 1175 234 1304 c +325 1416 448 1472 603 1472 c +718 1472 813 1440 886 1375 c +960 1310 1004 1221 1019 1107 c + +284 475 m +284 413 297 354 323 297 c +350 240 387 197 434 167 c +481 138 531 123 583 123 c +659 123 724 154 779 215 c +834 276 861 360 861 465 c +861 566 834 646 780 704 c +726 763 658 792 576 792 c +495 792 426 763 369 704 c +312 646 284 570 284 475 c ce} _d -/A{1366 0 4 0 1362 1409 sc -1167 0 m -1006 412 l -364 412 l -202 0 l -4 0 l -579 1409 l -796 1409 l -1362 0 l -1167 0 l - -685 1265 m -676 1237 l -659 1182 635 1111 602 1024 c -422 561 l -949 561 l -768 1026 l -749 1072 731 1124 712 1182 c -685 1265 l +/seven{1139 0 97 0 1046 1447 sc +97 1274 m +97 1447 l +1046 1447 l +1046 1307 l +953 1208 860 1076 768 911 c +677 746 606 577 556 403 c +520 280 497 146 487 0 c +302 0 l +304 115 327 255 370 418 c +413 581 475 739 556 890 c +637 1042 724 1170 815 1274 c +97 1274 l ce} _d -/B{1366 0 168 0 1258 1409 sc -1258 397 m -1258 272 1212 174 1121 104 c -1030 35 903 0 740 0 c -168 0 l -168 1409 l -680 1409 l -1011 1409 1176 1295 1176 1067 c -1176 984 1153 914 1106 857 c -1059 800 993 762 908 743 c -1020 730 1106 692 1167 630 c -1228 569 1258 491 1258 397 c - -984 1044 m -984 1120 958 1174 906 1207 c -854 1240 779 1256 680 1256 c -359 1256 l -359 810 l -680 810 l -782 810 858 829 908 867 c -959 906 984 965 984 1044 c - -1065 412 m -1065 578 948 661 715 661 c -359 661 l -359 153 l -730 153 l -847 153 932 175 985 218 c -1038 261 1065 326 1065 412 c +/A{1366 0 -3 0 1369 1466 sc +-3 0 m +560 1466 l +769 1466 l +1369 0 l +1148 0 l +977 444 l +364 444 l +203 0 l +-3 0 l + +420 602 m +917 602 l +764 1008 l +717 1131 683 1233 660 1312 c +641 1218 615 1125 581 1032 c +420 602 l ce} _d -/C{1479 0 104 -20 1401 1430 sc -792 1274 m -636 1274 515 1224 428 1123 c -341 1023 298 886 298 711 c -298 538 343 399 433 294 c -524 189 646 137 800 137 c -997 137 1146 235 1245 430 c -1401 352 l -1343 231 1261 138 1156 75 c -1051 12 930 -20 791 -20 c -649 -20 526 9 422 68 c -319 127 240 212 185 321 c -131 431 104 561 104 711 c -104 936 165 1112 286 1239 c -407 1366 575 1430 790 1430 c -940 1430 1065 1401 1166 1342 c -1267 1283 1341 1196 1388 1081 c -1207 1021 l -1174 1103 1122 1166 1049 1209 c -977 1252 891 1274 792 1274 c +/B{1366 0 150 0 1257 1466 sc +150 0 m +150 1466 l +700 1466 l +812 1466 902 1451 969 1421 c +1037 1392 1090 1346 1128 1284 c +1167 1223 1186 1158 1186 1091 c +1186 1028 1169 969 1135 914 c +1101 859 1050 814 981 780 c +1070 754 1138 710 1185 647 c +1233 584 1257 510 1257 425 c +1257 356 1242 292 1213 233 c +1184 174 1149 129 1106 97 c +1063 65 1010 41 945 24 c +881 8 802 0 709 0 c +150 0 l + +344 850 m +661 850 l +747 850 809 856 846 867 c +895 882 932 906 957 940 c +982 974 995 1017 995 1068 c +995 1117 983 1159 960 1196 c +937 1233 903 1259 860 1272 c +817 1286 742 1293 637 1293 c +344 1293 l +344 850 l + +344 173 m +709 173 l +772 173 816 175 841 180 c +886 188 923 201 953 220 c +983 239 1008 266 1027 301 c +1046 337 1056 378 1056 425 c +1056 480 1042 527 1014 567 c +986 608 947 636 897 652 c +848 669 776 677 683 677 c +344 677 l +344 173 l ce} _d -/D{1479 0 168 0 1381 1409 sc -1381 719 m -1381 574 1353 446 1296 337 c -1239 228 1159 145 1055 87 c -951 29 831 0 695 0 c -168 0 l -168 1409 l -634 1409 l -873 1409 1057 1349 1186 1229 c -1316 1110 1381 940 1381 719 c - -1189 719 m -1189 894 1141 1027 1045 1118 c -950 1210 811 1256 630 1256 c -359 1256 l -359 153 l -673 153 l -776 153 867 176 945 221 c -1024 266 1084 332 1126 417 c -1168 502 1189 603 1189 719 c +/C{1479 0 102 -25 1398 1491 sc +1204 514 m +1398 465 l +1357 306 1284 184 1178 100 c +1073 17 944 -25 791 -25 c +633 -25 504 7 405 71 c +306 136 231 229 179 351 c +128 473 102 604 102 744 c +102 897 131 1030 189 1143 c +248 1257 331 1343 438 1402 c +546 1461 665 1491 794 1491 c +941 1491 1064 1454 1164 1379 c +1264 1304 1334 1199 1373 1064 c +1182 1019 l +1148 1126 1099 1203 1034 1252 c +969 1301 888 1325 790 1325 c +677 1325 583 1298 507 1244 c +432 1190 379 1117 348 1026 c +317 935 302 842 302 745 c +302 620 320 511 356 418 c +393 325 449 256 526 210 c +603 164 686 141 775 141 c +884 141 976 172 1051 235 c +1126 298 1177 391 1204 514 c ce} _d -/E{1366 0 168 0 1278 1409 sc -168 0 m -168 1409 l -1237 1409 l -1237 1253 l -359 1253 l -359 801 l -1177 801 l -1177 647 l -359 647 l -359 156 l -1278 156 l -1278 0 l -168 0 l +/D{1479 0 158 0 1370 1466 sc +158 0 m +158 1466 l +663 1466 l +777 1466 864 1459 924 1445 c +1008 1426 1080 1391 1139 1340 c +1216 1275 1274 1191 1312 1089 c +1351 988 1370 872 1370 741 c +1370 630 1357 531 1331 445 c +1305 359 1272 288 1231 231 c +1190 175 1146 131 1097 98 c +1049 66 991 42 922 25 c +854 8 776 0 687 0 c +158 0 l + +352 173 m +665 173 l +762 173 837 182 892 200 c +947 218 991 243 1024 276 c +1070 322 1106 384 1131 461 c +1157 539 1170 633 1170 744 c +1170 897 1145 1015 1094 1097 c +1044 1180 983 1235 911 1263 c +859 1283 775 1293 660 1293 c +352 1293 l +352 173 l ce} _d -/I{569 0 189 0 380 1409 sc -189 0 m -189 1409 l -380 1409 l -380 0 l -189 0 l +/E{1366 0 162 0 1256 1466 sc +162 0 m +162 1466 l +1222 1466 l +1222 1293 l +356 1293 l +356 844 l +1167 844 l +1167 672 l +356 672 l +356 173 l +1256 173 l +1256 0 l +162 0 l ce} _d -/M{1706 0 168 0 1538 1409 sc -1366 0 m -1366 940 l -1366 1044 1369 1144 1375 1240 c -1342 1121 1313 1027 1287 960 c -923 0 l -789 0 l -420 960 l -364 1130 l -331 1240 l -334 1129 l -338 940 l -338 0 l -168 0 l -168 1409 l -419 1409 l -794 432 l -807 393 820 350 832 305 c -845 260 853 228 857 208 c -862 235 873 275 890 329 c -907 384 919 418 925 432 c -1293 1409 l -1538 1409 l -1538 0 l -1366 0 l +/I{569 0 191 0 385 1466 sc +191 0 m +191 1466 l +385 1466 l +385 0 l +191 0 l ce} _d -/O{1593 0 97 -20 1495 1430 sc -1495 711 m -1495 564 1467 435 1410 324 c -1354 213 1273 128 1168 69 c -1063 10 938 -20 795 -20 c -650 -20 525 9 420 68 c -315 127 235 211 180 322 c -125 433 97 563 97 711 c -97 936 159 1112 282 1239 c -405 1366 577 1430 797 1430 c -940 1430 1065 1401 1170 1344 c -1275 1287 1356 1205 1411 1096 c -1467 987 1495 859 1495 711 c - -1300 711 m -1300 886 1256 1024 1168 1124 c -1081 1224 957 1274 797 1274 c -636 1274 511 1225 423 1126 c -335 1027 291 889 291 711 c -291 534 335 394 424 290 c -513 187 637 135 795 135 c -958 135 1082 185 1169 285 c -1256 386 1300 528 1300 711 c +/M{1706 0 152 0 1551 1466 sc +152 0 m +152 1466 l +444 1466 l +791 428 l +823 331 846 259 861 211 c +878 264 904 343 939 446 c +1290 1466 l +1551 1466 l +1551 0 l +1364 0 l +1364 1227 l +938 0 l +763 0 l +339 1248 l +339 0 l +152 0 l ce} _d -/P{1366 0 168 0 1258 1409 sc -1258 985 m -1258 852 1214 746 1127 667 c -1040 588 922 549 773 549 c -359 549 l -359 0 l -168 0 l -168 1409 l -761 1409 l -919 1409 1041 1372 1128 1298 c -1215 1224 1258 1120 1258 985 c - -1066 983 m -1066 1165 957 1256 738 1256 c -359 1256 l -359 700 l -746 700 l -959 700 1066 794 1066 983 c +/O{1593 0 99 -25 1501 1492 sc +99 714 m +99 957 164 1148 295 1285 c +426 1423 594 1492 801 1492 c +936 1492 1058 1460 1167 1395 c +1276 1330 1358 1240 1415 1124 c +1472 1009 1501 878 1501 731 c +1501 582 1471 449 1411 332 c +1351 215 1266 126 1156 65 c +1046 5 927 -25 800 -25 c +662 -25 539 8 430 75 c +321 142 239 233 183 348 c +127 463 99 585 99 714 c + +299 711 m +299 534 346 395 441 293 c +536 192 656 141 799 141 c +945 141 1065 192 1159 295 c +1254 398 1301 543 1301 732 c +1301 851 1281 955 1240 1044 c +1200 1133 1141 1202 1063 1251 c +986 1300 899 1325 802 1325 c +665 1325 546 1278 447 1183 c +348 1089 299 932 299 711 c ce} _d -/S{1366 0 93 -20 1272 1430 sc -1272 389 m -1272 259 1221 158 1119 87 c -1018 16 875 -20 690 -20 c -347 -20 148 99 93 338 c -278 375 l -299 290 345 228 414 188 c -483 149 578 129 697 129 c -820 129 915 150 982 192 c -1049 235 1083 297 1083 379 c -1083 425 1072 462 1051 491 c -1030 520 1001 543 963 562 c -925 581 880 596 827 609 c -774 622 716 635 652 650 c -541 675 456 699 398 724 c -341 749 295 776 262 806 c -229 837 203 872 185 913 c -168 954 159 1000 159 1053 c -159 1174 205 1267 297 1332 c -390 1397 522 1430 694 1430 c -854 1430 976 1405 1061 1356 c -1146 1307 1205 1224 1239 1106 c -1051 1073 l -1030 1148 991 1202 933 1235 c -875 1269 795 1286 692 1286 c -579 1286 493 1267 434 1230 c -375 1193 345 1137 345 1063 c -345 1020 356 984 379 955 c -402 927 436 903 479 883 c -522 864 609 840 738 811 c -781 801 824 791 867 780 c -910 770 952 758 991 743 c -1030 729 1067 712 1101 693 c -1136 674 1166 650 1191 622 c -1216 594 1236 561 1250 523 c -1265 485 1272 440 1272 389 c +/P{1366 0 158 0 1277 1466 sc +158 0 m +158 1466 l +711 1466 l +808 1466 883 1461 934 1452 c +1006 1440 1066 1417 1115 1383 c +1164 1350 1203 1303 1232 1242 c +1262 1181 1277 1115 1277 1042 c +1277 917 1237 812 1158 725 c +1079 639 935 596 728 596 c +352 596 l +352 0 l +158 0 l + +352 769 m +731 769 l +856 769 945 792 998 839 c +1051 886 1077 951 1077 1036 c +1077 1097 1061 1150 1030 1193 c +999 1237 959 1266 908 1280 c +875 1289 815 1293 727 1293 c +352 1293 l +352 769 l ce} _d -/T{1251 0 46 0 1204 1409 sc -720 1253 m -720 0 l -530 0 l -530 1253 l -46 1253 l -46 1409 l -1204 1409 l -1204 1253 l -720 1253 l +/S{1366 0 92 -25 1259 1491 sc +92 471 m +275 487 l +284 414 304 353 335 306 c +367 259 416 221 483 192 c +550 163 625 149 708 149 c +782 149 847 160 904 182 c +961 204 1003 234 1030 272 c +1058 311 1072 353 1072 398 c +1072 444 1059 484 1032 518 c +1005 553 961 582 900 605 c +861 620 774 644 639 676 c +504 709 410 739 356 768 c +286 805 234 850 199 904 c +165 959 148 1020 148 1087 c +148 1161 169 1230 211 1294 c +253 1359 314 1408 395 1441 c +476 1474 565 1491 664 1491 c +773 1491 868 1473 951 1438 c +1034 1403 1098 1352 1143 1284 c +1188 1216 1212 1139 1215 1053 c +1029 1039 l +1019 1132 985 1202 927 1249 c +870 1296 785 1320 672 1320 c +555 1320 469 1298 415 1255 c +362 1212 335 1161 335 1100 c +335 1047 354 1004 392 970 c +429 936 527 901 684 865 c +842 830 950 799 1009 772 c +1094 733 1157 683 1198 622 c +1239 562 1259 493 1259 414 c +1259 336 1237 262 1192 193 c +1147 124 1083 71 999 32 c +916 -6 822 -25 717 -25 c +584 -25 473 -6 383 33 c +294 72 223 130 172 207 c +121 285 95 373 92 471 c ce} _d -/a{1139 0 87 -20 1139 1102 sc -414 -20 m -305 -20 224 9 169 66 c -114 123 87 202 87 302 c -87 414 124 500 197 560 c -271 620 390 652 554 656 c -797 660 l -797 719 l -797 807 778 870 741 908 c -704 946 645 965 565 965 c -484 965 426 951 389 924 c -352 897 330 853 323 793 c -135 810 l -166 1005 310 1102 569 1102 c -705 1102 807 1071 876 1008 c -945 946 979 856 979 738 c -979 272 l -979 219 986 178 1000 151 c -1014 124 1041 111 1080 111 c -1097 111 1117 113 1139 118 c -1139 6 l -1094 -5 1047 -10 1000 -10 c -933 -10 885 7 854 42 c -824 77 807 132 803 207 c -797 207 l -751 124 697 66 636 31 c -575 -3 501 -20 414 -20 c - -455 115 m -521 115 580 130 631 160 c -682 190 723 231 752 283 c -782 336 797 390 797 445 c -797 534 l -600 530 l -515 529 451 520 407 504 c -364 488 330 463 307 430 c -284 397 272 353 272 299 c -272 240 288 195 319 163 c -351 131 396 115 455 115 c +/T{1251 0 48 0 1210 1466 sc +531 0 m +531 1293 l +48 1293 l +48 1466 l +1210 1466 l +1210 1293 l +725 1293 l +725 0 l +531 0 l ce} _d -/d{1139 0 86 -20 1007 1484 sc -821 174 m -788 105 743 55 688 25 c -633 -5 565 -20 484 -20 c -347 -20 247 26 182 118 c -118 210 86 349 86 536 c -86 913 219 1102 484 1102 c -566 1102 634 1087 689 1057 c -744 1027 788 979 821 914 c -823 914 l -821 1035 l -821 1484 l -1001 1484 l -1001 223 l -1001 110 1003 36 1007 0 c -835 0 l -833 11 831 35 828 74 c -826 113 825 146 825 174 c -821 174 l - -275 542 m -275 391 295 282 335 217 c -375 152 440 119 530 119 c -632 119 706 154 752 225 c -798 296 821 405 821 554 c -821 697 798 802 752 869 c -706 936 633 969 532 969 c -441 969 376 935 335 868 c -295 801 275 693 275 542 c +/a{1139 0 74 -24 1052 1086 sc +828 131 m +761 74 697 34 635 11 c +574 -12 508 -24 437 -24 c +320 -24 231 4 168 61 c +105 118 74 191 74 280 c +74 332 86 379 109 422 c +133 465 164 500 202 526 c +241 552 284 572 332 585 c +367 594 421 603 492 612 c +637 629 744 650 813 674 c +814 699 814 714 814 721 c +814 794 797 846 763 876 c +717 917 649 937 558 937 c +473 937 411 922 370 892 c +330 863 300 810 281 735 c +105 759 l +121 834 147 895 184 941 c +221 988 274 1023 343 1048 c +412 1073 493 1086 584 1086 c +675 1086 748 1075 805 1054 c +862 1033 903 1006 930 973 c +957 941 975 900 986 851 c +992 820 995 765 995 685 c +995 445 l +995 278 999 172 1006 127 c +1014 83 1029 41 1052 0 c +864 0 l +845 37 833 81 828 131 c + +813 533 m +748 506 650 484 519 465 c +445 454 393 442 362 429 c +331 416 308 396 291 370 c +274 345 266 316 266 285 c +266 237 284 197 320 165 c +357 133 410 117 480 117 c +549 117 611 132 665 162 c +719 193 759 234 784 287 c +803 328 813 388 813 467 c +813 533 l ce} _d -/e{1139 0 87 -20 1048 1102 sc -276 503 m -276 379 302 283 353 216 c -404 149 479 115 578 115 c -656 115 718 131 765 162 c -812 193 844 233 861 281 c -1019 236 l -954 65 807 -20 578 -20 c -418 -20 296 28 212 123 c -129 218 87 360 87 548 c -87 727 129 864 212 959 c -296 1054 416 1102 571 1102 c -889 1102 1048 910 1048 527 c -1048 503 l -276 503 l - -862 641 m -852 755 823 838 775 890 c -727 943 658 969 568 969 c -481 969 411 940 360 881 c -309 823 282 743 278 641 c -862 641 l +/d{1139 0 70 -24 991 1466 sc +824 0 m +824 134 l +757 29 658 -24 527 -24 c +442 -24 364 -1 293 46 c +222 93 167 158 128 241 c +89 325 70 421 70 530 c +70 636 88 732 123 818 c +158 905 211 971 282 1017 c +353 1063 432 1086 519 1086 c +583 1086 640 1072 690 1045 c +740 1018 781 983 812 940 c +812 1466 l +991 1466 l +991 0 l +824 0 l + +255 530 m +255 394 284 292 341 225 c +398 158 466 124 544 124 c +623 124 689 156 744 220 c +799 285 827 383 827 515 c +827 660 799 767 743 835 c +687 903 618 937 536 937 c +456 937 389 904 335 839 c +282 774 255 671 255 530 c ce} _d -/g{1139 0 86 -425 1007 1099 sc -548 -425 m -430 -425 336 -402 266 -355 c -196 -309 151 -243 131 -158 c -312 -132 l -324 -182 350 -220 391 -247 c -432 -274 486 -288 553 -288 c -732 -288 822 -183 822 27 c -822 201 l -820 201 l -786 132 739 79 680 44 c -621 9 551 -8 472 -8 c -339 -8 242 36 179 124 c -117 212 86 350 86 539 c -86 730 119 871 186 962 c -253 1053 355 1099 492 1099 c -569 1099 635 1081 691 1046 c -748 1011 791 962 822 897 c -824 897 l -824 917 825 952 828 1001 c -831 1050 833 1077 836 1082 c -1007 1082 l -1003 1046 1001 971 1001 858 c -1001 31 l -1001 -273 850 -425 548 -425 c - -822 541 m -822 629 810 705 786 768 c -762 832 728 881 684 914 c -641 948 591 965 536 965 c -444 965 377 932 335 865 c -293 798 272 690 272 541 c -272 393 292 287 331 222 c -370 157 438 125 533 125 c -590 125 640 142 684 175 c -728 208 762 256 786 318 c -810 381 822 455 822 541 c +/e{1139 0 75 -24 1054 1086 sc +862 342 m +1048 319 l +1019 210 964 126 885 66 c +806 6 704 -24 581 -24 c +426 -24 302 24 211 119 c +120 215 75 349 75 522 c +75 701 121 839 213 938 c +305 1037 424 1086 571 1086 c +713 1086 829 1038 919 941 c +1009 844 1054 708 1054 533 c +1054 522 1054 506 1053 485 c +261 485 l +268 368 301 279 360 217 c +419 155 493 124 582 124 c +648 124 704 141 751 176 c +798 211 835 266 862 342 c + +271 633 m +864 633 l +856 722 833 789 796 834 c +739 903 664 938 573 938 c +490 938 421 910 364 855 c +308 800 277 726 271 633 c ce} _d -/h{1139 0 142 0 1006 1484 sc -317 897 m -356 968 402 1019 456 1052 c -511 1085 580 1102 663 1102 c -780 1102 867 1073 922 1014 c -978 956 1006 858 1006 721 c -1006 0 l -825 0 l -825 686 l -825 762 818 818 804 855 c -790 892 767 920 735 937 c -703 954 659 963 602 963 c -517 963 449 934 398 875 c -347 816 322 737 322 638 c -322 0 l -142 0 l -142 1484 l -322 1484 l -322 1098 l -322 1057 321 1015 318 972 c -316 929 315 904 314 897 c -317 897 l +/g{1139 0 66 -431 1002 1086 sc +102 -88 m +277 -114 l +284 -168 305 -207 338 -232 c +383 -265 444 -282 521 -282 c +604 -282 669 -265 714 -232 c +759 -199 790 -152 806 -92 c +815 -55 820 22 819 139 c +740 46 642 0 525 0 c +379 0 266 53 186 158 c +106 263 66 390 66 537 c +66 638 84 732 121 817 c +158 903 211 969 280 1016 c +350 1063 432 1086 526 1086 c +651 1086 755 1035 836 934 c +836 1062 l +1002 1062 l +1002 144 l +1002 -21 985 -138 951 -207 c +918 -276 864 -331 791 -371 c +718 -411 629 -431 522 -431 c +395 -431 293 -402 215 -345 c +137 -288 99 -203 102 -88 c + +251 550 m +251 411 279 309 334 245 c +389 181 459 149 542 149 c +625 149 694 181 750 244 c +806 308 834 408 834 544 c +834 674 805 772 747 838 c +690 904 620 937 539 937 c +459 937 391 904 335 839 c +279 774 251 678 251 550 c ce} _d -/i{455 0 137 0 317 1484 sc -137 1312 m -137 1484 l -317 1484 l -317 1312 l -137 1312 l - -137 0 m -137 1082 l -317 1082 l -317 0 l -137 0 l +/h{1139 0 135 0 1000 1466 sc +135 0 m +135 1466 l +315 1466 l +315 940 l +399 1037 505 1086 633 1086 c +712 1086 780 1070 838 1039 c +896 1008 937 966 962 911 c +987 856 1000 777 1000 673 c +1000 0 l +820 0 l +820 673 l +820 763 800 828 761 869 c +722 910 667 931 596 931 c +543 931 492 917 445 889 c +398 862 365 824 345 777 c +325 730 315 664 315 581 c +315 0 l +135 0 l ce} _d -/l{455 0 138 0 318 1484 sc -138 0 m -138 1484 l -318 1484 l -318 0 l -138 0 l +/i{455 0 136 0 316 1466 sc +136 1259 m +136 1466 l +316 1466 l +316 1259 l +136 1259 l + +136 0 m +136 1062 l +316 1062 l +316 0 l +136 0 l ce} _d -/m{1706 0 136 0 1571 1102 sc -768 0 m -768 686 l -768 791 754 863 725 903 c -696 943 645 963 570 963 c -493 963 433 934 388 875 c -343 816 321 734 321 627 c -321 0 l -142 0 l -142 851 l -142 977 140 1054 136 1082 c -306 1082 l -307 1079 307 1070 308 1055 c -309 1040 309 1023 310 1004 c -311 985 313 950 314 897 c -317 897 l -356 974 400 1027 450 1057 c -500 1087 561 1102 633 1102 c -715 1102 780 1086 827 1053 c -875 1020 908 968 927 897 c -930 897 l -967 970 1012 1022 1065 1054 c -1118 1086 1183 1102 1258 1102 c -1367 1102 1447 1072 1496 1013 c -1546 954 1571 856 1571 721 c -1571 0 l -1393 0 l -1393 686 l -1393 791 1379 863 1350 903 c -1321 943 1270 963 1195 963 c -1116 963 1055 934 1011 875 c -968 817 946 734 946 627 c +/l{455 0 131 0 311 1466 sc +131 0 m +131 1466 l +311 1466 l +311 0 l +131 0 l + +ce} _d +/m{1706 0 135 0 1574 1086 sc +135 0 m +135 1062 l +296 1062 l +296 913 l +329 965 374 1007 429 1038 c +484 1070 547 1086 618 1086 c +697 1086 761 1070 811 1037 c +862 1004 897 959 918 900 c +1002 1024 1111 1086 1246 1086 c +1351 1086 1432 1057 1489 998 c +1546 940 1574 850 1574 729 c +1574 0 l +1395 0 l +1395 669 l +1395 741 1389 793 1377 824 c +1366 856 1345 882 1314 901 c +1283 920 1247 930 1206 930 c +1131 930 1069 905 1020 855 c +971 806 946 726 946 617 c 946 0 l -768 0 l +766 0 l +766 690 l +766 770 751 830 722 870 c +693 910 645 930 578 930 c +527 930 480 917 437 890 c +394 863 363 824 344 773 c +325 722 315 648 315 551 c +315 0 l +135 0 l ce} _d -/n{1139 0 136 0 1006 1102 sc -825 0 m -825 686 l -825 757 818 813 804 852 c -790 891 768 920 737 937 c -706 954 661 963 602 963 c -515 963 447 933 397 874 c -347 815 322 732 322 627 c -322 0 l -142 0 l -142 851 l -142 977 140 1054 136 1082 c -306 1082 l -307 1079 307 1070 308 1055 c -309 1040 309 1023 310 1004 c -311 985 313 950 314 897 c -317 897 l -358 972 406 1024 460 1055 c -515 1086 582 1102 663 1102 c -782 1102 868 1072 923 1013 c -978 954 1006 857 1006 721 c -1006 0 l -825 0 l +/n{1139 0 135 0 998 1086 sc +135 0 m +135 1062 l +297 1062 l +297 911 l +375 1028 488 1086 635 1086 c +699 1086 758 1074 811 1051 c +865 1028 905 998 932 961 c +959 924 977 879 988 828 c +995 795 998 736 998 653 c +998 0 l +818 0 l +818 646 l +818 719 811 774 797 810 c +783 847 758 876 722 897 c +687 919 645 930 597 930 c +520 930 454 906 398 857 c +343 808 315 716 315 580 c +315 0 l +135 0 l ce} _d -/o{1139 0 86 -20 1053 1102 sc -1053 542 m -1053 353 1011 212 928 119 c -845 26 724 -20 565 -20 c -407 -20 288 28 207 124 c -126 221 86 360 86 542 c -86 915 248 1102 571 1102 c -736 1102 858 1056 936 965 c -1014 874 1053 733 1053 542 c - -864 542 m -864 691 842 800 797 867 c -753 935 679 969 574 969 c -469 969 392 934 345 865 c -298 796 275 689 275 542 c -275 399 298 292 344 220 c -391 149 464 113 563 113 c -671 113 748 148 794 217 c -841 286 864 395 864 542 c +/o{1139 0 68 -24 1063 1086 sc +68 531 m +68 728 123 873 232 968 c +323 1047 435 1086 566 1086 c +712 1086 831 1038 924 942 c +1017 847 1063 715 1063 546 c +1063 409 1042 302 1001 223 c +960 145 901 84 822 41 c +744 -2 659 -24 566 -24 c +417 -24 297 24 205 119 c +114 214 68 352 68 531 c + +253 531 m +253 395 283 293 342 225 c +401 158 476 124 566 124 c +655 124 730 158 789 226 c +848 294 878 398 878 537 c +878 668 848 768 788 835 c +729 903 655 937 566 937 c +476 937 401 903 342 836 c +283 769 253 667 253 531 c ce} _d -/r{682 0 136 0 648 1102 sc -142 0 m -142 830 l -142 906 140 990 136 1082 c -306 1082 l -311 959 314 886 314 861 c -318 861 l -347 954 380 1017 417 1051 c -454 1085 507 1102 575 1102 c -599 1102 623 1099 648 1092 c -648 927 l -624 934 592 937 552 937 c -477 937 420 905 381 840 c -342 776 322 684 322 564 c -322 0 l -142 0 l +/r{682 0 133 0 710 1086 sc +133 0 m +133 1062 l +295 1062 l +295 901 l +336 976 374 1026 409 1050 c +444 1074 483 1086 525 1086 c +586 1086 647 1067 710 1028 c +648 861 l +604 887 560 900 516 900 c +477 900 441 888 410 864 c +379 841 356 808 343 766 c +323 702 313 632 313 556 c +313 0 l +133 0 l ce} _d -/s{1024 0 57 -20 950 1099 sc -950 299 m -950 197 911 118 834 63 c -757 8 650 -20 511 -20 c -376 -20 272 2 199 46 c -126 91 79 160 57 254 c -216 285 l -231 227 263 184 311 157 c -359 130 426 117 511 117 c -602 117 669 131 711 159 c -754 187 775 229 775 285 c -775 328 760 362 731 389 c -702 416 654 438 589 455 c -460 489 l -357 516 283 542 239 567 c -196 593 162 624 137 661 c -112 698 100 743 100 796 c -100 895 135 970 205 1021 c -276 1073 378 1099 513 1099 c -632 1099 727 1078 797 1036 c -868 994 912 927 931 834 c -769 814 l -759 862 732 899 688 924 c -645 950 586 963 513 963 c -432 963 372 951 333 926 c -294 901 275 864 275 814 c -275 783 283 758 299 738 c -315 718 339 701 370 687 c -401 673 467 654 568 629 c -663 605 732 583 774 562 c -816 542 849 520 873 495 c -898 470 917 442 930 409 c -943 377 950 340 950 299 c +/s{1024 0 63 -24 945 1086 sc +63 317 m +241 345 l +251 274 279 219 324 181 c +370 143 434 124 516 124 c +599 124 660 141 700 174 c +740 208 760 248 760 293 c +760 334 742 366 707 389 c +682 405 621 425 523 450 c +391 483 299 512 248 536 c +197 561 159 594 132 637 c +106 680 93 728 93 780 c +93 827 104 871 125 911 c +147 952 177 985 214 1012 c +242 1033 280 1050 328 1064 c +377 1079 429 1086 484 1086 c +567 1086 640 1074 703 1050 c +766 1026 813 993 843 952 c +873 911 894 857 905 788 c +729 764 l +721 819 698 861 659 892 c +621 923 567 938 497 938 c +414 938 355 924 320 897 c +285 870 267 838 267 801 c +267 778 274 757 289 738 c +304 719 327 703 358 690 c +376 683 429 668 517 644 c +644 610 733 582 783 560 c +834 539 873 507 902 466 c +931 425 945 373 945 312 c +945 252 927 195 892 142 c +857 89 807 48 741 19 c +675 -10 600 -24 517 -24 c +379 -24 274 5 201 62 c +129 119 83 204 63 317 c ce} _d -/t{569 0 31 -16 554 1324 sc -554 8 m -495 -8 434 -16 372 -16 c -228 -16 156 66 156 229 c -156 951 l -31 951 l -31 1082 l -163 1082 l -216 1324 l -336 1324 l -336 1082 l -536 1082 l -536 951 l -336 951 l -336 268 l -336 216 344 179 361 158 c -378 137 408 127 450 127 c -474 127 509 132 554 141 c -554 8 l +/t{569 0 36 -14 554 1433 sc +528 161 m +554 2 l +503 -9 458 -14 418 -14 c +353 -14 302 -4 266 17 c +230 38 205 65 190 98 c +175 132 168 203 168 311 c +168 922 l +36 922 l +36 1062 l +168 1062 l +168 1325 l +347 1433 l +347 1062 l +528 1062 l +528 922 l +347 922 l +347 301 l +347 250 350 217 356 202 c +363 187 373 176 387 167 c +402 158 422 154 449 154 c +469 154 495 156 528 161 c ce} _d -/v{1024 0 7 0 1017 1082 sc -613 0 m -400 0 l -7 1082 l -199 1082 l -437 378 l -446 351 469 272 506 141 c -541 258 l -580 376 l -826 1082 l -1017 1082 l -613 0 l +/v{1024 0 26 0 1000 1062 sc +430 0 m +26 1062 l +216 1062 l +444 426 l +469 357 491 286 512 212 c +528 268 550 335 579 414 c +815 1062 l +1000 1062 l +598 0 l +430 0 l ce} _d -/w{1479 0 -3 0 1484 1082 sc -1174 0 m -965 0 l -776 765 l -740 934 l -734 904 725 861 712 804 c -699 748 631 480 508 0 c -300 0 l --3 1082 l -175 1082 l -358 347 l -363 331 377 265 401 149 c -418 223 l -644 1082 l -837 1082 l -1026 339 l -1072 149 l -1103 288 l -1308 1082 l -1484 1082 l -1174 0 l +/w{1479 0 6 0 1463 1062 sc +331 0 m +6 1062 l +192 1062 l +361 449 l +424 221 l +427 232 445 305 479 440 c +648 1062 l +833 1062 l +992 446 l +1045 243 l +1106 448 l +1288 1062 l +1463 1062 l +1131 0 l +944 0 l +775 636 l +734 817 l +519 0 l +331 0 l ce} _d -/y{1024 0 5 -425 1020 1082 sc -191 -425 m -142 -425 100 -421 67 -414 c -67 -279 l -92 -283 120 -285 151 -285 c -263 -285 352 -203 417 -38 c -434 5 l -5 1082 l -197 1082 l -425 484 l -428 475 432 463 437 450 c -442 437 457 394 482 320 c -507 246 521 205 523 196 c -593 393 l -830 1082 l -1020 1082 l -604 0 l -559 -115 518 -201 479 -257 c -440 -314 397 -356 350 -383 c -303 -411 250 -425 191 -425 c +/y{1024 0 33 -431 1006 1062 sc +127 -409 m +107 -240 l +146 -251 181 -256 210 -256 c +250 -256 282 -249 306 -236 c +330 -223 350 -204 365 -180 c +376 -162 395 -117 420 -46 c +423 -36 429 -21 436 -2 c +33 1062 l +227 1062 l +448 447 l +477 369 502 287 525 201 c +546 284 570 364 599 443 c +826 1062 l +1006 1062 l +602 -18 l +559 -135 525 -215 501 -259 c +469 -318 432 -362 391 -389 c +350 -417 300 -431 243 -431 c +208 -431 170 -424 127 -409 c ce} _d -/z{1024 0 83 0 922 1082 sc -83 0 m -83 137 l -688 943 l -117 943 l -117 1082 l -901 1082 l -901 945 l -295 139 l -922 139 l -922 0 l -83 0 l +/z{1024 0 40 0 980 1062 sc +40 0 m +40 146 l +716 922 l +639 918 572 916 513 916 c +80 916 l +80 1062 l +948 1062 l +948 943 l +373 269 l +262 146 l +343 152 418 155 489 155 c +980 155 l +980 0 l +40 0 l ce} _d end readonly def @@ -964,22 +993,22 @@ FontName currentdict end definefont pop end %%EndProlog mpldict begin -70.85 304.196 translate -470.301 183.609 0 0 clipbox +71.011 303.666 translate +469.978 184.669 0 0 clipbox gsave 0 0 m -470.300625 0 l -470.300625 183.60875 l -0 183.60875 l +469.978125 0 l +469.978125 184.66875 l +0 184.66875 l cl 1.000 setgray fill grestore gsave -33.515625 26.15625 m -470.300625 26.15625 l -470.300625 165.29625 l -33.515625 165.29625 l +33.328125 25.78125 m +469.978125 25.78125 l +469.978125 166.29375 l +33.328125 166.29375 l cl 1.000 setgray fill @@ -990,93 +1019,93 @@ grestore [] 0 setdash 0.800 setgray gsave -436.785 139.14 33.516 26.156 clipbox -33.515625 26.15625 m -33.515625 165.29625 l +436.65 140.512 33.328 25.781 clipbox +33.328125 25.78125 m +33.328125 166.29375 l stroke grestore 0.150 setgray -/LiberationSans 10.000 selectfont +/ArialMT 10.000 selectfont gsave -30.734375 15.406250 translate +30.546875 15.125000 translate 0.000000 rotate 0.000000 0 m /one glyphshow grestore 0.800 setgray gsave -436.785 139.14 33.516 26.156 clipbox -69.914375 26.15625 m -69.914375 165.29625 l +436.65 140.512 33.328 25.781 clipbox +69.715625 25.78125 m +69.715625 166.29375 l stroke grestore 0.150 setgray gsave -67.133125 15.406250 translate +66.934375 15.125000 translate 0.000000 rotate 0.000000 0 m /two glyphshow grestore 0.800 setgray gsave -436.785 139.14 33.516 26.156 clipbox -106.313125 26.15625 m -106.313125 165.29625 l +436.65 140.512 33.328 25.781 clipbox +106.103125 25.78125 m +106.103125 166.29375 l stroke grestore 0.150 setgray gsave -103.531875 15.406250 translate +103.321875 15.125000 translate 0.000000 rotate 0.000000 0 m /three glyphshow grestore 0.800 setgray gsave -436.785 139.14 33.516 26.156 clipbox -142.711875 26.15625 m -142.711875 165.29625 l +436.65 140.512 33.328 25.781 clipbox +142.490625 25.78125 m +142.490625 166.29375 l stroke grestore 0.150 setgray gsave -139.930625 15.406250 translate +139.709375 15.125000 translate 0.000000 rotate 0.000000 0 m /four glyphshow grestore 0.800 setgray gsave -436.785 139.14 33.516 26.156 clipbox -215.509375 26.15625 m -215.509375 165.29625 l +436.65 140.512 33.328 25.781 clipbox +215.265625 25.78125 m +215.265625 166.29375 l stroke grestore 0.150 setgray gsave -212.728125 15.406250 translate +212.484375 15.125000 translate 0.000000 rotate 0.000000 0 m /six glyphshow grestore 0.800 setgray gsave -436.785 139.14 33.516 26.156 clipbox -433.901875 26.15625 m -433.901875 165.29625 l +436.65 140.512 33.328 25.781 clipbox +433.590625 25.78125 m +433.590625 166.29375 l stroke grestore 0.150 setgray gsave -428.339375 15.406250 translate +428.028125 15.125000 translate 0.000000 rotate 0.000000 0 m /one glyphshow 5.561523 0 m /two glyphshow grestore gsave -230.509687 2.078125 translate +230.254687 1.984375 translate 0.000000 rotate 0.000000 0 m /t glyphshow 2.778320 0 m /e glyphshow @@ -1090,44 +1119,74 @@ gsave grestore 0.800 setgray gsave -436.785 139.14 33.516 26.156 clipbox -33.515625 26.15625 m -470.300625 26.15625 l +436.65 140.512 33.328 25.781 clipbox +33.328125 25.78125 m +469.978125 25.78125 l stroke grestore 0.150 setgray gsave -24.453125 22.531250 translate +24.265625 22.203125 translate 0.000000 rotate 0.000000 0 m /zero glyphshow grestore 0.800 setgray gsave -436.785 139.14 33.516 26.156 clipbox -33.515625 92.413393 m -470.300625 92.413393 l +436.65 140.512 33.328 25.781 clipbox +33.328125 59.236607 m +469.978125 59.236607 l stroke grestore 0.150 setgray gsave -18.890625 88.788393 translate +18.703125 55.658482 translate +0.000000 rotate +0.000000 0 m /two glyphshow +5.561523 0 m /five glyphshow +grestore +0.800 setgray +gsave +436.65 140.512 33.328 25.781 clipbox +33.328125 92.691964 m +469.978125 92.691964 l +stroke +grestore +0.150 setgray +gsave + +18.703125 89.113839 translate 0.000000 rotate 0.000000 0 m /five glyphshow 5.561523 0 m /zero glyphshow grestore 0.800 setgray gsave -436.785 139.14 33.516 26.156 clipbox -33.515625 158.670536 m -470.300625 158.670536 l +436.65 140.512 33.328 25.781 clipbox +33.328125 126.147321 m +469.978125 126.147321 l +stroke +grestore +0.150 setgray +gsave + +18.703125 122.569196 translate +0.000000 rotate +0.000000 0 m /seven glyphshow +5.561523 0 m /five glyphshow +grestore +0.800 setgray +gsave +436.65 140.512 33.328 25.781 clipbox +33.328125 159.602679 m +469.978125 159.602679 l stroke grestore 0.150 setgray gsave -13.328125 155.045536 translate +13.140625 156.024554 translate 0.000000 rotate 0.000000 0 m /one glyphshow 5.561523 0 m /zero glyphshow @@ -1135,7 +1194,7 @@ gsave grestore gsave -7.250000 75.437187 translate +7.156250 75.748437 translate 90.000000 rotate 0.000000 0 m /percent glyphshow 8.891602 0 m /space glyphshow @@ -1149,46 +1208,46 @@ grestore 2.000 setlinewidth 0.800 0.267 0.322 setrgbcolor gsave -436.785 139.14 33.516 26.156 clipbox -433.901875 26.15625 m -215.509375 31.456821 l -142.711875 28.806536 l -106.313125 42.057964 l -69.914375 64.585393 l -33.515625 130.842536 l +436.65 140.512 33.328 25.781 clipbox +433.590625 25.78125 m +215.265625 31.134107 l +142.490625 28.457679 l +106.103125 41.839821 l +69.715625 64.589464 l +33.328125 131.500179 l stroke grestore 0.141 0.380 0.502 setrgbcolor gsave -436.785 139.14 33.516 26.156 clipbox -433.901875 132.167679 m -215.509375 134.817964 l -142.711875 137.46825 l -106.313125 137.46825 l -69.914375 124.216821 l -33.515625 121.566536 l +436.65 140.512 33.328 25.781 clipbox +433.590625 132.838393 m +215.265625 135.514821 l +142.490625 138.19125 l +106.103125 138.19125 l +69.715625 124.809107 l +33.328125 122.132679 l stroke grestore 0.502 0.114 0.153 setrgbcolor gsave -436.785 139.14 33.516 26.156 clipbox -433.901875 26.15625 m -215.509375 34.107107 l -142.711875 30.131679 l -106.313125 53.98425 l -69.914375 103.014536 l -33.515625 156.02025 l +436.65 140.512 33.328 25.781 clipbox +433.590625 25.78125 m +215.265625 33.810536 l +142.490625 29.795893 l +106.103125 53.88375 l +69.715625 103.397679 l +33.328125 156.92625 l stroke grestore 0.184 0.596 0.800 setrgbcolor gsave -436.785 139.14 33.516 26.156 clipbox -433.901875 26.15625 m -215.509375 26.15625 l -142.711875 26.15625 l -106.313125 26.15625 l -69.914375 26.15625 l -33.515625 26.15625 l +436.65 140.512 33.328 25.781 clipbox +433.590625 25.78125 m +215.265625 25.78125 l +142.490625 25.78125 l +106.103125 25.78125 l +69.715625 25.78125 l +33.328125 25.78125 l stroke grestore 1.000 setlinewidth @@ -1196,30 +1255,30 @@ grestore 2 setlinecap 0.800 setgray gsave -33.515625 26.15625 m -33.515625 165.29625 l +33.328125 25.78125 m +33.328125 166.29375 l stroke grestore gsave -470.300625 26.15625 m -470.300625 165.29625 l +469.978125 25.78125 m +469.978125 166.29375 l stroke grestore gsave -33.515625 26.15625 m -470.300625 26.15625 l +33.328125 25.78125 m +469.978125 25.78125 l stroke grestore gsave -33.515625 165.29625 m -470.300625 165.29625 l +33.328125 166.29375 m +469.978125 166.29375 l stroke grestore 0.150 setgray -/LiberationSans 16.800 selectfont +/ArialMT 16.800 selectfont gsave -129.040937 171.296250 translate +128.785937 172.293750 translate 0.000000 rotate 0.000000 0 m /percent glyphshow 14.893433 0 m /space glyphshow @@ -1259,15 +1318,15 @@ grestore 1 setlinecap 0.800 0.267 0.322 setrgbcolor gsave -359.39125 106.703125 m -387.39125 106.703125 l +359.06875 105.453125 m +387.06875 105.453125 l stroke grestore 0.150 setgray -/LiberationSans 14.000 selectfont +/ArialMT 14.000 selectfont gsave -398.591250 101.803125 translate +398.268750 100.553125 translate 0.000000 rotate 0.000000 0 m /E glyphshow 9.337891 0 m /P glyphshow @@ -1277,14 +1336,14 @@ gsave grestore 0.141 0.380 0.502 setrgbcolor gsave -359.39125 86.65625 m -387.39125 86.65625 l +359.06875 85.65625 m +387.06875 85.65625 l stroke grestore 0.150 setgray gsave -398.591250 81.756250 translate +398.268750 80.756250 translate 0.000000 rotate 0.000000 0 m /C glyphshow 10.110352 0 m /B glyphshow @@ -1292,14 +1351,14 @@ gsave grestore 0.502 0.114 0.153 setrgbcolor gsave -359.39125 66.609375 m -387.39125 66.609375 l +359.06875 65.859375 m +387.06875 65.859375 l stroke grestore 0.150 setgray gsave -398.591250 61.709375 translate +398.268750 60.959375 translate 0.000000 rotate 0.000000 0 m /A glyphshow 9.337891 0 m /asterisk glyphshow @@ -1312,14 +1371,14 @@ gsave grestore 0.184 0.596 0.800 setrgbcolor gsave -359.39125 46.5625 m -387.39125 46.5625 l +359.06875 46.0625 m +387.06875 46.0625 l stroke grestore 0.150 setgray gsave -398.591250 41.662500 translate +398.268750 41.162500 translate 0.000000 rotate 0.000000 0 m /I glyphshow 3.889648 0 m /C glyphshow diff --git a/python/benchmarks/paper/team_size_0percent/team_size_0percent.png b/python/benchmarks/paper/team_size_0percent/team_size_0percent.png index 3239ab4f4..d6131610c 100644 Binary files a/python/benchmarks/paper/team_size_0percent/team_size_0percent.png and b/python/benchmarks/paper/team_size_0percent/team_size_0percent.png differ diff --git a/python/main.py b/python/main.py index fcead0bc6..2cce4969e 100644 --- a/python/main.py +++ b/python/main.py @@ -1,4 +1,6 @@ import pathlib as pathlib + +from mapf_branch_and_bound.bbsolver import solve_bb from mapfmclient import MapfBenchmarker, ProgressiveDescriptor, BenchmarkDescriptor, Problem, MarkedLocation import pathlib @@ -20,6 +22,10 @@ token = f.read() +def branch_and_boundify(algorithm: MapfAlgorithm): + return lambda problem: solve_bb(problem,lambda x,y: algorithm.solve(x)) + + def submit(algorithm: MapfAlgorithm): benchmarker = MapfBenchmarker( token, @@ -31,11 +37,11 @@ def submit(algorithm: MapfAlgorithm): # num_teams=2, # ), # ),cp5 - 81, - algorithm.name, + 93, + algorithm.name+" with branch-and-bound", algorithm.version, True, - solver=algorithm.solve, + solver=branch_and_boundify(algorithm), cores=1, baseURL="https://mapf.nl", ) @@ -43,23 +49,23 @@ def submit(algorithm: MapfAlgorithm): if __name__ == '__main__': - submit(BetterMatchingAStar()) + # submit(BetterMatchingAStar()) # submit(RMStarOD()) # submit(PrematchMStarOD()) # submit(PrematchMStar()) # submit(VisualPrematchMStar()) # submit(MStar()) # submit(MStarOD()) - # submit(ConfigurableMStar(Config( - # operator_decomposition=True, - # precompute_paths=False, - # precompute_heuristic=True, - # collision_avoidance_table=False, - # recursive=False, - # matching_strategy=MatchingStrategy.Prematch, - # max_memory_usage=3 * GigaByte, - # debug=False, - # ))) + submit(ConfigurableMStar(Config( + operator_decomposition=True, + precompute_paths=False, + precompute_heuristic=True, + collision_avoidance_table=False, + recursive=False, + matching_strategy=MatchingStrategy.Prematch, + max_memory_usage=3 * GigaByte, + debug=False, + ))) # m = MStar() # s = m.solve(Problem(