Commit a08ee57

committed

🚸 Don't restrict nan timestamps to predetermined options

1 parent fa65caf commit a08ee57Copy full SHA for a08ee57

File tree

+10

-5

lines changed

+10

-5

lines changed

Lines changed: 10 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -138,15 +138,20 @@ def calculate_resource_timeseries(events, resource):`
`138`	`138`	`all_res = 0.0`
`139`	`139`
`140`	`140`	`# Iterate through the events`
`141`		`- nan = {"Unknown", "N/A"}`
`142`	`141`	`for _, event in sorted(events.items()):`
`143`	`142`	`if event["event"] == "start":`
`144`		`- if resource in event and event[resource] not in nan:`
`145`		`- all_res += float(event[resource])`
	`143`	`+ if resource in event:`
	`144`	`+ try:`
	`145`	`+ all_res += float(event[resource])`
	`146`	`+ except ValueError:`
	`147`	`+ next`
`146`	`148`	`current_time = event["start"]`
`147`	`149`	`elif event["event"] == "finish":`
`148`		`- if resource in event and event[resource] not in nan:`
`149`		`- all_res -= float(event[resource])`
	`150`	`+ if resource in event:`
	`151`	`+ try:`
	`152`	`+ all_res -= float(event[resource])`
	`153`	`+ except ValueError:`
	`154`	`+ next`
`150`	`155`	`current_time = event["finish"]`
`151`	`156`	`res[current_time] = all_res`
`152`	`157`

Comments

(0)