Update app.py
Browse files
app.py
CHANGED
@@ -53,7 +53,7 @@ def calculate(p, m, f, b, w, c, mem):
|
|
53 |
list(filter(lambda x: x.type in {'F', 'B'}, r)) for r in baseline_result
|
54 |
]
|
55 |
baseline_time = get_schedule_time(baseline_result)
|
56 |
-
baseline_bubble=percentage(
|
57 |
baseline_acceleration=percentage(0)
|
58 |
|
59 |
|
@@ -68,7 +68,7 @@ def calculate(p, m, f, b, w, c, mem):
|
|
68 |
|
69 |
zb_time=get_schedule_time(zb_result)
|
70 |
|
71 |
-
zb_bubble=percentage(
|
72 |
zb_acceleration=percentage(baseline_time/zb_time - 1) if baseline_time is not None else None
|
73 |
|
74 |
if mem < p:
|
@@ -93,7 +93,7 @@ def calculate(p, m, f, b, w, c, mem):
|
|
93 |
zbv_result = zbv_graph.get_v_schedule()
|
94 |
|
95 |
zbv_time = get_schedule_time(zbv_result)
|
96 |
-
zbv_bubble=percentage(
|
97 |
zbv_acceleration=percentage(baseline_time/zbv_time - 1) if baseline_time is not None else None
|
98 |
|
99 |
max_time = max(filter(lambda x: x is not None, [baseline_time, zb_time, zbv_time]))
|
|
|
53 |
list(filter(lambda x: x.type in {'F', 'B'}, r)) for r in baseline_result
|
54 |
]
|
55 |
baseline_time = get_schedule_time(baseline_result)
|
56 |
+
baseline_bubble=percentage(1-(f+b+w)*m / baseline_time)
|
57 |
baseline_acceleration=percentage(0)
|
58 |
|
59 |
|
|
|
68 |
|
69 |
zb_time=get_schedule_time(zb_result)
|
70 |
|
71 |
+
zb_bubble=percentage(1-(f+b+w)*m/zb_time)
|
72 |
zb_acceleration=percentage(baseline_time/zb_time - 1) if baseline_time is not None else None
|
73 |
|
74 |
if mem < p:
|
|
|
93 |
zbv_result = zbv_graph.get_v_schedule()
|
94 |
|
95 |
zbv_time = get_schedule_time(zbv_result)
|
96 |
+
zbv_bubble=percentage(1- (f+b+w)*m/zbv_time)
|
97 |
zbv_acceleration=percentage(baseline_time/zbv_time - 1) if baseline_time is not None else None
|
98 |
|
99 |
max_time = max(filter(lambda x: x is not None, [baseline_time, zb_time, zbv_time]))
|