Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-26 20:59:27 +01:00
Code Issues Projects Releases Wiki Activity

Math: Fix log/log10 return type.

Browse Source 
They used to always return complex numbers, instead of floats on float argument.
This commit is contained in:
Valentin Lorentz 2020-01-26 20:41:16 +01:00
parent 4528a847e4
commit 5c10bea7aa
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/Math/evaluator.py
View File

@ -61,11 +61,11 @@ BIN_OPS = {
MATH_CONSTANTS = 'e inf nan pi tau'.split()
SAFE_MATH_FUNCTIONS = (
'acos acosh asin asinh atan atan2 atanh copysign cos cosh degrees erf '
'erfc exp expm1 fabs fmod frexp fsum gamma hypot ldexp lgamma log log10 '
'erfc exp expm1 fabs fmod frexp fsum gamma hypot ldexp lgamma '
'log1p log2 modf pow radians remainder sin sinh tan tanh'
).split()
SAFE_CMATH_FUNCTIONS = (
'acos acosh asin asinh atan atanh cos cosh exp inf infj log log10 '
'acos acosh asin asinh atan atanh cos cosh exp inf infj '
'nanj phase polar rect sin sinh tan tanh tau'
).split()
@ -78,6 +78,18 @@ def _sqrt(x):
else:
return math.sqrt(x)
def _log(x):
if isinstance(x, complex) or x < 0:
return cmath.log(x)
else:
return math.log(x)
def _log10(x):
if isinstance(x, complex) or x < 0:
return cmath.log10(x)
else:
return math.log10(x)
def _cbrt(x):
return math.pow(x, 1.0/3)
@ -96,6 +108,8 @@ SAFE_ENV.update({
'factorial': _factorial,
'sqrt': _sqrt,
'cbrt': _cbrt,
'log': _log,
'log10': _log10,
'ceil': lambda x: float(math.ceil(x)),
'floor': lambda x: float(math.floor(x)),
})