mostly superficial cleanup

This commit is contained in:
Connor Olding 2023-05-09 23:58:04 -07:00
parent 3365a182b5
commit e6b125bed1

View File

@ -254,16 +254,10 @@ def main(argv, display=True):
old_summary = True old_summary = True
note = (lambda s: None) if quieter else m36 note = (lambda s: None) if quieter else m36
if 1: multiple = 2
multiple = 2 run_anyway = 3
run_anyway = 3 # run_anyway = 7 always_run_anyway = True
always_run_anyway = True
else:
multiple = 1
run_anyway = 3
always_run_anyway = False
# percents = dict(frugal_percent=0.1, greedy_percent=1.5)
percents = dict(frugal_percent=1.0, greedy_percent=2.0) percents = dict(frugal_percent=1.0, greedy_percent=2.0)
which = parties[argv[1]] if len(argv) > 1 else parties["standard"] which = parties[argv[1]] if len(argv) > 1 else parties["standard"]
@ -272,6 +266,7 @@ def main(argv, display=True):
place_names = ("1st", "2nd", "3rd", "4th") place_names = ("1st", "2nd", "3rd", "4th")
place_scores = (5, 3, 2, 1) place_scores = (5, 3, 2, 1)
assert size < 0, "unsupported in this version" assert size < 0, "unsupported in this version"
size = abs(size) size = abs(size)
objectives = GO_BENCHMARKS[size] # * multiple objectives = GO_BENCHMARKS[size] # * multiple
@ -349,29 +344,24 @@ def main(argv, display=True):
scores.setdefault(opt_name, 0.0) scores.setdefault(opt_name, 0.0)
prices.setdefault(opt_name, 0.0) prices.setdefault(opt_name, 0.0)
sorted_res = sorted(all_res) sorted_res = sorted(all_res)
score_insignificance = sum( places = min(len(place_names), len(place_scores))
len(all_res[fopt]) for _, fopt in zip(range(len(place_scores)), sorted_res) score_insignificance = sum(len(all_res[fopt]) for fopt in sorted_res[:places])
) price_insignificance = sum(len(all_res[fopt]) for fopt in sorted_res[-places:])
price_insignificance = sum(
len(all_res[fopt])
for _, fopt in zip(range(len(place_scores)), reversed(sorted_res))
)
# print("score 1/x:", obj_name, score_insignificance) # print("score 1/x:", obj_name, score_insignificance)
# print("price 1/x:", obj_name, price_insignificance) # print("price 1/x:", obj_name, price_insignificance)
for i, fopt in enumerate(sorted_res):
# if i >= len(place_scores): # TODO: just make this part of the loop. for i, fopt in enumerate(sorted_res[:places]):
# break for opt_i, opt_name in enumerate(all_res[fopt]):
mi = len(all_res) - i - 1 scores[opt_name] += place_scores[i] / score_insignificance
if i < len(place_scores): if display and summarize_each_objective:
for opt_i, opt_name in enumerate(all_res[fopt]): print_place(i, all_res[fopt], "best")
scores[opt_name] += place_scores[i] / score_insignificance
if display and summarize_each_objective: for i, fopt in enumerate(sorted_res[-places:]):
print_place(i, all_res[fopt], "best") mi = places - i - 1
if mi < len(place_scores): for opt_i, opt_name in enumerate(all_res[fopt]):
for opt_i, opt_name in enumerate(all_res[fopt]): prices[opt_name] += place_scores[mi] / price_insignificance
prices[opt_name] += place_scores[mi] / price_insignificance if display and summarize_each_objective:
if display and summarize_each_objective: print_place(mi, all_res[fopt], "worst")
print_place(mi, all_res[fopt], "worst")
if display: if display:
more_scores = perform_another_experimental_scoring_method(results) more_scores = perform_another_experimental_scoring_method(results)