diff --git a/main.py b/main.py index da55b42..a734bf5 100644 --- a/main.py +++ b/main.py @@ -33,14 +33,15 @@ def process_table(file): for i in table[1:]: i.append(round((preset_L2**2) / (2 * (i[5]**2) * preset_L1), r)) + #i.append(round((i[0]**2) / (2 * (i[5]**2) * i[1]), r)) - preset_avg_a = [(preset_L2**2) / (2 * (avg(list(zip(*table[1:][i:i+3]))[9])**2) * preset_L1) for i in range(0, 12, 3)] + preset_avg_a = [avg(list(zip(*table[1:][i:i+3]))[9]) for i in range(0, 12, 3)] for i in range(4): for k in range(3): table[1 + i*3 + k].append(round(preset_avg_a[i], r)) for i in table[1:]: - i.append(round(i[4]/(2*i[3]), r)) + i.append(round(i[4]/(2*2*i[3]), r)) i.append(round(i[10]/(9.8-i[10]), r)) w = max([max(list(map(lambda x: len(str(x)), i))) for i in table])