diff --git a/results/cost_opti_16np_64ants_10iter.txt b/results/10iter/cost_opti_16np_64ants_10iter.txt similarity index 100% rename from results/cost_opti_16np_64ants_10iter.txt rename to results/10iter/cost_opti_16np_64ants_10iter.txt diff --git a/results/cost_opti_1np_64ants_10iter.txt b/results/10iter/cost_opti_1np_64ants_10iter.txt similarity index 100% rename from results/cost_opti_1np_64ants_10iter.txt rename to results/10iter/cost_opti_1np_64ants_10iter.txt diff --git a/results/cost_opti_2np_64ants_10iter.txt b/results/10iter/cost_opti_2np_64ants_10iter.txt similarity index 100% rename from results/cost_opti_2np_64ants_10iter.txt rename to results/10iter/cost_opti_2np_64ants_10iter.txt diff --git a/results/cost_opti_4np_64ants_10iter.txt b/results/10iter/cost_opti_4np_64ants_10iter.txt similarity index 100% rename from results/cost_opti_4np_64ants_10iter.txt rename to results/10iter/cost_opti_4np_64ants_10iter.txt diff --git a/results/cost_opti_8np_64ants_10iter.txt b/results/10iter/cost_opti_8np_64ants_10iter.txt similarity index 100% rename from results/cost_opti_8np_64ants_10iter.txt rename to results/10iter/cost_opti_8np_64ants_10iter.txt diff --git a/results/result_16np_64ants_10iter.out b/results/10iter/result_16np_64ants_10iter.out similarity index 100% rename from results/result_16np_64ants_10iter.out rename to results/10iter/result_16np_64ants_10iter.out diff --git a/results/result_1np_64ants_10iter.out b/results/10iter/result_1np_64ants_10iter.out similarity index 100% rename from results/result_1np_64ants_10iter.out rename to results/10iter/result_1np_64ants_10iter.out diff --git a/results/result_2np_64ants_10iter.out b/results/10iter/result_2np_64ants_10iter.out similarity index 100% rename from results/result_2np_64ants_10iter.out rename to results/10iter/result_2np_64ants_10iter.out diff --git a/results/result_4np_64ants_10iter.out b/results/10iter/result_4np_64ants_10iter.out similarity index 100% rename from results/result_4np_64ants_10iter.out rename to results/10iter/result_4np_64ants_10iter.out diff --git a/results/result_8np_64ants_10iter.out b/results/10iter/result_8np_64ants_10iter.out similarity index 100% rename from results/result_8np_64ants_10iter.out rename to results/10iter/result_8np_64ants_10iter.out diff --git a/results/cost_opti_16np_32ants_400iter_1.txt b/results/16np_32ants_400iter/cost_opti_16np_32ants_400iter_1.txt similarity index 100% rename from results/cost_opti_16np_32ants_400iter_1.txt rename to results/16np_32ants_400iter/cost_opti_16np_32ants_400iter_1.txt diff --git a/results/cost_opti_16np_32ants_400iter_2.txt b/results/16np_32ants_400iter/cost_opti_16np_32ants_400iter_2.txt similarity index 100% rename from results/cost_opti_16np_32ants_400iter_2.txt rename to results/16np_32ants_400iter/cost_opti_16np_32ants_400iter_2.txt diff --git a/results/cost_opti_16np_32ants_400iter_3.txt b/results/16np_32ants_400iter/cost_opti_16np_32ants_400iter_3.txt similarity index 100% rename from results/cost_opti_16np_32ants_400iter_3.txt rename to results/16np_32ants_400iter/cost_opti_16np_32ants_400iter_3.txt diff --git a/results/cost_opti_16np_32ants_400iter_4.txt b/results/16np_32ants_400iter/cost_opti_16np_32ants_400iter_4.txt similarity index 100% rename from results/cost_opti_16np_32ants_400iter_4.txt rename to results/16np_32ants_400iter/cost_opti_16np_32ants_400iter_4.txt diff --git a/results/cost_opti_16np_32ants_400iter_5.txt b/results/16np_32ants_400iter/cost_opti_16np_32ants_400iter_5.txt similarity index 100% rename from results/cost_opti_16np_32ants_400iter_5.txt rename to results/16np_32ants_400iter/cost_opti_16np_32ants_400iter_5.txt diff --git a/results/cost_opti_16np_32ants_400iter_6.txt b/results/16np_32ants_400iter/cost_opti_16np_32ants_400iter_6.txt similarity index 100% rename from results/cost_opti_16np_32ants_400iter_6.txt rename to results/16np_32ants_400iter/cost_opti_16np_32ants_400iter_6.txt diff --git a/results/result_16np_32ants_400iter_1.out b/results/16np_32ants_400iter/result_16np_32ants_400iter_1.out similarity index 100% rename from results/result_16np_32ants_400iter_1.out rename to results/16np_32ants_400iter/result_16np_32ants_400iter_1.out diff --git a/results/result_16np_32ants_400iter_2.out b/results/16np_32ants_400iter/result_16np_32ants_400iter_2.out similarity index 100% rename from results/result_16np_32ants_400iter_2.out rename to results/16np_32ants_400iter/result_16np_32ants_400iter_2.out diff --git a/results/result_16np_32ants_400iter_3.out b/results/16np_32ants_400iter/result_16np_32ants_400iter_3.out similarity index 100% rename from results/result_16np_32ants_400iter_3.out rename to results/16np_32ants_400iter/result_16np_32ants_400iter_3.out diff --git a/results/result_16np_32ants_400iter_4.out b/results/16np_32ants_400iter/result_16np_32ants_400iter_4.out similarity index 100% rename from results/result_16np_32ants_400iter_4.out rename to results/16np_32ants_400iter/result_16np_32ants_400iter_4.out diff --git a/results/result_16np_32ants_400iter_5.out b/results/16np_32ants_400iter/result_16np_32ants_400iter_5.out similarity index 100% rename from results/result_16np_32ants_400iter_5.out rename to results/16np_32ants_400iter/result_16np_32ants_400iter_5.out diff --git a/results/result_16np_32ants_400iter_6.out b/results/16np_32ants_400iter/result_16np_32ants_400iter_6.out similarity index 100% rename from results/result_16np_32ants_400iter_6.out rename to results/16np_32ants_400iter/result_16np_32ants_400iter_6.out diff --git a/results/comm_times/comm_times_gthrbcst_16ants.txt b/results/comm_times/comm_times_gthrbcst_16ants.txt new file mode 100644 index 0000000000000000000000000000000000000000..77ce01fbd8d0463b1ace947067848540ae01baeb --- /dev/null +++ b/results/comm_times/comm_times_gthrbcst_16ants.txt @@ -0,0 +1,182 @@ +========== 1 Process ========== +The update of tau takes 0.09913301467895508 s. +---------------- + +========== 2 Process ========== +The update of tau takes 22.373729705810547 s. +The update of tau takes 0.0698847770690918 s. +---------------- +The update of tau takes 7.213011264801025 s. +The update of tau takes 0.02954888343811035 s. +---------------- +The update of tau takes 0.029207706451416016 s. +The update of tau takes 3.4748778343200684 s. +---------------- +The update of tau takes 10.204100847244263 s. +The update of tau takes 0.03219437599182129 s. +---------------- +The update of tau takes 5.623860597610474 s. +The update of tau takes 0.03072190284729004 s. +---------------- + +========== 4 Process ========== +The update of tau takes 0.05961155891418457 s. +The update of tau takes 14.912492513656616 s. +The update of tau takes 21.16039752960205 s. +The update of tau takes 15.727792501449585 s. +---------------- +The update of tau takes 3.137505531311035 s. +The update of tau takes 6.568080186843872 s. +The update of tau takes 4.525001764297485 s. +The update of tau takes 0.11267971992492676 s. +---------------- +The update of tau takes 0.009357929229736328 s. +The update of tau takes 4.349734783172607 s. +The update of tau takes 18.154149532318115 s. +The update of tau takes 14.63952898979187 s. +---------------- +The update of tau takes 21.171955823898315 s. +The update of tau takes 0.465893030166626 s. +The update of tau takes 0.008575439453125 s. +The update of tau takes 20.73850989341736 s. +---------------- +The update of tau takes 8.638056993484497 s. +The update of tau takes 18.74207353591919 s. +The update of tau takes 0.03296256065368652 s. +The update of tau takes 9.112927913665771 s. +---------------- + +========== 8 Process ========== +The update of tau takes 14.339687585830688 s. +The update of tau takes 3.376807689666748 s. +The update of tau takes 4.813735485076904 s. +The update of tau takes 22.012387990951538 s. +The update of tau takes 15.522985219955444 s. +The update of tau takes 19.5987286567688 s. +The update of tau takes 0.07252073287963867 s. +The update of tau takes 16.88066530227661 s. +---------------- +The update of tau takes 0.013082265853881836 s. +The update of tau takes 23.5510733127594 s. +The update of tau takes 5.920792818069458 s. +The update of tau takes 20.973257303237915 s. +The update of tau takes 12.074134349822998 s. +The update of tau takes 19.446594715118408 s. +The update of tau takes 6.701741933822632 s. +The update of tau takes 24.294646501541138 s. +---------------- +The update of tau takes 13.181703805923462 s. +The update of tau takes 3.3882999420166016 s. +The update of tau takes 1.382721185684204 s. +The update of tau takes 9.624243974685669 s. +The update of tau takes 13.210530757904053 s. +The update of tau takes 14.211763620376587 s. +The update of tau takes 0.11337494850158691 s. +The update of tau takes 7.060912132263184 s. +---------------- +The update of tau takes 15.49002480506897 s. +The update of tau takes 38.06357789039612 s. +The update of tau takes 0.01352691650390625 s. +The update of tau takes 8.693908929824829 s. +The update of tau takes 26.007373094558716 s. +The update of tau takes 32.717233657836914 s. +The update of tau takes 7.254819869995117 s. +The update of tau takes 2.64982533454895 s. +---------------- +The update of tau takes 13.652789831161499 s. +The update of tau takes 1.693331241607666 s. +The update of tau takes 28.02141261100769 s. +The update of tau takes 0.013052940368652344 s. +The update of tau takes 23.7999267578125 s. +The update of tau takes 18.643357038497925 s. +The update of tau takes 6.375317096710205 s. +The update of tau takes 19.336090087890625 s. +---------------- + +========== 16 Process ========== +The update of tau takes 25.060819625854492 s. +The update of tau takes 12.87904977798462 s. +The update of tau takes 19.05889654159546 s. +The update of tau takes 10.956089735031128 s. +The update of tau takes 12.982044458389282 s. +The update of tau takes 12.447086095809937 s. +The update of tau takes 17.237581729888916 s. +The update of tau takes 16.80542778968811 s. +The update of tau takes 10.128946304321289 s. +The update of tau takes 4.354808568954468 s. +The update of tau takes 8.936133623123169 s. +The update of tau takes 0.08362674713134766 s. +The update of tau takes 27.454564094543457 s. +The update of tau takes 19.954668283462524 s. +The update of tau takes 23.765451908111572 s. +The update of tau takes 17.12417483329773 s. +---------------- +The update of tau takes 33.69630837440491 s. +The update of tau takes 30.097689867019653 s. +The update of tau takes 39.807077169418335 s. +The update of tau takes 15.450464725494385 s. +The update of tau takes 37.91788387298584 s. +The update of tau takes 40.22591543197632 s. +The update of tau takes 17.626543045043945 s. +The update of tau takes 31.12188148498535 s. +The update of tau takes 35.80254101753235 s. +The update of tau takes 32.10729694366455 s. +The update of tau takes 28.675655364990234 s. +The update of tau takes 0.07104635238647461 s. +The update of tau takes 28.296031951904297 s. +The update of tau takes 29.233425855636597 s. +The update of tau takes 11.68274998664856 s. +The update of tau takes 42.9933397769928 s. +---------------- +The update of tau takes 23.28940200805664 s. +The update of tau takes 9.794701337814331 s. +The update of tau takes 27.609760761260986 s. +The update of tau takes 4.188655614852905 s. +The update of tau takes 9.030377388000488 s. +The update of tau takes 27.96933603286743 s. +The update of tau takes 12.339949607849121 s. +The update of tau takes 25.35353374481201 s. +The update of tau takes 13.021750211715698 s. +The update of tau takes 0.08763766288757324 s. +The update of tau takes 8.261036396026611 s. +The update of tau takes 25.16412901878357 s. +The update of tau takes 17.20633864402771 s. +The update of tau takes 2.9310224056243896 s. +The update of tau takes 3.930478811264038 s. +The update of tau takes 28.06206750869751 s. +---------------- +The update of tau takes 21.61470317840576 s. +The update of tau takes 42.72353506088257 s. +The update of tau takes 26.014607667922974 s. +The update of tau takes 41.65948987007141 s. +The update of tau takes 22.580242156982422 s. +The update of tau takes 42.62879204750061 s. +The update of tau takes 28.68349838256836 s. +The update of tau takes 37.752838134765625 s. +The update of tau takes 44.30511689186096 s. +The update of tau takes 0.07688403129577637 s. +The update of tau takes 43.28420376777649 s. +The update of tau takes 35.88371562957764 s. +The update of tau takes 31.498971462249756 s. +The update of tau takes 24.762646675109863 s. +The update of tau takes 24.230530738830566 s. +The update of tau takes 41.73650884628296 s. +---------------- +The update of tau takes 15.988333463668823 s. +The update of tau takes 20.738231897354126 s. +The update of tau takes 2.2191011905670166 s. +The update of tau takes 31.92435622215271 s. +The update of tau takes 31.576402187347412 s. +The update of tau takes 8.800199031829834 s. +The update of tau takes 18.074927806854248 s. +The update of tau takes 16.960297107696533 s. +The update of tau takes 27.90590763092041 s. +The update of tau takes 35.6890709400177 s. +The update of tau takes 19.841561794281006 s. +The update of tau takes 22.803118467330933 s. +The update of tau takes 22.965753078460693 s. +The update of tau takes 35.18033528327942 s. +The update of tau takes 20.949975967407227 s. +The update of tau takes 0.08925700187683105 s. +---------------- + diff --git a/results/comm_times_gthrbcst_64ants.txt b/results/comm_times/comm_times_gthrbcst_64ants.txt similarity index 88% rename from results/comm_times_gthrbcst_64ants.txt rename to results/comm_times/comm_times_gthrbcst_64ants.txt index 75f97a625ce28a3a819369b40c0e0e16b40922e0..0c9d1289594d30034ca2b671c695270fd7371435 100644 --- a/results/comm_times_gthrbcst_64ants.txt +++ b/results/comm_times/comm_times_gthrbcst_64ants.txt @@ -20,30 +20,30 @@ The update of tau takes 0.05071616172790527 s. ---------------- ========== 4 Process ========== -The update of tau takes 0.0656583309173584 s. -The update of tau takes 67.51811242103577 s. -The update of tau takes 60.8839111328125 s. -The update of tau takes 58.22569465637207 s. ----------------- -The update of tau takes 34.724695682525635 s. -The update of tau takes 0.06490325927734375 s. -The update of tau takes 14.503316879272461 s. -The update of tau takes 20.473705053329468 s. ----------------- -The update of tau takes 23.652085304260254 s. -The update of tau takes 30.33950710296631 s. -The update of tau takes 33.59425234794617 s. -The update of tau takes 0.07303237915039062 s. ----------------- -The update of tau takes 29.053896188735962 s. -The update of tau takes 0.05734705924987793 s. -The update of tau takes 35.97857999801636 s. -The update of tau takes 53.88191080093384 s. ----------------- -The update of tau takes 7.798046827316284 s. -The update of tau takes 0.06777834892272949 s. -The update of tau takes 71.43308115005493 s. -The update of tau takes 49.83935523033142 s. +The update of tau takes 0.5088016986846924 s. +The update of tau takes 42.136775493621826 s. +The update of tau takes 22.916038274765015 s. +The update of tau takes 40.00288701057434 s. +---------------- +The update of tau takes 21.310214042663574 s. +The update of tau takes 44.1985137462616 s. +The update of tau takes 0.12133359909057617 s. +The update of tau takes 46.402963638305664 s. +---------------- +The update of tau takes 41.42518758773804 s. +The update of tau takes 0.016083717346191406 s. +The update of tau takes 30.68100118637085 s. +The update of tau takes 28.87326431274414 s. +---------------- +The update of tau takes 8.84601092338562 s. +The update of tau takes 15.234434366226196 s. +The update of tau takes 16.11204433441162 s. +The update of tau takes 0.016422748565673828 s. +---------------- +The update of tau takes 23.869322061538696 s. +The update of tau takes 44.21074962615967 s. +The update of tau takes 23.90828514099121 s. +The update of tau takes 0.016566038131713867 s. ---------------- ========== 8 Process ========== diff --git a/results/comm_times/comm_times_sndrcv_16ants.txt b/results/comm_times/comm_times_sndrcv_16ants.txt new file mode 100644 index 0000000000000000000000000000000000000000..61a22a7e762019b3d205560af239f9846a4e01b6 --- /dev/null +++ b/results/comm_times/comm_times_sndrcv_16ants.txt @@ -0,0 +1,190 @@ +========== 1 Process ========== +The update of tau takes 0.051210641860961914 s. +---------------- +The update of tau takes 0.0043871402740478516 s. +---------------- +The update of tau takes 0.10500741004943848 s. +---------------- +The update of tau takes 0.004146099090576172 s. +---------------- +The update of tau takes 0.0040302276611328125 s. +---------------- + +========== 2 Process ========== +The update of tau takes 10.771445035934448 s. +The update of tau takes 0.026795625686645508 s. +---------------- +The update of tau takes 8.820273399353027 s. +The update of tau takes 0.0028676986694335938 s. +---------------- +The update of tau takes 0.10897231101989746 s. +The update of tau takes 1.1178336143493652 s. +---------------- +The update of tau takes 5.639611721038818 s. +The update of tau takes 0.002729654312133789 s. +---------------- +The update of tau takes 0.0026280879974365234 s. +The update of tau takes 11.79865550994873 s. +---------------- + +========== 4 Process ========== +The update of tau takes 18.099440336227417 s. +The update of tau takes 0.04003143310546875 s. +The update of tau takes 15.875937223434448 s. +The update of tau takes 16.91982388496399 s. +---------------- +The update of tau takes 19.382026195526123 s. +The update of tau takes 0.004785060882568359 s. +The update of tau takes 21.716426372528076 s. +The update of tau takes 12.56604552268982 s. +---------------- +The update of tau takes 4.720373630523682 s. +The update of tau takes 24.887489318847656 s. +The update of tau takes 0.0045108795166015625 s. +The update of tau takes 11.063212156295776 s. +---------------- +The update of tau takes 19.61106562614441 s. +The update of tau takes 17.01151704788208 s. +The update of tau takes 11.422006607055664 s. +The update of tau takes 0.004232645034790039 s. +---------------- +The update of tau takes 4.220478057861328 s. +The update of tau takes 6.524776935577393 s. +The update of tau takes 10.752532720565796 s. +The update of tau takes 0.006626605987548828 s. +---------------- + +========== 8 Process ========== +The update of tau takes 53.100878953933716 s. +The update of tau takes 36.66013503074646 s. +The update of tau takes 42.187110900878906 s. +The update of tau takes 29.612024784088135 s. +The update of tau takes 0.048192501068115234 s. +The update of tau takes 23.813103437423706 s. +The update of tau takes 6.661475896835327 s. +The update of tau takes 52.28170394897461 s. +---------------- +The update of tau takes 0.010004997253417969 s. +The update of tau takes 6.007991552352905 s. +The update of tau takes 8.568843364715576 s. +The update of tau takes 27.3125581741333 s. +The update of tau takes 25.1840603351593 s. +The update of tau takes 7.628563404083252 s. +The update of tau takes 10.19534158706665 s. +The update of tau takes 12.891939401626587 s. +---------------- +The update of tau takes 4.741968393325806 s. +The update of tau takes 20.098488807678223 s. +The update of tau takes 3.7364606857299805 s. +The update of tau takes 20.136448621749878 s. +The update of tau takes 30.11574697494507 s. +The update of tau takes 17.68135976791382 s. +The update of tau takes 1.4189207553863525 s. +The update of tau takes 0.007524013519287109 s. +---------------- +The update of tau takes 20.151676893234253 s. +The update of tau takes 20.746768712997437 s. +The update of tau takes 12.281693458557129 s. +The update of tau takes 20.960956811904907 s. +The update of tau takes 16.057372570037842 s. +The update of tau takes 2.6285200119018555 s. +The update of tau takes 0.00895071029663086 s. +The update of tau takes 13.804379224777222 s. +---------------- +The update of tau takes 0.008026599884033203 s. +The update of tau takes 8.011805057525635 s. +The update of tau takes 23.178380250930786 s. +The update of tau takes 27.886707067489624 s. +The update of tau takes 24.549723148345947 s. +The update of tau takes 21.430049657821655 s. +The update of tau takes 0.628485918045044 s. +The update of tau takes 28.567094802856445 s. +---------------- + +========== 16 Process ========== +The update of tau takes 22.895402193069458 s. +The update of tau takes 30.67358708381653 s. +The update of tau takes 24.57679319381714 s. +The update of tau takes 12.004367351531982 s. +The update of tau takes 0.05120229721069336 s. +The update of tau takes 19.433353185653687 s. +The update of tau takes 29.63249707221985 s. +The update of tau takes 34.193899631500244 s. +The update of tau takes 34.676820039749146 s. +The update of tau takes 44.57223987579346 s. +The update of tau takes 22.42823576927185 s. +The update of tau takes 29.62427020072937 s. +The update of tau takes 30.931122064590454 s. +The update of tau takes 36.975414991378784 s. +The update of tau takes 30.871814489364624 s. +The update of tau takes 26.21287703514099 s. +---------------- +The update of tau takes 0.014468193054199219 s. +The update of tau takes 23.962283611297607 s. +The update of tau takes 21.988383054733276 s. +The update of tau takes 16.465786933898926 s. +The update of tau takes 10.971245527267456 s. +The update of tau takes 11.98998498916626 s. +The update of tau takes 24.212546348571777 s. +The update of tau takes 22.447329998016357 s. +The update of tau takes 20.15367603302002 s. +The update of tau takes 19.182127952575684 s. +The update of tau takes 29.0464026927948 s. +The update of tau takes 33.222975730895996 s. +The update of tau takes 24.433661222457886 s. +The update of tau takes 5.671199560165405 s. +The update of tau takes 26.833141088485718 s. +The update of tau takes 29.772572994232178 s. +---------------- +The update of tau takes 20.037549018859863 s. +The update of tau takes 15.945697784423828 s. +The update of tau takes 11.919301509857178 s. +The update of tau takes 23.264798164367676 s. +The update of tau takes 18.37003493309021 s. +The update of tau takes 23.728219747543335 s. +The update of tau takes 12.316410779953003 s. +The update of tau takes 0.31989073753356934 s. +The update of tau takes 27.297943115234375 s. +The update of tau takes 0.013715505599975586 s. +The update of tau takes 17.111215353012085 s. +The update of tau takes 18.290406465530396 s. +The update of tau takes 24.27836775779724 s. +The update of tau takes 13.973273754119873 s. +The update of tau takes 15.334537744522095 s. +The update of tau takes 18.468526124954224 s. +---------------- +The update of tau takes 10.745818376541138 s. +The update of tau takes 26.880325078964233 s. +The update of tau takes 4.792725086212158 s. +The update of tau takes 31.415343284606934 s. +The update of tau takes 0.013391256332397461 s. +The update of tau takes 22.878878116607666 s. +The update of tau takes 18.388559579849243 s. +The update of tau takes 20.011327505111694 s. +The update of tau takes 7.7229015827178955 s. +The update of tau takes 10.39621901512146 s. +The update of tau takes 2.807328939437866 s. +The update of tau takes 16.77381992340088 s. +The update of tau takes 5.00842547416687 s. +The update of tau takes 18.066486835479736 s. +The update of tau takes 13.413923740386963 s. +The update of tau takes 6.116581201553345 s. +---------------- +The update of tau takes 29.295532703399658 s. +The update of tau takes 14.984050035476685 s. +The update of tau takes 17.240195989608765 s. +The update of tau takes 0.014101505279541016 s. +The update of tau takes 13.590804100036621 s. +The update of tau takes 24.738932609558105 s. +The update of tau takes 16.227232456207275 s. +The update of tau takes 24.130399703979492 s. +The update of tau takes 40.17794179916382 s. +The update of tau takes 31.064399480819702 s. +The update of tau takes 15.413181781768799 s. +The update of tau takes 16.38581109046936 s. +The update of tau takes 29.041075229644775 s. +The update of tau takes 28.690170526504517 s. +The update of tau takes 17.25130319595337 s. +The update of tau takes 28.721024751663208 s. +---------------- + diff --git a/results/comm_times_sndrcv_64ants.txt b/results/comm_times/comm_times_sndrcv_64ants.txt similarity index 100% rename from results/comm_times_sndrcv_64ants.txt rename to results/comm_times/comm_times_sndrcv_64ants.txt diff --git a/results/batch_stability.png b/results/images/batch_stability.png similarity index 100% rename from results/batch_stability.png rename to results/images/batch_stability.png diff --git a/results/images/comm_time_16ants.png b/results/images/comm_time_16ants.png new file mode 100644 index 0000000000000000000000000000000000000000..d244dda6e337d91582ea12bbd22d91d68be76d2f Binary files /dev/null and b/results/images/comm_time_16ants.png differ diff --git a/results/images/comm_time_64ants.png b/results/images/comm_time_64ants.png new file mode 100644 index 0000000000000000000000000000000000000000..ecb69180277b5fc2127fd6344832782102881bd9 Binary files /dev/null and b/results/images/comm_time_64ants.png differ diff --git a/results/linear_scalability_of_problem.png b/results/images/linear_scalability_of_problem.png similarity index 100% rename from results/linear_scalability_of_problem.png rename to results/images/linear_scalability_of_problem.png diff --git a/results/throughput_evolution.png b/results/images/throughput_evolution.png similarity index 100% rename from results/throughput_evolution.png rename to results/images/throughput_evolution.png diff --git a/results/exploit_results.py b/results/result_exploitation.py similarity index 63% rename from results/exploit_results.py rename to results/result_exploitation.py index 34452377719697c589284bb12ac08ba10a61dbd6..66de31b782f36e63e119c57983eb41cc44b78fb6 100644 --- a/results/exploit_results.py +++ b/results/result_exploitation.py @@ -2,14 +2,14 @@ import matplotlib.pyplot as plt import numpy as np -# ########################################################################### -# ## Compare 2 different setups -# ########################################################################### +# # ########################################################################### +# # ## Compare 2 different setups +# # ########################################################################### cost_opti = [] iter_list = [] iter = 1 -with open("cost_opti_16np_32ants_400iter_1.txt", 'r') as file: +with open("16np_32ants_400iter/cost_opti_16np_32ants_400iter_1.txt", 'r') as file: for line in file: cost = float(line.strip("\n")) cost_opti.append(cost) @@ -44,7 +44,7 @@ times = [] nb_processes = [1, 2, 4, 8, 16] for i in nb_processes: - with open("result_" + str(i) + "np_64ants_10iter.out") as file: + with open("10iter/result_" + str(i) + "np_64ants_10iter.out") as file: for line in file: if "Le temps d'exécution total est " in line: time = line.split(" ")[-2] @@ -71,7 +71,7 @@ for i in range(1, 7): throughputs = [] iter_list = [] iter = 1 - with open(f"cost_opti_16np_32ants_400iter_{i}.txt", 'r') as file: + with open(f"16np_32ants_400iter/cost_opti_16np_32ants_400iter_{i}.txt", 'r') as file: for line in file: cost = float(line.strip("\n")) throughputs.append(cost) @@ -89,32 +89,35 @@ plt.show() ########################################################################### ## Compare Gather/Bcast and Send/Receive approaches ########################################################################### - -for method in ["sndrcv", "gthrbcst"]: - np_list = [] - times = [] - with open(f"comm_times_{method}_64ants.txt", 'r') as file: - for line in file: - if line[0] == "=": - np = int(line.split(" ")[1]) - avg = 0 - nb_batch = 0 - max = 0 - elif line[0] == "T": - time = float(line.split(" ")[5]) - if time > max: - max = time - elif line[0] == "-": - avg += max - max = 0 - nb_batch += 1 - elif line == "\n": - avg /= nb_batch - np_list.append(np) - times.append(avg) - plt.plot(np_list, times, '+-',label=f"{method}") -plt.title("Time to update tau with 64 ants per process with Gather/Bcast and Snd/Rcv methods.") -plt.xlabel("Nombre de process") -plt.ylabel("Temps (s)") -plt.legend() -plt.show() \ No newline at end of file +ants_list=[16, 64] +for nb_ants in ants_list: + for method in ["sndrcv", "gthrbcst"]: + np_list = [] + times = [] + with open(f"comm_times/comm_times_{method}_{nb_ants}ants.txt", 'r') as file: + for line in file: + if line[0] == "=": + np = int(line.split(" ")[1]) + avg = 0 + nb_batch = 0 + max = 0 + elif line[0] == "T": + time = float(line.split(" ")[5]) + if time > max: + max = time + elif line[0] == "-": + avg += max + max = 0 + nb_batch += 1 + elif line == "\n": + avg /= nb_batch + np_list.append(np) + times.append(avg) + plt.plot(np_list, times, '+-',label=f"{method}") + plt.title(f"Time to update tau with {nb_ants} ants per process with Gather/Bcast and Snd/Rcv methods.") + plt.xlabel("Nombre de process") + plt.ylabel("Temps (s)") + plt.yscale("log") + plt.xscale("log") + plt.legend() + plt.show() \ No newline at end of file diff --git a/results/tau_update_comparison.png b/results/tau_update_comparison.png deleted file mode 100644 index 024954daee415ac66d2cdb80d1219f97f9455adc..0000000000000000000000000000000000000000 Binary files a/results/tau_update_comparison.png and /dev/null differ