101,108c101,108
< import db, info
< info.source = db.Database()
< info.source.host = options.host
< info.source.db = options.db
< info.source.passwd = options.passwd
< info.source.user = options.user
< info.source.connect()
< #info.source.update_dict(globals())
---
> import db
> source = db.Database()
> source.host = options.host
> source.db = options.db
> source.passwd = options.passwd
> source.user = options.user
> source.connect()
> #source.update_dict(globals())
110,111c110,111
< if type(options.get) is str:
< info.source.get = options.get
---
> if type(options.method) is str:
> source.method = options.method
114c114
< runs = info.source.allRuns
---
> runs = source.allRuns
118c118
< for run in info.source.allRuns:
---
> for run in source.allRuns:
122,123d121
< info.display_run = runs[0].run
<
132c130
< info.source.listRuns(user)
---
> source.listRuns(user)
137c135
< info.source.listStats()
---
> source.listStats()
139c137
< info.source.listStats(args[0])
---
> source.listStats(args[0])
147c145
< info.source.listBins()
---
> source.listBins()
149c147
< info.source.listBins(args[0])
---
> source.listBins(args[0])
157c155
< info.source.listFormulas()
---
> source.listFormulas()
159c157
< info.source.listFormulas(args[0])
---
> source.listFormulas(args[0])
169c167
< info.source.listTicks(runs)
---
> source.listTicks(runs)
180,181c178,179
< stats = info.source.getStat(args[1])
< info.source.get = "sum"
---
> stats = source.getStat(args[1])
> source.method = 'sum'
198,199c196
< info.display_run = run.run;
< runTicks = info.source.retTicks([ run ])
---
> runTicks = source.retTicks([ run ])
202c199
< info.globalTicks = runTicks
---
> source.ticks = runTicks
209c206
< if float(stat) == 1e300*1e300:
---
> if value(stat, run.run) == 1e300*1e300:
218,219c215,216
< info.globalTicks = tick
< avg += float(stat)
---
> source.ticks = tick
> avg += value(stat, run.run)
222,223c219,220
< info.globalTicks = tick
< val = float(stat)
---
> source.ticks = tick
> val = value(stat, run.run)
227,228c224,225
< info.globalTicks = tick
< val = float(stat)
---
> source.ticks = tick
> val = value(stat, run.run)
267c264
< info.globalTicks = [ int(x) for x in options.ticks.split() ]
---
> source.ticks = [ int(x) for x in options.ticks.split() ]
269c266
< from output import StatOutput
---
> import output
283c280
< stats = info.source.getStat(args[0])
---
> stats = source.getStat(args[0])
288c285
< output = StatOutput(stat.name, options.jobfile)
---
> output = output.StatOutput(stat.name, options.jobfile, source)
298,303c295,299
< system = info.source.__dict__[options.system]
<
< from proxy import ProxyGroup
< sim_ticks = info.source['sim_ticks']
< sim_seconds = info.source['sim_seconds']
< proxy = ProxyGroup(system = info.source[options.system])
---
> system = source.__dict__[options.system]
> from info import ProxyGroup
> sim_ticks = source['sim_ticks']
> sim_seconds = source['sim_seconds']
> proxy = ProxyGroup(system = source[options.system])
312c308
< output = StatOutput(command, options.jobfile)
---
> output = output.StatOutput(command, options.jobfile, source)
463c459
< options.get = None
---
> options.method = None
472c468
< opts, args = getopts(sys.argv[1:], '-BEFG:Jad:g:h:j:pr:s:u:T:')
---
> opts, args = getopts(sys.argv[1:], '-BEFJad:g:h:j:m:pr:s:u:T:')
480,481d475
< if o == '-G':
< options.get = a
494a489,490
> if o == '-m':
> options.method = a