Merge remote-tracking branch 'refs/remotes/origin/main'
God i hate this
This commit is contained in:
@@ -384,6 +384,7 @@ int main()
|
||||
setlocale(LC_ALL, "");
|
||||
std::ofstream wyniki("wyniki.txt");
|
||||
|
||||
<<<<<<< HEAD
|
||||
//std::ostream& output = wyniki;//std::cerr; // Wypisanie do pliku (zamiast na ekran)
|
||||
std::ostream& output = std::cerr; // Wypisanie na ekran
|
||||
//eksperyment(sortowanie_shella, "Sortowanie shella", output);
|
||||
@@ -393,6 +394,17 @@ int main()
|
||||
// eksperyment(sortowanie_babelkowe, "Sortowanie bąbelkowe", output);
|
||||
// eksperyment(sortowanie_wstawianie, "Sortowanie przez proste wstawianie", output);
|
||||
// eksperyment(sortowanie_wybieranie, "Sortowanie przez proste wybieranie", output);
|
||||
=======
|
||||
std::ostream& output = wyniki;//std::cerr; // Wypisanie do pliku (zamiast na ekran)
|
||||
//std::ostream& output = std::cerr; // Wypisanie na ekran
|
||||
eksperyment(sortowanie_shella, "Sortowanie shella", output);
|
||||
eksperyment(sortowanie_szybkie, "Sortowanie szybkie", output);
|
||||
eksperyment(sortowanie_szybkie_mod, "Sortowanie szybkie z modyfikacją", output);
|
||||
eksperyment(ulepszone_sortowanie_babelkowe, "Ulepszone sortowanie bąbelkowe", output);
|
||||
eksperyment(sortowanie_babelkowe, "Sortowanie bąbelkowe", output);
|
||||
eksperyment(sortowanie_wstawianie, "Sortowanie przez proste wstawianie", output);
|
||||
eksperyment(sortowanie_wybieranie, "Sortowanie przez proste wybieranie", output);
|
||||
>>>>>>> main
|
||||
|
||||
eksperyment(sortowanie_kopcowanie, "Sortowanie przez kopcowanie", output);
|
||||
eksperyment(sortowanie_std, "Sortowanie std::sort", output);
|
||||
|
||||
@@ -1,51 +1,121 @@
|
||||
**************************************** Sortowanie shella *****************************************
|
||||
|
||||
N 1 2 3 średnia
|
||||
1024: 0.000039 0.000039 0.000038 0.000039
|
||||
2048: 0.000087 0.000088 0.000088 0.000088
|
||||
4096: 0.000202 0.000200 0.000201 0.000201
|
||||
8192: 0.000428 0.000428 0.000428 0.000428
|
||||
16384: 0.001009 0.000980 0.000979 0.000990
|
||||
32768: 0.002163 0.002347 0.002190 0.002233
|
||||
65536: 0.005800 0.004758 0.004694 0.005084
|
||||
131072: 0.011073 0.010688 0.010740 0.010834
|
||||
262144: 0.023325 0.022057 0.022610 0.022664
|
||||
524288: 0.048786 0.049036 0.048790 0.048871
|
||||
1048576: 0.107587 0.108653 0.106911 0.107717
|
||||
2097152: 0.230365 0.230278 0.228869 0.229837
|
||||
4194304: 0.537978 0.514392 0.516091 0.522820
|
||||
8388608: 1.147607 1.149780 1.147807 1.148398
|
||||
16777216: 2.442296 2.397227 2.607914 2.482479
|
||||
33554432: 5.459634 5.507145 5.474442 5.480407
|
||||
67108864: 11.858016 11.966240 12.176047 12.000101
|
||||
134217728: 26.767550 26.464177 27.816124 27.015950
|
||||
|
||||
**************************************** Sortowanie szybkie ****************************************
|
||||
|
||||
N 1 2 3 średnia
|
||||
1024: 0.000038 0.000038 0.000036 0.000037
|
||||
2048: 0.000076 0.000077 0.000078 0.000077
|
||||
4096: 0.000170 0.000167 0.000165 0.000167
|
||||
8192: 0.000356 0.000355 0.000359 0.000357
|
||||
16384: 0.000774 0.000789 0.000764 0.000776
|
||||
32768: 0.001605 0.001610 0.001619 0.001612
|
||||
65536: 0.003401 0.003437 0.003395 0.003411
|
||||
131072: 0.007390 0.007297 0.007751 0.007480
|
||||
262144: 0.015527 0.014979 0.015224 0.015243
|
||||
524288: 0.032364 0.032118 0.031711 0.032064
|
||||
1048576: 0.067752 0.066852 0.067468 0.067358
|
||||
2097152: 0.140202 0.140045 0.137131 0.139126
|
||||
4194304: 0.290995 0.288694 0.296544 0.292078
|
||||
8388608: 0.607588 0.607925 0.611922 0.609145
|
||||
16777216: 1.249832 1.275680 1.272675 1.266062
|
||||
33554432: 2.607922 2.641568 2.610221 2.619904
|
||||
67108864: 5.517913 5.455063 5.422462 5.465146
|
||||
134217728: 11.289586 11.302320 11.284963 11.292290
|
||||
268435456: 23.673582 23.403316 23.415799 23.497565
|
||||
536870912: 48.038953 48.151862 48.282429 48.157748
|
||||
|
||||
******************************** Sortowanie szybkie z modyfikacją *********************************
|
||||
|
||||
N 1 2 3 średnia
|
||||
1024: 0.000033 0.000037 0.000032 0.000034
|
||||
2048: 0.000071 0.000068 0.000068 0.000069
|
||||
4096: 0.000154 0.000146 0.000152 0.000150
|
||||
8192: 0.000310 0.000328 0.000322 0.000320
|
||||
16384: 0.000705 0.000707 0.000686 0.000700
|
||||
32768: 0.001467 0.001518 0.001481 0.001489
|
||||
65536: 0.003152 0.003211 0.003103 0.003156
|
||||
131072: 0.006677 0.006623 0.006583 0.006628
|
||||
262144: 0.014446 0.014019 0.014061 0.014175
|
||||
524288: 0.029223 0.030550 0.029887 0.029887
|
||||
1048576: 0.062390 0.064171 0.063205 0.063255
|
||||
2097152: 0.130656 0.130451 0.136104 0.132403
|
||||
4194304: 0.278890 0.276330 0.277773 0.277664
|
||||
8388608: 0.585235 0.580238 0.578145 0.581206
|
||||
16777216: 1.209792 1.204233 1.193494 1.202506
|
||||
33554432: 2.493599 2.524945 2.506664 2.508402
|
||||
67108864: 5.226669 5.208662 5.144034 5.193122
|
||||
134217728: 10.860226 10.765679 10.772853 10.799586
|
||||
268435456: 22.688817 22.353193 22.509365 22.517125
|
||||
536870912: 46.516290 46.294159 46.264816 46.358421
|
||||
|
||||
********************************* Ulepszone sortowanie bąbelkowe **********************************
|
||||
|
||||
N 1 2 3 średnia
|
||||
1024: 0.002044 0.002045 0.002029 0.002039
|
||||
2048: 0.008014 0.013855 0.012354 0.011408
|
||||
4096: 0.038421 0.038198 0.037962 0.038194
|
||||
8192: 0.164003 0.166471 0.162862 0.164445
|
||||
16384: 0.684504 0.696913 0.663257 0.681558
|
||||
32768: 2.908903 2.795147 2.808413 2.837488
|
||||
65536: 11.742243 11.758447 11.715050 11.738580
|
||||
131072: 47.868170 47.708679 47.534870 47.703907
|
||||
1024: 0.001473 0.001447 0.001468 0.001463
|
||||
2048: 0.005740 0.005750 0.005760 0.005750
|
||||
4096: 0.023143 0.023477 0.023167 0.023263
|
||||
8192: 0.096102 0.095958 0.095663 0.095907
|
||||
16384: 0.466030 0.463253 0.462989 0.464091
|
||||
32768: 2.235860 2.234073 2.220705 2.230213
|
||||
65536: 9.446262 9.466576 9.474952 9.462597
|
||||
131072: 38.367472 38.442789 38.377182 38.395814
|
||||
|
||||
************************************** Sortowanie bąbelkowe ***************************************
|
||||
|
||||
N 1 2 3 średnia
|
||||
1024: 0.002339 0.002308 0.002332 0.002326
|
||||
2048: 0.009395 0.009124 0.009249 0.009256
|
||||
4096: 0.038457 0.048472 0.039403 0.042110
|
||||
8192: 0.197120 0.174104 0.196598 0.189274
|
||||
16384: 0.761761 0.778530 0.796097 0.778796
|
||||
32768: 3.253830 3.292660 3.265293 3.270595
|
||||
65536: 13.566257 13.426956 13.381866 13.458359
|
||||
131072: 54.356201 54.100949 54.477668 54.311606
|
||||
1024: 0.001823 0.001800 0.001744 0.001789
|
||||
2048: 0.006974 0.007163 0.006942 0.007026
|
||||
4096: 0.028334 0.028949 0.028935 0.028739
|
||||
8192: 0.119174 0.118411 0.121572 0.119719
|
||||
16384: 0.550985 0.561181 0.553686 0.555284
|
||||
32768: 2.518112 2.505003 2.510291 2.511136
|
||||
65536: 10.832427 10.518550 10.464796 10.605258
|
||||
131072: 42.525125 42.984569 43.508137 43.005944
|
||||
|
||||
******************************** Sortowanie przez proste wstawianie ********************************
|
||||
|
||||
N 1 2 3 średnia
|
||||
1024: 0.000255 0.000386 0.000393 0.000345
|
||||
2048: 0.001484 0.001388 0.001096 0.001323
|
||||
4096: 0.004499 0.003932 0.003270 0.003900
|
||||
8192: 0.011644 0.011540 0.011026 0.011404
|
||||
16384: 0.043329 0.042484 0.042641 0.042818
|
||||
32768: 0.172772 0.184408 0.223851 0.193677
|
||||
65536: 0.789005 0.721012 0.754773 0.754930
|
||||
131072: 2.954878 3.211969 3.036609 3.067819
|
||||
262144: 11.864130 11.979444 12.489485 12.111020
|
||||
524288: 51.603773 51.800863 51.390265 51.598300
|
||||
1024: 0.000133 0.000069 0.000133 0.000112
|
||||
2048: 0.000501 0.000513 0.000263 0.000426
|
||||
4096: 0.001691 0.001053 0.001098 0.001280
|
||||
8192: 0.004396 0.004389 0.004424 0.004403
|
||||
16384: 0.020335 0.020352 0.020142 0.020276
|
||||
32768: 0.092153 0.092719 0.092686 0.092519
|
||||
65536: 0.389915 0.390262 0.392533 0.390903
|
||||
131072: 1.596092 1.587199 1.587138 1.590143
|
||||
262144: 6.399347 6.434105 6.397203 6.410218
|
||||
524288: 25.768513 25.694963 25.717130 25.726868
|
||||
|
||||
******************************** Sortowanie przez proste wybieranie ********************************
|
||||
|
||||
N 1 2 3 średnia
|
||||
1024: 0.000615 0.000597 0.000592 0.000601
|
||||
2048: 0.002364 0.002382 0.002453 0.002400
|
||||
4096: 0.009755 0.009131 0.009662 0.009516
|
||||
8192: 0.038531 0.042756 0.037862 0.039716
|
||||
16384: 0.154498 0.157357 0.145383 0.152413
|
||||
32768: 0.636285 0.604619 0.628256 0.623053
|
||||
65536: 2.576952 2.565646 2.672341 2.604980
|
||||
131072: 10.543565 10.375769 10.148472 10.355936
|
||||
262144: 40.747539 40.789195 40.930092 40.822275
|
||||
1024: 0.000523 0.000525 0.000522 0.000523
|
||||
2048: 0.002092 0.002083 0.002103 0.002093
|
||||
4096: 0.008373 0.008313 0.008335 0.008340
|
||||
8192: 0.033263 0.033232 0.033334 0.033276
|
||||
16384: 0.132721 0.132562 0.132582 0.132622
|
||||
32768: 0.529357 0.529295 0.529577 0.529410
|
||||
65536: 2.115070 2.115255 2.114803 2.115043
|
||||
131072: 8.459898 8.460790 8.461544 8.460744
|
||||
262144: 34.072488 33.931198 33.857620 33.953769
|
||||
|
||||
|
||||
Reference in New Issue
Block a user