diff --git a/colors.py b/colors.py index 723b6db..a441101 100644 --- a/colors.py +++ b/colors.py @@ -22,65 +22,65 @@ N_UNDS.remove(N_UND_CHIC) color1 = { - 6: 2.5782081923331286, - 7: 2.5782000000000003, - 8: 2.5782081923331286, - 9: 2.5782000000000003, - 10: 2.5782269928449404, - 11: 2.5782457933506078, - 12: 2.5735, - 13: 2.568807163979898, + 6: 2.0618975071726737, + 7: 2.0618998489503135, + 8: 2.061926961690368, + 9: 2.0618991835864264, + 10: 2.061919185767039, + 11: 2.0619176190165964, + 12: 2.0618790520140906, + 13: 2.052086641409292, - 15: 3.1, - 16: 1.8714000000000002, - 17: 1.8, - 18: 2.0, - 19: 3.4000000000000004, - 20: 2.3000000000000003, - 21: 2.9000000000000004, - 22: 1.6 + 15: 1.1842616466870595, + 16: 1.2842673674062317, + 17: 1.3842579267233892, + 18: 1.484294303739585, + 19: 1.6843694577800838, + 20: 1.584281331329752, + 21: 1.2842820179639072, + 22: 1.3842844240055432 } color2 = { - 6: 2.0782000000000003, - 7: 3.0782000000000003, - 8: 1.5782, - 9: 3.1782000000000004, - 10: 1.7782, - 11: 3.2882000000000002, - 12: 1.9635, - 13: 1.2688000000000001, - - 15: 2.9713000000000003, - 16: 2.971323113370471, - 17: 2.97130268459635, - 18: 2.9713128989831805, - 19: 2.9713128989831805, - 20: 2.9713000000000003, - 21: 2.9713000000000003, - 22: 2.9613 + 6: 1.0843075706646517, + 7: 1.1843037624109625, + 8: 1.3842958393058413, + 9: 1.4843045803089876, + 10: 1.5843035457018615, + 11: 1.8400123990046287, + 12: 1.6843112146639572, + 13: 1.7742896734281286, + + 15: 2.124329777953559, + 16: 2.124339587297864, + 17: 2.124344707174983, + 18: 2.1243781537048076, + 19: 2.1243433061478303, + 20: 2.124360736030826, + 21: 2.124337879383864, + 22: 2.11434429180146 } colors_both = { - 6: 2.5782081923331286, - 7: 2.5782000000000003, - 8: 2.5782081923331286, - 9: 2.5782000000000003, - 10: 2.5782269928449404, - 11: 2.5782457933506078, - 12: 2.5735, - 13: 2.568807163979898, - - 15: 2.9713000000000003, - 16: 2.971323113370471, - 17: 2.97130268459635, - 18: 2.9713128989831805, - 19: 2.9713128989831805, - 20: 2.9713000000000003, - 21: 2.9713000000000003, - 22: 2.9613 + 6: 2.061898658676767, + 7: 2.0619010015723753, + 8: 2.061836025091557, + 9: 2.0619014907947957, + 10: 2.0619007931739812, + 11: 2.0619164451260863, + 12: 2.061841664062066, + 13: 2.0520064916331067, + + 15: 2.124321241942164, + 16: 2.1243286922141595, + 17: 2.124315652168558, + 18: 2.124332151134097, + 19: 2.124354200526172, + 20: 2.1243170649754792, + 21: 2.1243234280187435, + 22: 2.11434068217272 }