From eb7b1c18fc503f1af040381e2127b5b11eb91db5 Mon Sep 17 00:00:00 2001 From: Don Cross Date: Thu, 4 Jul 2019 21:46:41 -0400 Subject: [PATCH] Minor cleanup in _iau2000b optimizer. --- generate/fixaddsol.py | 13 ++-- generate/template/astronomy.py | 128 ++++++++++++++++----------------- source/python/astronomy.py | 128 ++++++++++++++++----------------- 3 files changed, 132 insertions(+), 137 deletions(-) diff --git a/generate/fixaddsol.py b/generate/fixaddsol.py index 964ec8d0..41edb791 100755 --- a/generate/fixaddsol.py +++ b/generate/fixaddsol.py @@ -89,21 +89,16 @@ def OptimizeDotProduct(nlist, vlist): if n != 0.0: if n < 0.0: n *= -1.0 - op = ' - ' + op = '-' if first else ' - ' else: - op = ' + ' + op = '' if first else ' + ' if n == 1.0: prod = v else: - prod = '({:0.1f}*{})'.format(n, v) + prod = '{:0.1f}*{}'.format(n, v) - if first: - if op == ' - ': - text += '-' - text += prod - else: - text += op + prod + text += op + prod first = False return text diff --git a/generate/template/astronomy.py b/generate/template/astronomy.py index a1406c26..630ca866 100644 --- a/generate/template/astronomy.py +++ b/generate/template/astronomy.py @@ -233,17 +233,17 @@ class _iau2000b: carg = math.cos(arg) dp += (-172064161.0 + -174666.0*t)*sarg + 33386.0*carg de += (92052331.0 + 9086.0*t)*carg + 15377.0*sarg - arg = math.fmod((2.0*f) - (2.0*d) + (2.0*om), _PI2) + arg = math.fmod(2.0*f - 2.0*d + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-13170906.0 + -1675.0*t)*sarg + -13696.0*carg de += (5730336.0 + -3015.0*t)*carg + -4587.0*sarg - arg = math.fmod((2.0*f) + (2.0*om), _PI2) + arg = math.fmod(2.0*f + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-2276413.0 + -234.0*t)*sarg + 2796.0*carg de += (978459.0 + -485.0*t)*carg + 1374.0*sarg - arg = math.fmod((2.0*om), _PI2) + arg = math.fmod(2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (2074554.0 + 207.0*t)*sarg + -698.0*carg @@ -253,7 +253,7 @@ class _iau2000b: carg = math.cos(arg) dp += (1475877.0 + -3633.0*t)*sarg + 11817.0*carg de += (73871.0 + -184.0*t)*carg + -1924.0*sarg - arg = math.fmod(elp + (2.0*f) - (2.0*d) + (2.0*om), _PI2) + arg = math.fmod(elp + 2.0*f - 2.0*d + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-516821.0 + 1226.0*t)*sarg + -524.0*carg @@ -263,32 +263,32 @@ class _iau2000b: carg = math.cos(arg) dp += (711159.0 + 73.0*t)*sarg + -872.0*carg de += (-6750.0 + 0.0*t)*carg + 358.0*sarg - arg = math.fmod((2.0*f) + om, _PI2) + arg = math.fmod(2.0*f + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-387298.0 + -367.0*t)*sarg + 380.0*carg de += (200728.0 + 18.0*t)*carg + 318.0*sarg - arg = math.fmod(el + (2.0*f) + (2.0*om), _PI2) + arg = math.fmod(el + 2.0*f + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-301461.0 + -36.0*t)*sarg + 816.0*carg de += (129025.0 + -63.0*t)*carg + 367.0*sarg - arg = math.fmod(-elp + (2.0*f) - (2.0*d) + (2.0*om), _PI2) + arg = math.fmod(-elp + 2.0*f - 2.0*d + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (215829.0 + -494.0*t)*sarg + 111.0*carg de += (-95929.0 + 299.0*t)*carg + 132.0*sarg - arg = math.fmod((2.0*f) - (2.0*d) + om, _PI2) + arg = math.fmod(2.0*f - 2.0*d + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (128227.0 + 137.0*t)*sarg + 181.0*carg de += (-68982.0 + -9.0*t)*carg + 39.0*sarg - arg = math.fmod(-el + (2.0*f) + (2.0*om), _PI2) + arg = math.fmod(-el + 2.0*f + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (123457.0 + 11.0*t)*sarg + 19.0*carg de += (-53311.0 + 32.0*t)*carg + -4.0*sarg - arg = math.fmod(-el + (2.0*d), _PI2) + arg = math.fmod(-el + 2.0*d, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (156994.0 + 10.0*t)*sarg + -168.0*carg @@ -303,62 +303,62 @@ class _iau2000b: carg = math.cos(arg) dp += (-57976.0 + -63.0*t)*sarg + -189.0*carg de += (31429.0 + 0.0*t)*carg + -75.0*sarg - arg = math.fmod(-el + (2.0*f) + (2.0*d) + (2.0*om), _PI2) + arg = math.fmod(-el + 2.0*f + 2.0*d + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-59641.0 + -11.0*t)*sarg + 149.0*carg de += (25543.0 + -11.0*t)*carg + 66.0*sarg - arg = math.fmod(el + (2.0*f) + om, _PI2) + arg = math.fmod(el + 2.0*f + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-51613.0 + -42.0*t)*sarg + 129.0*carg de += (26366.0 + 0.0*t)*carg + 78.0*sarg - arg = math.fmod(-(2.0*el) + (2.0*f) + om, _PI2) + arg = math.fmod(-2.0*el + 2.0*f + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (45893.0 + 50.0*t)*sarg + 31.0*carg de += (-24236.0 + -10.0*t)*carg + 20.0*sarg - arg = math.fmod((2.0*d), _PI2) + arg = math.fmod(2.0*d, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (63384.0 + 11.0*t)*sarg + -150.0*carg de += (-1220.0 + 0.0*t)*carg + 29.0*sarg - arg = math.fmod((2.0*f) + (2.0*d) + (2.0*om), _PI2) + arg = math.fmod(2.0*f + 2.0*d + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-38571.0 + -1.0*t)*sarg + 158.0*carg de += (16452.0 + -11.0*t)*carg + 68.0*sarg - arg = math.fmod(-(2.0*elp) + (2.0*f) - (2.0*d) + (2.0*om), _PI2) + arg = math.fmod(-2.0*elp + 2.0*f - 2.0*d + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (32481.0 + 0.0*t)*sarg + 0.0*carg de += (-13870.0 + 0.0*t)*carg + 0.0*sarg - arg = math.fmod(-(2.0*el) + (2.0*d), _PI2) + arg = math.fmod(-2.0*el + 2.0*d, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-47722.0 + 0.0*t)*sarg + -18.0*carg de += (477.0 + 0.0*t)*carg + -25.0*sarg - arg = math.fmod((2.0*el) + (2.0*f) + (2.0*om), _PI2) + arg = math.fmod(2.0*el + 2.0*f + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-31046.0 + -1.0*t)*sarg + 131.0*carg de += (13238.0 + -11.0*t)*carg + 59.0*sarg - arg = math.fmod(el + (2.0*f) - (2.0*d) + (2.0*om), _PI2) + arg = math.fmod(el + 2.0*f - 2.0*d + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (28593.0 + 0.0*t)*sarg + -1.0*carg de += (-12338.0 + 10.0*t)*carg + -3.0*sarg - arg = math.fmod(-el + (2.0*f) + om, _PI2) + arg = math.fmod(-el + 2.0*f + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (20441.0 + 21.0*t)*sarg + 10.0*carg de += (-10758.0 + 0.0*t)*carg + -3.0*sarg - arg = math.fmod((2.0*el), _PI2) + arg = math.fmod(2.0*el, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (29243.0 + 0.0*t)*sarg + -74.0*carg de += (-609.0 + 0.0*t)*carg + 13.0*sarg - arg = math.fmod((2.0*f), _PI2) + arg = math.fmod(2.0*f, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (25887.0 + 0.0*t)*sarg + -66.0*carg @@ -368,22 +368,22 @@ class _iau2000b: carg = math.cos(arg) dp += (-14053.0 + -25.0*t)*sarg + 79.0*carg de += (8551.0 + -2.0*t)*carg + -45.0*sarg - arg = math.fmod(-el + (2.0*d) + om, _PI2) + arg = math.fmod(-el + 2.0*d + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (15164.0 + 10.0*t)*sarg + 11.0*carg de += (-8001.0 + 0.0*t)*carg + -1.0*sarg - arg = math.fmod((2.0*elp) + (2.0*f) - (2.0*d) + (2.0*om), _PI2) + arg = math.fmod(2.0*elp + 2.0*f - 2.0*d + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-15794.0 + 72.0*t)*sarg + -16.0*carg de += (6850.0 + -42.0*t)*carg + -5.0*sarg - arg = math.fmod(-(2.0*f) + (2.0*d), _PI2) + arg = math.fmod(-2.0*f + 2.0*d, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (21783.0 + 0.0*t)*sarg + 13.0*carg de += (-167.0 + 0.0*t)*carg + 13.0*sarg - arg = math.fmod(el - (2.0*d) + om, _PI2) + arg = math.fmod(el - 2.0*d + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-12873.0 + -10.0*t)*sarg + -37.0*carg @@ -393,92 +393,92 @@ class _iau2000b: carg = math.cos(arg) dp += (-12654.0 + 11.0*t)*sarg + 63.0*carg de += (6415.0 + 0.0*t)*carg + 26.0*sarg - arg = math.fmod(-el + (2.0*f) + (2.0*d) + om, _PI2) + arg = math.fmod(-el + 2.0*f + 2.0*d + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-10204.0 + 0.0*t)*sarg + 25.0*carg de += (5222.0 + 0.0*t)*carg + 15.0*sarg - arg = math.fmod((2.0*elp), _PI2) + arg = math.fmod(2.0*elp, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (16707.0 + -85.0*t)*sarg + -10.0*carg de += (168.0 + -1.0*t)*carg + 10.0*sarg - arg = math.fmod(el + (2.0*f) + (2.0*d) + (2.0*om), _PI2) + arg = math.fmod(el + 2.0*f + 2.0*d + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-7691.0 + 0.0*t)*sarg + 44.0*carg de += (3268.0 + 0.0*t)*carg + 19.0*sarg - arg = math.fmod(-(2.0*el) + (2.0*f), _PI2) + arg = math.fmod(-2.0*el + 2.0*f, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-11024.0 + 0.0*t)*sarg + -14.0*carg de += (104.0 + 0.0*t)*carg + 2.0*sarg - arg = math.fmod(elp + (2.0*f) + (2.0*om), _PI2) + arg = math.fmod(elp + 2.0*f + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (7566.0 + -21.0*t)*sarg + -11.0*carg de += (-3250.0 + 0.0*t)*carg + -5.0*sarg - arg = math.fmod((2.0*f) + (2.0*d) + om, _PI2) + arg = math.fmod(2.0*f + 2.0*d + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-6637.0 + -11.0*t)*sarg + 25.0*carg de += (3353.0 + 0.0*t)*carg + 14.0*sarg - arg = math.fmod(-elp + (2.0*f) + (2.0*om), _PI2) + arg = math.fmod(-elp + 2.0*f + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-7141.0 + 21.0*t)*sarg + 8.0*carg de += (3070.0 + 0.0*t)*carg + 4.0*sarg - arg = math.fmod((2.0*d) + om, _PI2) + arg = math.fmod(2.0*d + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-6302.0 + -11.0*t)*sarg + 2.0*carg de += (3272.0 + 0.0*t)*carg + 4.0*sarg - arg = math.fmod(el + (2.0*f) - (2.0*d) + om, _PI2) + arg = math.fmod(el + 2.0*f - 2.0*d + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (5800.0 + 10.0*t)*sarg + 2.0*carg de += (-3045.0 + 0.0*t)*carg + -1.0*sarg - arg = math.fmod((2.0*el) + (2.0*f) - (2.0*d) + (2.0*om), _PI2) + arg = math.fmod(2.0*el + 2.0*f - 2.0*d + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (6443.0 + 0.0*t)*sarg + -7.0*carg de += (-2768.0 + 0.0*t)*carg + -4.0*sarg - arg = math.fmod(-(2.0*el) + (2.0*d) + om, _PI2) + arg = math.fmod(-2.0*el + 2.0*d + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-5774.0 + -11.0*t)*sarg + -15.0*carg de += (3041.0 + 0.0*t)*carg + -5.0*sarg - arg = math.fmod((2.0*el) + (2.0*f) + om, _PI2) + arg = math.fmod(2.0*el + 2.0*f + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-5350.0 + 0.0*t)*sarg + 21.0*carg de += (2695.0 + 0.0*t)*carg + 12.0*sarg - arg = math.fmod(-elp + (2.0*f) - (2.0*d) + om, _PI2) + arg = math.fmod(-elp + 2.0*f - 2.0*d + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-4752.0 + -11.0*t)*sarg + -3.0*carg de += (2719.0 + 0.0*t)*carg + -3.0*sarg - arg = math.fmod(-(2.0*d) + om, _PI2) + arg = math.fmod(-2.0*d + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-4940.0 + -11.0*t)*sarg + -21.0*carg de += (2720.0 + 0.0*t)*carg + -9.0*sarg - arg = math.fmod(-el - elp + (2.0*d), _PI2) + arg = math.fmod(-el - elp + 2.0*d, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (7350.0 + 0.0*t)*sarg + -8.0*carg de += (-51.0 + 0.0*t)*carg + 4.0*sarg - arg = math.fmod((2.0*el) - (2.0*d) + om, _PI2) + arg = math.fmod(2.0*el - 2.0*d + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (4065.0 + 0.0*t)*sarg + 6.0*carg de += (-2206.0 + 0.0*t)*carg + 1.0*sarg - arg = math.fmod(el + (2.0*d), _PI2) + arg = math.fmod(el + 2.0*d, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (6579.0 + 0.0*t)*sarg + -24.0*carg de += (-199.0 + 0.0*t)*carg + 2.0*sarg - arg = math.fmod(elp + (2.0*f) - (2.0*d) + om, _PI2) + arg = math.fmod(elp + 2.0*f - 2.0*d + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (3579.0 + 0.0*t)*sarg + 5.0*carg @@ -488,22 +488,22 @@ class _iau2000b: carg = math.cos(arg) dp += (4725.0 + 0.0*t)*sarg + -6.0*carg de += (-41.0 + 0.0*t)*carg + 3.0*sarg - arg = math.fmod(-(2.0*el) + (2.0*f) + (2.0*om), _PI2) + arg = math.fmod(-2.0*el + 2.0*f + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-3075.0 + 0.0*t)*sarg + -2.0*carg de += (1313.0 + 0.0*t)*carg + -1.0*sarg - arg = math.fmod((3.0*el) + (2.0*f) + (2.0*om), _PI2) + arg = math.fmod(3.0*el + 2.0*f + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-2904.0 + 0.0*t)*sarg + 15.0*carg de += (1233.0 + 0.0*t)*carg + 7.0*sarg - arg = math.fmod(-elp + (2.0*d), _PI2) + arg = math.fmod(-elp + 2.0*d, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (4348.0 + 0.0*t)*sarg + -10.0*carg de += (-81.0 + 0.0*t)*carg + 2.0*sarg - arg = math.fmod(el - elp + (2.0*f) + (2.0*om), _PI2) + arg = math.fmod(el - elp + 2.0*f + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-2878.0 + 0.0*t)*sarg + 8.0*carg @@ -513,32 +513,32 @@ class _iau2000b: carg = math.cos(arg) dp += (-4230.0 + 0.0*t)*sarg + 5.0*carg de += (-20.0 + 0.0*t)*carg + -2.0*sarg - arg = math.fmod(-el - elp + (2.0*f) + (2.0*d) + (2.0*om), _PI2) + arg = math.fmod(-el - elp + 2.0*f + 2.0*d + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-2819.0 + 0.0*t)*sarg + 7.0*carg de += (1207.0 + 0.0*t)*carg + 3.0*sarg - arg = math.fmod(-el + (2.0*f), _PI2) + arg = math.fmod(-el + 2.0*f, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-4056.0 + 0.0*t)*sarg + 5.0*carg de += (40.0 + 0.0*t)*carg + -2.0*sarg - arg = math.fmod(-elp + (2.0*f) + (2.0*d) + (2.0*om), _PI2) + arg = math.fmod(-elp + 2.0*f + 2.0*d + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-2647.0 + 0.0*t)*sarg + 11.0*carg de += (1129.0 + 0.0*t)*carg + 5.0*sarg - arg = math.fmod(-(2.0*el) + om, _PI2) + arg = math.fmod(-2.0*el + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-2294.0 + 0.0*t)*sarg + -10.0*carg de += (1266.0 + 0.0*t)*carg + -4.0*sarg - arg = math.fmod(el + elp + (2.0*f) + (2.0*om), _PI2) + arg = math.fmod(el + elp + 2.0*f + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (2481.0 + 0.0*t)*sarg + -7.0*carg de += (-1062.0 + 0.0*t)*carg + -3.0*sarg - arg = math.fmod((2.0*el) + om, _PI2) + arg = math.fmod(2.0*el + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (2179.0 + 0.0*t)*sarg + -2.0*carg @@ -553,17 +553,17 @@ class _iau2000b: carg = math.cos(arg) dp += (-3389.0 + 0.0*t)*sarg + 5.0*carg de += (35.0 + 0.0*t)*carg + -2.0*sarg - arg = math.fmod(el + (2.0*f), _PI2) + arg = math.fmod(el + 2.0*f, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (3339.0 + 0.0*t)*sarg + -13.0*carg de += (-107.0 + 0.0*t)*carg + 1.0*sarg - arg = math.fmod(-el + (2.0*f) - (2.0*d) + om, _PI2) + arg = math.fmod(-el + 2.0*f - 2.0*d + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-1987.0 + 0.0*t)*sarg + -6.0*carg de += (1073.0 + 0.0*t)*carg + -2.0*sarg - arg = math.fmod(el + (2.0*om), _PI2) + arg = math.fmod(el + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-1981.0 + 0.0*t)*sarg + 0.0*carg @@ -573,12 +573,12 @@ class _iau2000b: carg = math.cos(arg) dp += (4026.0 + 0.0*t)*sarg + -353.0*carg de += (-553.0 + 0.0*t)*carg + -139.0*sarg - arg = math.fmod((2.0*f) + d + (2.0*om), _PI2) + arg = math.fmod(2.0*f + d + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (1660.0 + 0.0*t)*sarg + -5.0*carg de += (-710.0 + 0.0*t)*carg + -2.0*sarg - arg = math.fmod(-el + (2.0*f) + (4.0*d) + (2.0*om), _PI2) + arg = math.fmod(-el + 2.0*f + 4.0*d + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-1521.0 + 0.0*t)*sarg + 9.0*carg @@ -588,27 +588,27 @@ class _iau2000b: carg = math.cos(arg) dp += (1314.0 + 0.0*t)*sarg + 0.0*carg de += (-700.0 + 0.0*t)*carg + 0.0*sarg - arg = math.fmod(-(2.0*elp) + (2.0*f) - (2.0*d) + om, _PI2) + arg = math.fmod(-2.0*elp + 2.0*f - 2.0*d + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-1283.0 + 0.0*t)*sarg + 0.0*carg de += (672.0 + 0.0*t)*carg + 0.0*sarg - arg = math.fmod(el + (2.0*f) + (2.0*d) + om, _PI2) + arg = math.fmod(el + 2.0*f + 2.0*d + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-1331.0 + 0.0*t)*sarg + 8.0*carg de += (663.0 + 0.0*t)*carg + 4.0*sarg - arg = math.fmod(-(2.0*el) + (2.0*f) + (2.0*d) + (2.0*om), _PI2) + arg = math.fmod(-2.0*el + 2.0*f + 2.0*d + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (1383.0 + 0.0*t)*sarg + -2.0*carg de += (-594.0 + 0.0*t)*carg + -2.0*sarg - arg = math.fmod(-el + (2.0*om), _PI2) + arg = math.fmod(-el + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (1405.0 + 0.0*t)*sarg + 4.0*carg de += (-610.0 + 0.0*t)*carg + 2.0*sarg - arg = math.fmod(el + elp + (2.0*f) - (2.0*d) + (2.0*om), _PI2) + arg = math.fmod(el + elp + 2.0*f - 2.0*d + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (1290.0 + 0.0*t)*sarg + 0.0*carg diff --git a/source/python/astronomy.py b/source/python/astronomy.py index ee12bb90..cc8a527e 100644 --- a/source/python/astronomy.py +++ b/source/python/astronomy.py @@ -324,17 +324,17 @@ class _iau2000b: carg = math.cos(arg) dp += (-172064161.0 + -174666.0*t)*sarg + 33386.0*carg de += (92052331.0 + 9086.0*t)*carg + 15377.0*sarg - arg = math.fmod((2.0*f) - (2.0*d) + (2.0*om), _PI2) + arg = math.fmod(2.0*f - 2.0*d + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-13170906.0 + -1675.0*t)*sarg + -13696.0*carg de += (5730336.0 + -3015.0*t)*carg + -4587.0*sarg - arg = math.fmod((2.0*f) + (2.0*om), _PI2) + arg = math.fmod(2.0*f + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-2276413.0 + -234.0*t)*sarg + 2796.0*carg de += (978459.0 + -485.0*t)*carg + 1374.0*sarg - arg = math.fmod((2.0*om), _PI2) + arg = math.fmod(2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (2074554.0 + 207.0*t)*sarg + -698.0*carg @@ -344,7 +344,7 @@ class _iau2000b: carg = math.cos(arg) dp += (1475877.0 + -3633.0*t)*sarg + 11817.0*carg de += (73871.0 + -184.0*t)*carg + -1924.0*sarg - arg = math.fmod(elp + (2.0*f) - (2.0*d) + (2.0*om), _PI2) + arg = math.fmod(elp + 2.0*f - 2.0*d + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-516821.0 + 1226.0*t)*sarg + -524.0*carg @@ -354,32 +354,32 @@ class _iau2000b: carg = math.cos(arg) dp += (711159.0 + 73.0*t)*sarg + -872.0*carg de += (-6750.0 + 0.0*t)*carg + 358.0*sarg - arg = math.fmod((2.0*f) + om, _PI2) + arg = math.fmod(2.0*f + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-387298.0 + -367.0*t)*sarg + 380.0*carg de += (200728.0 + 18.0*t)*carg + 318.0*sarg - arg = math.fmod(el + (2.0*f) + (2.0*om), _PI2) + arg = math.fmod(el + 2.0*f + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-301461.0 + -36.0*t)*sarg + 816.0*carg de += (129025.0 + -63.0*t)*carg + 367.0*sarg - arg = math.fmod(-elp + (2.0*f) - (2.0*d) + (2.0*om), _PI2) + arg = math.fmod(-elp + 2.0*f - 2.0*d + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (215829.0 + -494.0*t)*sarg + 111.0*carg de += (-95929.0 + 299.0*t)*carg + 132.0*sarg - arg = math.fmod((2.0*f) - (2.0*d) + om, _PI2) + arg = math.fmod(2.0*f - 2.0*d + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (128227.0 + 137.0*t)*sarg + 181.0*carg de += (-68982.0 + -9.0*t)*carg + 39.0*sarg - arg = math.fmod(-el + (2.0*f) + (2.0*om), _PI2) + arg = math.fmod(-el + 2.0*f + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (123457.0 + 11.0*t)*sarg + 19.0*carg de += (-53311.0 + 32.0*t)*carg + -4.0*sarg - arg = math.fmod(-el + (2.0*d), _PI2) + arg = math.fmod(-el + 2.0*d, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (156994.0 + 10.0*t)*sarg + -168.0*carg @@ -394,62 +394,62 @@ class _iau2000b: carg = math.cos(arg) dp += (-57976.0 + -63.0*t)*sarg + -189.0*carg de += (31429.0 + 0.0*t)*carg + -75.0*sarg - arg = math.fmod(-el + (2.0*f) + (2.0*d) + (2.0*om), _PI2) + arg = math.fmod(-el + 2.0*f + 2.0*d + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-59641.0 + -11.0*t)*sarg + 149.0*carg de += (25543.0 + -11.0*t)*carg + 66.0*sarg - arg = math.fmod(el + (2.0*f) + om, _PI2) + arg = math.fmod(el + 2.0*f + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-51613.0 + -42.0*t)*sarg + 129.0*carg de += (26366.0 + 0.0*t)*carg + 78.0*sarg - arg = math.fmod(-(2.0*el) + (2.0*f) + om, _PI2) + arg = math.fmod(-2.0*el + 2.0*f + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (45893.0 + 50.0*t)*sarg + 31.0*carg de += (-24236.0 + -10.0*t)*carg + 20.0*sarg - arg = math.fmod((2.0*d), _PI2) + arg = math.fmod(2.0*d, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (63384.0 + 11.0*t)*sarg + -150.0*carg de += (-1220.0 + 0.0*t)*carg + 29.0*sarg - arg = math.fmod((2.0*f) + (2.0*d) + (2.0*om), _PI2) + arg = math.fmod(2.0*f + 2.0*d + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-38571.0 + -1.0*t)*sarg + 158.0*carg de += (16452.0 + -11.0*t)*carg + 68.0*sarg - arg = math.fmod(-(2.0*elp) + (2.0*f) - (2.0*d) + (2.0*om), _PI2) + arg = math.fmod(-2.0*elp + 2.0*f - 2.0*d + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (32481.0 + 0.0*t)*sarg + 0.0*carg de += (-13870.0 + 0.0*t)*carg + 0.0*sarg - arg = math.fmod(-(2.0*el) + (2.0*d), _PI2) + arg = math.fmod(-2.0*el + 2.0*d, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-47722.0 + 0.0*t)*sarg + -18.0*carg de += (477.0 + 0.0*t)*carg + -25.0*sarg - arg = math.fmod((2.0*el) + (2.0*f) + (2.0*om), _PI2) + arg = math.fmod(2.0*el + 2.0*f + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-31046.0 + -1.0*t)*sarg + 131.0*carg de += (13238.0 + -11.0*t)*carg + 59.0*sarg - arg = math.fmod(el + (2.0*f) - (2.0*d) + (2.0*om), _PI2) + arg = math.fmod(el + 2.0*f - 2.0*d + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (28593.0 + 0.0*t)*sarg + -1.0*carg de += (-12338.0 + 10.0*t)*carg + -3.0*sarg - arg = math.fmod(-el + (2.0*f) + om, _PI2) + arg = math.fmod(-el + 2.0*f + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (20441.0 + 21.0*t)*sarg + 10.0*carg de += (-10758.0 + 0.0*t)*carg + -3.0*sarg - arg = math.fmod((2.0*el), _PI2) + arg = math.fmod(2.0*el, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (29243.0 + 0.0*t)*sarg + -74.0*carg de += (-609.0 + 0.0*t)*carg + 13.0*sarg - arg = math.fmod((2.0*f), _PI2) + arg = math.fmod(2.0*f, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (25887.0 + 0.0*t)*sarg + -66.0*carg @@ -459,22 +459,22 @@ class _iau2000b: carg = math.cos(arg) dp += (-14053.0 + -25.0*t)*sarg + 79.0*carg de += (8551.0 + -2.0*t)*carg + -45.0*sarg - arg = math.fmod(-el + (2.0*d) + om, _PI2) + arg = math.fmod(-el + 2.0*d + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (15164.0 + 10.0*t)*sarg + 11.0*carg de += (-8001.0 + 0.0*t)*carg + -1.0*sarg - arg = math.fmod((2.0*elp) + (2.0*f) - (2.0*d) + (2.0*om), _PI2) + arg = math.fmod(2.0*elp + 2.0*f - 2.0*d + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-15794.0 + 72.0*t)*sarg + -16.0*carg de += (6850.0 + -42.0*t)*carg + -5.0*sarg - arg = math.fmod(-(2.0*f) + (2.0*d), _PI2) + arg = math.fmod(-2.0*f + 2.0*d, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (21783.0 + 0.0*t)*sarg + 13.0*carg de += (-167.0 + 0.0*t)*carg + 13.0*sarg - arg = math.fmod(el - (2.0*d) + om, _PI2) + arg = math.fmod(el - 2.0*d + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-12873.0 + -10.0*t)*sarg + -37.0*carg @@ -484,92 +484,92 @@ class _iau2000b: carg = math.cos(arg) dp += (-12654.0 + 11.0*t)*sarg + 63.0*carg de += (6415.0 + 0.0*t)*carg + 26.0*sarg - arg = math.fmod(-el + (2.0*f) + (2.0*d) + om, _PI2) + arg = math.fmod(-el + 2.0*f + 2.0*d + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-10204.0 + 0.0*t)*sarg + 25.0*carg de += (5222.0 + 0.0*t)*carg + 15.0*sarg - arg = math.fmod((2.0*elp), _PI2) + arg = math.fmod(2.0*elp, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (16707.0 + -85.0*t)*sarg + -10.0*carg de += (168.0 + -1.0*t)*carg + 10.0*sarg - arg = math.fmod(el + (2.0*f) + (2.0*d) + (2.0*om), _PI2) + arg = math.fmod(el + 2.0*f + 2.0*d + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-7691.0 + 0.0*t)*sarg + 44.0*carg de += (3268.0 + 0.0*t)*carg + 19.0*sarg - arg = math.fmod(-(2.0*el) + (2.0*f), _PI2) + arg = math.fmod(-2.0*el + 2.0*f, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-11024.0 + 0.0*t)*sarg + -14.0*carg de += (104.0 + 0.0*t)*carg + 2.0*sarg - arg = math.fmod(elp + (2.0*f) + (2.0*om), _PI2) + arg = math.fmod(elp + 2.0*f + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (7566.0 + -21.0*t)*sarg + -11.0*carg de += (-3250.0 + 0.0*t)*carg + -5.0*sarg - arg = math.fmod((2.0*f) + (2.0*d) + om, _PI2) + arg = math.fmod(2.0*f + 2.0*d + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-6637.0 + -11.0*t)*sarg + 25.0*carg de += (3353.0 + 0.0*t)*carg + 14.0*sarg - arg = math.fmod(-elp + (2.0*f) + (2.0*om), _PI2) + arg = math.fmod(-elp + 2.0*f + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-7141.0 + 21.0*t)*sarg + 8.0*carg de += (3070.0 + 0.0*t)*carg + 4.0*sarg - arg = math.fmod((2.0*d) + om, _PI2) + arg = math.fmod(2.0*d + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-6302.0 + -11.0*t)*sarg + 2.0*carg de += (3272.0 + 0.0*t)*carg + 4.0*sarg - arg = math.fmod(el + (2.0*f) - (2.0*d) + om, _PI2) + arg = math.fmod(el + 2.0*f - 2.0*d + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (5800.0 + 10.0*t)*sarg + 2.0*carg de += (-3045.0 + 0.0*t)*carg + -1.0*sarg - arg = math.fmod((2.0*el) + (2.0*f) - (2.0*d) + (2.0*om), _PI2) + arg = math.fmod(2.0*el + 2.0*f - 2.0*d + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (6443.0 + 0.0*t)*sarg + -7.0*carg de += (-2768.0 + 0.0*t)*carg + -4.0*sarg - arg = math.fmod(-(2.0*el) + (2.0*d) + om, _PI2) + arg = math.fmod(-2.0*el + 2.0*d + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-5774.0 + -11.0*t)*sarg + -15.0*carg de += (3041.0 + 0.0*t)*carg + -5.0*sarg - arg = math.fmod((2.0*el) + (2.0*f) + om, _PI2) + arg = math.fmod(2.0*el + 2.0*f + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-5350.0 + 0.0*t)*sarg + 21.0*carg de += (2695.0 + 0.0*t)*carg + 12.0*sarg - arg = math.fmod(-elp + (2.0*f) - (2.0*d) + om, _PI2) + arg = math.fmod(-elp + 2.0*f - 2.0*d + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-4752.0 + -11.0*t)*sarg + -3.0*carg de += (2719.0 + 0.0*t)*carg + -3.0*sarg - arg = math.fmod(-(2.0*d) + om, _PI2) + arg = math.fmod(-2.0*d + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-4940.0 + -11.0*t)*sarg + -21.0*carg de += (2720.0 + 0.0*t)*carg + -9.0*sarg - arg = math.fmod(-el - elp + (2.0*d), _PI2) + arg = math.fmod(-el - elp + 2.0*d, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (7350.0 + 0.0*t)*sarg + -8.0*carg de += (-51.0 + 0.0*t)*carg + 4.0*sarg - arg = math.fmod((2.0*el) - (2.0*d) + om, _PI2) + arg = math.fmod(2.0*el - 2.0*d + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (4065.0 + 0.0*t)*sarg + 6.0*carg de += (-2206.0 + 0.0*t)*carg + 1.0*sarg - arg = math.fmod(el + (2.0*d), _PI2) + arg = math.fmod(el + 2.0*d, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (6579.0 + 0.0*t)*sarg + -24.0*carg de += (-199.0 + 0.0*t)*carg + 2.0*sarg - arg = math.fmod(elp + (2.0*f) - (2.0*d) + om, _PI2) + arg = math.fmod(elp + 2.0*f - 2.0*d + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (3579.0 + 0.0*t)*sarg + 5.0*carg @@ -579,22 +579,22 @@ class _iau2000b: carg = math.cos(arg) dp += (4725.0 + 0.0*t)*sarg + -6.0*carg de += (-41.0 + 0.0*t)*carg + 3.0*sarg - arg = math.fmod(-(2.0*el) + (2.0*f) + (2.0*om), _PI2) + arg = math.fmod(-2.0*el + 2.0*f + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-3075.0 + 0.0*t)*sarg + -2.0*carg de += (1313.0 + 0.0*t)*carg + -1.0*sarg - arg = math.fmod((3.0*el) + (2.0*f) + (2.0*om), _PI2) + arg = math.fmod(3.0*el + 2.0*f + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-2904.0 + 0.0*t)*sarg + 15.0*carg de += (1233.0 + 0.0*t)*carg + 7.0*sarg - arg = math.fmod(-elp + (2.0*d), _PI2) + arg = math.fmod(-elp + 2.0*d, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (4348.0 + 0.0*t)*sarg + -10.0*carg de += (-81.0 + 0.0*t)*carg + 2.0*sarg - arg = math.fmod(el - elp + (2.0*f) + (2.0*om), _PI2) + arg = math.fmod(el - elp + 2.0*f + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-2878.0 + 0.0*t)*sarg + 8.0*carg @@ -604,32 +604,32 @@ class _iau2000b: carg = math.cos(arg) dp += (-4230.0 + 0.0*t)*sarg + 5.0*carg de += (-20.0 + 0.0*t)*carg + -2.0*sarg - arg = math.fmod(-el - elp + (2.0*f) + (2.0*d) + (2.0*om), _PI2) + arg = math.fmod(-el - elp + 2.0*f + 2.0*d + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-2819.0 + 0.0*t)*sarg + 7.0*carg de += (1207.0 + 0.0*t)*carg + 3.0*sarg - arg = math.fmod(-el + (2.0*f), _PI2) + arg = math.fmod(-el + 2.0*f, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-4056.0 + 0.0*t)*sarg + 5.0*carg de += (40.0 + 0.0*t)*carg + -2.0*sarg - arg = math.fmod(-elp + (2.0*f) + (2.0*d) + (2.0*om), _PI2) + arg = math.fmod(-elp + 2.0*f + 2.0*d + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-2647.0 + 0.0*t)*sarg + 11.0*carg de += (1129.0 + 0.0*t)*carg + 5.0*sarg - arg = math.fmod(-(2.0*el) + om, _PI2) + arg = math.fmod(-2.0*el + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-2294.0 + 0.0*t)*sarg + -10.0*carg de += (1266.0 + 0.0*t)*carg + -4.0*sarg - arg = math.fmod(el + elp + (2.0*f) + (2.0*om), _PI2) + arg = math.fmod(el + elp + 2.0*f + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (2481.0 + 0.0*t)*sarg + -7.0*carg de += (-1062.0 + 0.0*t)*carg + -3.0*sarg - arg = math.fmod((2.0*el) + om, _PI2) + arg = math.fmod(2.0*el + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (2179.0 + 0.0*t)*sarg + -2.0*carg @@ -644,17 +644,17 @@ class _iau2000b: carg = math.cos(arg) dp += (-3389.0 + 0.0*t)*sarg + 5.0*carg de += (35.0 + 0.0*t)*carg + -2.0*sarg - arg = math.fmod(el + (2.0*f), _PI2) + arg = math.fmod(el + 2.0*f, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (3339.0 + 0.0*t)*sarg + -13.0*carg de += (-107.0 + 0.0*t)*carg + 1.0*sarg - arg = math.fmod(-el + (2.0*f) - (2.0*d) + om, _PI2) + arg = math.fmod(-el + 2.0*f - 2.0*d + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-1987.0 + 0.0*t)*sarg + -6.0*carg de += (1073.0 + 0.0*t)*carg + -2.0*sarg - arg = math.fmod(el + (2.0*om), _PI2) + arg = math.fmod(el + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-1981.0 + 0.0*t)*sarg + 0.0*carg @@ -664,12 +664,12 @@ class _iau2000b: carg = math.cos(arg) dp += (4026.0 + 0.0*t)*sarg + -353.0*carg de += (-553.0 + 0.0*t)*carg + -139.0*sarg - arg = math.fmod((2.0*f) + d + (2.0*om), _PI2) + arg = math.fmod(2.0*f + d + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (1660.0 + 0.0*t)*sarg + -5.0*carg de += (-710.0 + 0.0*t)*carg + -2.0*sarg - arg = math.fmod(-el + (2.0*f) + (4.0*d) + (2.0*om), _PI2) + arg = math.fmod(-el + 2.0*f + 4.0*d + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-1521.0 + 0.0*t)*sarg + 9.0*carg @@ -679,27 +679,27 @@ class _iau2000b: carg = math.cos(arg) dp += (1314.0 + 0.0*t)*sarg + 0.0*carg de += (-700.0 + 0.0*t)*carg + 0.0*sarg - arg = math.fmod(-(2.0*elp) + (2.0*f) - (2.0*d) + om, _PI2) + arg = math.fmod(-2.0*elp + 2.0*f - 2.0*d + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-1283.0 + 0.0*t)*sarg + 0.0*carg de += (672.0 + 0.0*t)*carg + 0.0*sarg - arg = math.fmod(el + (2.0*f) + (2.0*d) + om, _PI2) + arg = math.fmod(el + 2.0*f + 2.0*d + om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (-1331.0 + 0.0*t)*sarg + 8.0*carg de += (663.0 + 0.0*t)*carg + 4.0*sarg - arg = math.fmod(-(2.0*el) + (2.0*f) + (2.0*d) + (2.0*om), _PI2) + arg = math.fmod(-2.0*el + 2.0*f + 2.0*d + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (1383.0 + 0.0*t)*sarg + -2.0*carg de += (-594.0 + 0.0*t)*carg + -2.0*sarg - arg = math.fmod(-el + (2.0*om), _PI2) + arg = math.fmod(-el + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (1405.0 + 0.0*t)*sarg + 4.0*carg de += (-610.0 + 0.0*t)*carg + 2.0*sarg - arg = math.fmod(el + elp + (2.0*f) - (2.0*d) + (2.0*om), _PI2) + arg = math.fmod(el + elp + 2.0*f - 2.0*d + 2.0*om, _PI2) sarg = math.sin(arg) carg = math.cos(arg) dp += (1290.0 + 0.0*t)*sarg + 0.0*carg