@@ -1,22 +1,6 @@ # -*- coding: utf-8 -*- -def getText(elem): - r = '' - if elem==None: - return r - - nodes = elem.childNodes - for node in nodes: - if node.nodeType == node.TEXT_NODE: - r = r + node.data - return r - -def getNodes(elem, name): - r = [] - for node in elem.childNodes: - if node.nodeName == name: - r.append(node) - return r +from .. xmlutil import getText, getNodes, getActivities def getTracks(obj): return obj.getElementsByTagName('Track') @@ -74,7 +58,7 @@ def getTrackpointDetail(obj): def parseString(xml): import sys - from .. import calc + from ... import calc from datetime import datetime from xml.dom.minidom import parse Bicicalc/Garmin/Tcx/history.py @@ -1,25 +1,6 @@ # -*- coding: utf-8 -*- -def getText(elem): - r = '' - if elem==None: - return r - - nodes = elem.childNodes - for node in nodes: - if node.nodeType == node.TEXT_NODE: - r = r + node.data - return r - -def getNodes(elem, name): - r = [] - for node in elem.childNodes: - if node.nodeName == name: - r.append(node) - return r - -def getActivities(obj): - return obj.getElementsByTagName('Activities') +from .. xmlutil import getText, getNodes, getActivities def getFtp(obj): return int(getText(obj.getElementsByTagName('FTP')[0])) @@ -79,7 +60,7 @@ def parseString(xml): hr_high=getHighValue(hrz) hr_zones.append({ - 'zone':number, + 'number':number, 'low':hr_low, 'high':hr_high, }) @@ -104,6 +85,7 @@ def parseString(xml): 'weight':weight, 'ftp':ftp, 'gender':gender, + 'heartrate_max':hr_max, 'gearweight':gearweight, 'heartrate_zones':hr_zones, 'power_zones':power_zones, Bicicalc/Garmin/Tcx/userprofile.py @@ -1,14 +1,13 @@ # -*- coding: utf-8 -*- import power +import time +from Garmin.Tcx import history def summary(records, options=None): ''' Summarize activity data ''' - import time - from Garmin import export - duration=sum([t['time_diff'] for t in records]) cad = [c['cadence'] for c in records] @@ -23,7 +22,6 @@ def summary(records, options=None): spd = [(records[i]['distance'] - records[i-1]['distance']) * 3.6 / records[i]['time_diff'] for i in range(0, len(records)) if records[i]['time_diff'] > 0] nrm_power=power.normalized_power(records) - intensity_factor=power.intensity_factor(records, options.ftp) values={'duration':time.strftime('%H:%M:%S', time.gmtime(duration)), 'duration_total':duration, @@ -42,14 +40,16 @@ def summary(records, options=None): 'power_min':min(pwr), 'power_max':max(pwr), 'power_average':average(pwr), - 'intensity_factor':intensity_factor, - 'tss':power.tss(duration, nrm_power, intensity_factor, options.ftp), 'vi':power.vi(records), 'grade_min':min(grade), 'grade_max':max(grade), 'grade_average':average(grade), 'joules':power.joules(records) } + + if options.ftp is not None: + values['intensity_factor']=power.intensity_factor(records, options.ftp) + values['tss']=power.tss(duration, nrm_power, values['intensity_factor'], options.ftp) return values @@ -62,8 +62,9 @@ def print_summary(records, options=None): print 'Total Ascent:\t\t%.2fm' % (values['ascent_total']) print 'Average Power:\t\t%.2fW' % (values['power_average']) print 'Normalized Power:\t%.2fW' % (values['power_normalized']) - print "Intensity Factor:\t%.3f" % (values['intensity_factor']) - print "Training Stress Score:\t%.3f" % (values['tss']) + if values.has_key('intensity_factor') and values.has_key('tss'): + print "Intensity Factor:\t%.3f" % (values['intensity_factor']) + print "Training Stress Score:\t%.3f" % (values['tss']) print "Variability Index:\t%.3f" % (values['vi']) print "Work:\t\t\t%.3fkJ" % (values['joules']) Bicicalc/calc.py @@ -7,11 +7,13 @@ def joules(data): joules=[line['power'] * line['time_diff'] for line in data] return float(sum(joules)) / 1000 -def tss(duration, np, intensity_factor, ftp): +def tss(duration, np, intensity_factor, ftp=None): ''' Caliculate Training Stress Score (TSS) ''' + if ftp is None: raise Exception('FTP is not set') + return float((duration * np * intensity_factor) / (ftp * 3600) * 100) def average_power(data): @@ -30,11 +32,13 @@ def normalized_power(data): power=[line['power'] for line in data if line['power'] > 0] return float(sum(power) / len(power)) -def intensity_factor(data, ftp): +def intensity_factor(data, ftp=None): ''' Caliculate Intensity Factor (IF) ''' + if ftp is None: raise Exception('FTP is not set') + return float(normalized_power(data) / ftp) def vi(data): Bicicalc/power.py @@ -1,12 +1,12 @@ githubのissue listに書いたけど、ローカルで参照できないのでやっぱりこっちにも書く。 + * bike profileを読めるようにする + * ゾーン滞留時間の自動計算 * バーチャルパートナー自動生成機能 * GPX取り込み／出力 * ワークアウトエディタ - * ファイルを分割 + * ファイルを分割(案) * bicifilter.py (importor/exportor) * bicicalc.py (計算機) - - * g_userprofile.py TODO @@ -2,13 +2,12 @@ # -*- coding: utf-8 -*- from optparse import OptionParser -from Bicicalc.Garmin import tcx +from Bicicalc.Garmin.Tcx import history from Bicicalc import calc, export import sys -if __name__ == '__main__': - +def main(): parser = OptionParser() parser.need_dump = False @@ -42,9 +41,8 @@ if __name__ == '__main__': sys.stderr.write('Usage: bicicalc.py [options] file\n') sys.exit(1) - - data=tcx.parseString(args[0]) - + data=history.parseString(args[0]) + if options.dump_csv==True: export.csv(data) elif options.dump_kml==True: @@ -61,3 +59,6 @@ if __name__ == '__main__': calc.peak_n_power(data, options.mp) else: calc.print_summary(data, options) + +if __name__ == '__main__': + main() bicicalc.py @@ -1,15 +1,40 @@ +#!/usr/bin/env python # -*- coding: utf-8 -*- from optparse import OptionParser -from Bicicalc.Garmin import tcx -from Bicicalc import calc, export - from Bicicalc.Garmin.Tcx import userprofile def main(): parser = OptionParser() parser.need_dump = False (options, args) = parser.parse_args() + + if len(args) < 1: + raise Exception('Please set UserProfile.tcx file') data=userprofile.parseString(args[0]) + print_summary(data) + + +def print_summary(data): + print 'UserProfile' + + print 'BirthDate:\t' + data['birthdate'] + print 'Gender:\t\t' + data['gender'] + print 'Weight:\t\t%.1fkg' % (data['weight']) + print 'MaximumHR:\t' + str(data['heartrate_max']) + print 'GearWeight:\t%.2fkg' % (data['gearweight']) + print 'FTP:\t\t%dWatts' % (data['ftp']) + + print '' + print '\t\t\tLow\tHigh' + + for hrz in data['heartrate_zones']: + print 'HeartRate Zone %d:\t%d\t%d' % (hrz['number'], hrz['low'], hrz['high']) + + print '' + print '\t\t\tLow\tHigh' + for pwrz in data['power_zones']: + print 'Power Zone %d:\t\t%d\t%d' % (pwrz['number'], pwrz['low'], pwrz['high']) + if __name__ == '__main__': main() g_userprofile.py 43cf3277420022303d56c2b265994f42e69089e3 黄川田 光国 kikawada@kikawada-mitsukuni-no-macbook-pro.local http://github.com/key/bicicalc/commit/ae9fb5562b97e56cf75abadeee47f903e7da6646 ae9fb5562b97e56cf75abadeee47f903e7da6646 2009-06-14T01:57:40-07:00 2009-06-14T01:57:40-07:00 * XML操作部分をGarminモジュールに移した * TSS/IFの取得をFTPの有無で切り替えるようにした * Garmin.tcxモジュールをGarmin.Tcx.historyに移した(ProfileもTCXのため、Historyと混同するおそれあり) * g_userprofile.pyを追加してサマリを表示できるようにした 8c3bdf31124cc7841ddebfdc06e517e09b3e6123 黄川田 光国 kikawada@kikawada-mitsukuni-no-macbook-pro.local