diff --git a/main.py b/main.py index dc3bfde..865c13e 100644 --- a/main.py +++ b/main.py @@ -58,43 +58,54 @@ if __name__ == '__main__': bidirectional_weight.append(weight) tracemalloc.stop() - with open("output/graphs_times.out", "w") as file: + with open("output/graphs_times.out", "w", encoding="utf-8") as file: file.write("\\begin{table}[]\n") file.write("\\begin{tabular}{|l|l|l|l|l|}\n") file.write("\\hline\n") file.write("nazwa grafu & (s, t) & Dijkstra & A* & Bi A* \\\\ \\hline\n") - with open("output/graphs_memory.out", "w") as file: + with open("output/graphs_memory.out", "w", encoding="utf-8") as file: file.write("\\begin{table}[]\n") file.write("\\begin{tabular}{|l|l|l|l|l|}\n") file.write("\\hline\n") file.write("nazwa grafu & (s, t) & Dijkstra & A* & Bi A* \\\\ \\hline\n") - with open("output/graph_weights.out", "w") as file: + with open("output/graph_weights.out", "w", encoding="utf-8") as file: file.write("\\begin{table}[]\n") file.write("\\begin{tabular}{|l|l|l|l|l|}\n") file.write("\\hline\n") file.write("nazwa grafu & (s, t) & Dijkstra & A* & Bi A* \\\\ \\hline\n") - with open("output/graphs_times.out", "a") as file: + with open("output/graphs_times.out", "a", encoding="utf-8") as file: for j in range(len(dijkstra_time)): file.write(" " + current_graph[j] + " & " + str(nodes_chosen[j]) + " & " + str(round(dijkstra_time[j], 5)) + " & " + str(round(a_star_time[j], 5)) + " & " + str(round(bidirectional_time[j], 5)) + " \\\\ \\hline\n") + file.write("\\hline\n") + file.write(" & średnia & " + str(round(sum(dijkstra_time) / len(dijkstra_time), 5)) + + " & " + str(round(sum(a_star_time) / len(a_star_time), 5)) + + " & " + str(round(sum(bidirectional_time) / len(bidirectional_time), 5)) + + " \\\\ \\hline\n") + file.write("\\end{tabular}\n") file.write("\\end{table}\n") - with open("output/graphs_memory.out", "a") as file: + with open("output/graphs_memory.out", "a", encoding="utf-8") as file: for j in range(len(dijkstra_time)): file.write(" " + current_graph[j] + " & " + str(nodes_chosen[j]) + " & " + str(dijkstra_memory[j]) + " & " + str(a_star_memory[j]) + " & " + str(bidirectional_memory[j]) + " \\\\ \\hline\n") + file.write("\\hline\n") + file.write(" & średnia & " + str(sum(dijkstra_memory) // len(dijkstra_memory)) + + " & " + str(sum(a_star_memory) // len(a_star_memory)) + + " & " + str(sum(bidirectional_memory) // len(bidirectional_memory)) + + " \\\\ \\hline\n") file.write("\\end{tabular}\n") file.write("\\end{table}\n") - with open("output/graph_weights.out", "a") as file: + with open("output/graph_weights.out", "a", encoding="utf-8") as file: for j in range(len(dijkstra_time)): file.write(" " + current_graph[j] + " & " + str(nodes_chosen[j]) + " & " + - str(dijkstra_weight[j]) + " & "+ str(a_star_weight[j]) + " & " + + str(dijkstra_weight[j]) + " & " + str(a_star_weight[j]) + " & " + str(bidirectional_weight[j]) + " \\\\ \\hline\n") file.write("\\end{tabular}\n") file.write("\\end{table}\n") @@ -150,25 +161,25 @@ if __name__ == '__main__': bidirectional_weight.append(weight) tracemalloc.stop() - with open("output/grids_times.out", "w") as file: + with open("output/grids_times.out", "w", encoding="utf-8") as file: file.write("\\begin{table}[]\n") file.write("\\begin{tabular}{|l|l|l|l|l|}\n") file.write("\\hline\n") file.write("nazwa siatki & (s, t) & Dijkstra & A* & Bi A* \\\\ \\hline\n") - with open("output/grids_memory.out", "w") as file: + with open("output/grids_memory.out", "w", encoding="utf-8") as file: file.write("\\begin{table}[]\n") file.write("\\begin{tabular}{|l|l|l|l|l|}\n") file.write("\\hline\n") file.write("nazwa siatki & (s, t) & Dijkstra & A* & Bi A* \\\\ \\hline\n") - with open("output/grids_weights.out", "w") as file: + with open("output/grids_weights.out", "w", encoding="utf-8") as file: file.write("\\begin{table}[]\n") file.write("\\begin{tabular}{|l|l|l|l|l|}\n") file.write("\\hline\n") file.write("nazwa siatki & (s, t) & Dijkstra & A* & Bi A* \\\\ \\hline\n") - with open("output/grids_times.out", "a") as file: + with open("output/grids_times.out", "a", encoding="utf-8") as file: for j in range(len(dijkstra_time)): file.write( " " + current_graph[j] + @@ -176,20 +187,30 @@ if __name__ == '__main__': + str(round(dijkstra_time[j], 5)) + " & " + str(round(a_star_time[j], 5)) + " & " + str(round(bidirectional_time[j], 5)) + " \\\\ \\hline\n") + file.write("\\hline\n") + file.write(" & średnia & " + str(round(sum(dijkstra_time) / len(dijkstra_time), 5)) + + " & " + str(round(sum(a_star_time) / len(a_star_time), 5)) + + " & " + str(round(sum(bidirectional_time) / len(bidirectional_time), 5)) + + " \\\\ \\hline\n") file.write("\\end{tabular}\n") file.write("\\end{table}\n") - with open("output/grids_memory.out", "a") as file: + with open("output/grids_memory.out", "a", encoding="utf-8") as file: for j in range(len(dijkstra_time)): file.write(" " + current_graph[j] + " & " + str(nodes_chosen[j]) + " & " + str(dijkstra_memory[j]) + " & " + str(a_star_memory[j]) + " & " + str(bidirectional_memory[j]) + " \\\\ \\hline\n") + file.write("\\hline\n") + file.write(" & średnia & " + str(sum(dijkstra_memory) // len(dijkstra_memory)) + + " & " + str(sum(a_star_memory) // len(a_star_memory)) + + " & " + str(sum(bidirectional_memory) // len(bidirectional_memory)) + + " \\\\ \\hline\n") file.write("\\end{tabular}\n") file.write("\\end{table}\n") - with open("output/grids_weights.out", "a") as file: + with open("output/grids_weights.out", "a", encoding="utf-8") as file: for j in range(len(dijkstra_time)): file.write(" " + current_graph[j] + " & " + str(nodes_chosen[j]) + " & " + - str(dijkstra_weight[j]) + " & "+ str(a_star_weight[j]) + " & " + + str(dijkstra_weight[j]) + " & " + str(a_star_weight[j]) + " & " + str(bidirectional_weight[j]) + " \\\\ \\hline\n") file.write("\\end{tabular}\n") file.write("\\end{table}\n") diff --git a/output/graph_weights.out b/output/graph_weights.out index 6e42686..37cb0d8 100644 --- a/output/graph_weights.out +++ b/output/graph_weights.out @@ -2,35 +2,35 @@ \begin{tabular}{|l|l|l|l|l|} \hline nazwa grafu & (s, t) & Dijkstra & A* & Bi A* \\ \hline - graph1 & (557, 2854) & 393 & 393 & 393 \\ \hline - graph1 & (2019, 2765) & 396 & 396 & 418 \\ \hline - graph1 & (3637, 530) & 301 & 301 & 301 \\ \hline - graph2 & (2931, 3234) & 400 & 400 & 400 \\ \hline - graph2 & (3164, 1155) & 592 & 592 & 601 \\ \hline - graph2 & (2276, 343) & 524 & 524 & 524 \\ \hline - graph3 & (807, 623) & 664 & 664 & 664 \\ \hline - graph3 & (3745, 2398) & 761 & 761 & 839 \\ \hline - graph3 & (2390, 655) & 442 & 442 & 442 \\ \hline - graph4 & (4620, 67) & 494 & 494 & 494 \\ \hline - graph4 & (4213, 2705) & 571 & 571 & 601 \\ \hline - graph4 & (2556, 2853) & 421 & 421 & 421 \\ \hline - graph5 & (3335, 2706) & 514 & 514 & 514 \\ \hline - graph5 & (2950, 1368) & 645 & 645 & 645 \\ \hline - graph5 & (657, 2650) & 423 & 423 & 430 \\ \hline - graph6 & (4133, 3082) & 385 & 385 & 385 \\ \hline - graph6 & (641, 218) & 573 & 573 & 654 \\ \hline - graph6 & (4168, 2508) & 377 & 377 & 433 \\ \hline - graph7 & (300, 1212) & 431 & 431 & 431 \\ \hline - graph7 & (1872, 3056) & 468 & 468 & 468 \\ \hline - graph7 & (2673, 1551) & 693 & 693 & 720 \\ \hline - graph8 & (1788, 319) & 316 & 316 & 316 \\ \hline - graph8 & (3219, 452) & 464 & 464 & 464 \\ \hline - graph8 & (4330, 4283) & 359 & 359 & 359 \\ \hline - graph9 & (282, 4009) & 669 & 669 & 693 \\ \hline - graph9 & (741, 325) & 489 & 489 & 489 \\ \hline - graph9 & (3275, 427) & 534 & 534 & 586 \\ \hline - graph10 & (264, 3217) & 573 & 573 & 668 \\ \hline - graph10 & (1932, 86) & 786 & 786 & 786 \\ \hline - graph10 & (3789, 3859) & 446 & 446 & 446 \\ \hline + graph1 & (2715, 5168) & 304 & 304 & 304 \\ \hline + graph1 & (4480, 5067) & 396 & 396 & 396 \\ \hline + graph1 & (1006, 3364) & 645 & 645 & 645 \\ \hline + graph2 & (1979, 529) & 756 & 756 & 793 \\ \hline + graph2 & (362, 317) & 574 & 574 & 612 \\ \hline + graph2 & (1849, 2070) & 476 & 476 & 476 \\ \hline + graph3 & (3116, 2486) & 522 & 522 & 522 \\ \hline + graph3 & (3865, 2378) & 742 & 742 & 828 \\ \hline + graph3 & (3891, 783) & 690 & 690 & 707 \\ \hline + graph4 & (249, 1908) & 303 & 303 & 303 \\ \hline + graph4 & (1268, 1121) & 536 & 536 & 536 \\ \hline + graph4 & (1616, 1418) & 291 & 291 & 291 \\ \hline + graph5 & (750, 677) & 478 & 478 & 478 \\ \hline + graph5 & (2325, 844) & 463 & 463 & 463 \\ \hline + graph5 & (2456, 1026) & 532 & 532 & 532 \\ \hline + graph6 & (1845, 1461) & 604 & 604 & 637 \\ \hline + graph6 & (3500, 671) & 477 & 477 & 477 \\ \hline + graph6 & (1714, 480) & 269 & 269 & 269 \\ \hline + graph7 & (985, 1903) & 298 & 298 & 298 \\ \hline + graph7 & (2509, 1211) & 398 & 398 & 398 \\ \hline + graph7 & (3251, 2489) & 363 & 363 & 399 \\ \hline + graph8 & (3584, 1793) & 376 & 376 & 413 \\ \hline + graph8 & (4686, 3513) & 406 & 406 & 406 \\ \hline + graph8 & (4496, 1860) & 381 & 381 & 444 \\ \hline + graph9 & (1900, 5416) & 298 & 298 & 298 \\ \hline + graph9 & (4511, 3384) & 301 & 301 & 301 \\ \hline + graph9 & (267, 4657) & 471 & 471 & 498 \\ \hline + graph10 & (2020, 2233) & 637 & 637 & 637 \\ \hline + graph10 & (3009, 3262) & 577 & 577 & 577 \\ \hline + graph10 & (2301, 3638) & 547 & 547 & 547 \\ \hline \end{tabular} \end{table} diff --git a/output/graphs_memory.out b/output/graphs_memory.out index 00e0cf6..6ede1f8 100644 --- a/output/graphs_memory.out +++ b/output/graphs_memory.out @@ -2,35 +2,37 @@ \begin{tabular}{|l|l|l|l|l|} \hline nazwa grafu & (s, t) & Dijkstra & A* & Bi A* \\ \hline - graph1 & (557, 2854) & 1291640 & 1517868 & 1112140 \\ \hline - graph1 & (2019, 2765) & 1407028 & 1665338 & 1101624 \\ \hline - graph1 & (3637, 530) & 709876 & 806404 & 874216 \\ \hline - graph2 & (2931, 3234) & 725704 & 845620 & 921180 \\ \hline - graph2 & (3164, 1155) & 1138540 & 1372780 & 1005032 \\ \hline - graph2 & (2276, 343) & 1126336 & 1342828 & 908816 \\ \hline - graph3 & (807, 623) & 1478223 & 1755420 & 1060112 \\ \hline - graph3 & (3745, 2398) & 1505936 & 1788924 & 1104832 \\ \hline - graph3 & (2390, 655) & 1158108 & 1384084 & 972808 \\ \hline - graph4 & (4620, 67) & 1612780 & 1877684 & 1743524 \\ \hline - graph4 & (4213, 2705) & 1753420 & 2045228 & 1803180 \\ \hline - graph4 & (2556, 2853) & 1723964 & 1991748 & 2015896 \\ \hline - graph5 & (3335, 2706) & 1129316 & 1346284 & 869980 \\ \hline - graph5 & (2950, 1368) & 1180976 & 1427900 & 1072292 \\ \hline - graph5 & (657, 2650) & 502992 & 567224 & 841208 \\ \hline - graph6 & (4133, 3082) & 694784 & 798844 & 915644 \\ \hline - graph6 & (641, 218) & 1278204 & 1524012 & 1221392 \\ \hline - graph6 & (4168, 2508) & 925364 & 1061364 & 1017992 \\ \hline - graph7 & (300, 1212) & 565432 & 638932 & 835824 \\ \hline - graph7 & (1872, 3056) & 509820 & 581528 & 1041196 \\ \hline - graph7 & (2673, 1551) & 1140220 & 1370768 & 970416 \\ \hline - graph8 & (1788, 319) & 533628 & 594472 & 1107332 \\ \hline - graph8 & (3219, 452) & 1293896 & 1548348 & 1099560 \\ \hline - graph8 & (4330, 4283) & 1151164 & 1359620 & 959408 \\ \hline - graph9 & (282, 4009) & 2240936 & 2677836 & 1717560 \\ \hline - graph9 & (741, 325) & 1009700 & 1138540 & 1657380 \\ \hline - graph9 & (3275, 427) & 2224496 & 2665012 & 1880452 \\ \hline - graph10 & (264, 3217) & 1254612 & 1497412 & 1155928 \\ \hline - graph10 & (1932, 86) & 1318108 & 1577268 & 1172436 \\ \hline - graph10 & (3789, 3859) & 833436 & 973244 & 939008 \\ \hline + graph1 & (2715, 5168) & 801804 & 897688 & 1029408 \\ \hline + graph1 & (4480, 5067) & 851292 & 977612 & 892096 \\ \hline + graph1 & (1006, 3364) & 1546544 & 1839602 & 1094036 \\ \hline + graph2 & (1979, 529) & 1167956 & 1404500 & 1031440 \\ \hline + graph2 & (362, 317) & 856264 & 992720 & 1073052 \\ \hline + graph2 & (1849, 2070) & 1116952 & 1339540 & 922840 \\ \hline + graph3 & (3116, 2486) & 1183151 & 1417620 & 1198424 \\ \hline + graph3 & (3865, 2378) & 1520544 & 1798828 & 2012400 \\ \hline + graph3 & (3891, 783) & 1503120 & 1784260 & 1138812 \\ \hline + graph4 & (249, 1908) & 654984 & 709780 & 1587272 \\ \hline + graph4 & (1268, 1121) & 1319624 & 1553044 & 1685304 \\ \hline + graph4 & (1616, 1418) & 582844 & 613936 & 1587272 \\ \hline + graph5 & (750, 677) & 896156 & 1035972 & 1012612 \\ \hline + graph5 & (2325, 844) & 502692 & 567456 & 926416 \\ \hline + graph5 & (2456, 1026) & 808076 & 948164 & 827780 \\ \hline + graph6 & (1845, 1461) & 1347488 & 1602732 & 1112640 \\ \hline + graph6 & (3500, 671) & 1325300 & 1574716 & 1097728 \\ \hline + graph6 & (1714, 480) & 316208 & 328124 & 808788 \\ \hline + graph7 & (985, 1903) & 546576 & 604288 & 834792 \\ \hline + graph7 & (2509, 1211) & 1111188 & 1323868 & 881976 \\ \hline + graph7 & (3251, 2489) & 860240 & 985860 & 991048 \\ \hline + graph8 & (3584, 1793) & 1182940 & 1405340 & 1074256 \\ \hline + graph8 & (4686, 3513) & 1334004 & 1582384 & 1000256 \\ \hline + graph8 & (4496, 1860) & 1157816 & 1388860 & 1037356 \\ \hline + graph9 & (1900, 5416) & 586244 & 618724 & 1587440 \\ \hline + graph9 & (4511, 3384) & 904392 & 1020260 & 1587272 \\ \hline + graph9 & (267, 4657) & 1738624 & 2034764 & 1794080 \\ \hline + graph10 & (2020, 2233) & 1313656 & 1565092 & 972568 \\ \hline + graph10 & (3009, 3262) & 1294368 & 1547732 & 948636 \\ \hline + graph10 & (2301, 3638) & 907600 & 1048564 & 899572 \\ \hline +\hline + & średnia & 1041288 & 1217067 & 1154919 \\ \hline \end{tabular} \end{table} diff --git a/output/graphs_times.out b/output/graphs_times.out index eba3379..5f4bfc7 100644 --- a/output/graphs_times.out +++ b/output/graphs_times.out @@ -2,35 +2,37 @@ \begin{tabular}{|l|l|l|l|l|} \hline nazwa grafu & (s, t) & Dijkstra & A* & Bi A* \\ \hline - graph1 & (557, 2854) & 0.56539 & 0.54258 & 0.02294 \\ \hline - graph1 & (2019, 2765) & 0.83885 & 0.83377 & 0.02593 \\ \hline - graph1 & (3637, 530) & 0.07081 & 0.07181 & 0.00898 \\ \hline - graph2 & (2931, 3234) & 0.10388 & 0.09968 & 0.01496 \\ \hline - graph2 & (3164, 1155) & 0.34259 & 0.33861 & 0.01795 \\ \hline - graph2 & (2276, 343) & 0.28973 & 0.28291 & 0.01197 \\ \hline - graph3 & (807, 623) & 0.83488 & 0.82191 & 0.01693 \\ \hline - graph3 & (3745, 2398) & 0.84344 & 0.8455 & 0.02094 \\ \hline - graph3 & (2390, 655) & 0.28474 & 0.28483 & 0.01396 \\ \hline - graph4 & (4620, 67) & 0.8794 & 0.8789 & 0.02892 \\ \hline - graph4 & (4213, 2705) & 1.13884 & 1.17542 & 0.02793 \\ \hline - graph4 & (2556, 2853) & 1.15356 & 1.22388 & 0.1139 \\ \hline - graph5 & (3335, 2706) & 0.47613 & 0.33744 & 0.00997 \\ \hline - graph5 & (2950, 1368) & 0.42144 & 0.41225 & 0.02294 \\ \hline - graph5 & (657, 2650) & 0.02793 & 0.02992 & 0.00898 \\ \hline - graph6 & (4133, 3082) & 0.06682 & 0.06733 & 0.01297 \\ \hline - graph6 & (641, 218) & 0.57718 & 0.57742 & 0.04041 \\ \hline - graph6 & (4168, 2508) & 0.31241 & 0.28752 & 0.01792 \\ \hline - graph7 & (300, 1212) & 0.05685 & 0.05883 & 0.00795 \\ \hline - graph7 & (1872, 3056) & 0.03494 & 0.0359 & 0.03089 \\ \hline - graph7 & (2673, 1551) & 0.36807 & 0.366 & 0.01496 \\ \hline - graph8 & (1788, 319) & 0.03391 & 0.03292 & 0.02391 \\ \hline - graph8 & (3219, 452) & 0.61233 & 0.61523 & 0.02097 \\ \hline - graph8 & (4330, 4283) & 0.38218 & 0.37903 & 0.01396 \\ \hline - graph9 & (282, 4009) & 1.36691 & 1.37665 & 0.0229 \\ \hline - graph9 & (741, 325) & 0.16356 & 0.16663 & 0.02192 \\ \hline - graph9 & (3275, 427) & 1.39584 & 1.39674 & 0.06485 \\ \hline - graph10 & (264, 3217) & 0.49667 & 0.49797 & 0.02892 \\ \hline - graph10 & (1932, 86) & 0.59541 & 0.58572 & 0.03887 \\ \hline - graph10 & (3789, 3859) & 0.1825 & 0.18169 & 0.01293 \\ \hline + graph1 & (2715, 5168) & 0.13814 & 0.13665 & 0.01795 \\ \hline + graph1 & (4480, 5067) & 0.17206 & 0.17109 & 0.01001 \\ \hline + graph1 & (1006, 3364) & 1.12031 & 1.11102 & 0.01895 \\ \hline + graph2 & (1979, 529) & 0.3619 & 0.34805 & 0.02094 \\ \hline + graph2 & (362, 317) & 0.21909 & 0.22282 & 0.0269 \\ \hline + graph2 & (1849, 2070) & 0.31826 & 0.31511 & 0.01396 \\ \hline + graph3 & (3116, 2486) & 0.40078 & 0.40402 & 0.04388 \\ \hline + graph3 & (3865, 2378) & 0.8971 & 0.85262 & 0.46628 \\ \hline + graph3 & (3891, 783) & 0.85337 & 0.8459 & 0.02194 \\ \hline + graph4 & (249, 1908) & 0.01895 & 0.01995 & 0.00997 \\ \hline + graph4 & (1268, 1121) & 0.34112 & 0.34427 & 0.02294 \\ \hline + graph4 & (1616, 1418) & 0.01297 & 0.01296 & 0.00997 \\ \hline + graph5 & (750, 677) & 0.25083 & 0.25145 & 0.02097 \\ \hline + graph5 & (2325, 844) & 0.02989 & 0.02992 & 0.01297 \\ \hline + graph5 & (2456, 1026) & 0.16907 & 0.16803 & 0.00798 \\ \hline + graph6 & (1845, 1461) & 0.67703 & 0.67277 & 0.02294 \\ \hline + graph6 & (3500, 671) & 0.67242 & 0.64496 & 0.02793 \\ \hline + graph6 & (1714, 480) & 0.00598 & 0.00598 & 0.00649 \\ \hline + graph7 & (985, 1903) & 0.04984 & 0.0519 & 0.00894 \\ \hline + graph7 & (2509, 1211) & 0.30819 & 0.31317 & 0.01197 \\ \hline + graph7 & (3251, 2489) & 0.24786 & 0.2565 & 0.01796 \\ \hline + graph8 & (3584, 1793) & 0.43392 & 0.43184 & 0.02097 \\ \hline + graph8 & (4686, 3513) & 0.75471 & 0.76096 & 0.01546 \\ \hline + graph8 & (4496, 1860) & 0.40264 & 0.41081 & 0.01693 \\ \hline + graph9 & (1900, 5416) & 0.01796 & 0.01293 & 0.01097 \\ \hline + graph9 & (4511, 3384) & 0.10024 & 0.1013 & 0.01296 \\ \hline + graph9 & (267, 4657) & 1.22887 & 1.23776 & 0.03194 \\ \hline + graph10 & (2020, 2233) & 0.57919 & 0.57698 & 0.01596 \\ \hline + graph10 & (3009, 3262) & 0.55286 & 0.56203 & 0.01496 \\ \hline + graph10 & (2301, 3638) & 0.24984 & 0.2484 & 0.01197 \\ \hline +\hline + & średnia & 0.38618 & 0.38407 & 0.03247 \\ \hline \end{tabular} \end{table} diff --git a/output/grids_memory.out b/output/grids_memory.out index d6da3e4..c419422 100644 --- a/output/grids_memory.out +++ b/output/grids_memory.out @@ -2,35 +2,37 @@ \begin{tabular}{|l|l|l|l|l|} \hline nazwa siatki & (s, t) & Dijkstra & A* & Bi A* \\ \hline - grid1 & ((208, 78), (193, 313)) & 13175208 & 5960837 & 14074640 \\ \hline - grid1 & ((133, 142), (282, 167)) & 11188912 & 5216016 & 14609812 \\ \hline - grid1 & ((224, 298), (249, 137)) & 10972088 & 5822780 & 14950104 \\ \hline - grid2 & ((163, 84), (144, 201)) & 5849168 & 2957536 & 7555256 \\ \hline - grid2 & ((94, 101), (128, 189)) & 5343824 & 3039216 & 7612488 \\ \hline - grid2 & ((154, 224), (157, 90)) & 5912496 & 2590128 & 7101992 \\ \hline - grid3 & ((191, 133), (180, 155)) & 2740648 & 2422680 & 7300360 \\ \hline - grid3 & ((159, 245), (269, 251)) & 9316760 & 3381848 & 7864808 \\ \hline - grid3 & ((103, 190), (123, 99)) & 6617248 & 2996656 & 7763936 \\ \hline - grid4 & ((130, 350), (59, 203)) & 11425208 & 6628816 & 15638608 \\ \hline - grid4 & ((108, 314), (130, 162)) & 10967424 & 5115480 & 14182476 \\ \hline - grid4 & ((152, 212), (280, 254)) & 13013960 & 5950344 & 14811352 \\ \hline - grid5 & ((193, 333), (93, 223)) & 18250132 & 8540904 & 17088024 \\ \hline - grid5 & ((240, 368), (202, 168)) & 18239428 & 8508956 & 17866616 \\ \hline - grid5 & ((267, 406), (328, 293)) & 8760144 & 6492704 & 15933288 \\ \hline - grid6 & ((155, 104), (225, 147)) & 5992328 & 3410328 & 7946864 \\ \hline - grid6 & ((248, 188), (206, 256)) & 5428616 & 3151168 & 7572016 \\ \hline - grid6 & ((212, 232), (244, 215)) & 2972352 & 2422680 & 7014920 \\ \hline - grid7 & ((206, 145), (266, 134)) & 5997360 & 4978744 & 13891832 \\ \hline - grid7 & ((257, 99), (255, 142)) & 4978576 & 4978576 & 13891664 \\ \hline - grid7 & ((92, 279), (247, 173)) & 13515236 & 9202544 & 19062000 \\ \hline - grid8 & ((267, 79), (133, 98)) & 6488952 & 3032800 & 7300056 \\ \hline - grid8 & ((231, 125), (163, 24)) & 8799464 & 4465016 & 8835800 \\ \hline - grid8 & ((135, 90), (270, 92)) & 5893664 & 2954108 & 6988848 \\ \hline - grid9 & ((35, 155), (42, 121)) & 2859976 & 2422680 & 6879472 \\ \hline - grid9 & ((198, 192), (25, 215)) & 8792032 & 3986756 & 7765844 \\ \hline - grid9 & ((78, 104), (108, 271)) & 6741008 & 4060480 & 8109348 \\ \hline - grid10 & ((191, 266), (304, 264)) & 10898012 & 4978744 & 13891832 \\ \hline - grid10 & ((235, 350), (284, 64)) & 19392492 & 12808116 & 19511180 \\ \hline - grid10 & ((142, 189), (140, 313)) & 11011232 & 5395416 & 14090392 \\ \hline + grid1 & ((193, 87), (310, 165)) & 11318488 & 6533565 & 15717904 \\ \hline + grid1 & ((229, 126), (297, 99)) & 7343704 & 4978576 & 13891664 \\ \hline + grid1 & ((210, 65), (245, 281)) & 12422800 & 6400048 & 15228344 \\ \hline + grid2 & ((188, 129), (162, 65)) & 5240896 & 2513656 & 6970208 \\ \hline + grid2 & ((191, 229), (134, 232)) & 3010384 & 2422680 & 6879304 \\ \hline + grid2 & ((117, 199), (119, 209)) & 2422680 & 2422680 & 6879304 \\ \hline + grid3 & ((135, 303), (184, 226)) & 5983920 & 3613008 & 8468896 \\ \hline + grid3 & ((152, 163), (41, 207)) & 10069704 & 4446008 & 8510000 \\ \hline + grid3 & ((135, 107), (124, 304)) & 10195776 & 4596272 & 8769816 \\ \hline + grid4 & ((187, 120), (219, 204)) & 7021352 & 4978744 & 13891832 \\ \hline + grid4 & ((53, 213), (129, 127)) & 8361224 & 5777920 & 14286608 \\ \hline + grid4 & ((79, 171), (236, 166)) & 11028408 & 5778452 & 13891832 \\ \hline + grid5 & ((266, 355), (129, 257)) & 18250108 & 9277824 & 19350192 \\ \hline + grid5 & ((345, 226), (322, 359)) & 12587344 & 6423116 & 14911584 \\ \hline + grid5 & ((357, 134), (367, 149)) & 4978576 & 4978576 & 14012048 \\ \hline + grid6 & ((175, 293), (198, 194)) & 4178752 & 3151336 & 7703504 \\ \hline + grid6 & ((227, 253), (125, 208)) & 5812696 & 3407568 & 8095536 \\ \hline + grid6 & ((112, 155), (231, 88)) & 9818168 & 4873160 & 9342632 \\ \hline + grid7 & ((333, 223), (83, 240)) & 17926968 & 6769068 & 14367016 \\ \hline + grid7 & ((138, 208), (147, 272)) & 6024672 & 4978744 & 13891832 \\ \hline + grid7 & ((317, 228), (280, 170)) & 6149680 & 4978576 & 13891664 \\ \hline + grid8 & ((212, 76), (214, 35)) & 2813944 & 2422680 & 6879472 \\ \hline + grid8 & ((299, 112), (177, 68)) & 6048520 & 4034784 & 8318192 \\ \hline + grid8 & ((313, 85), (223, 11)) & 5601512 & 3317304 & 7763328 \\ \hline + grid9 & ((107, 214), (145, 213)) & 2747664 & 2422680 & 6879472 \\ \hline + grid9 & ((186, 240), (174, 256)) & 2422680 & 2422680 & 6879304 \\ \hline + grid9 & ((211, 206), (44, 207)) & 6218840 & 3305216 & 7167648 \\ \hline + grid10 & ((189, 285), (167, 143)) & 11757384 & 5343168 & 14667632 \\ \hline + grid10 & ((152, 142), (285, 175)) & 11194656 & 6083300 & 15169728 \\ \hline + grid10 & ((371, 104), (340, 248)) & 8139488 & 5139760 & 14600696 \\ \hline +\hline + & średnia & 7903032 & 4593038 & 11242573 \\ \hline \end{tabular} \end{table} diff --git a/output/grids_times.out b/output/grids_times.out index 975deb1..d594985 100644 --- a/output/grids_times.out +++ b/output/grids_times.out @@ -2,35 +2,37 @@ \begin{tabular}{|l|l|l|l|l|} \hline nazwa siatki & (s, t) & Dijkstra & A* & Bi A* \\ \hline - grid1 & ((208, 78), (193, 313)) & 0.97547 & 0.65044 & 0.32221 \\ \hline - grid1 & ((133, 142), (282, 167)) & 0.67833 & 0.21254 & 0.27779 \\ \hline - grid1 & ((224, 298), (249, 137)) & 0.68965 & 0.28482 & 0.31787 \\ \hline - grid2 & ((163, 84), (144, 201)) & 0.37655 & 0.09874 & 0.12965 \\ \hline - grid2 & ((94, 101), (128, 189)) & 0.29137 & 0.10773 & 0.13267 \\ \hline - grid2 & ((154, 224), (157, 90)) & 0.38826 & 0.07979 & 0.08727 \\ \hline - grid3 & ((191, 133), (180, 155)) & 0.06483 & 0.03992 & 0.0783 \\ \hline - grid3 & ((159, 245), (269, 251)) & 0.99566 & 0.11769 & 0.12467 \\ \hline - grid3 & ((103, 190), (123, 99)) & 0.47224 & 0.09176 & 0.11416 \\ \hline - grid4 & ((130, 350), (59, 203)) & 0.7361 & 0.31638 & 0.34315 \\ \hline - grid4 & ((108, 314), (130, 162)) & 0.6939 & 0.19754 & 0.21945 \\ \hline - grid4 & ((152, 212), (280, 254)) & 1.86474 & 0.25312 & 0.27071 \\ \hline - grid5 & ((193, 333), (93, 223)) & 1.70941 & 0.51266 & 0.42399 \\ \hline - grid5 & ((240, 368), (202, 168)) & 1.47604 & 0.77196 & 0.87325 \\ \hline - grid5 & ((267, 406), (328, 293)) & 0.5223 & 0.23535 & 0.30725 \\ \hline - grid6 & ((155, 104), (225, 147)) & 0.39372 & 0.13515 & 0.1486 \\ \hline - grid6 & ((248, 188), (206, 256)) & 0.27286 & 0.08628 & 0.10971 \\ \hline - grid6 & ((212, 232), (244, 215)) & 0.08833 & 0.03491 & 0.06984 \\ \hline - grid7 & ((206, 145), (266, 134)) & 0.28069 & 0.06805 & 0.12022 \\ \hline - grid7 & ((257, 99), (255, 142)) & 0.0748 & 0.05184 & 0.11336 \\ \hline - grid7 & ((92, 279), (247, 173)) & 1.05079 & 0.7273 & 0.70458 \\ \hline - grid8 & ((267, 79), (133, 98)) & 0.47181 & 0.11669 & 0.11124 \\ \hline - grid8 & ((231, 125), (163, 24)) & 0.5606 & 0.26279 & 0.24619 \\ \hline - grid8 & ((135, 90), (270, 92)) & 0.35506 & 0.11719 & 0.08475 \\ \hline - grid9 & ((35, 155), (42, 121)) & 0.08375 & 0.03793 & 0.05582 \\ \hline - grid9 & ((198, 192), (25, 215)) & 0.47002 & 0.29917 & 0.16811 \\ \hline - grid9 & ((78, 104), (108, 271)) & 0.45982 & 0.2244 & 0.21892 \\ \hline - grid10 & ((191, 266), (304, 264)) & 0.81184 & 0.1002 & 0.13913 \\ \hline - grid10 & ((235, 350), (284, 64)) & 1.54801 & 2.3618 & 2.10291 \\ \hline - grid10 & ((142, 189), (140, 313)) & 0.718 & 0.17307 & 0.18807 \\ \hline + grid1 & ((193, 87), (310, 165)) & 0.67465 & 0.34114 & 0.34611 \\ \hline + grid1 & ((229, 126), (297, 99)) & 0.38498 & 0.08577 & 0.12218 \\ \hline + grid1 & ((210, 65), (245, 281)) & 0.85432 & 0.65564 & 0.62845 \\ \hline + grid2 & ((188, 129), (162, 65)) & 0.27677 & 0.05784 & 0.08178 \\ \hline + grid2 & ((191, 229), (134, 232)) & 0.10921 & 0.04093 & 0.06536 \\ \hline + grid2 & ((117, 199), (119, 209)) & 0.02294 & 0.02091 & 0.04687 \\ \hline + grid3 & ((135, 303), (184, 226)) & 0.34097 & 0.14308 & 0.20396 \\ \hline + grid3 & ((152, 163), (41, 207)) & 0.96207 & 0.19803 & 0.19004 \\ \hline + grid3 & ((135, 107), (124, 304)) & 0.72786 & 0.4463 & 0.30669 \\ \hline + grid4 & ((187, 120), (219, 204)) & 0.2998 & 0.11221 & 0.15259 \\ \hline + grid4 & ((53, 213), (129, 127)) & 0.46476 & 0.17617 & 0.21094 \\ \hline + grid4 & ((79, 171), (236, 166)) & 0.67797 & 0.28275 & 0.17105 \\ \hline + grid5 & ((266, 355), (129, 257)) & 1.543 & 0.77508 & 0.60208 \\ \hline + grid5 & ((345, 226), (322, 359)) & 1.18201 & 0.21693 & 0.22989 \\ \hline + grid5 & ((357, 134), (367, 149)) & 0.06782 & 0.06301 & 0.1372 \\ \hline + grid6 & ((175, 293), (198, 194)) & 0.189 & 0.08827 & 0.11815 \\ \hline + grid6 & ((227, 253), (125, 208)) & 0.35367 & 0.12919 & 0.16712 \\ \hline + grid6 & ((112, 155), (231, 88)) & 0.70591 & 0.3032 & 0.27389 \\ \hline + grid7 & ((333, 223), (83, 240)) & 1.10072 & 0.93206 & 0.39559 \\ \hline + grid7 & ((138, 208), (147, 272)) & 0.2763 & 0.05832 & 0.11569 \\ \hline + grid7 & ((317, 228), (280, 170)) & 0.24236 & 0.09431 & 0.14956 \\ \hline + grid8 & ((212, 76), (214, 35)) & 0.08528 & 0.02094 & 0.04687 \\ \hline + grid8 & ((299, 112), (177, 68)) & 0.39228 & 0.18455 & 0.20746 \\ \hline + grid8 & ((313, 85), (223, 11)) & 0.30622 & 0.13568 & 0.13566 \\ \hline + grid9 & ((107, 214), (145, 213)) & 0.07488 & 0.02294 & 0.04787 \\ \hline + grid9 & ((186, 240), (174, 256)) & 0.02344 & 0.02094 & 0.04588 \\ \hline + grid9 & ((211, 206), (44, 207)) & 0.39596 & 0.20197 & 0.10423 \\ \hline + grid10 & ((189, 285), (167, 143)) & 0.90487 & 0.18108 & 0.21493 \\ \hline + grid10 & ((152, 142), (285, 175)) & 0.74349 & 0.2259 & 0.28469 \\ \hline + grid10 & ((371, 104), (340, 248)) & 0.40145 & 0.16889 & 0.23043 \\ \hline +\hline + & średnia & 0.49283 & 0.2128 & 0.20111 \\ \hline \end{tabular} \end{table} diff --git a/output/grids_weights.out b/output/grids_weights.out index 79d8d21..17d3583 100644 --- a/output/grids_weights.out +++ b/output/grids_weights.out @@ -2,35 +2,35 @@ \begin{tabular}{|l|l|l|l|l|} \hline nazwa siatki & (s, t) & Dijkstra & A* & Bi A* \\ \hline - grid1 & ((208, 78), (193, 313)) & 256 & 256 & 256 \\ \hline - grid1 & ((133, 142), (282, 167)) & 174 & 174 & 174 \\ \hline - grid1 & ((224, 298), (249, 137)) & 186 & 186 & 186 \\ \hline - grid2 & ((163, 84), (144, 201)) & 136 & 136 & 136 \\ \hline - grid2 & ((94, 101), (128, 189)) & 122 & 122 & 122 \\ \hline - grid2 & ((154, 224), (157, 90)) & 145 & 145 & 145 \\ \hline - grid3 & ((191, 133), (180, 155)) & 33 & 33 & 33 \\ \hline - grid3 & ((159, 245), (269, 251)) & 130 & 130 & 130 \\ \hline - grid3 & ((103, 190), (123, 99)) & 115 & 115 & 115 \\ \hline - grid4 & ((130, 350), (59, 203)) & 218 & 218 & 218 \\ \hline - grid4 & ((108, 314), (130, 162)) & 176 & 176 & 176 \\ \hline - grid4 & ((152, 212), (280, 254)) & 170 & 170 & 170 \\ \hline - grid5 & ((193, 333), (93, 223)) & 210 & 210 & 210 \\ \hline - grid5 & ((240, 368), (202, 168)) & 238 & 238 & 238 \\ \hline - grid5 & ((267, 406), (328, 293)) & 174 & 174 & 174 \\ \hline - grid6 & ((155, 104), (225, 147)) & 119 & 119 & 119 \\ \hline - grid6 & ((248, 188), (206, 256)) & 110 & 110 & 110 \\ \hline - grid6 & ((212, 232), (244, 215)) & 49 & 49 & 49 \\ \hline - grid7 & ((206, 145), (266, 134)) & 73 & 73 & 73 \\ \hline - grid7 & ((257, 99), (255, 142)) & 53 & 53 & 53 \\ \hline - grid7 & ((92, 279), (247, 173)) & 261 & 261 & 261 \\ \hline - grid8 & ((267, 79), (133, 98)) & 153 & 153 & 153 \\ \hline - grid8 & ((231, 125), (163, 24)) & 169 & 169 & 169 \\ \hline - grid8 & ((135, 90), (270, 92)) & 149 & 149 & 149 \\ \hline - grid9 & ((35, 155), (42, 121)) & 63 & 63 & 63 \\ \hline - grid9 & ((198, 192), (25, 215)) & 202 & 202 & 202 \\ \hline - grid9 & ((78, 104), (108, 271)) & 201 & 201 & 201 \\ \hline - grid10 & ((191, 266), (304, 264)) & 125 & 125 & 125 \\ \hline - grid10 & ((235, 350), (284, 64)) & 353 & 353 & 353 \\ \hline - grid10 & ((142, 189), (140, 313)) & 154 & 154 & 154 \\ \hline + grid1 & ((193, 87), (310, 165)) & 197 & 197 & 197 \\ \hline + grid1 & ((229, 126), (297, 99)) & 95 & 95 & 95 \\ \hline + grid1 & ((210, 65), (245, 281)) & 253 & 253 & 253 \\ \hline + grid2 & ((188, 129), (162, 65)) & 90 & 90 & 90 \\ \hline + grid2 & ((191, 229), (134, 232)) & 80 & 80 & 80 \\ \hline + grid2 & ((117, 199), (119, 209)) & 12 & 12 & 12 \\ \hline + grid3 & ((135, 303), (184, 226)) & 128 & 128 & 128 \\ \hline + grid3 & ((152, 163), (41, 207)) & 159 & 159 & 159 \\ \hline + grid3 & ((135, 107), (124, 304)) & 224 & 224 & 224 \\ \hline + grid4 & ((187, 120), (219, 204)) & 116 & 116 & 116 \\ \hline + grid4 & ((53, 213), (129, 127)) & 162 & 162 & 162 \\ \hline + grid4 & ((79, 171), (236, 166)) & 188 & 188 & 188 \\ \hline + grid5 & ((266, 355), (129, 257)) & 235 & 235 & 235 \\ \hline + grid5 & ((345, 226), (322, 359)) & 164 & 164 & 164 \\ \hline + grid5 & ((357, 134), (367, 149)) & 33 & 33 & 33 \\ \hline + grid6 & ((175, 293), (198, 194)) & 128 & 128 & 128 \\ \hline + grid6 & ((227, 253), (125, 208)) & 147 & 147 & 147 \\ \hline + grid6 & ((112, 155), (231, 88)) & 186 & 186 & 186 \\ \hline + grid7 & ((333, 223), (83, 240)) & 281 & 281 & 281 \\ \hline + grid7 & ((138, 208), (147, 272)) & 73 & 73 & 73 \\ \hline + grid7 & ((317, 228), (280, 170)) & 95 & 95 & 95 \\ \hline + grid8 & ((212, 76), (214, 35)) & 43 & 43 & 43 \\ \hline + grid8 & ((299, 112), (177, 68)) & 166 & 166 & 166 \\ \hline + grid8 & ((313, 85), (223, 11)) & 166 & 166 & 166 \\ \hline + grid9 & ((107, 214), (145, 213)) & 41 & 41 & 41 \\ \hline + grid9 & ((186, 240), (174, 256)) & 32 & 32 & 32 \\ \hline + grid9 & ((211, 206), (44, 207)) & 192 & 192 & 192 \\ \hline + grid10 & ((189, 285), (167, 143)) & 164 & 164 & 164 \\ \hline + grid10 & ((152, 142), (285, 175)) & 166 & 166 & 166 \\ \hline + grid10 & ((371, 104), (340, 248)) & 191 & 191 & 191 \\ \hline \end{tabular} \end{table}