Merge pull request #3 from firefly-cpp/master

Ascent and descent

README.md

@@ -17,6 +17,7 @@ Data extracted:
  - average, max and min heart rate during workout
  - average pace during workout
  - average altitude during workout
+ - ascent and descent of workout
 
 ## Installation
 

tcxparser.py

@@ -77,4 +77,26 @@ def pace(self):
     def altitude_avg(self):
         """Average altitude for the workout"""
         altitude_data = self.altitude_points()
-        return sum(altitude_data)/len(altitude_data)
+        return sum(altitude_data)/len(altitude_data)
+
+    @property
+    def ascent(self):
+        """Returns ascent of workout in meters"""
+        total_ascent = 0.0
+        altitude_data = self.altitude_points()
+        for i in range(len(altitude_data) - 1):
+	  diff = altitude_data[i+1] - altitude_data[i] 
+	  if diff > 0.0:
+	    total_ascent += diff
+        return total_ascent
+
+    @property 
+    def descent(self):
+        """Returns descent of workout in meters"""
+	total_descent = 0.0
+        altitude_data = self.altitude_points()
+        for i in range(len(altitude_data) - 1):
+	  diff = altitude_data[i+1] - altitude_data[i] 
+	  if diff < 0.0:
+	    total_descent += abs(diff)
+        return total_descent   

test_tcxparser.py

@@ -46,6 +46,12 @@ def test_pace(self):
 
     def test_altitude_avg_is_correct(self):
         self.assertAlmostEqual(self.tcx.altitude_avg, 172.020056184)
-
+
+    def test_ascent_is_correct(self):
+        self.assertAlmostEqual(self.tcx.ascent, 153.80981445)
+
+    def test_descent_is_correct(self):
+        self.assertAlmostEqual(self.tcx.descent, 166.307128903)
+
 if __name__ == '__main__':
     unittest.main()