teich-hrmparser 0.4.4 → 0.4.5

data/CHANGELOG.txt

@@ -1,3 +1,6 @@
+0.4.5 - May 11th, 2009
+	Added support for Suunto full variables including speed, distance, etc.
+	
 0.4.4 - May 10th, 2009
 	Fixed time-zone in trackpoints now
 	

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
+:patch: 5
 :major: 0
 :minor: 4
-:patch: 4

data/lib/hrmparser/arraymath.rb

@@ -3,23 +3,23 @@ require 'enumerator'
 # Set of basic array math functions.  
 module ArrayMath
 
-  def aaverage
-    accum = self.asum
-    return nil if accum.nil? || self.size == 0
-    accum.to_f / self.size
-  end
+	def aaverage
+		accum = self.asum
+		return nil if accum.nil? || self.size == 0
+		accum.to_f / self.size
+	end
 
-  def asum
-    self.map {|i| return nil if i.is_a?(String)}
-    inject(0){ |sum,item| sum + item }
-  end
-  
-  ## Retun array FACTOR smaller.  Average values to get smaller
-  def smoothed(factor)
-    self.enum_for(:each_slice, factor).map { |snipit| snipit.compact.aaverage }
-  end  
+	def asum
+		self.map {|i| return nil if i.is_a?(String)}
+		inject(0){ |sum,item| sum + item }
+	end
+
+	## Retun array FACTOR smaller.  Average values to get smaller
+	def smoothed(factor)
+		self.enum_for(:each_slice, factor).map { |snipit| snipit.compact.aaverage }
+	end  
 end
 
 class Array
-  include ArrayMath
+	include ArrayMath
 end

data/lib/hrmparser/importer/garmin.rb

@@ -1,85 +1,85 @@
 module Importer
-  class Garmin
-    def initialize(opts = {:data => nil})
-      @data = opts[:data]
-    end
-    
-    def restore
-      workout = HRMParser::Workout.new(:duration => 0)
-      #data = Importer.read_in_file(@file_name)
-      
-      @xml = Hpricot::XML(@data)
-      workout.time = Time.parse((@xml/:Id).innerHTML)
-
-      (@xml/:Lap).each do |lap|
-        f_time =  (lap/:TotalTimeSeconds).innerHTML
-        workout.duration += Float f_time
-      end
-
-      found = false
-      trackpoints = Array.new
-      distance_one = nil
-      time_one = nil
-      
-      (@xml/:Trackpoint).each do |t| 
-        found = true
-        trackpoint = HRMParser::TrackPoint.new
-
-        trackpoint.time = Time.parse((t/:Time).innerHTML)
-
-        hr = (t/:HeartRateBpm/:Value).innerHTML
-        alt = (t/:AltitudeMeters).innerHTML
-        dis = (t/:DistanceMeters).innerHTML
-        
-        trackpoint.hr =       hr != "" ? hr.to_i : nil
-        trackpoint.altitude = alt != "" ? alt.to_f : nil
-        trackpoint.distance = dis != "" ? dis.to_f : nil
-
-        (t/:Position).each do |p|
-          trackpoint.lat = (p/:LatitudeDegrees).innerHTML
-          trackpoint.lng = (p/:LongitudeDegrees).innerHTML
-        end
-
-        trackpoints << trackpoint
-        
-    
-        ## CALCULATE SPEED.  ICK.
-        if distance_one.nil?
-          distance_one = trackpoint.distance
-          time_one = trackpoint.time
-        else
-          distance_two = trackpoint.distance
-          next if distance_two.nil?
-          time_two = trackpoint.time
-          time_delta = time_two - time_one
-          distance_delta = distance_two - distance_one
-          if (distance_delta > 0 && time_delta > 0)
-            trackpoint.speed = distance_delta / time_delta  
-            distance_one = distance_two
-            time_one = time_two
-          else 
-            trackpoint.speed = nil
-          end      
-        end
-      end 
-
-      if found
-        workout.trackpoints = trackpoints
-        workout.calc_average_speed! 
-        workout.calc_altitude_gain!
-        workout.calc_average_hr!
-        trackpoints.reverse_each do |tp|
-          if !tp.distance.nil?
-            workout.distance = tp.distance
-            break
-          end
-        end
-        # workout.distance = trackpoints.last.distance if !trackpoints.last.nil? && !trackpoints.last.distance.nil?
-
-      end
-
-      return workout
-    end
-    
-  end
+	class Garmin
+		def initialize(opts = {:data => nil})
+			@data = opts[:data]
+		end
+
+		def restore
+			workout = HRMParser::Workout.new(:duration => 0)
+			#data = Importer.read_in_file(@file_name)
+
+			@xml = Hpricot::XML(@data)
+			workout.time = Time.parse((@xml/:Id).innerHTML)
+
+			(@xml/:Lap).each do |lap|
+				f_time =  (lap/:TotalTimeSeconds).innerHTML
+				workout.duration += Float f_time
+			end
+
+			found = false
+			trackpoints = Array.new
+			distance_one = nil
+			time_one = nil
+
+			(@xml/:Trackpoint).each do |t| 
+				found = true
+				trackpoint = HRMParser::TrackPoint.new
+
+				trackpoint.time = Time.parse((t/:Time).innerHTML)
+
+				hr = (t/:HeartRateBpm/:Value).innerHTML
+				alt = (t/:AltitudeMeters).innerHTML
+				dis = (t/:DistanceMeters).innerHTML
+
+				trackpoint.hr =       hr != "" ? hr.to_i : nil
+				trackpoint.altitude = alt != "" ? alt.to_f : nil
+				trackpoint.distance = dis != "" ? dis.to_f : nil
+
+				(t/:Position).each do |p|
+					trackpoint.lat = (p/:LatitudeDegrees).innerHTML
+					trackpoint.lng = (p/:LongitudeDegrees).innerHTML
+				end
+
+				trackpoints << trackpoint
+
+
+				## CALCULATE SPEED.  ICK.
+				if distance_one.nil?
+					distance_one = trackpoint.distance
+					time_one = trackpoint.time
+				else
+					distance_two = trackpoint.distance
+					next if distance_two.nil?
+					time_two = trackpoint.time
+					time_delta = time_two - time_one
+					distance_delta = distance_two - distance_one
+					if (distance_delta > 0 && time_delta > 0)
+						trackpoint.speed = distance_delta / time_delta  
+						distance_one = distance_two
+						time_one = time_two
+					else 
+						trackpoint.speed = nil
+					end      
+				end
+			end 
+
+			if found
+				workout.trackpoints = trackpoints
+				workout.calc_average_speed! 
+				workout.calc_altitude_gain!
+				workout.calc_average_hr!
+				trackpoints.reverse_each do |tp|
+					if !tp.distance.nil?
+						workout.distance = tp.distance
+						break
+					end
+				end
+				# workout.distance = trackpoints.last.distance if !trackpoints.last.nil? && !trackpoints.last.distance.nil?
+
+			end
+
+			return workout
+		end
+
+	end
 end

data/lib/hrmparser/importer/gpx.rb

@@ -7,7 +7,7 @@ module Importer
 		def restore
 			workout = HRMParser::Workout.new(:duration => 0)
 			@xml = Hpricot::XML(@data)
-			
+
 			# Set the time based on first trackpoint.  Seen an instance where the gpx begining time is wrong
 			ttime = (@xml/:trk/:trkpt/:time).first.innerHTML
 			workout.time = Time.parse(ttime)
@@ -16,26 +16,26 @@ module Importer
 			distance = 0
 			(@xml/:trk).each do |trk|
 				(trk/:trkpt).each do |trkpt|
-			        trackpoint = HRMParser::TrackPoint.new
+					trackpoint = HRMParser::TrackPoint.new
 					trackpoint.altitude = (trkpt/:ele).innerHTML.to_f
 					trackpoint.time = Time.parse((trkpt/:time).innerHTML)
-					
+
 					trackpoint.lat = (trkpt.attributes)["lat"].to_f
 					trackpoint.lng = (trkpt.attributes)["lon"].to_f
-					
+
 					distance += trackpoint.calc_distance(trackpoints.last, trackpoint)
 					trackpoint.distance = distance
-					
+
 					trackpoint.speed = trackpoint.calc_speed(trackpoints.last, trackpoint)
-					
+
 					trackpoints << trackpoint
 				end
 			end
-			
+
 			workout.duration = trackpoints.last.time - trackpoints.first.time
 			workout.trackpoints = trackpoints
 			workout.calc_average_speed! 
-	        workout.calc_altitude_gain!
+			workout.calc_altitude_gain!
 			workout.distance = trackpoints.last.distance
 			return workout
 		end

data/lib/hrmparser/importer/polar.rb

@@ -1,103 +1,103 @@
 module Importer
-  class Polar
-    
-    attr_reader :time_zone
-    
-    def initialize(opts = {:data => nil, :time_zone => "UTC"})
-      @data = opts[:data]
-      @time_zone = opts[:time_zone]
-    end      
-    
-    def restore
-      workout = HRMParser::Workout.new(:duration => 0)
-      
-      params = parse_params
-
-      date = params["Date"] + " " + params["StartTime"] + " " + @time_zone
-
-      length_array = params["Length"].split(/:/)
-      workout.duration = (length_array[0].to_f * 3600) + (length_array[1].to_f * 60) + (length_array[2].to_f)
-      workout.time = Time.parse(date)
-      
-      workout.trackpoints = get_trackpoints(workout.time, params["Interval"].to_i)
-      
-      workout.calc_average_hr!
-
-      return workout
-    end
-    
-    
-    
-    private
-    
-    # def parse_tabbed_blocks
-    #   # This is the list of tabbed blocks
-    #   tabbed_blocks = %w[IntTimes ExtraData Sumary-123 Summary-TH]
-    #   tabbed_blocks.each do |block_name|
-    #     @polarHash[block_name] = []
-    #     block_text = find_block(block_name)
-    #     block_text.each do |block_line|
-    #       @polarHash[block_name] << block_line.split(/\t/)
-    #     end
-    #   end
-    # end
-
-    # Params is the only "ini" style block
-    def parse_params
-      hash = {}
-      param_block = find_block("Params")
-      param_block.each do |param|
-        # /=/ in case that doesn't work
-        key, value = param.split("=", 2)
-        key = key.strip unless key.nil?
-        value = value.strip unless value.nil?
-        hash[key] = value unless key.nil?
-      end
-      return hash
-    end
-
-    # Polar file has [Foo] blocks.  Return the data in the block
-    def find_block(header)
-      found = false
-      block = []
-      @data.each do |line|
-        line.chomp!
-        found = false if line =~ /^\[.*\]$/
-        block << line if found
-        found = true if line =~ /\[#{header}\]/
-      end
-      return block
-    end
-    
-    def parse_hrdata
-      hrdata = []
-      block_text = find_block("HRData")
-      block_text.each do |block_line|
-        hrdata << block_line.chomp
-      end
-      return hrdata
-    end
-    
-    def get_trackpoints(start_time, interval)
-      trackpoints = []
-      rrcounter = 0
-      
-      hrdata = parse_hrdata
-      hrdata.each do |hrd|
-        tp = HRMParser::TrackPoint.new
-        
-        if (interval == 238)
-          rrcounter += hrd.to_i
-          tp.hr = 60000 / hrd.to_i
-          tp.time = start_time + (rrcounter/1000)
-        else
-          tp.hr = hrd.to_i
-          tp.time = start_time + (interval * trackpoints.size)
-        end
-        
-        trackpoints << tp
-      end
-      return trackpoints
-    end
-  end
+	class Polar
+
+		attr_reader :time_zone
+
+		def initialize(opts = {:data => nil, :time_zone => "UTC"})
+			@data = opts[:data]
+			@time_zone = opts[:time_zone]
+		end      
+
+		def restore
+			workout = HRMParser::Workout.new(:duration => 0)
+
+			params = parse_params
+
+			date = params["Date"] + " " + params["StartTime"] + " " + @time_zone
+
+			length_array = params["Length"].split(/:/)
+			workout.duration = (length_array[0].to_f * 3600) + (length_array[1].to_f * 60) + (length_array[2].to_f)
+			workout.time = Time.parse(date)
+
+			workout.trackpoints = get_trackpoints(workout.time, params["Interval"].to_i)
+
+			workout.calc_average_hr!
+
+			return workout
+		end
+
+
+
+		private
+
+		# def parse_tabbed_blocks
+		#   # This is the list of tabbed blocks
+		#   tabbed_blocks = %w[IntTimes ExtraData Sumary-123 Summary-TH]
+		#   tabbed_blocks.each do |block_name|
+		#     @polarHash[block_name] = []
+		#     block_text = find_block(block_name)
+		#     block_text.each do |block_line|
+		#       @polarHash[block_name] << block_line.split(/\t/)
+		#     end
+		#   end
+		# end
+
+		# Params is the only "ini" style block
+		def parse_params
+			hash = {}
+			param_block = find_block("Params")
+			param_block.each do |param|
+				# /=/ in case that doesn't work
+				key, value = param.split("=", 2)
+				key = key.strip unless key.nil?
+				value = value.strip unless value.nil?
+				hash[key] = value unless key.nil?
+			end
+			return hash
+		end
+
+		# Polar file has [Foo] blocks.  Return the data in the block
+		def find_block(header)
+			found = false
+			block = []
+			@data.each do |line|
+				line.chomp!
+				found = false if line =~ /^\[.*\]$/
+				block << line if found
+				found = true if line =~ /\[#{header}\]/
+			end
+			return block
+		end
+
+		def parse_hrdata
+			hrdata = []
+			block_text = find_block("HRData")
+			block_text.each do |block_line|
+				hrdata << block_line.chomp
+			end
+			return hrdata
+		end
+
+		def get_trackpoints(start_time, interval)
+			trackpoints = []
+			rrcounter = 0
+
+			hrdata = parse_hrdata
+			hrdata.each do |hrd|
+				tp = HRMParser::TrackPoint.new
+
+				if (interval == 238)
+					rrcounter += hrd.to_i
+					tp.hr = 60000 / hrd.to_i
+					tp.time = start_time + (rrcounter/1000)
+				else
+					tp.hr = hrd.to_i
+					tp.time = start_time + (interval * trackpoints.size)
+				end
+
+				trackpoints << tp
+			end
+			return trackpoints
+		end
+	end
 end

data/lib/hrmparser/importer/suunto.rb

@@ -1,17 +1,17 @@
 module Importer
 	class Suunto
 		attr_reader :time_zone
-	    
-	    def initialize(opts = {:data => nil, :time_zone => "UTC"})
-		  @data = opts[:data]
-	      @time_zone = opts[:time_zone]
+
+		def initialize(opts = {:data => nil, :time_zone => "UTC"})
+			@data = opts[:data]
+			@time_zone = opts[:time_zone]
 		end
-		
+
 		def restore
 			workout = HRMParser::Workout.new(:duration => 0)
-	      
+
 			params = parse_params("HEADER")
-			
+
 			# Using DateTime because 1.8 at leas doesn't have a Time.strptime
 			# And european ordeirng consfuses time.parse
 			# TODO: must be some better way
@@ -20,17 +20,18 @@ module Importer
 
 			workout.time = Time.parse(time_for_parse)
 			workout.duration = params["DURATION"].to_f
-			
+
 			workout.trackpoints = get_trackpoints
-			
+
 			workout.calc_average_hr!
 			workout.calc_altitude_gain!
-	        
+			workout.calc_average_speed! 
+
 			return workout
 		end
-		
+
 		private 
-		
+
 		def parse_params(string)
 			hash = {}
 			param_block = find_block(string)
@@ -43,47 +44,47 @@ module Importer
 			end
 			return hash
 		end
-		
+
 		def find_block(header)
-	      found = false
-	      block = []
-	      @data.each do |line|
-	        line.chomp!
-	        found = false if line =~ /^\[.*\]$/
-	        block << line if found
-	        found = true if line =~ /\[#{header}\]/
-	      end
-	      return block
-	    end
-	
-	    def parse_data(string)
-	      data = []
-	      block_text = find_block(string)
-	      block_text.each do |block_line|
-	        data << block_line.chomp
-	      end
-	      return data
-	    end
-	
+			found = false
+			block = []
+			@data.each do |line|
+				line.chomp!
+				found = false if line =~ /^\[.*\]$/
+				block << line if found
+				found = true if line =~ /\[#{header}\]/
+			end
+			return block
+		end
+
+		def parse_data(string)
+			data = []
+			block_text = find_block(string)
+			block_text.each do |block_line|
+				data << block_line.chomp
+			end
+			return data
+		end
+
 		def get_trackpoints
 			trackpoints = []
-	      	logs = parse_data("POINTS")
+			logs = parse_data("POINTS")
 			for line in logs do
-				type, date, time, altitude, blank, blank, hr, epoc, respiration, ventilation, vo2, kcal, blank, blank, blank, blank, blank, temp = line.split(/,/)
+				type, date, time, altitude, blank, blank, hr, epoc, respiration, ventilation, vo2, kcal, blank, blank, distance, speed, cadence, temp = line.split(/,/)
 				next if type == "\"T6LAP\""
-				
+
 				trackpoint = HRMParser::TrackPoint.new
-				
-				#dt = DateTime.strptime(date + " " + time + " " + @time_zone, "%d.%m.%Y %H:%M.%S %Z")
+
+				points_f = %w[epoc kcal speed]
+				points_i = %w[altitude hr respiration ventilation vo2 distance cadence temp]
+
+				points_f.each { |p| trackpoint.send("#{p}=".to_sym, (eval p).to_f) }
+				points_i.each { |p| trackpoint.send("#{p}=".to_sym, (eval p).to_i) }
 
 				dt = DateTime.strptime(date + " " + time, "%d.%m.%Y %H:%M.%S")
 				time_for_parse = dt.strftime("%b %d %H:%M:%S @time_zone %Y")
-		        trackpoint.time = Time.parse(time_for_parse)
-				trackpoint.hr = hr.to_i
-				trackpoint.temp = temp.to_i
-				trackpoint.kcal = kcal.to_i
-				trackpoint.altitude = altitude.to_i
-				
+				trackpoint.time = Time.parse(time_for_parse)
+
 				trackpoints << trackpoint
 			end
 			return trackpoints

data/lib/hrmparser/trackpoint.rb

@@ -1,9 +1,10 @@
 module HRMParser
 	class TrackPoint
-		
+
 		RAD_PER_DEG = 0.017453293  #  PI/180  
-		
-		attr_accessor :lat, :lng, :altitude, :speed, :hr, :distance, :time, :cadence, :temp, :kcal
+
+		attr_accessor :lat, :lng, :altitude, :speed, :hr, :distance, :time, :cadence, :temp, :kcal, :epoc, :respiration, :ventilation, :vo2, :cadence
+
 		def initialize(opts = {:lat => nil, :lng => nil, :altitude => nil, :speed => nil, :hr => nil, :distance => nil, :cadence => nil, :time => Time.now})
 			@lat = opts[:lat]
 			@lng = opts[:lng]
@@ -17,7 +18,7 @@ module HRMParser
 
 		def calc_distance(pointA, pointB)
 			return 0 if pointA.nil? || pointA.lat.nil?
-			
+
 			dlng = pointB.lng - pointA.lng  
 			dlat = pointB.lat - pointA.lat  
 
@@ -29,13 +30,13 @@ module HRMParser
 
 			lat2_rad = pointB.lat * RAD_PER_DEG  
 			lng2_rad = pointB.lng * RAD_PER_DEG
-			
+
 			a = (Math.sin(dlat_rad/2))**2 + Math.cos(lat1_rad) * Math.cos(lat2_rad) * (Math.sin(dlng_rad/2))**2  
 			c = 2 * Math.atan2( Math.sqrt(a), Math.sqrt(1-a))
-			
+
 			return 6371000 * c
 		end
-		
+
 		def calc_speed(pointA, pointB)
 			return 0 if pointA.nil? || pointA.lat.nil?
 			time_delta = pointB.time - pointA.time

data/lib/hrmparser/workout.rb

@@ -1,55 +1,57 @@
 module HRMParser
-  class Workout
-    attr_accessor :duration, :distance, :time, :name, :file_name, :trackpoints
-    attr_reader :average_hr, :data, :average_speed, :altitude_gain
-    
-    def initialize(opts = {:duration => nil, :distance => nil, :time => Time.now, :name => nil, :file_name => nil})
-      @duration = opts[:duration]
-      @name = opts[:name]
-      @time = opts[:time]
-      @distance = opts[:distance]
-      @file_name = opts[:file_name]
-      
-      @data = nil
-      @trackpoints = {}
-    end
-    
-    
-    def calc_average_hr!
-      @average_hr = heart_rates.compact.aaverage
-    end
-    
-    def calc_average_speed! 
-      @average_speed = speeds.compact.aaverage
-    end
-    
-    def calc_altitude_gain!
-      gain = 0
-      smoothed_altitude = altitudes.smoothed(10)
-      start = smoothed_altitude.first
-      smoothed_altitude.each do |alt|
-       diff = alt - start
-       if (diff > 0)
-         gain += diff
-       end
-       start = alt
-      end
-      @altitude_gain = gain
-      
-    end
-    
-    
-    ## Some helper functions that return specific files from trackpoint as array
-    def heart_rates
-      @trackpoints.map {|tp| tp.hr }
-    end
-    
-    def speeds
-      @trackpoints.map {|tp| tp.speed }
-    end
-    
-    def altitudes
-      @trackpoints.map { |tp| tp.altitude }
-    end 
-  end
+	class Workout
+		attr_accessor :duration, :distance, :time, :name, :file_name, :trackpoints
+		attr_reader :average_hr, :data, :average_speed, :altitude_gain
+
+		def initialize(opts = {:duration => nil, :distance => nil, :time => Time.now, :name => nil, :file_name => nil})
+			@duration = opts[:duration]
+			@name = opts[:name]
+			@time = opts[:time]
+			@distance = opts[:distance]
+			@file_name = opts[:file_name]
+
+			@data = nil
+			@trackpoints = {}
+		end
+
+
+		def calc_average_hr!
+			ahr = heart_rates.compact.aaverage
+			@average_hr = ahr == 0.0 ? nil : ahr
+		end
+
+		def calc_average_speed! 
+			aspeed = speeds.compact.aaverage
+			@average_speed = aspeed == 0.0 ? nil : aspeed
+		end
+
+		def calc_altitude_gain!
+			gain = 0
+			smoothed_altitude = altitudes.smoothed(10)
+			start = smoothed_altitude.first
+			smoothed_altitude.each do |alt|
+				diff = alt - start
+				if (diff > 0)
+					gain += diff
+				end
+				start = alt
+			end
+			@altitude_gain = gain == 0.0 ? nil : gain
+
+		end
+
+
+		## Some helper functions that return specific files from trackpoint as array
+		def heart_rates
+			@trackpoints.map {|tp| tp.hr }
+		end
+
+		def speeds
+			@trackpoints.map {|tp| tp.speed }
+		end
+
+		def altitudes
+			@trackpoints.map { |tp| tp.altitude }
+		end 
+	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: teich-hrmparser
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors: 
 - Oren Teich
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-10 00:00:00 -07:00
+date: 2009-05-11 00:00:00 -07:00
 default_executable: 
 dependencies: []