diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py
index 1c21937d..4cb22c2d 100644
--- a/rowers/interactiveplots.py
+++ b/rowers/interactiveplots.py
@@ -1903,6 +1903,7 @@ def interactive_cpchart(rower,thedistances,thesecs,theavpower,
cpdata = dataprep.fetchcperg(rower, theworkouts)
+
if cpdata.empty:
message = 'Calculations are running in the background. Please refresh this page to see updated results'
return ['','',paulslope,paulintercept,p1,message,p1wc]
diff --git a/rowers/tests/test_cpchart.py b/rowers/tests/test_cpchart.py
index acc87673..b904cf20 100644
--- a/rowers/tests/test_cpchart.py
+++ b/rowers/tests/test_cpchart.py
@@ -69,6 +69,8 @@ class CPChartTest(TestCase):
gdproptindate=timezone.now(),
rowerplan='coach')
+ r = self.u.rower
+ age = calculate_age(r.birthdate)
self.c = Client()
self.user_workouts = WorkoutFactory.create_batch(5, user=self.r)
self.factory = RequestFactory()
@@ -91,6 +93,21 @@ class CPChartTest(TestCase):
)
record.save()
+
+ perfsdf = pd.read_csv('rowers/tests/testdata/calcageperformance.csv')
+
+ r = self.u.rower
+
+ for i in range(len(perfsdf)):
+ perf = CalcAgePerformance(
+ age = age,
+ duration = perfsdf.ix[i,'duration'],
+ power = perfsdf.ix[i,'power'],
+ sex = r.sex,
+ weightcategory = r.weightcategory
+ )
+ perf.save()
+
def test_analytics_page(self):
login = self.c.login(username=self.u.username,password=self.password)
@@ -179,7 +196,7 @@ class CPChartTest(TestCase):
self.assertEqual(result,1)
- @patch('rowers.dataprep.fetchcperg')
+ @patch('rowers.dataprep.fetchcperg', side_effect = mocked_fetchcperg)
@patch('rowers.dataprep.create_engine')
def test_rankingpieces(self, mocked_fetchcperg, mocked_sqlalchemy):
url = '/rowers/ote-bests2/'
diff --git a/rowers/tests/testdata/calcageperformance.csv b/rowers/tests/testdata/calcageperformance.csv
new file mode 100644
index 00000000..209f007a
--- /dev/null
+++ b/rowers/tests/testdata/calcageperformance.csv
@@ -0,0 +1,391 @@
+,age,duration,id,power,sex,weightcategory
+0,45,13.2440476642,235,1205.30185826,male,hwt
+1,45,73.5385254098,236,880.082312518,male,hwt
+2,45,166.736357722,237,604.041949331,male,hwt
+3,45,353.836294396,238,505.639372648,male,hwt
+4,45,947.957417918,239,410.867279374,male,hwt
+5,45,1146.69533233,240,401.113841201,male,hwt
+6,45,1951.3692914,241,376.824934758,male,hwt
+7,45,4285.48978877,242,334.055591979,male,hwt
+8,45,8787.15244505,243,310.024861649,male,hwt
+9,45,60.0,244,912.214155523,male,hwt
+10,45,240.0,245,497.154286453,male,hwt
+11,45,1800.0,246,366.919497902,male,hwt
+12,45,3600.0,247,341.223551648,male,hwt
+13,45,13.2440476642,248,1205.30185826,male,hwt
+14,45,73.5385254098,249,880.082312518,male,hwt
+15,45,166.736357722,250,604.041949331,male,hwt
+16,45,353.836294396,251,505.639372648,male,hwt
+17,45,947.957417918,252,410.867279374,male,hwt
+18,45,1146.69533233,253,401.113841201,male,hwt
+19,45,1951.3692914,254,376.824934758,male,hwt
+20,45,4285.48978877,255,334.055591979,male,hwt
+21,45,8787.15244505,256,310.024861649,male,hwt
+22,45,60.0,257,912.214155523,male,hwt
+23,45,240.0,258,497.154286453,male,hwt
+24,45,1800.0,259,366.919497902,male,hwt
+25,45,3600.0,260,341.223551648,male,hwt
+26,45,14.8171605855,261,860.722326177,male,lwt
+27,45,83.0940710386,262,610.039467825,male,lwt
+28,45,181.840714205,263,465.676847163,male,lwt
+29,45,376.970403559,264,418.144371038,male,lwt
+30,45,1009.8173503,265,339.890917361,male,lwt
+31,45,1215.41942618,266,336.847448572,male,lwt
+32,45,2079.36408731,267,311.434280059,male,lwt
+33,45,4448.15153914,268,298.731773375,male,lwt
+34,45,9184.64308874,269,271.490196332,male,lwt
+35,45,60.0,270,691.913307687,male,lwt
+36,45,240.0,271,404.057083459,male,lwt
+37,45,1800.0,272,321.820390501,male,lwt
+38,45,3600.0,273,295.960717058,male,lwt
+39,45,14.8171605855,274,860.722326177,male,lwt
+40,45,83.0940710386,275,610.039467825,male,lwt
+41,45,181.840714205,276,465.676847163,male,lwt
+42,45,376.970403559,277,418.144371038,male,lwt
+43,45,1009.8173503,278,339.890917361,male,lwt
+44,45,1215.41942618,279,336.847448572,male,lwt
+45,45,2079.36408731,280,311.434280059,male,lwt
+46,45,4448.15153914,281,298.731773375,male,lwt
+47,45,9184.64308874,282,271.490196332,male,lwt
+48,45,60.0,283,691.913307687,male,lwt
+49,45,240.0,284,404.057083459,male,lwt
+50,45,1800.0,285,321.820390501,male,lwt
+51,45,3600.0,286,295.960717058,male,lwt
+52,45,14.8171605855,287,860.722326177,male,lwt
+53,45,83.0940710386,288,610.039467825,male,lwt
+54,45,181.840714205,289,465.676847163,male,lwt
+55,45,376.970403559,290,418.144371038,male,lwt
+56,45,1009.8173503,291,339.890917361,male,lwt
+57,45,1215.41942618,292,336.847448572,male,lwt
+58,45,2079.36408731,293,311.434280059,male,lwt
+59,45,4448.15153914,294,298.731773375,male,lwt
+60,45,9184.64308874,295,271.490196332,male,lwt
+61,45,60.0,296,691.913307687,male,lwt
+62,45,240.0,297,404.057083459,male,lwt
+63,45,1800.0,298,321.820390501,male,lwt
+64,45,3600.0,299,295.960717058,male,lwt
+65,45,14.8171605855,300,860.722326177,male,lwt
+66,45,83.0940710386,301,610.039467825,male,lwt
+67,45,181.840714205,302,465.676847163,male,lwt
+68,45,376.970403559,303,418.144371038,male,lwt
+69,45,1009.8173503,304,339.890917361,male,lwt
+70,45,1215.41942618,305,336.847448572,male,lwt
+71,45,2079.36408731,306,311.434280059,male,lwt
+72,45,4448.15153914,307,298.731773375,male,lwt
+73,45,9184.64308874,308,271.490196332,male,lwt
+74,45,60.0,309,691.913307687,male,lwt
+75,45,240.0,310,404.057083459,male,lwt
+76,45,1800.0,311,321.820390501,male,lwt
+77,45,3600.0,312,295.960717058,male,lwt
+78,45,14.8171605855,313,860.722326177,male,lwt
+79,45,83.0940710386,314,610.039467825,male,lwt
+80,45,181.840714205,315,465.676847163,male,lwt
+81,45,376.970403559,316,418.144371038,male,lwt
+82,45,1009.8173503,317,339.890917361,male,lwt
+83,45,1215.41942618,318,336.847448572,male,lwt
+84,45,2079.36408731,319,311.434280059,male,lwt
+85,45,4448.15153914,320,298.731773375,male,lwt
+86,45,9184.64308874,321,271.490196332,male,lwt
+87,45,60.0,322,691.913307687,male,lwt
+88,45,240.0,323,404.057083459,male,lwt
+89,45,1800.0,324,321.820390501,male,lwt
+90,45,3600.0,325,295.960717058,male,lwt
+91,45,14.8171605855,326,860.722326177,male,lwt
+92,45,83.0940710386,327,610.039467825,male,lwt
+93,45,181.840714205,328,465.676847163,male,lwt
+94,45,376.970403559,329,418.144371038,male,lwt
+95,45,1009.8173503,330,339.890917361,male,lwt
+96,45,1215.41942618,331,336.847448572,male,lwt
+97,45,2079.36408731,332,311.434280059,male,lwt
+98,45,4448.15153914,333,298.731773375,male,lwt
+99,45,9184.64308874,334,271.490196332,male,lwt
+100,45,60.0,335,691.913307687,male,lwt
+101,45,240.0,336,404.057083459,male,lwt
+102,45,1800.0,337,321.820390501,male,lwt
+103,45,3600.0,338,295.960717058,male,lwt
+104,45,14.8171605855,339,860.722326177,male,lwt
+105,45,83.0940710386,340,610.039467825,male,lwt
+106,45,181.840714205,341,465.676847163,male,lwt
+107,45,376.970403559,342,418.144371038,male,lwt
+108,45,1009.8173503,343,339.890917361,male,lwt
+109,45,1215.41942618,344,336.847448572,male,lwt
+110,45,2079.36408731,345,311.434280059,male,lwt
+111,45,4448.15153914,346,298.731773375,male,lwt
+112,45,9184.64308874,347,271.490196332,male,lwt
+113,45,60.0,348,691.913307687,male,lwt
+114,45,240.0,349,404.057083459,male,lwt
+115,45,1800.0,350,321.820390501,male,lwt
+116,45,3600.0,351,295.960717058,male,lwt
+117,45,14.8171605855,352,860.722326177,male,lwt
+118,45,83.0940710386,353,610.039467825,male,lwt
+119,45,181.840714205,354,465.676847163,male,lwt
+120,45,376.970403559,355,418.144371038,male,lwt
+121,45,1009.8173503,356,339.890917361,male,lwt
+122,45,1215.41942618,357,336.847448572,male,lwt
+123,45,2079.36408731,358,311.434280059,male,lwt
+124,45,4448.15153914,359,298.731773375,male,lwt
+125,45,9184.64308874,360,271.490196332,male,lwt
+126,45,60.0,361,691.913307687,male,lwt
+127,45,240.0,362,404.057083459,male,lwt
+128,45,1800.0,363,321.820390501,male,lwt
+129,45,3600.0,364,295.960717058,male,lwt
+130,45,14.8171605855,365,860.722326177,male,lwt
+131,45,83.0940710386,366,610.039467825,male,lwt
+132,45,181.840714205,367,465.676847163,male,lwt
+133,45,376.970403559,368,418.144371038,male,lwt
+134,45,1009.8173503,369,339.890917361,male,lwt
+135,45,1215.41942618,370,336.847448572,male,lwt
+136,45,2079.36408731,371,311.434280059,male,lwt
+137,45,4448.15153914,372,298.731773375,male,lwt
+138,45,9184.64308874,373,271.490196332,male,lwt
+139,45,60.0,374,691.913307687,male,lwt
+140,45,240.0,375,404.057083459,male,lwt
+141,45,1800.0,376,321.820390501,male,lwt
+142,45,3600.0,377,295.960717058,male,lwt
+143,46,14.8427800689,378,856.27304752,male,lwt
+144,46,83.3137159085,379,605.227327445,male,lwt
+145,46,182.315880665,380,462.045274037,male,lwt
+146,46,378.191135287,381,414.108346298,male,lwt
+147,46,1012.43613971,382,337.260225925,male,lwt
+148,46,1219.23151175,383,333.697725343,male,lwt
+149,46,2083.71094726,384,309.489280347,male,lwt
+150,46,4459.91212566,385,296.374773102,male,lwt
+151,46,9207.72447165,386,269.453642951,male,lwt
+152,46,60.0,387,687.719388842,male,lwt
+153,46,240.0,388,401.016651911,male,lwt
+154,46,1800.0,389,319.488337537,male,lwt
+155,46,3600.0,390,293.375937135,male,lwt
+156,46,14.8427800689,391,856.27304752,male,lwt
+157,46,83.3137159085,392,605.227327445,male,lwt
+158,46,182.315880665,393,462.045274037,male,lwt
+159,46,378.191135287,394,414.108346298,male,lwt
+160,46,1012.43613971,395,337.260225925,male,lwt
+161,46,1219.23151175,396,333.697725343,male,lwt
+162,46,2083.71094726,397,309.489280347,male,lwt
+163,46,4459.91212566,398,296.374773102,male,lwt
+164,46,9207.72447165,399,269.453642951,male,lwt
+165,46,60.0,400,687.719388842,male,lwt
+166,46,240.0,401,401.016651911,male,lwt
+167,46,1800.0,402,319.488337537,male,lwt
+168,46,3600.0,403,293.375937135,male,lwt
+169,46,14.8427800689,404,856.27304752,male,lwt
+170,46,83.3137159085,405,605.227327445,male,lwt
+171,46,182.315880665,406,462.045274037,male,lwt
+172,46,378.191135287,407,414.108346298,male,lwt
+173,46,1012.43613971,408,337.260225925,male,lwt
+174,46,1219.23151175,409,333.697725343,male,lwt
+175,46,2083.71094726,410,309.489280347,male,lwt
+176,46,4459.91212566,411,296.374773102,male,lwt
+177,46,9207.72447165,412,269.453642951,male,lwt
+178,46,60.0,413,687.719388842,male,lwt
+179,46,240.0,414,401.016651911,male,lwt
+180,46,1800.0,415,319.488337537,male,lwt
+181,46,3600.0,416,293.375937135,male,lwt
+182,46,13.2911819764,417,1192.52424882,male,hwt
+183,46,73.9219476308,418,866.458650634,male,hwt
+184,46,167.448917764,419,596.363419556,male,hwt
+185,46,355.277624325,420,499.510302364,male,hwt
+186,46,951.863603787,421,405.829750474,male,hwt
+187,46,1151.29901832,422,396.321268635,male,hwt
+188,46,1958.07827861,423,372.964831492,male,hwt
+189,46,4299.87428823,424,330.71421614,male,hwt
+190,46,8829.21045367,425,305.61551537,male,hwt
+191,46,60.0,426,900.121310529,male,hwt
+192,46,240.0,427,494.336468143,male,hwt
+193,46,1800.0,428,364.078265586,male,hwt
+194,46,3600.0,429,338.253753515,male,hwt
+195,46,13.2911819764,430,1192.52424882,male,hwt
+196,46,73.9219476308,431,866.458650634,male,hwt
+197,46,167.448917764,432,596.363419556,male,hwt
+198,46,355.277624325,433,499.510302364,male,hwt
+199,46,951.863603787,434,405.829750474,male,hwt
+200,46,1151.29901832,435,396.321268635,male,hwt
+201,46,1958.07827861,436,372.964831492,male,hwt
+202,46,4299.87428823,437,330.71421614,male,hwt
+203,46,8829.21045367,438,305.61551537,male,hwt
+204,46,60.0,439,900.121310529,male,hwt
+205,46,240.0,440,494.336468143,male,hwt
+206,46,1800.0,441,364.078265586,male,hwt
+207,46,3600.0,442,338.253753515,male,hwt
+208,46,13.2911819764,443,1192.52424882,male,hwt
+209,46,73.9219476308,444,866.458650634,male,hwt
+210,46,167.448917764,445,596.363419556,male,hwt
+211,46,355.277624325,446,499.510302364,male,hwt
+212,46,951.863603787,447,405.829750474,male,hwt
+213,46,1151.29901832,448,396.321268635,male,hwt
+214,46,1958.07827861,449,372.964831492,male,hwt
+215,46,4299.87428823,450,330.71421614,male,hwt
+216,46,8829.21045367,451,305.61551537,male,hwt
+217,46,60.0,452,900.121310529,male,hwt
+218,46,240.0,453,494.336468143,male,hwt
+219,46,1800.0,454,364.078265586,male,hwt
+220,46,3600.0,455,338.253753515,male,hwt
+221,46,14.8427800689,456,856.27304752,male,lwt
+222,46,83.3137159085,457,605.227327445,male,lwt
+223,46,182.315880665,458,462.045274037,male,lwt
+224,46,378.191135287,459,414.108346298,male,lwt
+225,46,1012.43613971,460,337.260225925,male,lwt
+226,46,1219.23151175,461,333.697725343,male,lwt
+227,46,2083.71094726,462,309.489280347,male,lwt
+228,46,4459.91212566,463,296.374773102,male,lwt
+229,46,9207.72447165,464,269.453642951,male,lwt
+230,46,60.0,465,687.719388842,male,lwt
+231,46,240.0,466,401.016651911,male,lwt
+232,46,1800.0,467,319.488337537,male,lwt
+233,46,3600.0,468,293.375937135,male,lwt
+234,46,13.2911819764,469,1192.52424882,male,hwt
+235,46,73.9219476308,470,866.458650634,male,hwt
+236,46,167.448917764,471,596.363419556,male,hwt
+237,46,355.277624325,472,499.510302364,male,hwt
+238,46,951.863603787,473,405.829750474,male,hwt
+239,46,1151.29901832,474,396.321268635,male,hwt
+240,46,1958.07827861,475,372.964831492,male,hwt
+241,46,4299.87428823,476,330.71421614,male,hwt
+242,46,8829.21045367,477,305.61551537,male,hwt
+243,46,60.0,478,900.121310529,male,hwt
+244,46,240.0,479,494.336468143,male,hwt
+245,46,1800.0,480,364.078265586,male,hwt
+246,46,3600.0,481,338.253753515,male,hwt
+247,46,13.2911819764,482,1192.52424882,male,hwt
+248,46,73.9219476308,483,866.458650634,male,hwt
+249,46,167.448917764,484,596.363419556,male,hwt
+250,46,355.277624325,485,499.510302364,male,hwt
+251,46,951.863603787,486,405.829750474,male,hwt
+252,46,1151.29901832,487,396.321268635,male,hwt
+253,46,1958.07827861,488,372.964831492,male,hwt
+254,46,4299.87428823,489,330.71421614,male,hwt
+255,46,8829.21045367,490,305.61551537,male,hwt
+256,46,60.0,491,900.121310529,male,hwt
+257,46,240.0,492,494.336468143,male,hwt
+258,46,1800.0,493,364.078265586,male,hwt
+259,46,3600.0,494,338.253753515,male,hwt
+260,46,13.2911819764,495,1192.52424882,male,hwt
+261,46,73.9219476308,496,866.458650634,male,hwt
+262,46,167.448917764,497,596.363419556,male,hwt
+263,46,355.277624325,498,499.510302364,male,hwt
+264,46,951.863603787,499,405.829750474,male,hwt
+265,46,1151.29901832,500,396.321268635,male,hwt
+266,46,1958.07827861,501,372.964831492,male,hwt
+267,46,4299.87428823,502,330.71421614,male,hwt
+268,46,8829.21045367,503,305.61551537,male,hwt
+269,46,60.0,504,900.121310529,male,hwt
+270,46,240.0,505,494.336468143,male,hwt
+271,46,1800.0,506,364.078265586,male,hwt
+272,46,3600.0,507,338.253753515,male,hwt
+273,46,13.2911819764,508,1192.52424882,male,hwt
+274,46,73.9219476308,509,866.458650634,male,hwt
+275,46,167.448917764,510,596.363419556,male,hwt
+276,46,355.277624325,511,499.510302364,male,hwt
+277,46,951.863603787,512,405.829750474,male,hwt
+278,46,1151.29901832,513,396.321268635,male,hwt
+279,46,1958.07827861,514,372.964831492,male,hwt
+280,46,4299.87428823,515,330.71421614,male,hwt
+281,46,8829.21045367,516,305.61551537,male,hwt
+282,46,60.0,517,900.121310529,male,hwt
+283,46,240.0,518,494.336468143,male,hwt
+284,46,1800.0,519,364.078265586,male,hwt
+285,46,3600.0,520,338.253753515,male,hwt
+286,46,13.2911819764,521,1192.52424882,male,hwt
+287,46,73.9219476308,522,866.458650634,male,hwt
+288,46,167.448917764,523,596.363419556,male,hwt
+289,46,355.277624325,524,499.510302364,male,hwt
+290,46,951.863603787,525,405.829750474,male,hwt
+291,46,1151.29901832,526,396.321268635,male,hwt
+292,46,1958.07827861,527,372.964831492,male,hwt
+293,46,4299.87428823,528,330.71421614,male,hwt
+294,46,8829.21045367,529,305.61551537,male,hwt
+295,46,60.0,530,900.121310529,male,hwt
+296,46,240.0,531,494.336468143,male,hwt
+297,46,1800.0,532,364.078265586,male,hwt
+298,46,3600.0,533,338.253753515,male,hwt
+299,46,13.0724665909,534,1253.3876455,male,hwt
+300,46,72.9790737099,535,900.477786918,male,hwt
+301,46,166.117834028,536,610.814378738,male,hwt
+302,46,354.160853418,537,504.250516665,male,hwt
+303,46,949.073983069,538,409.41885517,male,hwt
+304,46,1145.88163607,539,401.968946936,male,hwt
+305,46,1951.33257053,540,376.846208835,male,hwt
+306,46,4290.00654605,541,333.001565624,male,hwt
+307,46,8829.64303915,542,305.57059905,male,hwt
+308,46,60.0,543,906.239636356,male,hwt
+309,46,240.0,544,502.149079363,male,hwt
+310,46,1800.0,545,363.261062399,male,hwt
+311,46,3600.0,546,340.670595963,male,hwt
+312,40,15.9683527244,547,687.666202077,female,hwt
+313,40,88.2598948154,548,509.070379027,female,hwt
+314,40,191.207577481,549,400.537085849,female,hwt
+315,40,399.791338762,550,350.548307704,female,hwt
+316,40,1162.21376267,551,222.951296659,female,hwt
+317,40,1295.62196477,552,278.08456005,female,hwt
+318,40,2262.55443455,553,241.746904294,female,hwt
+319,40,4848.11734655,554,230.728249093,female,hwt
+320,40,9917.4245068,555,215.647434243,female,hwt
+321,40,60.0,556,552.630422756,female,hwt
+322,40,240.0,557,324.432045777,female,hwt
+323,40,1800.0,558,257.041095275,female,hwt
+324,40,3600.0,559,247.545646802,female,hwt
+325,46,13.072466936,560,1253.38754624,male,hwt
+326,46,72.9790737099,561,900.477786918,male,hwt
+327,46,166.117834028,562,610.814378738,male,hwt
+328,46,354.160853418,563,504.250516665,male,hwt
+329,46,949.073983069,564,409.41885517,male,hwt
+330,46,1145.88163607,565,401.968946936,male,hwt
+331,46,1951.33257053,566,376.846208835,male,hwt
+332,46,4290.00654605,567,333.001565624,male,hwt
+333,46,8829.64303915,568,305.57059905,male,hwt
+334,46,60.0,569,906.239636356,male,hwt
+335,46,240.0,570,502.149079363,male,hwt
+336,46,1800.0,571,363.261062399,male,hwt
+337,46,3600.0,572,340.670595963,male,hwt
+338,46,13.072466936,573,1253.38754624,male,hwt
+339,46,72.9790737099,574,900.477786918,male,hwt
+340,46,166.117834028,575,610.814378738,male,hwt
+341,46,354.160853418,576,504.250516665,male,hwt
+342,46,949.073983069,577,409.41885517,male,hwt
+343,46,1145.88163607,578,401.968946936,male,hwt
+344,46,1951.33257053,579,376.846208835,male,hwt
+345,46,4290.00654605,580,333.001565624,male,hwt
+346,46,8829.64303915,581,305.57059905,male,hwt
+347,46,60.0,582,906.239636356,male,hwt
+348,46,240.0,583,502.149079363,male,hwt
+349,46,1800.0,584,363.261062399,male,hwt
+350,46,3600.0,585,340.670595963,male,hwt
+351,46,13.072466936,586,1253.38754624,male,hwt
+352,46,72.9790737099,587,900.477786918,male,hwt
+353,46,166.117834028,588,610.814378738,male,hwt
+354,46,354.160853418,589,504.250516665,male,hwt
+355,46,949.073983069,590,409.41885517,male,hwt
+356,46,1145.88163607,591,401.968946936,male,hwt
+357,46,1951.33257053,592,376.846208835,male,hwt
+358,46,4290.00654605,593,333.001565624,male,hwt
+359,46,8829.64303915,594,305.57059905,male,hwt
+360,46,60.0,595,906.239636356,male,hwt
+361,46,240.0,596,502.149079363,male,hwt
+362,46,1800.0,597,363.261062399,male,hwt
+363,46,3600.0,598,340.670595963,male,hwt
+364,48,13.1400145972,599,1234.15722015,male,hwt
+365,48,73.6120032839,600,877.44950616,male,hwt
+366,48,167.490830156,601,595.915835116,male,hwt
+367,48,357.20985773,602,491.448158661,male,hwt
+368,48,957.23280992,603,399.038975136,male,hwt
+369,48,1154.74567718,604,392.783058093,male,hwt
+370,48,1964.48955388,605,369.325130476,male,hwt
+371,48,4317.88182425,606,326.593760964,male,hwt
+372,48,8905.14507116,607,297.86399397,male,hwt
+373,48,60.0,608,880.71881694,male,hwt
+374,48,240.0,609,492.078634034,male,hwt
+375,48,1800.0,610,354.842177068,male,hwt
+376,48,3600.0,611,334.597353164,male,hwt
+377,46,13.072466936,612,1253.38754624,male,hwt
+378,46,72.9790737099,613,900.477786918,male,hwt
+379,46,166.117834028,614,610.814378738,male,hwt
+380,46,354.160853418,615,504.250516665,male,hwt
+381,46,949.073983069,616,409.41885517,male,hwt
+382,46,1145.88163607,617,401.968946936,male,hwt
+383,46,1951.33257053,618,376.846208835,male,hwt
+384,46,4290.00654605,619,333.001565624,male,hwt
+385,46,8829.64303915,620,305.57059905,male,hwt
+386,46,60.0,621,906.239636356,male,hwt
+387,46,240.0,622,502.149079363,male,hwt
+388,46,1800.0,623,363.261062399,male,hwt
+389,46,3600.0,624,340.670595963,male,hwt
diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz
index f86f8b7b..85498223 100644
Binary files a/rowers/tests/testdata/testdata.csv.gz and b/rowers/tests/testdata/testdata.csv.gz differ
diff --git a/rowers/tests/testdata/testdata.tcx b/rowers/tests/testdata/testdata.tcx
index ab955bbc..9a7120bd 100644
--- a/rowers/tests/testdata/testdata.tcx
+++ b/rowers/tests/testdata/testdata.tcx
@@ -2502,7 +2502,7 @@
- <Element 'Notes' at 0x15b3f208>
+ <Element 'Notes' at 0x15ec7b00>