diff --git a/r2sol.cc b/r2sol.cc
index db5b4c8428ecea03d6eeb1487d097fbfd3af010a..73bef062cdef18f622da64303186cf189741db2b 100644
--- a/r2sol.cc
+++ b/r2sol.cc
@@ -748,9 +748,11 @@ bool OverlapsOngoingMove(int t1, int t2, int node, const int covered_by[][MAXNOD
if (t1 < tend_ongoing_move[node]) return true;
//if (t2 <= tend_ongoing_move[node]) return true;
+ const int min_tstart = t2;//USE_STRICT_SPACING_TO_AVOID_DEADLOCKS ? t2 : t1;
+ //const int min_tstart = t1;//USE_STRICT_SPACING_TO_AVOID_DEADLOCKS ? t2 : t1;
+
const int aid_t1 = is_covered[t1][node] == is_covered_idx ? covered_by[t1][node] : -1;
- const int min_tstart = t2;//USE_STRICT_SPACING_TO_AVOID_DEADLOCKS ? t2 : t1;
for (int tend = t2 + 1; tend <= t2 + 3 && tend <= T; ++tend) {
if (is_covered[tend][node] == is_covered_idx) {
const auto& aid = covered_by[tend][node];
@@ -1470,7 +1472,7 @@ void RegenerateFullPlan() {
updated_best_solution = true;
rerun = 0;
- const int kMaxReruns = 2;//2;
+ const int kMaxReruns = 4;//2;
while (updated_best_solution && rerun < kMaxReruns) {
updated_best_solution = false;
@@ -1498,7 +1500,7 @@ void RegenerateFullPlan() {
if (max_threads >= 2) th = new thread*[max_threads - 1];
// Random Permutations.
- const int kNumRandomPermutations = TINIT == 0 ? 10 /*10*/ : 6 /*6*/;
+ const int kNumRandomPermutations = TINIT == 0 ? 20 /*10*/ : 12 /*6*/;
if (max_threads >= 2) {
for (int tid = 0; tid + 1 < max_threads; ++tid) th[tid] = new thread([tid, kNumRandomPermutations]{
RandomPermutations(tid, kNumRandomPermutations);
@@ -2282,13 +2284,12 @@ void GetMoves(const char* testid, bool replay_mode = false) {
ReadTransitionsMap();
ReadAgentsData(replay_mode);
fclose(fin);
- //assert(TINIT < TEST);
if (TINIT == 0 || replay_mode) {
ReinitDataStructures();
ComputeShortestPaths();
}
- SCORE_EXPONENT1 = 2.0;
- SCORE_EXPONENT2 = 3.0;
+ SCORE_EXPONENT1 = 2.0;//2.0;
+ SCORE_EXPONENT2 = 4.0;//3.0;
DBG(2, "testid=%s TINIT=%d: resc=%d nda=%d npl=%d\n", testid, TINIT, reschedule, num_done_agents, num_planned);
if (reschedule) {
if (TINIT >= MIN_TINIT_FOR_SAVE_DATA_FOR_REPLAY) SaveDataForReplay(testid);
@@ -2297,7 +2298,7 @@ void GetMoves(const char* testid, bool replay_mode = false) {
updated_paths_ok = AdjustIPaths();
++num_adjust_ipaths_without_full_plan_regeneration;
}
- const int kMaxNumAdjustIPathsWithoutFullPlanRegenartion = 10;//10;
+ const int kMaxNumAdjustIPathsWithoutFullPlanRegenartion = 5;//10;
if (!updated_paths_ok || num_adjust_ipaths_without_full_plan_regeneration > kMaxNumAdjustIPathsWithoutFullPlanRegenartion) {
RegenerateFullPlan();
if (TINIT >= 1 && any_best_solution_updates) AdjustIPaths();
diff --git a/run_local.py b/run_local.py
index 336a3a7d6a7690ff9f8778d8cb2265ed0efa9f47..bd6842d0a04ff1899bb96b91e49910e9abee6e77 100644
--- a/run_local.py
+++ b/run_local.py
@@ -25,7 +25,7 @@ def GetTestParams(tid):
return (seed, width, height, nr_trains, nr_cities, max_rails_between_cities, max_rails_in_cities, malfunction_rate, malfunction_min_duration, malfunction_max_duration)
def ShouldRunTest(tid):
- #return tid >= 2
+ #return tid >= 22
#return tid == 2
return True
diff --git a/scores.txt b/scores.txt
index 06df220156b110f767043b8256e729f9e10def97..d1735f31aeaec212beeaeac3a6b137832cb4c67d 100644
--- a/scores.txt
+++ b/scores.txt
@@ -1,181 +1,111 @@
-0 103 76.2962962963 -52769.7500000492 76.2962962963 -0.7407407407
-1 103 73.5714285714 -45717.2500000268 74.9338624339 0.7010582011
-2 57 47.1074380165 -47576.7500000256 65.6583876281 0.7428542277
-3 80 100.0000000000 -12791.2500000028 74.2437907211 0.5571406708
-4 100 64.5161290323 -95055.8333332039 72.2982583833 0.4457125366
-5 126 96.1832061069 -44259.1666666814 76.2790830039 0.2442006507
-6 128 73.9884393064 -72143.0833333608 75.9518481900 -0.0384143060
-7 87 63.9705882353 -47207.8333333591 74.4541906956 0.2421227764
-8 85 70.8333333333 -41600.0833333466 74.0518732109 0.8633683938
-9 59 38.5620915033 -79349.8333333232 70.5028950402 0.5809531231
-10 91 54.1666666667 -89402.9999999342 69.0177833698 0.9610396357
-11 88 84.6153846154 -19843.8333333327 70.3175834736 0.6405683840
-12 60 54.5454545455 -52968.2500000329 69.1043427869 -0.1080068064
-13 115 72.3270440252 -57161.8333333912 69.3345357324 -0.2350629240
-14 77 62.6016260163 -58871.1666667203 68.8856750847 -1.0324001925
-15 85 44.7368421053 -139508.7499998754 67.3763730235 -0.5073488646
-16 48 42.8571428571 -79964.6666666530 65.9340653666 -0.6350678390
-17 98 68.0555555556 -58273.9166667204 66.0519259327 -0.8312677739
-18 79 42.9347826087 -66712.6666667216 64.8352341788 -0.9305374334
-19 68 85.0000000000 -27519.8333333222 65.8434724699 -0.8840105617
-20 119 90.8396946565 -43926.6666666829 67.0337687645 -0.9509660747
-21 81 67.5000000000 -51514.3333333653 67.0549610934 -1.0971342835
-22 61 54.9549549550 -57776.0833333807 66.5288738699 -1.1277720017
-23 133 81.5950920245 -61355.5833334050 67.1566329597 -1.2341557347
-24 78 97.5000000000 -24461.1666666588 68.3703676413 -1.0847895053
-25 78 41.2698412698 -108397.3333331934 67.3280397040 -0.7988665878
-26 99 99.0000000000 -29216.0833333177 68.5010752705 -0.7692789364
-27 111 77.6223776224 -51687.0833333773 68.8268360688 -0.6169295638
-28 155 83.3333333333 -79649.3333333101 69.3270601124 -0.5956561306
-29 115 77.1812080537 -42856.9166666754 69.5888650437 -0.7324004788
-30 62 44.2857142857 -74547.3333333356 68.7726343741 -0.5244428597
-31 77 48.1250000000 -100245.9166665504 68.1273957999 -0.4103977703
-32 87 73.7288135593 -31973.9999999810 68.2971357320 -0.5263641450
-33 98 71.0144927536 -53830.3333333724 68.3770579974 -0.6600729575
-34 90 54.8780487805 -83579.5833332880 67.9913720198 -0.8328513608
-35 63 33.1578947368 -109617.9999998922 67.0237754286 -0.8681961329
-36 80 100.0000000000 -14028.0000000030 67.9150247413 -0.8447313726
-37 112 67.8787878788 -62336.4166667321 67.9140711397 -0.7587057463
-38 109 56.4766839378 -84036.0833332759 67.6208048012 -0.8853923135
-39 52 42.9752066116 -74147.5833333334 67.0046648464 -0.9665632908
-40 91 74.5901639344 -45213.0000000209 67.1896770193 -0.9030045700
-41 114 69.5121951220 -59478.6666667260 67.2449750694 -0.8089144496
-42 138 91.3907284768 -72261.3333333554 67.8065042184 -0.8055036869
-43 79 65.8333333333 -56267.8333333762 67.7616594255 -0.9387119364
-44 101 84.1666666667 -52305.5000000364 68.1262151420 -1.0659998193
-45 105 66.8789808917 -50307.7500000355 68.0991013539 -0.9735930107
-46 100 100.0000000000 -30161.5833333164 68.7778438783 -0.8464952871
-47 67 46.8531468531 -70324.4166666940 68.3210793570 -0.7560161458
-48 116 62.3655913978 -92585.7499998991 68.1995387864 -0.7076708525
-49 108 83.0769230769 -35854.9166666591 68.4970864722 -0.7396712816
-50 85 45.6989247312 -104301.2499998773 68.0500636930 -0.6935423697
-51 159 96.9512195122 -57815.3333333904 68.6058551510 -0.6684789376
-52 109 68.9873417722 -64733.8333334054 68.6130530118 -0.6439244031
-53 101 77.0992366412 -49480.5833333735 68.7702045605 -0.6885449718
-54 77 62.0967741935 -59184.5833333993 68.6488694629 -0.7200142421
-55 93 59.6153846154 -90754.7499999243 68.4875572335 -0.6384755263
-56 45 56.2500000000 -34931.4999999939 68.2728632469 -0.4737654293
-57 111 62.0111731844 -85266.7499999302 68.1649030734 -0.4367008934
-58 44 44.0000000000 -57170.5833333711 67.7553284451 -0.4970957935
-59 57 50.4424778761 -69725.0833333616 67.4667809356 -0.4298138135
-60 80 100.0000000000 -13014.0000000027 68.0001123957 -0.4227676854
-61 50 62.5000000000 -43084.2500000155 67.9114009054 -0.3353036905
-62 64 59.8130841121 -33241.9166666486 67.7828561944 -0.3596505982
-63 45 28.1250000000 -125124.9999998458 67.1632021914 -0.3442654326
-64 93 93.0000000000 -32796.9166666466 67.5606913884 -0.3235844260
-65 118 64.8351648352 -83397.4999999453 67.5193955316 -0.2520815650
-66 119 67.6136363636 -87539.1666665970 67.5208021111 -0.2483191536
-67 126 100.0000000000 -31223.7499999845 67.9984373742 -0.2446674013
-68 64 62.7450980392 -52704.2500000397 67.9223020215 -0.2979558249
-69 102 73.9130434783 -70643.0000000455 68.0078840423 -0.3351071806
-70 86 73.5042735043 -30831.0833333202 68.0852979784 -0.3785395220
-71 59 49.5798319328 -55079.1666667115 67.8282776167 -0.3149253526
-72 68 56.6666666667 -57373.4166667189 67.6753788365 -0.4475976081
-73 77 57.8947368421 -44560.5833333520 67.5432079988 -0.2993014811
-74 47 26.4044943820 -84151.7499999810 66.9946918172 -0.3477452516
-75 100 100.0000000000 -23792.5833333276 67.4289721881 -0.3431696562
-76 105 97.2222222222 -26484.2499999888 67.8158975132 -0.3507379194
-77 129 77.2455089820 -60393.3333334108 67.9367899679 -0.3462412794
-78 100 100.0000000000 -27716.4166666542 68.3426533860 -0.3418584784
-79 92 92.0000000000 -36538.7499999940 68.6383702187 -0.4375852475
-80 50 50.0000000000 -52365.2500000308 68.4082668827 -0.3581088864
-81 90 81.8181818182 -54152.9166667158 68.5718024307 -0.3759146538
-82 65 41.6666666667 -77303.0833333248 68.2476441684 -0.4331711656
-83 89 79.4642857143 -47867.3333333670 68.3811756154 -0.4173851143
-84 107 75.3521126761 -44215.7500000196 68.4631866397 -0.3710496805
-85 73 91.2500000000 -28351.4166666539 68.7281495857 -0.4103398005
-86 79 98.7500000000 -28518.6666666565 69.0732283261 -0.4199910671
-87 44 55.0000000000 -34652.4166666596 68.9133052769 -0.4436275323
-88 80 52.6315789474 -88212.3333332788 68.7303645317 -0.3647221963
-89 145 78.3783783784 -79841.7499999683 68.8375646855 -0.3546637214
-90 112 60.2150537634 -96135.9999998735 68.7428118182 -0.3625824588
-91 107 67.7215189873 -93450.7499998628 68.7317108092 0.3774621222
-92 169 85.7868020305 -74764.4166666870 68.9150988869 1.2958421212
-93 111 77.0833333333 -78565.4999999833 69.0019949980 2.1020920277
-94 110 89.4308943089 -53834.1666667117 69.2170360434 3.0213425780
-95 111 58.4210526316 -84082.9166666052 69.1045778828 3.5984228911
-96 116 77.8523489933 -46664.5833333655 69.1947610902 4.3639272839
-97 88 49.1620111732 -137876.1666665384 68.9903452747 4.8210505889
-98 70 42.4242424242 -116812.9166665277 68.7220008014 5.2008808094
-99 74 45.3987730061 -97498.6666665685 68.4887685235 5.6028597314
-100 79 98.7500000000 -22066.7500000006 68.7883846767 6.5251086450
-101 102 70.3448275862 -49359.3333333675 68.8036439209 7.1507921640
-102 90 90.0000000000 -35713.7499999906 69.0094337858 7.9551534051
-103 89 82.4074074074 -43439.7500000220 69.1382604552 8.6710404628
-104 109 58.2887700535 -122171.0833331429 69.0349319752 9.1435902685
-105 182 92.8571428571 -67298.9166667469 69.2596698137 9.9333407646
-106 123 75.4601226994 -55753.2500000524 69.3176179715 10.5457405957
-107 130 89.6551724138 -45842.5000000247 69.5059286608 11.2782353348
-108 136 68.6868686869 -79842.6666666269 69.4984143491 11.8049200445
-109 65 65.0000000000 -53318.0833333652 69.4575196732 12.2885116804
-110 68 85.0000000000 -43878.8333333479 69.5975420185 12.9435701337
-111 72 68.5714285714 -33935.5833333219 69.5883802913 13.4402474412
-112 94 71.2121212121 -51072.3333333776 69.6027496800 13.9515029613
-113 133 99.2537313433 -27868.9999999880 69.8628460104 14.6997681226
-114 170 91.8918918919 -72119.3333333873 70.0544029311 15.3710039814
-115 90 54.2168674699 -60139.0000000545 69.9178724529 15.7058821149
-116 128 98.4615384615 -45287.2500000227 70.1618354103 16.4131954171
-117 63 63.0000000000 -30692.2499999876 70.1011418899 16.8079988457
-118 112 93.3333333333 -20836.8333333310 70.2963703894 17.4510688834
-119 133 68.5567010309 -102353.4166664918 70.2818731447 17.8769491513
-120 89 60.5442176871 -60737.2500000515 70.2013966533 18.2295712053
-121 96 89.7196261682 -17927.3333333369 70.3613821412 18.8155552624
-122 158 80.6122448980 -67429.8333334101 70.4447224888 19.3179673733
-123 133 67.1717171717 -69464.4166667200 70.4183272846 19.7038847104
-124 61 48.4126984127 -77230.9999999906 70.2422822536 19.9335552200
-125 59 59.0000000000 -65029.9166667258 70.1530577913 20.2436063690
-126 105 54.1237113402 -85554.4166666160 70.0268424649 20.5103788491
-127 110 71.4285714286 -54769.5000000449 70.0377934725 20.9081772286
-128 113 68.0722891566 -61894.6666667357 70.0225570049 21.2737904994
-129 131 95.6204379562 -45347.5000000168 70.2194637814 21.8456877875
-130 140 76.9230769231 -68958.8333333932 70.2706364008 22.2661258725
-131 93 77.5000000000 -57632.2500000582 70.3254043069 22.6845643129
-132 125 88.6524822695 -47974.1666666925 70.4632018856 23.1805636960
-133 83 49.1124260355 -71126.1666666922 70.3038677374 23.3740850568
-134 94 71.7557251908 -55655.3333333816 70.3146222371 23.7324675763
-135 112 72.7272727273 -58596.2500000560 70.3323623142 24.0927234965
-136 120 91.6030534351 -29462.4166666541 70.4876228333 24.5854996274
-137 86 53.7500000000 -86704.0833332622 70.3663357114 24.7968365867
-138 97 49.2385786802 -96995.4999998753 70.2143374593 24.9726764578
-139 132 82.5000000000 -62817.3333334019 70.3020921918 25.3835859117
-140 109 57.9787234043 -79648.9999999733 70.2146924131 25.6147570996
-141 126 84.5637583893 -37361.9166666615 70.3157421735 26.0298909115
-142 58 41.4285714286 -84233.8333333000 70.1137339865 26.1375739920
-143 97 55.1136363636 -109152.8333331809 70.0095666419 26.3387966474
-144 76 63.3333333333 -50906.0833333730 69.9635236536 26.5939313832
-145 90 90.0000000000 -24592.7499999932 70.1007597929 27.0282195244
-146 98 57.9881656805 -95110.1666665797 70.0183611935 27.2388314030
-147 100 100.0000000000 -25878.1666666543 70.2209398341 27.7304609205
-148 90 45.0000000000 -121087.9166664725 70.0516717815 27.8463638674
-149 43 41.7475728155 -44978.2500000159 69.8629777884 27.9390385937
-150 89 47.8494623656 -93737.4999999027 69.7171929181 28.0708957048
-151 81 72.9729729730 -47422.8333333625 69.7386125237 28.3663041079
-152 70 43.7500000000 -109436.1666665331 69.5687523111 28.4668511398
-153 89 52.9761904762 -81244.4999999718 69.4610084031 28.6260026940
-154 89 52.6627218935 -103627.4166665517 69.3526323611 28.7810783017
-155 54 47.7876106195 -56834.0000000452 69.2143950423 28.9029150473
-156 105 86.0655737705 -50568.2500000387 69.3217273908 29.2670084150
-157 99 85.3448275862 -48058.2500000358 69.4231394174 29.6219313211
-158 154 94.4785276074 -54107.9166667153 69.5807204752 30.0298344424
-159 78 39.0000000000 -152633.2500000174 69.3895909722 30.0858979772
-160 96 71.6417910448 -63511.6666667281 69.4035797925 30.3440091142
-161 91 56.8750000000 -67840.0833333828 69.3262428802 30.5077806629
-162 136 77.2727272727 -80817.4999999674 69.3749943182 30.7946821759
-163 118 62.4338624339 -80674.4999999544 69.3326703433 30.9876040067
-164 88 73.3333333333 -47171.5000000174 69.3569167857 31.2442447905
-165 145 92.9487179487 -56449.1666667202 69.4990360698 31.6159584842
-166 83 70.3389830508 -38608.8333333354 69.5040656925 31.8478328828
-167 100 92.5925925926 -42538.0000000151 69.6414974002 32.2094088335
-168 75 43.3526011561 -78440.2499999943 69.4859418011 32.2753448827
-169 36 36.0000000000 -47060.8333333452 69.2889656729 32.2972546187
-170 56 39.4366197183 -68177.4166667156 69.1143905503 32.3390052918
-171 80 72.7272727273 -63469.0000000548 69.1353956793 32.5738208002
-172 80 100.0000000000 -15232.5833333366 69.3138037967 32.9635675007
-173 64 52.4590163934 -71891.0833333452 69.2169372025 33.0756103105
-174 53 44.1666666667 -54488.5000000446 69.0737927994 33.1389877753
-175 144 74.6113989637 -84569.9166665902 69.1052564708 33.3746264753
-176 77 45.2941176471 -101555.2499999008 68.9707302627 33.4419682333
-177 64 32.8205128205 -124480.6666665022 68.7676391535 33.4384769108
-178 107 85.6000000000 -43121.9166666811 68.8616746890 33.7298820677
-179 147 74.6192893401 -73409.8333333531 68.8936614370 33.9570454414
-180 57 55.3398058252 -61315.0000000646 68.8187782569 34.0751822391
+0 106 78.5185185185 -52994.1666667134 78.5185185185 2.2222222222
+1 100 71.4285714286 -44207.9166666883 74.9735449735 0.0396825397
+2 49 40.4958677686 -49127.5833333638 63.4809859052 -2.1774017229
+3 80 100.0000000000 -12663.0000000030 72.6107394289 -1.6330512921
+4 99 63.8709677419 -98876.3333331863 70.8627850915 -1.4354732918
+5 124 94.6564885496 -45629.8333333515 74.8284023345 -1.4506806694
+6 133 76.8786127168 -71251.7500000302 75.1212895320 -0.8305586580
+7 90 66.1764705882 -47082.7500000240 74.0031871640 -0.4510035316
+8 88 73.3333333333 -39408.2500000073 73.9287589606 -0.1231142503
+9 63 41.1764705882 -78234.5833333309 70.6535301234 0.1506350832
+10 81 48.2142857143 -93231.6666665908 68.6135988135 -0.4041845564
+11 93 89.4230769231 -18525.5000000024 70.3477219893 0.0301385156
+12 66 60.0000000000 -47917.5833333604 69.5517433747 0.4474005878
+13 115 72.3270440252 -53697.9166667235 69.7499791355 0.4154434030
+14 84 68.2926829268 -61577.3333333941 69.6528260549 0.7671509702
+15 84 44.2105263158 -137849.0833331903 68.0626823212 0.6863092977
+16 47 41.9642857143 -73369.9166666747 66.5274825208 0.5934171541
+17 94 65.2777777778 -59859.8333333889 66.4580544795 0.4061285468
+18 80 43.4782608696 -69422.5000000359 65.2485916579 0.4133574791
+19 75 93.7500000000 -24955.4166666572 66.6736620750 0.8301896052
+20 117 89.3129770992 -42584.0833333417 67.7517246952 0.7179559308
+21 89 74.1666666667 -48544.2500000212 68.0433129667 0.9883518733
+22 58 52.2522522523 -64849.3333333850 52.2522522523 -2.7027027027
+23 133 81.5950920245 -61359.7500000714 66.9236721384 -1.3513513514
+24 77 96.2500000000 -23466.2499999932 76.6991147589 -1.3175675676
+25 77 40.7407407407 -106668.2499998568 67.7095212544 -1.1204508080
+26 96 96.0000000000 -30766.9999999834 73.3676170035 -1.4963606464
+27 107 74.8251748252 -49891.7500000391 73.6105433071 -1.7131676715
+28 159 85.4838709677 -79484.3333333132 75.3067329729 -1.1612097707
+29 116 77.8523489933 -41342.0833333376 75.6249349755 -0.9321659319
+30 63 45.0000000000 -78791.7499999835 72.2221644226 -0.7492268601
+31 72 45.0000000000 -101734.6666665632 69.4999479804 -0.9868041741
+32 96 81.3559322034 -29777.3333333180 70.5777647279 -0.2037202815
+33 111 80.4347826087 -50994.8333333660 71.3991828847 0.5982805632
+34 85 51.8292682927 -85673.4999999486 69.8938048391 0.3177374054
+35 60 31.5789473684 -110669.8333332141 67.1570293055 0.1822599216
+36 80 100.0000000000 -12376.6666666689 69.3465606851 0.1701092601
+37 117 70.9090909091 -58963.6666667266 69.4442188241 0.3488713708
+38 107 55.4404145078 -82089.9999999491 68.6204656290 0.2673925001
+39 56 46.2809917355 -71158.4166666919 67.3793837461 0.4361920904
+40 89 72.9508196721 -45861.3333333560 67.6726172159 0.3269533350
+41 97 59.1463414634 -69539.5000000394 67.2463034282 -0.2076870147
+42 137 90.7284768212 -66168.0833334116 68.3645021612 -0.2293329500
+43 83 69.1666666667 -56323.0833333781 68.4009641842 -0.0673935735
+44 108 90.0000000000 -53023.1666667064 69.3400526979 0.1891597703
+45 96 61.1464968153 -52345.4166667038 68.9986545362 -0.0575753900
+46 100 100.0000000000 -28655.9166666502 70.2387083547 -0.0552723744
+47 59 41.2587412587 -73483.5000000128 69.1240942356 -0.2683159598
+48 109 58.6021505376 -89732.5833332534 68.7343926172 -0.3977650302
+49 99 76.1538461538 -37966.7499999993 68.9993731007 -0.6308118835
+50 86 46.2365591398 -102455.3333332078 68.2144484813 -0.5905206320
+51 157 95.7317073171 -57933.9166667299 69.1316904425 -0.6114870175
+52 102 64.5569620253 -64526.8333334077 68.9841185581 -0.7346771055
+53 100 76.3358778626 -50002.1666667060 69.2138610363 -0.7355734078
+54 80 64.5161290323 -58572.0000000626 69.0715055211 -0.6399695215
+55 85 54.4871794872 -90309.4166665866 68.6425547554 -0.7719764511
+56 32 40.0000000000 -38966.8333333342 67.8241960481 -1.2142056954
+57 112 62.5698324022 -86876.2499999231 67.6782415024 -1.1649594478
+58 43 43.0000000000 -65179.5000000446 67.0112620023 -1.1605010844
+59 55 48.6725663717 -66837.1666667170 66.5286647489 -1.1765382007
+60 80 100.0000000000 -13154.3333333361 67.3869041143 -1.1463705545
+61 45 56.2500000000 -46214.0000000229 67.1084815114 -1.2739612906
+62 65 60.7476635514 -32065.0833333149 66.9533396099 -1.2200944436
+63 50 31.2500000000 -123192.4166665087 66.1032600954 -1.1166398140
+64 98 98.0000000000 -31738.7499999803 66.8450447444 -0.9743923764
+65 115 63.1868131868 -82612.8333332802 66.7619031181 -0.9897096326
+66 121 68.7500000000 -88025.5833332582 66.8060830488 -0.9424635600
+67 125 99.2063492063 -32734.8333333157 67.5104366609 -0.9392284998
+68 65 63.7254901961 -52030.4166667080 67.4299058850 -0.8983855071
+69 104 75.3623188406 -70565.6666667117 67.5951644883 -0.8494759057
+70 91 77.7777777778 -30848.3333333199 67.8029729228 -0.7449252898
+71 58 48.7394957983 -58469.4166667139 67.4217033803 -0.7468335067
+72 75 62.5000000000 -52436.5000000436 67.3251993924 -0.6178106275
+73 67 50.3759398496 -43178.5000000146 66.9992520935 -0.7505219037
+74 56 31.4606741573 -80463.5833333191 66.3287128872 -0.6409614947
+75 100 100.0000000000 -23030.3333333288 66.9522552411 -0.6290918374
+76 104 96.2962962963 -25798.3333333225 67.4857832603 -0.6344888208
+77 127 76.0479041916 -63685.7500000835 67.6386782769 -0.6445444631
+78 100 100.0000000000 -26668.6666666557 68.2064207633 -0.6332366655
+79 99 99.0000000000 -35319.3333333249 68.7373445433 -0.5016291368
+80 53 53.0000000000 -54447.8333333684 68.4706098900 -0.4422794904
+81 90 81.8181818182 -53478.2500000406 68.6930694221 -0.4349081656
+82 72 46.1538461538 -67439.8333333807 68.3235739587 -0.3542182040
+83 89 79.4642857143 -49547.8333333713 68.5032628580 -0.3485050072
+84 104 73.2394366197 -45276.8333333596 68.5784402193 -0.3765077223
+85 75 93.7500000000 -26804.4999999886 68.9717458409 -0.3315622891
+86 76 95.0000000000 -35835.1666666628 69.3721805202 -0.3841536385
+87 54 67.5000000000 -29709.9166666537 69.3438141487 -0.1889391894
+88 63 41.4473684211 -96082.2499999295 68.9274492871 -0.3530477169
+89 144 77.8378378378 -77835.3333333143 69.0584844128 -0.3558049643
+90 108 58.0645161290 -93165.1666665567 68.8991515392 -0.3818155827
+91 109 68.9873417722 -92862.9999998706 68.9004113996 -0.3582778917
+92 165 83.7563451777 -73850.5833333622 69.1096499036 -0.3818297081
+93 112 77.7777777778 -77321.6666666580 69.2300405685 -0.3668814559
+94 109 88.6178861789 -51253.0000000381 69.4956274946 -0.3729927802
+95 117 61.5789473684 -76918.4166666489 69.3886453308 -0.3252780841
+96 112 75.1677852349 -44968.4166666938 69.4657005295 -0.3567352264
+97 84 46.9273743017 -134604.5833331629 69.1691436054 -0.3814444586
+98 81 49.0909090909 -109069.8333332032 68.9083873130 -0.2899105478
+99 74 45.3987730061 -97883.7499999059 68.6069820014 -0.2861937460
+100 80 100.0000000000 -21479.2500000000 69.0043619761 -0.2667482555
+101 105 72.4137931034 -47613.3333333678 69.0469798652 -0.2375518333
+102 91 91.0000000000 -32946.4999999819 69.3180048051 -0.2222734156
+103 82 75.9259259259 -47043.2500000287 69.3985892090 -0.2986052213
+104 128 68.4491978610 -111117.9166664922 69.3871507591 -0.1725927752
+105 181 92.3469387755 -67885.1666667449 69.6604815688 -0.1766119574
+106 116 71.1656441718 -55325.6666667173 69.6781893641 -0.2250574465
+107 135 93.1034482759 -48175.2500000327 69.9505760956 -0.1823442685
+108 135 68.1818181818 -79761.2499999593 69.9302455449 -0.1860535356
+109 60 60.0000000000 -55615.5000000359 69.8174018455 -0.2407574727
+110 69 86.2500000000 -41840.6666666809 70.0020377798 -0.2240073887
diff --git a/tmp-scores.txt b/tmp-scores.txt
index b99ccfac0aeb3a3210e8ad95770d85bf4754989f..8e791b1108a0ece993743fe6a5c8c6b2173a8032 100644
--- a/tmp-scores.txt
+++ b/tmp-scores.txt
@@ -1,22 +1,6 @@
-0 106 78.5185185185 -52994.1666667134 78.5185185185 2.2222222222
-1 100 71.4285714286 -44207.9166666883 74.9735449735 0.0396825397
-2 49 40.4958677686 -49127.5833333638 63.4809859052 -2.1774017229
-3 80 100.0000000000 -12663.0000000030 72.6107394289 -1.6330512921
-4 99 63.8709677419 -98876.3333331863 70.8627850915 -1.4354732918
-5 124 94.6564885496 -45629.8333333515 74.8284023345 -1.4506806694
-6 133 76.8786127168 -71251.7500000302 75.1212895320 -0.8305586580
-7 90 66.1764705882 -47082.7500000240 74.0031871640 -0.4510035316
-8 88 73.3333333333 -39408.2500000073 73.9287589606 -0.1231142503
-9 63 41.1764705882 -78234.5833333309 70.6535301234 0.1506350832
-10 81 48.2142857143 -93231.6666665908 68.6135988135 -0.4041845564
-11 93 89.4230769231 -18525.5000000024 70.3477219893 0.0301385156
-12 66 60.0000000000 -47917.5833333604 69.5517433747 0.4474005878
-13 115 72.3270440252 -53697.9166667235 69.7499791355 0.4154434030
-14 84 68.2926829268 -61577.3333333941 69.6528260549 0.7671509702
-15 84 44.2105263158 -137849.0833331903 68.0626823212 0.6863092977
-16 47 41.9642857143 -73369.9166666747 66.5274825208 0.5934171541
-17 94 65.2777777778 -59859.8333333889 66.4580544795 0.4061285468
-18 80 43.4782608696 -69422.5000000359 65.2485916579 0.4133574791
-19 75 93.7500000000 -24955.4166666572 66.6736620750 0.8301896052
-20 117 89.3129770992 -42584.0833333417 67.7517246952 0.7179559308
-21 89 74.1666666667 -48544.2500000212 68.0433129667 0.9883518733
+0 107 79.2592592593 -52253.3333333783 79.2592592593 0.7407407407
+1 98 70.0000000000 -43813.6666666879 74.6296296296 -0.3439153439
+2 57 47.1074380165 -46015.0833333573 65.4555657586 1.9745798534
+3 80 100.0000000000 -12641.1666666695 74.0916743189 1.4809348900
+4 97 62.5806451613 -94266.6666665390 71.7894684874 0.9266833959
+5 120 91.6030534351 -49427.9166666963 75.0917326454 0.2633303108