diff --git a/r2sol.cc b/r2sol.cc index 04f1e0bc126fcbf67c27070400a760b4e3b49f70..62aed8d40d59177e8e858838961b1445d85eba04 100644 --- a/r2sol.cc +++ b/r2sol.cc @@ -2199,11 +2199,11 @@ void GetMoves(const char* testid, bool replay_mode = false) { const int kMaxNumAdjustIPathsWithoutFullPlanRegenartion = 5; const bool full_regenerate_paths = !updated_paths_ok || num_adjust_ipaths_without_full_plan_regeneration > kMaxNumAdjustIPathsWithoutFullPlanRegenartion; if (full_regenerate_paths) { - RegenerateFullPlan(4, TINIT == 0 ? 20 : /*12*/ 10); + RegenerateFullPlan(4, TINIT == 0 ? 18 : /*12*/ 10); num_adjust_ipaths_without_full_plan_regeneration = 0; } else { assert(TINIT >= 1); - RegenerateFullPlan(1, 1); + RegenerateFullPlan(1, 2); } if (TINIT >= 1 && any_best_solution_updates) AdjustIPaths(); } @@ -2225,12 +2225,17 @@ int main() { } /* -0 116 85.9259259259 -50744.2500000390 1 0.7407407407 0.7407407407 -1 109 77.8571428571 -42183.6666666794 9 6.4285714286 3.5846560847 -2 64 52.8925619835 -44531.5000000204 -2 -1.6528925620 1.8388065358 -3 80 100.0000000000 -12460.1666666696 0 0.0000000000 1.3791049018 -4 131 84.5161290323 -90310.6666665894 8 5.1612903226 2.1355419860 +0 119 88.1481481481 -48781.5000000313 4 2.9629629630 2.9629629630 +1 109 77.8571428571 -43081.9166666835 9 6.4285714286 4.6957671958 +2 64 52.8925619835 -46199.7500000267 -2 -1.6528925620 2.5795472765 +3 80 100.0000000000 -11739.2500000021 0 0.0000000000 1.9346604574 +4 124 80.0000000000 -89490.1666665898 1 0.6451612903 1.6767606240 +5 131 100.0000000000 -38661.0833333310 1 0.7633587786 1.5245269831 +6 165 95.3757225434 -58405.5000000463 0 0.0000000000 1.3067374141 +7 116 85.2941176471 -39543.4166666742 9 6.6176470588 1.9706011197 +8 84 70.0000000000 -42566.0833333510 5 4.1666666667 2.2146084027 */ + /* 0 115 85.1851851852 -49653.9166667006 10 7.4074074074 7.4074074074 1 100 71.4285714286 -43604.9166666858 -6 -4.2857142857 1.5608465608 diff --git a/tmp-scores.txt b/tmp-scores.txt index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..d8b7983d97b4d70e1cc845f06d62ed8582c4cb90 100644 --- a/tmp-scores.txt +++ b/tmp-scores.txt @@ -0,0 +1,5 @@ +0 120 88.8888888889 -48977.4166666987 5 3.7037037037 3.7037037037 +1 108 77.1428571429 -41917.6666666799 8 5.7142857143 4.7089947090 +2 67 55.3719008264 -46622.0000000222 1 0.8264462810 3.4148118997 +3 80 100.0000000000 -11866.1666666689 0 0.0000000000 2.5611089247 +4 132 85.1612903226 -92379.5833332421 9 5.8064516129 3.2101774624