AriasCreations/LSL-PyOptimizer
3
0
Fork 0
mirror of https://github.com/Sei-Lisa/LSL-PyOptimizer synced 2025-07-01 23:58:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Managed to deal with the '-nan' case in llList2CSV. Add test cases.

Browse source
This commit is contained in:
Sei Lisa 2015-09-07 02:56:44 +02:00
parent 0122d6ed70
commit bc4f574b33
2 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lslopt/lslbasefuncs.py
View file

@ -77,6 +77,7 @@ NULL_KEY = u'00000000-0000-0000-0000-000000000000'
Infinity = float('inf') Infinity = float('inf')
NaN = float('nan') NaN = float('nan')
Indet = Infinity * 0
class ELSLTypeMismatch(Exception): class ELSLTypeMismatch(Exception):
def __init__(self): def __init__(self):
@ -881,7 +882,7 @@ def llCos(f):
assert isfloat(f) assert isfloat(f)
f = ff(f) f = ff(f)
if math.isinf(f): if math.isinf(f):
return NaN return Indet
if -9223372036854775808.0 <= f < 9223372036854775808.0: if -9223372036854775808.0 <= f < 9223372036854775808.0:
return F32(math.cos(f)) return F32(math.cos(f))
return f return f
@ -974,14 +975,16 @@ def llIntegerToBase64(x):
return b64encode(chr((x>>24)&255) + chr((x>>16)&255) + chr((x>>8)&255) + chr(x&255)).decode('utf8') return b64encode(chr((x>>24)&255) + chr((x>>16)&255) + chr((x>>8)&255) + chr(x&255)).decode('utf8')
def llList2CSV(lst): def llList2CSV(lst):
# INCOMPATIBILITY NOTE: In LSL, llList2CSV can return "-nan". Python can't.
# In Python there's no distinction between -nan and nan.
assert islist(lst) assert islist(lst)
ret = [] ret = []
for elem in lst: for elem in lst:
# This always uses LSO rules for float to string. # This always uses LSO rules for float to string.
if type(elem) == float: if type(elem) == float:
ret.append(u'%.6f' % elem) from struct import pack
if math.isnan(elem) and pack('>f', elem)[0:1] == b'\xff':
ret.append(u'-nan')
else:
ret.append(u'%.6f' % elem)
elif type(elem) in (Vector, Quaternion): elif type(elem) in (Vector, Quaternion):
ret.append(u'<' + u', '.join(list(u'%.6f' % x for x in elem)) + u'>') ret.append(u'<' + u', '.join(list(u'%.6f' % x for x in elem)) + u'>')
else: else:
@ -1383,7 +1386,7 @@ def llPow(base, exp):
f = F32(math.pow(base, exp)) f = F32(math.pow(base, exp))
return 0.0 if f == 0.0 else f # don't return -0.0 return 0.0 if f == 0.0 else f # don't return -0.0
except ValueError: # should happen only with negative base and noninteger exponent except ValueError: # should happen only with negative base and noninteger exponent
return NaN return Indet
def llRot2Angle(r): def llRot2Angle(r):
assert isrotation(r) assert isrotation(r)
@ -1506,7 +1509,7 @@ def llSin(f):
assert isfloat(f) assert isfloat(f)
f = ff(f) f = ff(f)
if math.isinf(f): if math.isinf(f):
return NaN return Indet
if -9223372036854775808.0 <= f < 9223372036854775808.0: if -9223372036854775808.0 <= f < 9223372036854775808.0:
return F32(math.sin(f)) return F32(math.sin(f))
return f return f
@ -1515,7 +1518,7 @@ def llSqrt(f):
assert isfloat(f) assert isfloat(f)
f = ff(f) f = ff(f)
if f < 0.0: if f < 0.0:
return NaN return Indet
# LSL and Python both produce -0.0 when the input is -0.0. # LSL and Python both produce -0.0 when the input is -0.0.
return F32(math.sqrt(f)) return F32(math.sqrt(f))
@ -1550,7 +1553,7 @@ def llTan(f):
assert isfloat(f) assert isfloat(f)
f = ff(f) f = ff(f)
if math.isinf(f): if math.isinf(f):
return NaN return Indet
if -9223372036854775808.0 <= f < 9223372036854775808.0: if -9223372036854775808.0 <= f < 9223372036854775808.0:
# We only consider the first turn for anomalous results. # We only consider the first turn for anomalous results.
if abs(f) == 1.570796251296997: if abs(f) == 1.570796251296997:

8
testfuncs.py
View file

@ -828,6 +828,14 @@ def do_tests():
test('llTan(F32(math.pi*.5))', -22877330.) test('llTan(F32(math.pi*.5))', -22877330.)
test('llTan(F("0x1.921FB4p0"))', 13245400.) test('llTan(F("0x1.921FB4p0"))', 13245400.)
# nan and -nan in llList2CSV
test('llList2CSV([llSin(F32(4e38))])', u'-nan')
test('llList2CSV([llCos(F32(4e38))])', u'-nan')
test('llList2CSV([llTan(F32(4e38))])', u'-nan')
test('llList2CSV([llSqrt(F32(-1))])', u'-nan')
test('llList2CSV([llPow(-1.0,F32(1.3))])', u'-nan')
test('llList2CSV([llPow(nan,F32(1.3))])', u'nan')
testXB64S("", "", "") testXB64S("", "", "")
testXB64S(u"Hello, World!", u"", u"Hello, World!") testXB64S(u"Hello, World!", u"", u"Hello, World!")
testXB64S("AAAAA==AAAAA=", "_X", "/X/X/==X/X/X=") testXB64S("AAAAA==AAAAA=", "_X", "/X/X/==X/X/X=")