@@ -55,29 +55,30 @@ def mmp(data, sec=60): mmp_start=0 mmp_end=0 peak_joules=0 - + for i in range(0, len(data)): - count=0 - joules=0 - while count < sec: - try: - time_diff=data[i+count]['time_diff'] - joule=int(data[i+count]['power'] * time_diff) + index_count, time_count, joules=0, 0, 0 + while time_count < sec: + try: + line=data[i+index_count] + + time_diff, joule=line['time_diff'], line['power'] * line['time_diff'] + joules+=joule - - # Increment counter forced if time difference is not set. - if time_diff < 1: - count+=1 - else: - count=count+time_diff + index_count+=1 + time_count+=time_diff except IndexError, e: # todo: ずぼら…? break pass - if joules > peak_joules: + + # record index pointer when greater than previous power + if joules > peak_joules and time_count <= sec: mmp_start=i - mmp_end=(i+count) + mmp_end=(i+index_count) peak_joules=joules - return data[mmp_start:mmp_end] + mmp=data[mmp_start:mmp_end] + + return mmp Bicicalc/power.py @@ -1,5 +1,7 @@ githubのissue listに書いたけど、ローカルで参照できないのでやっぱりこっちにも書く。 + * CSV出力ルーチンを別に分ける？ + * bike profileを読めるようにする * ゾーン滞留時間の自動計算 TODO @@ -11,7 +11,7 @@ def main(): parser.add_option('--mmp-second', action='store', dest='second', type='int', help='Set MMP seconds') parser.add_option('--mmp-minute', action='store', dest='minute', type='int', help='Set MMP minutes') parser.add_option('--dump', action='store_true', dest='dump', help='dump csv data') - parser.add_option('--dump-summary', action='store_true', dest='dump_summary', help='dump csv data') + parser.add_option('--dump-summary', action='store_true', dest='dump_summary', help='dump summary csv data') (options, args) = parser.parse_args() @@ -26,33 +26,39 @@ def main(): sys.stderr.write(str(e)+'\n') quit(1) - if options.minute != None: - sec=options.minute * 60 - else: - sec=options.second - - mmp=power.mmp(data, sec) - try: - if options.dump: - dump(mmp) - elif options.dump_summary: - dump_summary(mmp, sec) + if options.dump or options.dump_summary: + mmp=power.mmp(data, sec) + if options.dump: + dump(mmp) + elif options.dump_summary: + dump_summary(mmp) else: - # summary (default) - print_summary(mmp, sec) + if options.second > 0 or options.minute > 0: + if options.minute > 0: + sec=options.minute*60 + else: + sec=options.second + mmp=power.mmp(data, sec) + print_summary(mmp) + else: + for sec in (5, 10, 15, 30, 60, 180, 300, 600, 900): + print_summary(power.mmp(data, sec)) except ZeroDivisionError, e: - sys.stderr.write('Skip file because nothing powerdata\n') + sys.stderr.write('Skip file because nothing powerdata (or record broken)\n') + sys.stderr.write(str(e)+'\n') pass -def summary(mmp, sec): +def summary(mmp): ''' return powers, joules ''' + powers=[line['power'] for line in mmp] joules=[line['power'] * line['time_diff'] for line in mmp] + times=[line['time_diff'] for line in mmp] - return [powers, joules] + return [powers, joules, sum(times)] def dump(mmp): ''' @@ -63,29 +69,29 @@ def dump(mmp): m=mmp[i] print '%d,%s,%d' % (i, m['id'], m['power']) -def dump_summary(mmp, sec): +def dump_summary(mmp): ''' dump mmp summary ''' - powers, joules=summary(mmp, sec) + powers, joules=summary(mmp) # print 'Average Watts,Max Power,Work' print '%.2f,%d,%d' % (sum(powers) / len(powers), max(powers), sum(joules)) -def print_summary(mmp, sec): +def print_summary(mmp): ''' print mmp summary ''' - powers, joules=summary(mmp, sec) + powers, joules, times=summary(mmp) - print '== %d seconds Mean Maximal Power ==' % sec + print '== %d seconds Mean Maximal Power ==' % times print '' print 'Average Watts:\t%.2fW' % (sum(powers) / len(powers)) print 'Max Power:\t%dW' % (max(powers)) print 'Work:\t\t%dJ' % (sum(joules)) - + print '' if __name__ == '__main__': main() g_mmp.py 1d8728fcb34cdadd010292e87c7d96103e823306 黄川田 光国 kikawada@k-matsukawa.hq.indexnext.co.jp http://github.com/key/bicicalc/commit/927175ad8946b060d76c677d74eb0c68253dae25 927175ad8946b060d76c677d74eb0c68253dae25 2009-06-15T19:59:27-07:00 2009-06-15T19:59:27-07:00 * MMP計算時、指定よりも長いデータを取得する問題があったのを修正した * データインデックスと時間積算置の取り扱いを間違えていた * g_mmp.pyのデフォルト出力を複数出力するように変更した bd62a11dd0218354acce003d915171b40abd8ed7 黄川田 光国 kikawada@k-matsukawa.hq.indexnext.co.jp