This commit is contained in:
wuaho 2021-09-10 15:46:33 +08:00
parent de42e34754
commit ea93aee1bd

View File

@ -33,7 +33,7 @@ class CombinationEvent:
result = pd.Series(self.data[int(factors[0])]['values'][0]) result = pd.Series(self.data[int(factors[0])]['values'][0])
for i, opt in enumerate(opts): for i, opt in enumerate(opts):
b = pd.Series(self.data[int(factors[i + 1])]['values'][0]) b = pd.Series(self.data[int(factors[i + 1])]['values'][0])
result = settings.ARITHMETIC[opt](result, b) result = settings.ARITHMETIC[opt](result, b).fillna(0)
if self.format == 'percent': if self.format == 'percent':
result = round(result * 100, 2) result = round(result * 100, 2)
elif self.format == 'float': elif self.format == 'float':