From b8cd01c1afb99894cfda775d2abc852c91b5bac3 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 26 Oct 2020 20:53:52 +0100 Subject: [PATCH] fix obscure bug --- powers.csv | 1452 +++++++++++++++++++++++++++++++++++++++++++ rowers/dataprep.py | 2 +- rowers/datautils.py | 31 +- rowers/models.py | 3 + 4 files changed, 1472 insertions(+), 16 deletions(-) create mode 100644 powers.csv diff --git a/powers.csv b/powers.csv new file mode 100644 index 00000000..cd25d53b --- /dev/null +++ b/powers.csv @@ -0,0 +1,1452 @@ +,delta,CP +0,0.0,0.0 +1,2.000757054304704,886.9753856769698 +2,4.001514108609408,871.758080647962 +3,6.002271162913879,862.6007659901585 +4,8.00302821721835,856.4835294172935 +5,10.003785271523055,848.0301828596308 +6,12.004542325827758,841.6901729413801 +7,14.00529938013223,836.7590541160747 +8,16.006056434436935,832.8141590558313 +9,18.00681348874164,829.5865176429044 +10,20.00757054304634,826.8968164654622 +11,22.008327597350814,824.6209154691683 +12,24.009084651655517,822.6701431866312 +13,26.009841705960223,820.9794738750986 +14,28.010598760264692,819.5001382275062 +15,30.0113558145694,818.1948420678665 +16,32.0121128688741,817.0345788148533 +17,34.01286992317857,815.9964485358418 +18,36.01362697748328,815.0621312847312 +19,38.01438403178798,814.2167966289644 +20,40.01514108609268,813.4483105782674 +21,42.015898140397155,812.7466494015442 +22,44.01665519470186,812.1034599895476 +23,46.01741224900656,811.5117257305102 +24,48.01816930331103,810.9655094914007 +25,50.01892635761574,810.4597537144449 +26,52.01968341192045,809.9901233501307 +27,54.02044046622492,809.5528812868031 +28,56.02119752052962,809.1447886943635 +29,58.021954574834325,808.763024656276 +30,60.022711629139025,808.405120870568 +31,62.0234686834435,808.0689082233878 +32,64.0242257377482,807.7524727907479 +33,66.02498279205291,807.4541193828305 +34,68.02573984635738,807.1723411642416 +35,70.02649690066208,795.9169631947277 +36,72.02725395496678,780.32794629736 +37,74.02801100927125,765.3663834109077 +38,76.02876806357597,750.985215484552 +39,78.02952511788067,737.141974594383 +40,80.03028217218537,723.7982373806734 +41,82.03103922648984,710.9191547497168 +42,84.03179628079455,698.4730457072347 +43,86.03255333509925,686.4310453473283 +44,88.03331038940372,674.7667987559172 +45,90.03406744370842,663.4561939903311 +46,92.03482449801312,652.4771284364551 +47,94.0355815523176,641.8093037752072 +48,96.03633860662231,631.4340455530278 +49,98.03709566092701,621.3341439793834 +50,100.03785271523171,611.4937130937826 +51,102.03860976953618,601.8980658761477 +52,104.0393668238409,592.5336032338122 +53,106.0401238781456,583.3877150990335 +54,108.04088093245007,574.4486921231933 +55,110.04163798675476,565.7056466663465 +56,112.04239504105948,557.148441960269 +57,114.04315209536394,548.767628475262 +58,116.04390914966865,540.5543866502709 +59,118.04466620397335,532.5004752561141 +60,120.04542325827805,524.5981847558172 +61,122.04618031258252,516.8402951068148 +62,124.04693736688724,509.220037519202 +63,126.04769442119193,501.7310597439921 +64,128.0484514754964,494.4565372233271 +65,130.04920852980112,487.43180692606074 +66,132.04996558410582,480.5922292325217 +67,134.0507226384103,473.9440938562966 +68,136.051479692715,467.4785826645376 +69,138.0522367470197,461.2024179547976 +70,140.05299380132416,455.09589585514357 +71,142.05375085562886,449.15428509593806 +72,144.05450790993356,443.4088734419933 +73,146.0552649642383,437.9471954928022 +74,148.056022018543,432.6511435635839 +75,150.0567790728477,427.53019334103595 +76,152.05753612715216,422.54054953445086 +77,154.05829318145686,417.725067884552 +78,156.05905023576156,413.09353471182385 +79,158.05980729006603,408.5587913573209 +80,160.06056434437073,404.1262352938856 +81,162.06132139867543,399.8164179237021 +82,164.0620784529799,397.0572963129346 +83,166.06283550728463,396.3846247158095 +84,168.06359256158933,395.72434141747107 +85,170.06434961589403,395.0760192352025 +86,172.0651066701985,394.439250403683 +87,174.0658637245032,393.81364548412336 +88,176.0666207788079,393.19883234612496 +89,178.06737783311237,392.59445521666936 +90,180.06813488741707,392.0001737911301 +91,182.0688919417218,391.4156624016387 +92,184.06964899602625,390.8406092385342 +93,186.07040605033097,390.2747156209837 +94,188.07116310463567,389.7176953131879 +95,190.07192015894037,389.16927388288696 +96,192.07267721324484,388.6291880991371 +97,194.07343426754954,388.0971853665881 +98,196.07419132185424,387.57302319370416 +99,198.07494837615872,388.88734528273903 +100,200.0757054304632,392.5884512640022 +101,202.0764624847679,395.83464045706256 +102,204.07721953907262,397.5507254966252 +103,206.07797659337706,396.81271534523705 +104,208.0787336476818,395.0998644995516 +105,210.0794907019865,393.3747667090295 +106,212.0802477562912,391.63776216658295 +107,214.08100481059566,389.8891785809806 +108,216.08176186490036,388.1293317443087 +109,218.08251891920506,386.35852606875807 +110,220.08327597350953,384.5770550946559 +111,222.08403302781423,382.78520197152136 +112,224.08479008211896,380.98323991380255 +113,226.08554713642366,380.5123730496517 +114,228.08630419072836,380.08728169664124 +115,230.08706124503306,379.6670641317281 +116,232.08781829933753,379.2515964450459 +117,234.08857535364223,378.84075889176484 +118,236.08933240794693,378.4344357185502 +119,238.0900894622514,378.0325149986232 +120,240.0908465165561,377.6348884749359 +121,242.09160357086083,377.2414514109946 +122,244.0923606251653,376.8521024489025 +123,246.09311767947,376.46674347421475 +124,248.0938747337747,376.08527948723173 +125,250.09463178807917,375.7076184803693 +126,252.09538884238387,375.3336713212816 +127,254.09614589668857,374.96335164141504 +128,256.0969029509933,374.5965757297111 +129,258.09766000529777,374.23326243117344 +130,260.09841705960247,373.87333305004876 +131,262.09917411390717,373.5167112573722 +132,264.09993116821164,373.1633230026565 +133,266.10068822251634,372.8130964295023 +134,268.10144527682104,372.4659617949343 +135,270.1022023311255,372.12185139226796 +136,272.1029593854302,371.7806994773314 +137,274.1037164397349,371.44244219787157 +138,276.1044734940396,371.1070175259854 +139,278.1052305483441,370.77436519342666 +140,280.1059876026488,370.44442662964616 +141,282.1067446569535,370.11714490243173 +142,284.10750171125795,369.7924646610216 +143,286.10825876556265,369.47033208157154 +144,288.10901581986735,369.1506948148633 +145,290.1097728741718,368.83350193614683 +146,292.1105299284766,368.5187038970171 +147,294.1112869827813,368.2062524792271 +148,296.112044037086,367.89610075035046 +149,298.11280109139045,367.5882030212031 +150,300.11355814569515,367.2825148049486 +151,302.11431519999985,366.97899277780436 +152,304.1150722543043,366.67759474128155 +153,306.115829308609,366.37827958588406 +154,308.1165863629137,366.08100725620574 +155,310.1173434172182,365.78573871736023 +156,312.1181004715229,365.49243592268607 +157,314.1188575258276,365.20106178267065 +158,316.11961458013207,364.9115801350392 +159,318.12037163443676,364.6239557159583 +160,320.12112868874146,364.33815413230684 +161,322.12188574304616,364.05414183496634 +162,324.12264279735064,363.77188609308973 +163,326.12339985165534,363.49135496930467 +164,328.1241569059601,363.2125172958148 +165,330.12491396026456,362.93534265135696 +166,332.12567101456926,362.65980133898444 +167,334.12642806887396,362.38586436463623 +168,336.12718512317844,362.1135034164651 +169,338.12794217748313,361.8426908448888 +170,340.12869923178783,361.5733996433391 +171,342.12945628609253,361.3056034296764 +172,344.130213340397,361.0392764282478 +173,346.1309703947017,360.77439345255783 +174,348.1317274490064,360.5109298885313 +175,350.1324845033109,360.24886167834336 +176,352.1332415576156,359.98816530479473 +177,354.1339986119203,359.72881777620944 +178,356.13475566622475,359.4707966118387 +179,358.13551272052945,359.2140798277446 +180,360.13626977483415,358.95864592315405 +181,362.13702682913885,358.70447386725476 +182,364.1377838834433,358.4515430864273 +183,366.138540937748,358.1998334518866 +184,368.1392979920528,357.9493252677248 +185,370.14005504635725,357.69999925933683 +186,372.14081210066195,357.45183656221593 +187,374.14156915496665,357.20481871110337 +188,376.1423262092711,356.9589276294838 +189,378.1430832635758,356.71414561940657 +190,380.1438403178805,356.47045535162914 +191,382.144597372185,356.2278398560637 +192,384.1453544264897,355.9862825125217 +193,386.1461114807944,355.7457670417412 +194,388.1468685350991,355.50627749668996 +195,390.14762558940356,355.2677982541336 +196,392.14838264370826,355.03031400645864 +197,394.14913969801296,354.7938097537423 +198,396.14989675231743,354.5582707960599 +199,398.15065380662213,354.3236827260232 +200,400.15141086092683,354.0900314215378 +201,402.1521679152313,353.857303038779 +202,404.152924969536,353.62548400536724 +203,406.15368202384076,353.39456101375185 +204,408.15443907814546,353.16452101478023 +205,410.15519613244993,352.9353512114576 +206,412.15595318675463,352.7070390528853 +207,414.15671024105933,352.4795722283727 +208,416.1574672953638,352.2529386617193 +209,418.1582243496685,352.02712650565707 +210,420.1589814039732,351.80212413645097 +211,422.1597384582777,351.5779201486524 +212,424.1604955125824,351.35450334999865 +213,426.1612525668871,351.131862756455 +214,428.16200962119177,350.9099875873951 +215,430.16276667549624,350.68886726091364 +216,432.16352372980094,350.46849138926865 +217,434.16428078410564,350.24884977444844 +218,436.1650378384101,350.0299324038605 +219,438.1657948927148,349.8117294461347 +220,440.1665519470195,349.59423124704347 +221,442.167309001324,349.3774283255287 +222,444.1680660556287,349.1613113698372 +223,446.16882310993344,348.9458712337581 +224,448.1695801642379,348.73109893296026 +225,450.1703372185426,348.51698564142674 +226,452.1710942728473,348.30352268798265 +227,454.171851327152,348.0907015529156 +228,456.1726083814565,347.8785138646812 +229,458.1733654357612,347.6669513966971 +230,460.17412249006577,347.45600606421874 +231,462.17487954437047,347.245669921296 +232,464.17563659867506,347.03593515780557 +233,466.17639365297975,346.82679409656373 +234,468.17715070728434,346.6182391905076 +235,470.1779077615889,346.41026301995157 +236,472.1786648158936,346.2028582899101 +237,474.1794218701982,345.9960178274901 +238,476.1801789245029,345.78973457934603 +239,478.1809359788075,345.58400160920064 +240,480.1816930331121,345.37881209542576 +241,482.1824500874168,345.17415932868363 +242,484.1832071417214,344.9700367096252 +243,486.183964196026,344.7664377466466 +244,488.1847212503307,344.5633560536977 +245,490.1854783046353,344.360785348147 +246,492.18623535894,344.15871944869474 +247,494.1869924132446,343.9571522733402 +248,496.18774946754917,343.7560778373941 +249,498.18850652185387,343.5554902515408 +250,500.18926357615845,343.35538371994585 +251,502.19002063046315,343.1557525384084 +252,504.19077768476774,342.95659109255786 +253,506.1915347390723,342.757893856092 +254,508.192291793377,342.5596553890571 +255,510.1930488476816,342.36187033616784 +256,512.1938059019864,342.164533425167 +257,514.194562956291,341.96763946522157 +258,516.1953200105955,341.7711833453581 +259,518.1960770649002,341.5751600329317 +260,520.1968341192048,341.3795645721324 +261,522.1975911735095,341.18439208252323 +262,524.1983482278141,340.98963775761325 +263,526.1991052821187,340.7952968634625 +264,528.1998623364234,340.60136473731814 +265,530.200619390728,340.4078367862813 +266,532.2013764450327,340.2147084860034 +267,534.2021334993373,340.02197537941316 +268,536.2028905536419,339.8296330754696 +269,538.2036476079466,339.6376772479439 +270,540.2044046622511,339.44610363422856 +271,542.2051617165558,339.25490803417205 +272,544.2059187708604,339.0640863089385 +273,546.206675825165,338.8736343798936 +274,548.2074328794697,338.6835482275135 +275,550.2081899337743,338.493823890318 +276,552.2089469880789,338.30445746382674 +277,554.2097040423836,338.11544509953745 +278,556.2104610966882,337.9267830039268 +279,558.2112181509929,337.7384674374713 +280,560.2119752052974,337.55049471369045 +281,562.212732259602,337.36286119821006 +282,564.2134893139067,337.1755633078434 +283,566.2142463682113,336.98859750969484 +284,568.215003422516,336.80196032027925 +285,570.2157604768206,336.6156483046626 +286,572.2165175311252,336.4296580756174 +287,574.2172745854299,336.24398629279887 +288,576.2180316397345,336.0586296619356 +289,578.2187886940392,335.8735849340382 +290,580.2195457483439,335.6888489046244 +291,582.2203028026485,335.50441841295884 +292,584.2210598569532,335.3202903413095 +293,586.2218169112577,335.1364616142182 +294,588.2225739655624,334.95292919778785 +295,590.223331019867,334.7696900989811 +296,592.2240880741716,334.58674136493596 +297,594.2248451284763,334.40408008229383 +298,596.2256021827809,334.2217033765407 +299,598.2263592370856,334.0396084113619 +300,600.2271162913902,333.8577923880102 +301,602.2278733456948,333.67625254468516 +302,604.2286303999995,333.4949861559261 +303,606.2293874543041,333.3139905320158 +304,608.2301445086088,333.1332630183971 +305,610.2309015629133,332.95280099509966 +306,612.2316586172179,332.7726018761788 +307,614.2324156715226,332.5926631091649 +308,616.2331727258272,332.4129821745232 +309,618.2339297801319,332.23355658512503 +310,620.2346868344365,332.05438388572725 +311,622.2354438887411,331.8754616524643 +312,624.2362009430458,331.6967874923476 +313,626.2369579973504,331.5183590427758 +314,628.237715051655,331.34017397105373 +315,630.2384721059597,331.162229973921 +316,632.2392291602642,330.9845247770892 +317,634.239986214569,330.80705613478733 +318,636.2407432688735,330.62982182931654 +319,638.2415003231781,330.45281967061334 +320,640.2422573774828,330.27604749581934 +321,642.2430144317874,330.09950316886125 +322,644.2437714860921,329.92318458003666 +323,646.2445285403967,329.7470896456094 +324,648.2452855947013,329.5712163074096 +325,650.246042649006,329.3955625324448 +326,652.2467997033106,329.22012631251437 +327,654.2475567576153,329.04490566383413 +328,656.2483138119198,328.8698986266651 +329,658.2490708662245,328.6951032649515 +330,660.2498279205292,328.52051766596327 +331,662.2505849748338,328.34613993994606 +332,664.2513420291385,328.1719682197775 +333,666.2520990834431,327.99800066062903 +334,668.2528561377477,327.82423543963444 +335,670.2536131920524,327.6506707555638 +336,672.254370246357,327.47730482850363 +337,674.2551273006617,327.3041358995421 +338,676.2558843549663,327.13116223046103 +339,678.2566414092709,326.95838210343146 +340,680.2573984635756,326.785793820716 +341,682.2581555178801,326.6133957043762 +342,684.2589125721846,326.52914454458244 +343,686.2596696264893,326.48913284790893 +344,688.260426680794,326.448543330122 +345,690.2611837350985,326.40738098679316 +346,692.2619407894032,326.36565075607365 +347,694.2626978437079,326.32335751951706 +348,696.2634548980124,326.28050610288744 +349,698.264211952317,326.237101276955 +350,700.2649690066218,326.193147758276 +351,702.2657260609262,326.14865020996183 +352,704.2664831152309,326.1036132424329 +353,706.2672401695356,326.05804141416166 +354,708.2679972238401,326.0119392324014 +355,710.2687542781448,325.9653111539042 +356,712.2695113324495,325.9181615856261 +357,714.2702683867542,325.8704948854201 +358,716.2710254410587,325.82231536271917 +359,718.2717824953634,325.77362727920604 +360,720.2725395496681,325.72443484947314 +361,722.2732966039725,325.6747422416708 +362,724.2740536582772,325.62455357814616 +363,726.2748107125819,325.57387293606917 +364,728.2755677668864,325.52270434805104 +365,730.2763248211911,325.4710518027507 +366,732.2770818754958,325.4189192454721 +367,734.2778389298005,325.3663105787516 +368,736.278595984105,325.313229662936 +369,738.2793530384098,325.25968031675126 +370,740.2801100927145,325.2056663178616 +371,742.280867147019,325.15119140342 +372,744.2816242013237,325.09625927061023 +373,746.2823812556284,325.0408735771791 +374,748.2831383099328,324.98503794196154 +375,750.2838953642375,324.9287559453959 +376,752.2846524185422,324.8720311300328 +377,754.2854094728469,324.81486700103403 +378,756.2861665271514,324.7572670266653 +379,758.2869235814561,324.6992346387799 +380,760.2876806357608,324.6407732332953 +381,762.2884376900653,324.5818861706629 +382,764.28919474437,324.5225767763291 +383,766.2899517986747,324.46284834119024 +384,768.2907088529792,324.40270412204006 +385,770.2914659072839,324.34214734201066 +386,772.2922229615885,324.28118119100554 +387,774.292980015893,324.21980882612746 +388,776.2937370701977,324.1580333720985 +389,778.2944941245024,324.0958579216743 +390,780.2952511788071,324.0332855360516 +391,782.2960082331116,323.9703192452702 +392,784.2967652874163,323.906962048608 +393,786.2975223417209,323.8432169149706 +394,788.2982793960256,323.779086783274 +395,790.2990364503302,323.7145745628239 +396,792.2997935046349,323.6496831336859 +397,794.3005505589394,323.58441534705344 +398,796.301307613244,323.5187740256076 +399,798.3020646675487,323.4527619638733 +400,800.3028217218533,323.3863819285689 +401,802.303578776158,323.3196366589518 +402,804.3043358304626,323.2525288671581 +403,806.3050928847672,323.1850612385372 +404,808.3058499390719,323.11723643198184 +405,810.3066069933765,323.04905708025325 +406,812.3073640476811,322.9805257903012 +407,814.3081211019859,322.91164514357985 +408,816.3088781562905,322.842417696358 +409,818.3096352105952,322.7728459800263 +410,820.3103922648997,322.7029325013986 +411,822.3111493192043,322.63267974300976 +412,824.311906373509,322.56209016340875 +413,826.3126634278136,322.4911661974477 +414,828.3134204821183,322.41991025656665 +415,830.3141775364229,322.34832472907453 +416,832.3149345907275,322.27641198042534 +417,834.3156916450322,322.20417435349145 +418,836.3164486993368,322.13161416883213 +419,838.3172057536415,322.05873372495824 +420,840.3179628079461,321.98553529859413 +421,842.3187198622506,321.9120211449349 +422,844.3194769165553,321.8381934978999 +423,846.3202339708599,321.76405457038356 +424,848.3209910251646,321.68960655450223 +425,850.3217480794692,321.6148516218366 +426,852.3225051337738,321.5397919236726 +427,854.3232621880785,321.4644295912376 +428,856.3240192423831,321.3887667359334 +429,858.3247762966878,321.3128054495666 +430,860.3255333509924,321.23654780457514 +431,862.326290405297,321.15999585425175 +432,864.3270474596017,321.0831516329653 +433,866.3278045139062,321.0060171563778 +434,868.328561568211,320.9285944216586 +435,870.3293186225155,320.8508854076965 +436,872.3300756768201,320.7728920753083 +437,874.3308327311248,320.69461636744416 +438,876.3315897854294,320.6160602093916 +439,878.332346839734,320.53722550897515 +440,880.3331038940387,320.4581141567537 +441,882.3338609483433,320.37872802621587 +442,884.334618002648,320.299068973972 +443,886.3353750569526,320.2191388399435 +444,888.3361321112571,320.13893944755057 +445,890.3368891655618,320.05847260389635 +446,892.3376462198664,319.9777400999491 +447,894.3384032741712,319.89674371072164 +448,896.3391603284758,319.8154851954494 +449,898.3399173827804,319.7339662977647 +450,900.3406744370851,319.6521887458693 +451,902.3414314913897,319.570154252705 +452,904.3421885456944,319.4878645161216 +453,906.342945599999,319.40532121904283 +454,908.3437026543036,319.3225260296296 +455,910.3444597086083,319.2394806014422 +456,912.3452167629129,319.15618657359926 +457,914.3459738172176,319.0726455709351 +458,916.3467308715221,318.98885920415506 +459,918.3474879258267,318.9048290699888 +460,920.3482449801314,318.8205567513417 +461,922.349002034436,318.7360438174432 +462,924.3497590887407,318.65129182399573 +463,926.3505161430453,318.5663023133187 +464,928.3512731973499,318.48107681449284 +465,930.3520302516546,318.3956168435023 +466,932.3527873059592,318.30992390337354 +467,934.3535443602639,318.22399948431445 +468,936.3543014145685,318.13784506385014 +469,938.355058468873,318.05146210695756 +470,940.3558155231777,317.96485206619883 +471,942.3565725774823,317.87801638185243 +472,944.357329631787,317.790956482042 +473,946.3580866860916,317.7036737828652 +474,948.3588437403962,317.6161696885198 +475,950.3596007947009,317.52844559142824 +476,952.3603578490055,317.4405028723608 +477,954.3611149033101,317.3523429005575 +478,956.3618719576148,317.263967033848 +479,958.3626290119194,317.17537661877014 +480,960.363386066224,317.08657299068716 +481,962.3641431205286,316.9975574739035 +482,964.3649001748332,316.9083313817788 +483,966.3656572291379,316.81889601684105 +484,968.3664142834425,316.72925267089767 +485,970.3671713377473,316.63940262514586 +486,972.3679283920519,316.549347150281 +487,974.3686854463565,316.45908750660453 +488,976.3694425006612,316.36862494412964 +489,978.3701995549658,316.27796070268596 +490,980.3709566092705,316.18709601202335 +491,982.3717136635751,316.09603209191397 +492,984.3724707178797,316.0047701522532 +493,986.3732277721844,315.91331139315946 +494,988.3739848264889,315.82165700507295 +495,990.3747418807936,315.7298081688528 +496,992.3754989350982,315.6377660558732 +497,994.3762559894028,315.54553182811884 +498,996.3770130437075,315.4531066382782 +499,998.3777700980121,315.36049162983693 +500,1000.3785271523168,315.2676879371691 +501,1002.3792842066214,315.1746966856279 +502,1004.380041260926,315.0815189916354 +503,1006.3807983152307,314.98815596277035 +504,1008.3815553695352,314.8946086978561 +505,1010.38231242384,314.8008782870468 +506,1012.3830694781445,314.70696581191277 +507,1014.3838265324491,314.6128723455246 +508,1016.3845835867538,314.5185989525367 +509,1018.3853406410584,314.4241466892697 +510,1020.386097695363,314.32951660379166 +511,1022.3868547496677,314.23470973599854 +512,1024.3876118039723,314.13972711769355 +513,1026.388368858277,314.0445697726664 +514,1028.3891259125817,313.94923871676997 +515,1030.3898829668863,313.8537349579976 +516,1032.3906400211908,313.75805949655904 +517,1034.3913970754954,313.6622133249554 +518,1036.3921541298002,313.5661974280529 +519,1038.3929111841048,313.47001278315645 +520,1040.3936682384094,313.37366036008217 +521,1042.394425292714,313.27714112122885 +522,1044.3951823470186,313.18045602164864 +523,1046.3959394013234,313.08360600911703 +524,1048.396696455628,312.9865920242023 +525,1050.3974535099323,312.88941500033354 +526,1052.3982105642372,312.79207586386855 +527,1054.3989676185417,312.6945755341602 +528,1056.3997246728466,312.5969149236232 +529,1058.4004817271511,312.49909493779893 +530,1060.4012387814557,312.4011164754202 +531,1062.4019958357603,312.30298042847517 +532,1064.402752890065,312.20468768227033 +533,1066.4035099443695,312.10623911549317 +534,1068.4042669986743,312.0076356002737 +535,1070.405024052979,311.90887800224573 +536,1072.4057811072837,311.8099671806071 +537,1074.406538161588,311.7109039881794 +538,1076.4072952158929,311.61168927146696 +539,1078.4080522701972,311.51232387071536 +540,1080.408809324502,311.41280861996904 +541,1082.4095663788066,311.3131443471286 +542,1084.4103234331114,311.2133318740071 +543,1086.4110804874163,311.11337201638577 +544,1088.4118375417206,311.01326558406964 +545,1090.4125945960252,310.9130133809419 +546,1092.4133516503298,310.81261620501783 +547,1094.4141087046346,310.7120748484986 +548,1096.4148657589392,310.6113900978238 +549,1098.415622813244,310.5105627337239 +550,1100.4163798675484,310.4095935312717 +551,1102.4171369218532,310.30848325993406 +552,1104.4178939761575,310.2072326836218 +553,1106.4186510304623,310.10584256074014 +554,1108.419408084767,310.0043136442383 +555,1110.4201651390717,309.9026466816581 +556,1112.4209221933763,309.8008424151829 +557,1114.421679247681,309.698901581685 +558,1116.4224363019853,309.59682491277357 +559,1118.42319335629,309.4946131348411 +560,1120.4239504105947,309.39226696911015 +561,1122.4247074648995,309.2897871316792 +562,1124.425464519204,309.1871743335678 +563,1126.4262215735087,309.0844292807618 +564,1128.4269786278132,308.981552674258 +565,1130.4277356821178,308.87854521010763 +566,1132.4284927364224,308.77540757946025 +567,1134.4292497907272,308.6721404686067 +568,1136.4300068450318,308.56874455902175 +569,1138.4307638993366,308.46522052740625 +570,1140.431520953641,308.3615690457288 +571,1142.4322780079458,308.2618393419749 +572,1144.4330350622502,308.1638222002641 +573,1146.433792116555,308.06266772687235 +574,1148.4345491708596,307.9757533731798 +575,1150.4353062251644,307.88656889772506 +576,1152.436063279469,307.79166063640423 +577,1154.4368203337735,307.69419082755707 +578,1156.437577388078,307.59644222268196 +579,1158.4383344423827,307.50075127221265 +580,1160.4390914966873,307.4019527305078 +581,1162.439848550992,307.31484308802993 +582,1164.440605605297,307.22868753479696 +583,1166.4413626596013,307.1439340535613 +584,1168.442119713906,307.06007068486923 +585,1170.4428767682105,306.97308589664965 +586,1172.4436338225153,306.8421792879819 +587,1174.4443908768199,306.69813484097347 +588,1176.4451479311247,306.55457868022603 +589,1178.4459049854293,306.4105735670705 +590,1180.4466620397338,306.2662989495586 +591,1182.4474190940382,306.11913824306686 +592,1184.448176148343,305.97417095886664 +593,1186.4489332026476,305.83212272409355 +594,1188.4496902569524,305.6914648000598 +595,1190.450447311257,305.54625296622385 +596,1192.4512043655616,305.39999587955197 +597,1194.4519614198662,305.2547129122376 +598,1196.4527184741708,305.11262172405054 +599,1198.4534755284753,304.96434781103216 +600,1200.4542325827802,304.81656650237596 +601,1202.4549896370847,304.66697918958613 +602,1204.4557466913895,304.51521266774904 +603,1206.456503745694,304.3622949608602 +604,1208.4572607999987,304.2086812762331 +605,1210.458017854303,304.0564804505383 +606,1212.458774908608,303.91000597611304 +607,1214.4595319629125,303.77058067894376 +608,1216.4602890172173,303.6298084458038 +609,1218.4610460715219,303.4857865265257 +610,1220.4618031258265,303.3412019080183 +611,1222.4625601801308,303.1987203388372 +612,1224.4633172344356,303.05538436682906 +613,1226.4640742887402,302.91027290873194 +614,1228.464831343045,302.7691848033606 +615,1230.4655883973496,302.62369179719633 +616,1232.4663454516542,302.4782280827856 +617,1234.4671025059588,302.3307334941402 +618,1236.4678595602634,302.1802000530206 +619,1238.468616614568,302.03337203361156 +620,1240.4693736688728,301.8872989467749 +621,1242.4701307231776,301.74330704598225 +622,1244.4708877774822,301.5930773872547 +623,1246.4716448317868,301.45292846343506 +624,1248.4724018860911,301.3123697586768 +625,1250.473158940396,301.1683308914381 +626,1252.4739159947005,301.0215660333307 +627,1254.4746730490053,300.8800373114971 +628,1256.47543010331,300.7388277787605 +629,1258.4761871576145,300.59661093600494 +630,1260.476944211919,300.4564264250302 +631,1262.4777012662237,300.3166848351013 +632,1264.4784583205283,300.17792032608565 +633,1266.479215374833,300.04535667202884 +634,1268.4799724291377,299.91006523072065 +635,1270.4807294834425,299.77990814244635 +636,1272.4814865377468,299.65015907012275 +637,1274.4822435920516,299.520816098182 +638,1276.483000646356,299.393423477267 +639,1278.4837577006608,299.26644465748967 +640,1280.4845147549654,299.1383037779609 +641,1282.4852718092702,299.01367189028133 +642,1284.4860288635748,298.8863445521604 +643,1286.4867859178794,298.75938897921134 +644,1288.4875429721837,298.6328264575717 +645,1290.4883000264886,298.5051095696929 +646,1292.4890570807931,298.37364059546934 +647,1294.489814135098,298.24347528222006 +648,1296.4905711894025,298.11386993563207 +649,1298.4913282437071,297.98159056553123 +650,1300.4920852980117,297.8455821898497 +651,1302.4928423523163,297.7095246367259 +652,1304.493599406621,297.57694126572176 +653,1306.4943564609257,297.4462894469955 +654,1308.4951135152303,297.32214610768744 +655,1310.4958705695349,297.19989017753875 +656,1312.4966276238395,297.076486089123 +657,1314.4973846781443,296.9564914213095 +658,1316.4981417324486,296.8380795858066 +659,1318.4988987867534,296.72032152289313 +660,1320.4996558410583,296.6029192245202 +661,1322.5004128953628,296.4783296027638 +662,1324.5011699496674,296.35411525095236 +663,1326.501927003972,296.2302744761389 +664,1328.5026840582766,296.1023010910396 +665,1330.5034411125812,295.98070843573066 +666,1332.504198166886,295.85203199251185 +667,1334.5049552211906,295.72071355904023 +668,1336.5057122754954,295.5927721955193 +669,1338.5064693297998,295.4696831162413 +670,1340.5072263841046,295.349700394015 +671,1342.507983438409,295.2317959357772 +672,1344.5087404927137,295.10682294477454 +673,1346.5094975470183,294.9851832070786 +674,1348.5102546013231,294.8629909348631 +675,1350.5110116556275,294.74059360704206 +676,1352.5117687099323,294.5890588082116 +677,1354.512525764237,294.4409158644587 +678,1356.5132828185415,294.2916797502911 +679,1358.514039872846,294.14147170366806 +680,1360.5147969271509,293.99463670117 +681,1362.5155539814555,293.846702849345 +682,1364.51631103576,293.6978041609687 +683,1366.5170680900646,293.55517962934687 +684,1368.5178251443692,293.41297091268603 +685,1370.5185821986738,293.27117619520027 +686,1372.5193392529786,293.12543320654447 +687,1374.5200963072832,292.9776364415488 +688,1376.5208533615878,292.8281830308311 +689,1378.5216104158924,292.68081952427417 +690,1380.5223674701972,292.52521140357436 +691,1382.5231245245016,292.37377239161617 +692,1384.5238815788064,292.2277006734726 +693,1386.524638633111,292.08061045667625 +694,1388.5253956874158,291.9327017236954 +695,1390.5261527417201,291.78358737402004 +696,1392.526909796025,291.64492893938683 +697,1394.5276668503293,291.50523288178846 +698,1396.528423904634,291.36308254910017 +699,1398.529180958939,291.2156316467477 +700,1400.5299380132435,291.0705180761409 +701,1402.5306950675483,290.92959273037116 +702,1404.5314521218527,290.7890677406973 +703,1406.5322091761575,290.64798041785065 +704,1408.5329662304619,290.5054195390718 +705,1410.5337232847667,290.36184751709294 +706,1412.5344803390713,290.2200934951761 +707,1414.535237393376,290.077034295989 +708,1416.5359944476804,289.9290384730369 +709,1418.5367515019852,289.784271892906 +710,1420.5375085562898,289.63991196047215 +711,1422.5382656105944,289.49595696473517 +712,1424.539022664899,289.3510046440563 +713,1426.5397797192038,289.2070717057925 +714,1428.5405367735084,289.06711769503016 +715,1430.541293827813,288.92894877216406 +716,1432.5420508821176,288.79157861813985 +717,1434.5428079364222,288.65695889822587 +718,1436.5435649907267,288.5171575664228 +719,1438.5443220450315,288.3779532705669 +720,1440.5450790993361,288.2403106760093 +721,1442.5458361536407,288.0961332061946 +722,1444.5465932079453,287.95787887856176 +723,1446.5473502622501,287.8202289283643 +724,1448.5481073165545,287.6868677314933 +725,1450.5488643708593,287.55249789967553 +726,1452.5496214251639,287.4187286422229 +727,1454.5503784794687,287.28921049593725 +728,1456.551135533773,287.16004719388803 +729,1458.5518925880779,287.03123727980613 +730,1460.5526496423824,286.900047064943 +731,1462.553406696687,286.7665955822943 +732,1464.5541637509916,286.63339858558817 +733,1466.5549208052964,286.50056402968943 +734,1468.555677859601,286.36416836108447 +735,1470.5564349139056,286.2279890281657 +736,1472.5571919682104,286.09488877203 +737,1474.5579490225148,285.9595384836129 +738,1476.5587060768196,285.82445802620265 +739,1478.5594631311242,285.6883926307557 +740,1480.560220185429,285.55736654064617 +741,1482.5609772397333,285.42741046185665 +742,1484.5617342940382,285.2951155553219 +743,1486.5624913483427,285.16317580289865 +744,1488.5632484026473,285.0315897763532 +745,1490.564005456952,284.9003560550997 +746,1492.5647625112567,284.77359782969756 +747,1494.5655195655613,284.64839943473135 +748,1496.566276619866,284.5155349021517 +749,1498.5670336741705,284.3830242032141 +750,1500.567790728475,284.2508659263481 +751,1502.5685477827797,284.12038668873015 +752,1504.5693048370845,283.9912825196329 +753,1506.570061891389,283.86281724477243 +754,1508.5708189456936,283.7333690738138 +755,1510.5715759999982,283.60426290594876 +756,1512.572333054303,283.4754973876032 +757,1514.5730901086074,283.34970621844957 +758,1516.5738471629122,283.2215603469561 +759,1518.5746042172168,283.0924912794831 +760,1520.5753612715216,282.96507331192475 +761,1522.576118325826,282.8370946358474 +762,1524.5768753801308,282.7090356114549 +763,1526.5776324344354,282.5852329505249 +764,1528.57838948874,282.46098992114435 +765,1530.5791465430445,282.3365296996044 +766,1532.5799035973494,282.2110915098914 +767,1534.580660651654,282.0852159699333 +768,1536.5814177059585,281.9591312738685 +769,1538.5821747602631,281.8320766288959 +770,1540.5829318145677,281.70396284632926 +771,1542.5836888688723,281.5749797119873 +772,1544.584445923177,281.4527898157186 +773,1546.5852029774817,281.33281876230114 +774,1548.5859600317863,281.21512183090647 +775,1550.586717086091,281.08871884270707 +776,1552.5874741403957,280.9626407979221 +777,1554.5882311947003,280.83688644516485 +778,1556.5889882490048,280.71401864203 +779,1558.5897453033097,280.590194588801 +780,1560.5905023576142,280.4653989435468 +781,1562.5912594119188,280.3460306179484 +782,1564.5920164662234,280.2244250003032 +783,1566.592773520528,280.09929834425185 +784,1568.5935305748326,279.97957913516245 +785,1570.5942876291374,279.8606734766503 +786,1572.595044683442,279.74282998239056 +787,1574.5958017377466,279.6240177770897 +788,1576.5965587920512,279.50665736399606 +789,1578.597315846356,279.39223681107063 +790,1580.5980729006603,279.27810519893546 +791,1582.5988299549651,279.1650315941633 +792,1584.5995870092697,279.053992511551 +793,1586.6003440635745,278.93568560273144 +794,1588.601101117879,278.81651650221215 +795,1590.6018581721837,278.6950403209045 +796,1592.6026152264883,278.5554897572653 +797,1594.6033722807929,278.41994165767346 +798,1596.6041293350975,278.29316673060134 +799,1598.6048863894023,278.16565254193057 +800,1600.6056434437066,278.0345232993596 +801,1602.6064004980115,277.89624867507644 +802,1604.607157552316,277.7583180175204 +803,1606.6079146066206,277.62445675290235 +804,1608.6086716609252,277.49078471012314 +805,1610.60942871523,277.35634755434853 +806,1612.6101857695346,277.2259560350981 +807,1614.6109428238392,277.09588686818205 +808,1616.6116998781438,276.96490429180153 +809,1618.6124569324486,276.8343914566682 +810,1620.613213986753,276.70528506324865 +811,1622.6139710410578,276.57619981936455 +812,1624.6147280953624,276.4452708269574 +813,1626.6154851496672,276.3122091449612 +814,1628.6162422039718,276.1794735945384 +815,1630.6169992582763,276.04706297814363 +816,1632.6177563125812,275.91503550377956 +817,1634.6185133668855,275.78571311610705 +818,1636.6192704211903,275.6567061488923 +819,1638.620027475495,275.52801344956356 +820,1640.6207845297995,275.3984173261456 +821,1642.621541584104,275.26913613862905 +822,1644.622298638409,275.14259592486854 +823,1646.6230556927133,275.01636247526267 +824,1648.623812747018,274.89164532940885 +825,1650.6245698013227,274.7638521377471 +826,1652.6253268556275,274.6361180168078 +827,1654.6260839099318,274.5086920602133 +828,1656.6268409642366,274.3815731541167 +829,1658.6275980185412,274.2583702983356 +830,1660.6283550728458,274.1404809916379 +831,1662.6291121271504,274.0238657683586 +832,1664.6298691814552,273.90151287750604 +833,1666.6306262357596,273.77827753274255 +834,1668.6313832900644,273.65772935387565 +835,1670.632140344369,273.53746922322586 +836,1672.6328973986735,273.4163027921719 +837,1674.6336544529781,273.29366073243807 +838,1676.634411507283,273.17069208870896 +839,1678.6351685615875,273.0432596367604 +840,1680.6359256158921,272.91612987472155 +841,1682.6366826701967,272.7916742046448 +842,1684.6374397245015,272.67192090543176 +843,1686.6381967788059,272.553965969449 +844,1688.6389538331107,272.43717108301036 +845,1690.6397108874153,272.3209524630777 +846,1692.64046794172,272.20500794366365 +847,1694.6412249960244,272.083995753582 +848,1696.6419820503293,271.9603675232836 +849,1698.6427391046338,271.8393187148104 +850,1700.6434961589384,271.719788998009 +851,1702.644253213243,271.6005395384568 +852,1704.6450102675478,271.48004347732564 +853,1706.6457673218524,271.3590141867089 +854,1708.646524376157,271.23674182798055 +855,1710.6472814304618,271.1139451630704 +856,1712.6480384847662,270.9949312409689 +857,1714.648795539071,270.8761944176384 +858,1716.6495525933756,270.75773372645506 +859,1718.6503096476804,270.6427819324015 +860,1720.6510667019847,270.5306673361922 +861,1722.6518237562896,270.41533631958015 +862,1724.6525808105941,270.300272272914 +863,1726.6533378648987,270.190098547743 +864,1728.6540949192033,270.0785835384171 +865,1730.6548519735081,269.96545945129094 +866,1732.6556090278125,269.85472572973305 +867,1734.6563660821173,269.74672259310506 +868,1736.657123136422,269.64011716483714 +869,1738.6578801907267,269.533756525153 +870,1740.658637245031,269.42993340987186 +871,1742.6593942993359,269.32741557677076 +872,1744.6601513536405,269.2263544605502 +873,1746.660908407945,269.1186671983096 +874,1748.6616654622496,269.01122579739825 +875,1750.6624225165544,268.89946841336473 +876,1752.6631795708588,268.78880778401737 +877,1754.6639366251636,268.67983303113454 +878,1756.6646936794682,268.5699695845082 +879,1758.665450733773,268.4603555441172 +880,1760.6662077880774,268.3543914221851 +881,1762.6669648423822,268.24943638844456 +882,1764.6677218966868,268.1462130441138 +883,1766.6684789509914,268.0366446903506 +884,1768.669236005296,267.92825118618543 +885,1770.6699930596008,267.81559250390114 +886,1772.6707501139051,267.7053631172877 +887,1774.67150716821,267.60333233762816 +888,1776.6722642225145,267.5012175794603 +889,1778.673021276819,267.3985226102353 +890,1780.6737783311237,267.2915735938561 +891,1782.6745353854285,267.1848641049492 +892,1784.6752924397333,267.08063047619646 +893,1786.6760494940377,266.97683378020105 +894,1788.6768065483425,266.87418106392846 +895,1790.677563602647,266.7695275733332 +896,1792.6783206569517,266.66638347145164 +897,1794.6790777112562,266.56664333410856 +898,1796.679834765561,266.4304715179314 +899,1798.6805918198654,266.33454424654633 +900,1800.6813488741702,266.23853736699664 +901,1802.6821059284748,266.13971285164 +902,1804.6828629827796,266.04221316928204 +903,1806.683620037084,265.94562631206816 +904,1808.6843770913888,265.8562823536663 +905,1810.6851341456934,265.5856362019559 +906,1812.685891199998,265.49912946123914 +907,1814.6866482543026,265.41717222310797 +908,1816.6874053086074,265.3353951107749 +909,1818.6881623629117,265.2494067517071 +910,1820.6889194172165,265.1472343044875 +911,1822.6896764715211,265.04521104676076 +912,1824.690433525826,264.9297518281593 +913,1826.6911905801303,264.81507450375693 +914,1828.691947634435,264.71811481543403 +915,1830.6927046887397,264.62024106769724 +916,1832.6934617430445,264.3541844028657 +917,1834.694218797349,264.08870675145056 +918,1836.6949758516537,263.8265954589814 +919,1838.6957329059583,263.56414950908936 +920,1840.696489960263,263.3011419012139 +921,1842.6972470145674,263.0384772032401 +922,1844.6980040688723,262.778339202828 +923,1846.6987611231768,262.51876366295744 +924,1848.6995181774817,262.26126332584244 +925,1850.700275231786,262.00532283419614 +926,1852.7010322860908,261.7543955841127 +927,1854.7017893403954,261.5090012156181 +928,1856.7025463947,261.264911804752 +929,1858.7033034490048,261.02380291627287 +930,1860.7040605033094,260.78486962604876 +931,1862.704817557614,260.5464485186547 +932,1864.7055746119186,260.3104386593894 +933,1866.7063316662234,260.07969243993045 +934,1868.707088720528,259.85225945021506 +935,1870.7078457748325,259.6237931359641 +936,1872.7086028291371,259.395078211678 +937,1874.709359883442,259.1682585262222 +938,1876.7101169377463,258.94354348238255 +939,1878.7108739920511,258.7193060475627 +940,1880.7116310463557,258.49554470071496 +941,1882.7123881006603,258.27162039078934 +942,1884.7131451549649,258.0475844238927 +943,1886.7139022092697,257.8244678415038 +944,1888.7146592635743,257.601822964363 +945,1890.7154163178789,257.379648298156 +946,1892.7161733721834,257.1588482021494 +947,1894.7169304264883,256.93988741404974 +948,1896.7176874807926,256.7227601255163 +949,1898.7184445350974,256.5074605526388 +950,1900.719201589402,256.2939829358091 +951,1902.7199586437066,256.0823215395936 +952,1904.7207156980112,255.87247065260675 +953,1906.721472752316,255.664424587385 +954,1908.7222298066206,255.4581776802618 +955,1910.7229868609252,255.25372429124303 +956,1912.7237439152298,255.05105880388373 +957,1914.7245009695346,254.8501756251651 +958,1916.725258023839,254.65106918537268 +959,1918.7260150781437,254.45373393797496 +960,1920.7267721324483,254.25816435950293 +961,1922.727529186753,254.0643549494303 +962,1924.7282862410575,253.87230023005463 +963,1926.7290432953623,253.68199474637896 +964,1928.7298003496667,253.49343306599425 +965,1930.7305574039715,253.30660977896264 +966,1932.731314458276,253.12151949770146 +967,1934.732071512581,252.9381568568678 +968,1936.7328285668855,252.7565165132438 +969,1938.73358562119,252.57659314562284 +970,1940.7343426754949,252.39838145469628 +971,1942.7350997297992,252.22187616294093 +972,1944.735856784104,252.04707201450717 +973,1946.7366138384086,251.87396377510782 +974,1948.7373708927132,251.70254623190777 +975,1950.7381279470178,251.5328141934141 +976,1952.7388850013226,251.36476248936697 +977,1954.7396420556272,251.19838597063116 +978,1956.7403991099318,251.0336795090884 +979,1958.7411561642364,250.87063799753014 +980,1960.7419132185412,250.70925634955117 +981,1962.7426702728455,250.54952949944365 +982,1964.7434273271504,250.39145240209214 +983,1966.744184381455,250.23502003286902 +984,1968.7449414357595,250.08022738753044 +985,1970.7456984900641,249.9270694821132 +986,1972.746455544369,249.77554135283216 +987,1974.7472125986735,249.62563805597807 +988,1976.747969652978,249.47735466781637 +989,1978.7487267072827,249.33068628448615 +990,1980.7494837615875,249.18562802190027 +991,1982.7502408158919,249.04217501564563 +992,1984.7509978701967,248.90032242088415 +993,1986.7517549245013,248.76006541225453 +994,1988.7525119788058,248.6213991837745 +995,1990.7532690331104,248.48431894874352 +996,1992.7540260874152,248.34881993964618 +997,1994.7547831417196,248.21489740805623 +998,1996.7555401960244,248.0825466245412 +999,1998.756297250329,247.95159502951168 +1000,2000.7570543046338,247.83188285882355 +1001,2002.7578113589382,247.71374803225254 +1002,2004.758568413243,247.59849529516862 +1003,2006.7593254675476,247.48788412850146 +1004,2008.7600825218522,247.3899836472604 +1005,2010.7608395761567,247.29327065456204 +1006,2012.7615966304616,247.19723500163423 +1007,2014.7623536847661,247.10387797982884 +1008,2016.7631107390707,247.01086881840627 +1009,2018.7638677933755,246.91837918951364 +1010,2020.7646248476801,246.82359818240937 +1011,2022.7653819019847,246.72966332183825 +1012,2024.7661389562893,246.63920014301988 +1013,2026.766896010594,246.54694477342082 +1014,2028.7676530648985,246.45493908699447 +1015,2030.7684101192033,246.36402960903283 +1016,2032.7691671735079,246.27329873515362 +1017,2034.7699242278125,246.1828160460388 +1018,2036.770681282117,246.0934211283466 +1019,2038.7714383364219,246.00420132312783 +1020,2040.7721953907264,245.915372485307 +1021,2042.772952445031,245.82943370477395 +1022,2044.7737094993356,245.74073308592162 +1023,2046.7744665536404,245.65242792443192 +1024,2048.775223607945,245.56699670813128 +1025,2050.7759806622494,245.48268565072007 +1026,2052.776737716554,245.3985585246007 +1027,2054.7774947708585,245.3155667281725 +1028,2056.7782518251634,245.2308336226472 +1029,2058.779008879468,245.14622563659225 +1030,2060.7797659337725,245.0627506117506 +1031,2062.7805229880773,244.98038786880056 +1032,2064.781280042382,244.89820180703188 +1033,2066.7820370966865,244.8142421917594 +1034,2068.7827941509913,244.73044466068626 +1035,2070.7835512052957,244.64680874490932 +1036,2072.7843082596005,244.56760094396452 +1037,2074.785065313905,244.48909507202617 +1038,2076.7858223682097,244.4097786344569 +1039,2078.7865794225145,244.32976146628187 +1040,2080.787336476819,244.24979048598794 +1041,2082.7880935311236,244.17189039923244 +1042,2084.7888505854285,244.0924338670518 +1043,2086.789607639733,244.01291957626992 +1044,2088.7903646940376,243.93546936635 +1045,2090.7911217483424,243.85506686599496 +1046,2092.791878802647,243.77409829074114 +1047,2094.7926358569516,243.69805053259935 +1048,2096.793392911256,243.61911941011167 +1049,2098.794149965561,243.53955792637228 +1050,2100.794907019865,243.46204884089093 +1051,2102.79566407417,243.3846869711465 +1052,2104.7964211284743,243.30747189811885 +1053,2106.797178182779,243.23040320437656 +1054,2108.7979352370835,243.15083104436837 +1055,2110.7986922913883,243.07027207460078 +1056,2112.799449345693,242.9927009289726 +1057,2114.800206399998,242.91328840513796 +1058,2116.8009634543023,242.83318152928405 +1059,2118.8017205086066,242.75699568429886 +1060,2120.8024775629115,242.68095331548125 +1061,2122.8032346172163,242.6050540179126 +1062,2124.8039916715206,242.52647783932434 +1063,2126.8047487258254,242.4487123793154 +1064,2128.8055057801303,242.37136837145488 +1065,2130.8062628344346,242.29135771693618 +1066,2132.807019888739,242.21320626080072 +1067,2134.807776943044,242.13629961322277 +1068,2136.8085339973486,242.05953671638798 +1069,2138.8092910516534,241.9829171676332 +1070,2140.810048105958,241.9064405657977 +1071,2142.8108051602626,241.8306771724089 +1072,2144.811562214567,241.75541583425957 +1073,2146.8123192688718,241.67936428464628 +1074,2148.813076323176,241.60501186061342 +1075,2150.813833377481,241.53202670568248 +1076,2152.8145904317857,241.45824931541748 +1077,2154.8153474860906,241.385566714833 +1078,2156.8161045403945,241.31391341231927 +1079,2158.8168615946993,241.24146760897762 +1080,2160.817618649004,241.1681961365011 +1081,2162.818375703309,241.09417194800943 +1082,2164.8191327576133,241.02120684473635 +1083,2166.819889811918,240.9495414112163 +1084,2168.820646866223,240.87960629021148 +1085,2170.8214039205272,240.80520002867496 +1086,2172.8221609748316,240.73131995051264 +1087,2174.8229180291364,240.65810478067746 +1088,2176.8236750834412,240.58227165702542 +1089,2178.824432137746,240.50813922159642 +1090,2180.825189192051,240.43624532121035 +1091,2182.825946246355,240.36539788724767 +1092,2184.8267033006596,240.293897126265 +1093,2186.8274603549644,240.22148260834146 +1094,2188.828217409269,240.14920023369882 +1095,2190.8289744635736,240.07735090675124 +1096,2192.8297315178784,240.00624220829334 +1097,2194.830488572183,239.93435299791273 +1098,2196.831245626488,239.86330705533925 +1099,2198.8320026807924,239.79283581056023 +1100,2200.8327597350967,239.72219051243746 +1101,2202.8335167894015,239.65262815232282 +1102,2204.8342738437063,239.5813848297211 +1103,2206.8350308980107,239.51117543168513 +1104,2208.8357879523155,239.4413075534976 +1105,2210.83654500662,239.37225488181423 +1106,2212.8373020609247,239.30513190809418 +1107,2214.838059115229,239.23769793284936 +1108,2216.838816169534,239.16901532209903 +1109,2218.8395732238387,239.10045635241218 +1110,2220.8403302781435,239.03136823208956 +1111,2222.8410873324474,238.96036071346234 +1112,2224.841844386752,238.8912760090517 +1113,2226.842601441057,238.8215190858762 +1114,2228.843358495362,238.7490983698494 +1115,2230.844115549666,238.68128359959888 +1116,2232.844872603971,238.61359014378527 +1117,2234.845629658276,238.54562318934683 +1118,2236.84638671258,238.47549316864206 +1119,2238.8471437668845,238.4060187164532 +1120,2240.8479008211893,238.3387710118541 +1121,2242.848657875494,238.2663411178097 +1122,2244.849414929799,238.19848850115685 +1123,2246.850171984104,238.13075651137805 +1124,2248.850929038408,238.0631448270873 +1125,2250.8516860927125,237.99654043948564 +1126,2252.8524431470173,237.92991064130354 +1127,2254.853200201322,237.86088503400387 +1128,2256.8539572556265,237.79021168441628 +1129,2258.8547143099313,237.71976274122264 +1130,2260.855471364236,237.65110570699895 +1131,2262.8562284185405,237.58080464282685 +1132,2264.856985472845,237.51073074037134 +1133,2266.8577425271496,237.4423349305852 +1134,2268.8584995814545,237.37240329772376 +1135,2270.8592566357593,237.30343968061848 +1136,2272.8600136900636,237.23463173713816 +1137,2274.8607707443684,237.1703344309598 +1138,2276.861527798673,237.10192605947688 +1139,2278.8622848529776,237.03347564224686 +1140,2280.863041907282,236.96777207338323 +1141,2282.863798961587,236.89964984153906 +1142,2284.8645560158916,236.8324002088359 +1143,2286.8653130701964,236.76529767590242 +1144,2288.8660701245003,236.69918485070528 +1145,2290.866827178805,236.63395479438464 +1146,2292.86758423311,236.5689426386404 +1147,2294.8683412874148,236.50578428995576 +1148,2296.869098341719,236.43895051035437 +1149,2298.869855396024,236.3716707966182 +1150,2300.8706124503287,236.30624399905167 +1151,2302.871369504633,236.23941658255077 +1152,2304.8721265589375,236.17248467909968 +1153,2306.8728836132423,236.1091318785117 +1154,2308.873640667547,236.04437457623592 +1155,2310.874397721852,235.97951340546996 +1156,2312.8751547761563,235.9113100260179 +1157,2314.875911830461,235.84632618195369 +1158,2316.8766688847654,235.7806530134639 +1159,2318.8774259390702,235.71451980673396 +1160,2320.8781829933746,235.64936101171955 +1161,2322.8789400476794,235.58230106007147 +1162,2324.879697101984,235.51479049215047 +1163,2326.880454156289,235.45168766769368 +1164,2328.881211210593,235.38466533479905 +1165,2330.8819682648978,235.31664077153016 +1166,2332.8827253192026,235.25044501744495 +1167,2334.8834823735074,235.1820186430148 +1168,2336.884239427812,235.1126323022943 +1169,2338.8849964821165,235.0459263823094 +1170,2340.8857535364214,234.97874788894927 +1171,2342.8865105907257,234.91259043105597 +1172,2344.8872676450305,234.84707715130207 +1173,2346.888024699335,234.78082431968394 +1174,2348.8887817536397,234.71585813582877 +1175,2350.8895388079445,234.65152860470232 +1176,2352.8902958622493,234.5847616024912 +1177,2354.8910529165532,234.52062086776832 +1178,2356.891809970858,234.45831525686341 +1179,2358.892567025163,234.3935749391184 +1180,2360.8933240794677,234.33095715401174 +1181,2362.894081133772,234.2698151783955 +1182,2364.894838188077,234.2062426993597 +1183,2366.8955952423817,234.1447930747988 +1184,2368.896352296686,234.0848058968268 +1185,2370.8971093509904,234.02323487248236 +1186,2372.897866405295,233.9626082108364 +1187,2374.8986234596,233.90292561351862 +1188,2376.899380513905,233.83914164241483 +1189,2378.900137568209,233.77504357925457 +1190,2380.900894622514,233.71063498564783 +1191,2382.9016516768183,233.64381970066404 +1192,2384.902408731123,233.57576315873808 +1193,2386.9031657854275,233.5058252816178 +1194,2388.9039228397323,233.43934883907465 +1195,2390.904679894037,233.37298346828177 +1196,2392.905436948342,233.30672889109624 +1197,2394.906194002646,233.23975080194603 +1198,2396.9069510569507,233.17356511822032 +1199,2398.9077081112555,233.10847472261815 +1200,2400.9084651655603,233.04182873699202 +1201,2402.909222219865,232.97529355100949 +1202,2404.9099792741695,232.90886888859168 +1203,2406.9107363284743,232.84172459905759 +1204,2408.9114933827786,232.77469165992073 +1205,2410.9122504370835,232.70776979441956 +1206,2412.913007491388,232.64344217041756 +1207,2414.9137645456926,232.57869940807694 +1208,2416.9145215999974,232.51293188790498 +1209,2418.9152786543023,232.448924512275 +1210,2420.916035708606,232.38554676913384 +1211,2422.916792762911,232.3233987503629 +1212,2424.917549817216,232.26052939389638 +1213,2426.9183068715206,232.19812537163122 +1214,2428.919063925825,232.1371071764243 +1215,2430.9198209801298,232.07454587225303 +1216,2432.9205780344346,232.0122696378208 +1217,2434.921335088739,231.95073373163717 +1218,2436.9220921430433,231.8892987039883 +1219,2438.922849197348,231.82632630537734 +1220,2440.923606251653,231.76364119428538 +1221,2442.9243633059577,231.70169218267927 +1222,2444.925120360262,231.64147838187642 +1223,2446.925877414567,231.5812588962007 +1224,2448.9266344688713,231.52042589546969 +1225,2450.927391523176,231.46132204388414 +1226,2452.9281485774804,231.40189209846153 +1227,2454.9289056317853,231.3397261976491 +1228,2456.92966268609,231.2801004039925 +1229,2458.930419740395,231.2204643078912 +1230,2460.931176794699,231.1602204245244 +1231,2462.9319338490036,231.10088529036014 +1232,2464.9326909033084,231.0416186046171 +1233,2466.933447957613,230.98166587700203 +1234,2468.9342050119176,230.92261922176175 +1235,2470.9349620662224,230.8636090589641 +1236,2472.935719120527,230.80313764615394 +1237,2474.9364761748316,230.74518515410702 +1238,2476.937233229136,230.68732613382144 +1239,2478.9379902834407,230.62956035933811 +1240,2480.9387473377456,230.5718876054256 +1241,2482.9395043920504,230.5143076475773 +1242,2484.940261446355,230.4584279790503 +1243,2486.941018500659,230.39960985984055 +1244,2488.941775554964,230.34070166573153 +1245,2490.9425326092687,230.28268987610383 +1246,2492.9432896635735,230.22552810839238 +1247,2494.944046717878,230.168502065071 +1248,2496.9448037721827,230.11156726341895 +1249,2498.9455608264875,230.05472348463124 +1250,2500.946317880792,229.997970510602 +1251,2502.947074935096,229.94130812392154 +1252,2504.947831989401,229.88473610787375 +1253,2506.948589043706,229.8282542464332 +1254,2508.9493460980107,229.76947378923063 +1255,2510.950103152315,229.7114643569053 +1256,2512.95086020662,229.65366510065977 +1257,2514.951617260924,229.59754622448767 +1258,2516.952374315229,229.54083873659584 +1259,2518.9531313695334,229.48410531967545 +1260,2520.953888423838,229.427461813083 +1261,2522.954645478143,229.3716997688921 +1262,2524.955402532448,229.31602595578383 +1263,2526.9561595867517,229.26044016451442 +1264,2528.9569166410565,229.20652196533234 +1265,2530.9576736953613,229.15208967649255 +1266,2532.958430749666,229.09755332816724 +1267,2534.9591878039705,229.04467897566278 +1268,2536.9599448582753,228.9912883157153 +1269,2538.96070191258,228.93779398973913 +1270,2540.9614589668845,228.8851699378604 +1271,2542.962216021189,228.83322850846739 +1272,2544.9629730754937,228.78155407478727 +1273,2546.9637301297985,228.72917638531686 +1274,2548.9644871841033,228.67688079253838 +1275,2550.9652442384076,228.62466710358575 +1276,2552.966001292712,228.57175265358293 +1277,2554.966758347017,228.51944344314487 +1278,2556.9675154013216,228.4674751279549 +1279,2558.9682724556264,228.41246538936946 +1280,2560.969029509931,228.35649537944605 +1281,2562.9697865642356,228.30009904633658 +1282,2564.9705436185404,228.24301174178336 +1283,2566.971300672845,228.1873505996172 +1284,2568.972057727149,228.13277256649152 +1285,2570.972814781454,228.07827934771413 +1286,2572.973571835759,228.02342425051174 +1287,2574.9743288900636,227.9683246195959 +1288,2576.975085944368,227.91408560826287 +1289,2578.9758429986728,227.85578790831335 +1290,2580.976600052977,227.79740253526802 +1291,2582.977357107282,227.7387811875996 +1292,2584.9781141615863,227.68256883737735 +1293,2586.978871215891,227.62681425551415 +1294,2588.979628270196,227.57154665192192 +1295,2590.9803853245007,227.51636427208234 +1296,2592.9811423788046,227.46163876531452 +1297,2594.9818994331094,227.407395779352 +1298,2596.9826564874143,227.35400547490633 +1299,2598.983413541719,227.30106998080595 +1300,2600.9841705960234,227.24861140171163 +1301,2602.9849276503282,227.1954658826006 +1302,2604.985684704633,227.142062221609 +1303,2606.9864417589374,227.08831351492577 +1304,2608.987198813242,227.03541281545031 +1305,2610.9879558675466,226.98199709015688 +1306,2612.9887129218514,226.92772950828368 +1307,2614.989469976156,226.87889243455695 +1308,2616.9902270304606,226.82893376480712 +1309,2618.9909840847654,226.7771954476715 +1310,2620.9917411390697,226.7278225852876 +1311,2622.9924981933746,226.6782248434882 +1312,2624.993255247679,226.6282414151446 +1313,2626.9940123019837,226.5790944634981 +1314,2628.9947693562885,226.52934678459965 +1315,2630.9955264105934,226.47807165416336 +1316,2632.9962834648973,226.42915050723303 +1317,2634.997040519202,226.37985084070965 +1318,2636.997797573507,226.32956307492123 +1319,2638.9985546278117,226.28086544958063 +1320,2640.9993116821165,226.23201394320313 +1321,2643.000068736421,226.18270781021508 +1322,2645.0008257907257,226.13272087078138 +1323,2647.00158284503,226.08219626030885 +1324,2649.002339899335,226.0293439252709 +1325,2651.003096953639,225.98033914461885 +1326,2653.003854007944,225.9299021422509 +1327,2655.004611062249,225.87954104206864 +1328,2657.0053681165537,225.82925567286406 +1329,2659.0061251708576,225.7782945491429 +1330,2661.0068822251624,225.72740994362553 +1331,2663.007639279467,225.67660168410293 +1332,2665.008396333772,225.62661922406988 +1333,2667.0091533880764,225.57671164412676 +1334,2669.009910442381,225.52687877612965 +1335,2671.010667496686,225.47562456612508 +1336,2673.0114245509903,225.4244469692894 +1337,2675.0121816052947,225.37334581397252 +1338,2677.0129386595995,225.32249175392155 +1339,2679.0136957139043,225.2730342656636 +1340,2681.014452768209,225.22290532805877 +1341,2683.0152098225135,225.1729379553914 +1342,2685.0159668768183,225.1237021384603 +1343,2687.0167239311227,225.07453953463988 +1344,2689.0174809854275,225.02619292280136 +1345,2691.018238039732,224.97790343128602 +1346,2693.0189950940367,224.92895839906697 +1347,2695.0197521483415,224.8815685114472 +1348,2697.0205092026463,224.83421620394057 +1349,2699.02126625695,224.7854862141523 +1350,2701.022023311255,224.73682831014776 +1351,2703.02278036556,224.68824233209148 +1352,2705.0235374198646,224.6397281206202 +1353,2707.024294474169,224.59128551684114 +1354,2709.025051528474,224.5429143623302 +1355,2711.0258085827786,224.49608833848177 +1356,2713.026565637083,224.4506981111943 +1357,2715.027322691388,224.4054805261235 +1358,2717.028079745692,224.35738826103076 +1359,2719.028836799997,224.31141740485947 +1360,2721.0295938543018,224.26566746550202 +1361,2723.0303509086066,224.21998465738352 +1362,2725.0311079629105,224.1731479790977 +1363,2727.0318650172153,224.1261346838749 +1364,2729.03262207152,224.07992228659535 +1365,2731.033379125825,224.0325560033935 +1366,2733.0341361801293,223.9883129876385 +1367,2735.034893234434,223.9452243733305 +1368,2737.035650288739,223.90219866210907 +1369,2739.0364073430437,223.85923571633074 +1370,2741.037164397348,223.81680697747623 +1371,2743.0379214516524,223.7746971399107 +1372,2745.0386785059573,223.73192079555852 +1373,2747.039435560262,223.6901510745012 +1374,2749.0401926145664,223.64895183680167 +1375,2751.0409496688712,223.6070862218149 +1376,2753.041706723176,223.56480854797195 +1377,2755.042463777481,223.5223395062403 +1378,2757.0432208317848,223.47993201384446 +1379,2759.0439778860896,223.43805937625058 +1380,2761.0447349403944,223.39649782822144 +1381,2763.045491994699,223.35282718626323 +1382,2765.0462490490036,223.30881785249065 +1383,2767.0470061033084,223.26455155801233 +1384,2769.0477631576127,223.2210706405823 +1385,2771.0485202119175,223.1783734014759 +1386,2773.049277266222,223.13614050923576 +1387,2775.0500343205267,223.09428583644294 +1388,2777.0507913748315,223.04961368835916 +1389,2779.0515484291363,223.0070237077604 +1390,2781.0523054834407,222.96607038613126 +1391,2783.053062537745,222.92374011306154 +1392,2785.05381959205,222.88213579647166 +1393,2787.0545766463547,222.84136007188638 +1394,2789.0553337006595,222.80135909762285 +1395,2791.056090754964,222.76041481933615 +1396,2793.0568478092687,222.71838304907914 +1397,2795.0576048635735,222.67712616341146 +1398,2797.058361917878,222.63664250186616 +1399,2799.059118972182,222.59655136572883 +1400,2801.059876026487,222.55689619357068 +1401,2803.060633080792,222.5187230672745 +1402,2805.0613901350966,222.480075498093 +1403,2807.062147189401,222.4405878998737 +1404,2809.0629042437054,222.4025789468866 +1405,2811.06366129801,222.36382764018364 +1406,2813.064418352315,222.32379651259828 +1407,2815.0651754066193,222.28595137667736 +1408,2817.065932460924,222.24762690852705 +1409,2819.066689515229,222.20873881816806 +1410,2821.067446569534,222.17034736008154 +1411,2823.0682036238377,222.13059481417912 +1412,2825.0689606781425,222.0912928410882 +1413,2827.0697177324473,222.0530657790097 +1414,2829.070474786752,222.01418649526747 +1415,2831.0712318410565,221.97496537057822 +1416,2833.0719888953613,221.934785564252 +1417,2835.0727459496657,221.89677655398825 +1418,2837.0735030039705,221.86001830891198 +1419,2839.074260058275,221.82653114375384 +1420,2841.0750171125796,221.78656874491855 +1421,2843.0757741668845,221.75087895662278 +1422,2845.0765312211893,221.71523929443413 +1423,2847.0772882754936,221.679649652824 +1424,2849.078045329798,221.64410992655974 +1425,2851.078802384103,221.6084878144916 +1426,2853.0795594384076,221.5723474168624 +1427,2855.080316492712,221.5355578105525 +1428,2857.081073547017,221.49881965823744 +1429,2859.0818306013216,221.46213285204718 +1430,2861.0825876556264,221.42479896039072 +1431,2863.0833447099303,221.3877122613588 +1432,2865.084101764235,221.35250887521406 +1433,2867.08485881854,221.31672315474353 +1434,2869.0856158728448,221.28168365393938 +1435,2871.0863729271496,221.2466929207077 +1436,2873.087129981454,221.21175085330805 +1437,2875.0878870357583,221.1754674962175 +1438,2877.088644090063,221.13929670806013 +1439,2879.089401144368,221.10380795253752 +1440,2881.0901581986723,221.01940610286263 +1441,2883.090915252977,220.98474261976986 +1442,2885.091672307282,220.95012714704148 +1443,2887.0924293615867,220.91555958500203 +1444,2889.0931864158906,220.87965670838722 +1445,2891.0939434701954,220.843865330254 +1446,2893.0947005245002,220.80875216358945 +1447,2895.095457578805,220.76843821512333 +1448,2897.096214633109,220.7327358439405 +1449,2899.0969716874138,220.69714438750057 +1450,2901.0977287417186,220.66222899880395 diff --git a/rowers/dataprep.py b/rowers/dataprep.py index dcb39469..571ba4f2 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -1052,7 +1052,7 @@ def setcp(workout,background=False): job = myqueue(queuelow,handle_setcp,strokesdf,filename,workout.id) return job.id - + if not strokesdf.empty: totaltime = strokesdf['time'].max() diff --git a/rowers/datautils.py b/rowers/datautils.py index 08b7f5b5..a9610e99 100644 --- a/rowers/datautils.py +++ b/rowers/datautils.py @@ -269,22 +269,24 @@ def getcp(dfgrouped,logarr): mask = ww > 2000 ww.loc[mask] = 0 + + tmax = tt.max() - if tmax > 500000: - newlen = int(tmax/2000.) - else: - newlen = len(tt) - if newlen < len(tt): - newt = np.arange(newlen)*tmax/float(newlen) - ww = griddata(tt.values, - ww.values, - newt,method='linear', - rescale=True) - - tt = pd.Series(newt) - ww = pd.Series(ww) +# if tmax > 3600000: +# newlen = int(tmax/10000.) +# else: +# newlen = len(tt) +# if newlen < len(tt): +# newt = np.arange(newlen)*tmax/float(newlen) +# ww = griddata(tt.values, +# ww.values, +# newt,method='nearest', +# rescale=True) +# +# tt = pd.Series(newt) +# ww = pd.Series(ww) try: @@ -303,7 +305,6 @@ def getcp(dfgrouped,logarr): cpw.append(wmax) - dt = pd.Series(dt) cpw = pd.Series(cpw) if len(dt)>2: @@ -346,7 +347,7 @@ def getmaxwattinterval(tt,ww,i): t_0 = tt.loc[indexmaxpos] t_1 = tt.loc[indexmaxpos-i] deltas = tt.loc[indexmaxpos-i:indexmaxpos].diff().dropna() - testres = 1.0e-3*deltas.max() < 30. + testres = 1.0e-3*deltas.max() < 30. and not deltas.isnull().values.any() if testres: deltat = 1.0e-3*(t_0-t_1) wmax = w_roll.loc[indexmaxpos] diff --git a/rowers/models.py b/rowers/models.py index 3e031925..232fac00 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -40,6 +40,7 @@ import pandas as pd from dateutil import parser import datetime + #from rules.contrib.models import RulesModel from rowers.rower_rules import * @@ -3000,6 +3001,8 @@ def auto_delete_file_on_delete(sender, instance, **kwargs): except FileNotFoundError: pass + + @receiver(models.signals.post_delete,sender=Workout) def update_duplicates_on_delete(sender, instance, **kwargs): if instance.id: