From 20f87859d828e5c58b4cc2ea181a2e6fc4624c78 Mon Sep 17 00:00:00 2001 From: Don Cross Date: Sat, 6 Jul 2019 17:50:45 -0400 Subject: [PATCH] Moved AddSol data into a data file, so data can be shared across languages. --- generate/codegen.c | 56 ++++-- generate/fixaddsol.py | 205 --------------------- generate/model_data/addsol.txt | 104 +++++++++++ generate/template/astronomy.py | 107 +---------- source/python/astronomy.py | 313 +++++++++++---------------------- 5 files changed, 255 insertions(+), 530 deletions(-) delete mode 100755 generate/fixaddsol.py create mode 100644 generate/model_data/addsol.txt diff --git a/generate/codegen.c b/generate/codegen.c index 3e23121d..cfcba152 100644 --- a/generate/codegen.c +++ b/generate/codegen.c @@ -31,8 +31,9 @@ #include "ephfile.h" #define CG_MAX_LINE_LENGTH 200 -#define MAX_DATA_PER_LINE 20 -#define IAU_DATA_PER_ROW 11 +#define MAX_DATA_PER_LINE 20 +#define IAU_DATA_PER_ROW 11 +#define ADDSOL_DATA_PER_ROW 8 static const double MJD_BASIS = 2400000.5; @@ -870,17 +871,13 @@ fail: return error; } -static int OptAddSol(cg_context_t *context) +static int OptAddSolPython( + cg_context_t *context, + double cl, double cs, double cg, double cp, double p, double q, double r, double s) { - int nscanned; - double cl, cs, cg, cp, p, q, r, s; const char *op; - nscanned = sscanf(context->args, "%lf , %lf , %lf , %lf , %lf , %lf , %lf , %lf", &cl, &cs, &cg, &cp, &p, &q, &r, &s); - if (nscanned != 8) - return LogError(context, "OptAddSol: invalid arguments: '%s'", context->args); - - fprintf(context->outfile, "\n # AddSol(%s)\n", context->args); + fprintf(context->outfile, "\n # AddSol(%lf, %lf, %lf, %lf, %lf, %lf, %lf, %lf)\n", cl, cs, cg, cp, p, q, r, s); op = ""; fprintf(context->outfile, " z = "); @@ -920,6 +917,45 @@ static int OptAddSol(cg_context_t *context) return 0; } +static int OptAddSol(cg_context_t *context) +{ + int error; + FILE *infile; + int lnum; + const char *filename = "model_data/addsol.txt"; + char line[200]; + double data[ADDSOL_DATA_PER_ROW]; + + infile = fopen(filename, "rt"); + if (infile == NULL) goto fail; + + lnum = 0; + while (fgets(line, sizeof(line), infile)) + { + ++lnum; + CHECK(ScanRealArray(context, filename, lnum, line, ADDSOL_DATA_PER_ROW, data)); + switch (context->language) + { + case CODEGEN_LANGUAGE_PYTHON: + CHECK(OptAddSolPython(context, data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7])); + break; + + default: + error = LogError(context, "OptAddSol: Unsupported language %d\n", context->language); + goto fail; + } + } + + error = 0; +fail: + if (infile == NULL) + error = LogError(context, "Cannot open input file: %s", filename); + else + fclose(infile); + + return error; +} + static int LogError(const cg_context_t *context, const char *format, ...) { va_list v; diff --git a/generate/fixaddsol.py b/generate/fixaddsol.py deleted file mode 100755 index 584b6e0a..00000000 --- a/generate/fixaddsol.py +++ /dev/null @@ -1,205 +0,0 @@ -#!/usr/bin/env python3 -import sys -import re - -_iaudata = ( - (( 0.0, 0.0, 0.0, 0.0, 1.0), (-172064161.0, -174666.0, 33386.0, 92052331.0, 9086.0, 15377.0)), - (( 0.0, 0.0, 2.0, -2.0, 2.0), ( -13170906.0, -1675.0, -13696.0, 5730336.0, -3015.0, -4587.0)), - (( 0.0, 0.0, 2.0, 0.0, 2.0), ( -2276413.0, -234.0, 2796.0, 978459.0, -485.0, 1374.0)), - (( 0.0, 0.0, 0.0, 0.0, 2.0), ( 2074554.0, 207.0, -698.0, -897492.0, 470.0, -291.0)), - (( 0.0, 1.0, 0.0, 0.0, 0.0), ( 1475877.0, -3633.0, 11817.0, 73871.0, -184.0, -1924.0)), - (( 0.0, 1.0, 2.0, -2.0, 2.0), ( -516821.0, 1226.0, -524.0, 224386.0, -677.0, -174.0)), - (( 1.0, 0.0, 0.0, 0.0, 0.0), ( 711159.0, 73.0, -872.0, -6750.0, 0.0, 358.0)), - (( 0.0, 0.0, 2.0, 0.0, 1.0), ( -387298.0, -367.0, 380.0, 200728.0, 18.0, 318.0)), - (( 1.0, 0.0, 2.0, 0.0, 2.0), ( -301461.0, -36.0, 816.0, 129025.0, -63.0, 367.0)), - (( 0.0, -1.0, 2.0, -2.0, 2.0), ( 215829.0, -494.0, 111.0, -95929.0, 299.0, 132.0)), - (( 0.0, 0.0, 2.0, -2.0, 1.0), ( 128227.0, 137.0, 181.0, -68982.0, -9.0, 39.0)), - ((-1.0, 0.0, 2.0, 0.0, 2.0), ( 123457.0, 11.0, 19.0, -53311.0, 32.0, -4.0)), - ((-1.0, 0.0, 0.0, 2.0, 0.0), ( 156994.0, 10.0, -168.0, -1235.0, 0.0, 82.0)), - (( 1.0, 0.0, 0.0, 0.0, 1.0), ( 63110.0, 63.0, 27.0, -33228.0, 0.0, -9.0)), - ((-1.0, 0.0, 0.0, 0.0, 1.0), ( -57976.0, -63.0, -189.0, 31429.0, 0.0, -75.0)), - ((-1.0, 0.0, 2.0, 2.0, 2.0), ( -59641.0, -11.0, 149.0, 25543.0, -11.0, 66.0)), - (( 1.0, 0.0, 2.0, 0.0, 1.0), ( -51613.0, -42.0, 129.0, 26366.0, 0.0, 78.0)), - ((-2.0, 0.0, 2.0, 0.0, 1.0), ( 45893.0, 50.0, 31.0, -24236.0, -10.0, 20.0)), - (( 0.0, 0.0, 0.0, 2.0, 0.0), ( 63384.0, 11.0, -150.0, -1220.0, 0.0, 29.0)), - (( 0.0, 0.0, 2.0, 2.0, 2.0), ( -38571.0, -1.0, 158.0, 16452.0, -11.0, 68.0)), - (( 0.0, -2.0, 2.0, -2.0, 2.0), ( 32481.0, 0.0, 0.0, -13870.0, 0.0, 0.0)), - ((-2.0, 0.0, 0.0, 2.0, 0.0), ( -47722.0, 0.0, -18.0, 477.0, 0.0, -25.0)), - (( 2.0, 0.0, 2.0, 0.0, 2.0), ( -31046.0, -1.0, 131.0, 13238.0, -11.0, 59.0)), - (( 1.0, 0.0, 2.0, -2.0, 2.0), ( 28593.0, 0.0, -1.0, -12338.0, 10.0, -3.0)), - ((-1.0, 0.0, 2.0, 0.0, 1.0), ( 20441.0, 21.0, 10.0, -10758.0, 0.0, -3.0)), - (( 2.0, 0.0, 0.0, 0.0, 0.0), ( 29243.0, 0.0, -74.0, -609.0, 0.0, 13.0)), - (( 0.0, 0.0, 2.0, 0.0, 0.0), ( 25887.0, 0.0, -66.0, -550.0, 0.0, 11.0)), - (( 0.0, 1.0, 0.0, 0.0, 1.0), ( -14053.0, -25.0, 79.0, 8551.0, -2.0, -45.0)), - ((-1.0, 0.0, 0.0, 2.0, 1.0), ( 15164.0, 10.0, 11.0, -8001.0, 0.0, -1.0)), - (( 0.0, 2.0, 2.0, -2.0, 2.0), ( -15794.0, 72.0, -16.0, 6850.0, -42.0, -5.0)), - (( 0.0, 0.0, -2.0, 2.0, 0.0), ( 21783.0, 0.0, 13.0, -167.0, 0.0, 13.0)), - (( 1.0, 0.0, 0.0, -2.0, 1.0), ( -12873.0, -10.0, -37.0, 6953.0, 0.0, -14.0)), - (( 0.0, -1.0, 0.0, 0.0, 1.0), ( -12654.0, 11.0, 63.0, 6415.0, 0.0, 26.0)), - ((-1.0, 0.0, 2.0, 2.0, 1.0), ( -10204.0, 0.0, 25.0, 5222.0, 0.0, 15.0)), - (( 0.0, 2.0, 0.0, 0.0, 0.0), ( 16707.0, -85.0, -10.0, 168.0, -1.0, 10.0)), - (( 1.0, 0.0, 2.0, 2.0, 2.0), ( -7691.0, 0.0, 44.0, 3268.0, 0.0, 19.0)), - ((-2.0, 0.0, 2.0, 0.0, 0.0), ( -11024.0, 0.0, -14.0, 104.0, 0.0, 2.0)), - (( 0.0, 1.0, 2.0, 0.0, 2.0), ( 7566.0, -21.0, -11.0, -3250.0, 0.0, -5.0)), - (( 0.0, 0.0, 2.0, 2.0, 1.0), ( -6637.0, -11.0, 25.0, 3353.0, 0.0, 14.0)), - (( 0.0, -1.0, 2.0, 0.0, 2.0), ( -7141.0, 21.0, 8.0, 3070.0, 0.0, 4.0)), - (( 0.0, 0.0, 0.0, 2.0, 1.0), ( -6302.0, -11.0, 2.0, 3272.0, 0.0, 4.0)), - (( 1.0, 0.0, 2.0, -2.0, 1.0), ( 5800.0, 10.0, 2.0, -3045.0, 0.0, -1.0)), - (( 2.0, 0.0, 2.0, -2.0, 2.0), ( 6443.0, 0.0, -7.0, -2768.0, 0.0, -4.0)), - ((-2.0, 0.0, 0.0, 2.0, 1.0), ( -5774.0, -11.0, -15.0, 3041.0, 0.0, -5.0)), - (( 2.0, 0.0, 2.0, 0.0, 1.0), ( -5350.0, 0.0, 21.0, 2695.0, 0.0, 12.0)), - (( 0.0, -1.0, 2.0, -2.0, 1.0), ( -4752.0, -11.0, -3.0, 2719.0, 0.0, -3.0)), - (( 0.0, 0.0, 0.0, -2.0, 1.0), ( -4940.0, -11.0, -21.0, 2720.0, 0.0, -9.0)), - ((-1.0, -1.0, 0.0, 2.0, 0.0), ( 7350.0, 0.0, -8.0, -51.0, 0.0, 4.0)), - (( 2.0, 0.0, 0.0, -2.0, 1.0), ( 4065.0, 0.0, 6.0, -2206.0, 0.0, 1.0)), - (( 1.0, 0.0, 0.0, 2.0, 0.0), ( 6579.0, 0.0, -24.0, -199.0, 0.0, 2.0)), - (( 0.0, 1.0, 2.0, -2.0, 1.0), ( 3579.0, 0.0, 5.0, -1900.0, 0.0, 1.0)), - (( 1.0, -1.0, 0.0, 0.0, 0.0), ( 4725.0, 0.0, -6.0, -41.0, 0.0, 3.0)), - ((-2.0, 0.0, 2.0, 0.0, 2.0), ( -3075.0, 0.0, -2.0, 1313.0, 0.0, -1.0)), - (( 3.0, 0.0, 2.0, 0.0, 2.0), ( -2904.0, 0.0, 15.0, 1233.0, 0.0, 7.0)), - (( 0.0, -1.0, 0.0, 2.0, 0.0), ( 4348.0, 0.0, -10.0, -81.0, 0.0, 2.0)), - (( 1.0, -1.0, 2.0, 0.0, 2.0), ( -2878.0, 0.0, 8.0, 1232.0, 0.0, 4.0)), - (( 0.0, 0.0, 0.0, 1.0, 0.0), ( -4230.0, 0.0, 5.0, -20.0, 0.0, -2.0)), - ((-1.0, -1.0, 2.0, 2.0, 2.0), ( -2819.0, 0.0, 7.0, 1207.0, 0.0, 3.0)), - ((-1.0, 0.0, 2.0, 0.0, 0.0), ( -4056.0, 0.0, 5.0, 40.0, 0.0, -2.0)), - (( 0.0, -1.0, 2.0, 2.0, 2.0), ( -2647.0, 0.0, 11.0, 1129.0, 0.0, 5.0)), - ((-2.0, 0.0, 0.0, 0.0, 1.0), ( -2294.0, 0.0, -10.0, 1266.0, 0.0, -4.0)), - (( 1.0, 1.0, 2.0, 0.0, 2.0), ( 2481.0, 0.0, -7.0, -1062.0, 0.0, -3.0)), - (( 2.0, 0.0, 0.0, 0.0, 1.0), ( 2179.0, 0.0, -2.0, -1129.0, 0.0, -2.0)), - ((-1.0, 1.0, 0.0, 1.0, 0.0), ( 3276.0, 0.0, 1.0, -9.0, 0.0, 0.0)), - (( 1.0, 1.0, 0.0, 0.0, 0.0), ( -3389.0, 0.0, 5.0, 35.0, 0.0, -2.0)), - (( 1.0, 0.0, 2.0, 0.0, 0.0), ( 3339.0, 0.0, -13.0, -107.0, 0.0, 1.0)), - ((-1.0, 0.0, 2.0, -2.0, 1.0), ( -1987.0, 0.0, -6.0, 1073.0, 0.0, -2.0)), - (( 1.0, 0.0, 0.0, 0.0, 2.0), ( -1981.0, 0.0, 0.0, 854.0, 0.0, 0.0)), - ((-1.0, 0.0, 0.0, 1.0, 0.0), ( 4026.0, 0.0, -353.0, -553.0, 0.0, -139.0)), - (( 0.0, 0.0, 2.0, 1.0, 2.0), ( 1660.0, 0.0, -5.0, -710.0, 0.0, -2.0)), - ((-1.0, 0.0, 2.0, 4.0, 2.0), ( -1521.0, 0.0, 9.0, 647.0, 0.0, 4.0)), - ((-1.0, 1.0, 0.0, 1.0, 1.0), ( 1314.0, 0.0, 0.0, -700.0, 0.0, 0.0)), - (( 0.0, -2.0, 2.0, -2.0, 1.0), ( -1283.0, 0.0, 0.0, 672.0, 0.0, 0.0)), - (( 1.0, 0.0, 2.0, 2.0, 1.0), ( -1331.0, 0.0, 8.0, 663.0, 0.0, 4.0)), - ((-2.0, 0.0, 2.0, 2.0, 2.0), ( 1383.0, 0.0, -2.0, -594.0, 0.0, -2.0)), - ((-1.0, 0.0, 0.0, 0.0, 2.0), ( 1405.0, 0.0, 4.0, -610.0, 0.0, 2.0)), - (( 1.0, 1.0, 2.0, -2.0, 2.0), ( 1290.0, 0.0, 0.0, -556.0, 0.0, 0.0)), -) - -def OptimizeDotProduct(nlist, vlist): - text = '' - first = True - for n, v in zip(nlist, vlist): - if n != 0.0: - if n < 0.0: - n *= -1.0 - op = '-' if first else ' - ' - else: - op = '' if first else ' + ' - - if n == 1.0: - prod = v - else: - prod = '{:0.1f}*{}'.format(n, v) - - text += op + prod - first = False - return text - -def OptimizeLinear(a, b): - if b == 0.0: - return '{:0.1f}'.format(a) - if a == 0.0: - return '{:0.1f}*t'.format(b) - if b < 0: - return '{:0.1f} - {:0.1f}*t'.format(a, -b) - return '{:0.1f} + {:0.1f}*t'.format(a, b) - -def OptimizeConst(c, v): - if c == 0.0: - return '' - if c < 0.0: - op = ' - ' - c *= -1.0 - else: - op = ' + ' - - if c == 1.0: - term = v - else: - term = '{:0.1f}'.format(c) + '*' + v - - return op + term - -def UnrollIauLoop(): - text = '' - nv = ['el', 'elp', 'f', 'd', 'om'] - for n, (c0, c1, c2, c3, c4, c5) in _iaudata: - dotprod = OptimizeDotProduct(n, nv) - if dotprod in nv: - text += ' sarg = math.sin({})\n'.format(dotprod) - text += ' carg = math.cos({})\n'.format(dotprod) - else: - text += ' arg = {}\n'.format(dotprod) - text += ' sarg = math.sin(arg)\n' - text += ' carg = math.cos(arg)\n' - text += ' dp += ({})*sarg{}\n'.format(OptimizeLinear(c0, c1), OptimizeConst(c2, 'carg')) - text += ' de += ({})*carg{}\n'.format(OptimizeLinear(c3, c4), OptimizeConst(c5, 'sarg')) - text += '\n' - - return text - - -def Translate(line): - if line.strip() == '$ASTRO_IAULOOP()': - return UnrollIauLoop() - - m = re.match(r'^ \$ASTRO_ADDSOL\(\s*([0-9\+\-\.]+)\s*,\s*([0-9\+\-\.]+)\s*,\s*([0-9\+\-\.]+)\s*,\s*([0-9\+\-\.]+)\s*,\s*([\+\-]?\d+)\s*,\s*([\+\-]?\d+)\s*,\s*([\+\-]?\d+)\s*,\s*([\+\-]?\d+)\s*\)\s*$', line) - if m: - cl = float(m.group(1)) - cs = float(m.group(2)) - cg = float(m.group(3)) - cp = float(m.group(4)) - p = int(m.group(5)) - q = int(m.group(6)) - r = int(m.group(7)) - s = int(m.group(8)) - - text = '\n' - text += ' # AddSol({}, {}, {}, {}, {}, {}, {}, {})\n'.format(cl, cs, cg, cp, p, q, r, s) - - op = '' - text += ' z = ' - if p != 0: - text += op + 'ex[{}][1]'.format(p) - op = ' * ' - if q != 0: - text += op + 'ex[{}][2]'.format(q) - op = ' * ' - if r != 0: - text += op + 'ex[{}][3]'.format(r) - op = ' * ' - if s != 0: - text += op + 'ex[{}][4]'.format(s) - text += '\n' - - if cl != 0: - text += ' DLAM += {} * z.imag\n'.format(cl) - if cs != 0: - text += ' DS += {} * z.imag\n'.format(cs) - if cg != 0: - text += ' GAM1C += {} * z.real\n'.format(cg) - if cp != 0: - text += ' SINPI += {} * z.real\n'.format(cp) - - return text - return line - -def FixAddSol(inFileName, outFileName): - with open(inFileName, 'rt') as infile: - with open(outFileName, 'wt') as outfile: - lnum = 0 - for line in infile: - lnum += 1 - xlat = Translate(line) - outfile.write(xlat) - -if __name__ == '__main__': - FixAddSol('template/old.py', 'template/astronomy.py') - sys.exit(0) diff --git a/generate/model_data/addsol.txt b/generate/model_data/addsol.txt new file mode 100644 index 00000000..44b0885e --- /dev/null +++ b/generate/model_data/addsol.txt @@ -0,0 +1,104 @@ + 13.902 14.06 -0.001 0.2607 0 0 0 4 + 0.403 -4.01 0.394 0.0023 0 0 0 3 + 2369.912 2373.36 0.601 28.2333 0 0 0 2 + -125.154 -112.79 -0.725 -0.9781 0 0 0 1 + 1.979 6.98 -0.445 0.0433 1 0 0 4 + 191.953 192.72 0.029 3.0861 1 0 0 2 + -8.466 -13.51 0.455 -0.1093 1 0 0 1 + 22639.500 22609.07 0.079 186.5398 1 0 0 0 + 18.609 3.59 -0.094 0.0118 1 0 0 -1 + -4586.465 -4578.13 -0.077 34.3117 1 0 0 -2 + 3.215 5.44 0.192 -0.0386 1 0 0 -3 + -38.428 -38.64 0.001 0.6008 1 0 0 -4 + -0.393 -1.43 -0.092 0.0086 1 0 0 -6 + -0.289 -1.59 0.123 -0.0053 0 1 0 4 + -24.420 -25.10 0.040 -0.3000 0 1 0 2 + 18.023 17.93 0.007 0.1494 0 1 0 1 + -668.146 -126.98 -1.302 -0.3997 0 1 0 0 + 0.560 0.32 -0.001 -0.0037 0 1 0 -1 + -165.145 -165.06 0.054 1.9178 0 1 0 -2 + -1.877 -6.46 -0.416 0.0339 0 1 0 -4 + 0.213 1.02 -0.074 0.0054 2 0 0 4 + 14.387 14.78 -0.017 0.2833 2 0 0 2 + -0.586 -1.20 0.054 -0.0100 2 0 0 1 + 769.016 767.96 0.107 10.1657 2 0 0 0 + 1.750 2.01 -0.018 0.0155 2 0 0 -1 + -211.656 -152.53 5.679 -0.3039 2 0 0 -2 + 1.225 0.91 -0.030 -0.0088 2 0 0 -3 + -30.773 -34.07 -0.308 0.3722 2 0 0 -4 + -0.570 -1.40 -0.074 0.0109 2 0 0 -6 + -2.921 -11.75 0.787 -0.0484 1 1 0 2 + 1.267 1.52 -0.022 0.0164 1 1 0 1 + -109.673 -115.18 0.461 -0.9490 1 1 0 0 + -205.962 -182.36 2.056 1.4437 1 1 0 -2 + 0.233 0.36 0.012 -0.0025 1 1 0 -3 + -4.391 -9.66 -0.471 0.0673 1 1 0 -4 + 0.283 1.53 -0.111 0.0060 1 -1 0 4 + 14.577 31.70 -1.540 0.2302 1 -1 0 2 + 147.687 138.76 0.679 1.1528 1 -1 0 0 + -1.089 0.55 0.021 0.0 1 -1 0 -1 + 28.475 23.59 -0.443 -0.2257 1 -1 0 -2 + -0.276 -0.38 -0.006 -0.0036 1 -1 0 -3 + 0.636 2.27 0.146 -0.0102 1 -1 0 -4 + -0.189 -1.68 0.131 -0.0028 0 2 0 2 + -7.486 -0.66 -0.037 -0.0086 0 2 0 0 + -8.096 -16.35 -0.740 0.0918 0 2 0 -2 + -5.741 -0.04 0.0 -0.0009 0 0 2 2 + 0.255 0.0 0.0 0.0 0 0 2 1 + -411.608 -0.20 0.0 -0.0124 0 0 2 0 + 0.584 0.84 0.0 0.0071 0 0 2 -1 + -55.173 -52.14 0.0 -0.1052 0 0 2 -2 + 0.254 0.25 0.0 -0.0017 0 0 2 -3 + 0.025 -1.67 0.0 0.0031 0 0 2 -4 + 1.060 2.96 -0.166 0.0243 3 0 0 2 + 36.124 50.64 -1.300 0.6215 3 0 0 0 + -13.193 -16.40 0.258 -0.1187 3 0 0 -2 + -1.187 -0.74 0.042 0.0074 3 0 0 -4 + -0.293 -0.31 -0.002 0.0046 3 0 0 -6 + -0.290 -1.45 0.116 -0.0051 2 1 0 2 + -7.649 -10.56 0.259 -0.1038 2 1 0 0 + -8.627 -7.59 0.078 -0.0192 2 1 0 -2 + -2.740 -2.54 0.022 0.0324 2 1 0 -4 + 1.181 3.32 -0.212 0.0213 2 -1 0 2 + 9.703 11.67 -0.151 0.1268 2 -1 0 0 + -0.352 -0.37 0.001 -0.0028 2 -1 0 -1 + -2.494 -1.17 -0.003 -0.0017 2 -1 0 -2 + 0.360 0.20 -0.012 -0.0043 2 -1 0 -4 + -1.167 -1.25 0.008 -0.0106 1 2 0 0 + -7.412 -6.12 0.117 0.0484 1 2 0 -2 + -0.311 -0.65 -0.032 0.0044 1 2 0 -4 + 0.757 1.82 -0.105 0.0112 1 -2 0 2 + 2.580 2.32 0.027 0.0196 1 -2 0 0 + 2.533 2.40 -0.014 -0.0212 1 -2 0 -2 + -0.344 -0.57 -0.025 0.0036 0 3 0 -2 + -0.992 -0.02 0.0 0.0 1 0 2 2 + -45.099 -0.02 0.0 -0.0010 1 0 2 0 + -0.179 -9.52 0.0 -0.0833 1 0 2 -2 + -0.301 -0.33 0.0 0.0014 1 0 2 -4 + -6.382 -3.37 0.0 -0.0481 1 0 -2 2 + 39.528 85.13 0.0 -0.7136 1 0 -2 0 + 9.366 0.71 0.0 -0.0112 1 0 -2 -2 + 0.202 0.02 0.0 0.0 1 0 -2 -4 + 0.415 0.10 0.0 0.0013 0 1 2 0 + -2.152 -2.26 0.0 -0.0066 0 1 2 -2 + -1.440 -1.30 0.0 0.0014 0 1 -2 2 + 0.384 -0.04 0.0 0.0 0 1 -2 -2 + 1.938 3.60 -0.145 0.0401 4 0 0 0 + -0.952 -1.58 0.052 -0.0130 4 0 0 -2 + -0.551 -0.94 0.032 -0.0097 3 1 0 0 + -0.482 -0.57 0.005 -0.0045 3 1 0 -2 + 0.681 0.96 -0.026 0.0115 3 -1 0 0 + -0.297 -0.27 0.002 -0.0009 2 2 0 -2 + 0.254 0.21 -0.003 0.0 2 -2 0 -2 + -0.250 -0.22 0.004 0.0014 1 3 0 -2 + -3.996 0.0 0.0 0.0004 2 0 2 0 + 0.557 -0.75 0.0 -0.0090 2 0 2 -2 + -0.459 -0.38 0.0 -0.0053 2 0 -2 2 + -1.298 0.74 0.0 0.0004 2 0 -2 0 + 0.538 1.14 0.0 -0.0141 2 0 -2 -2 + 0.263 0.02 0.0 0.0 1 1 2 0 + 0.426 0.07 0.0 -0.0006 1 1 -2 -2 + -0.304 0.03 0.0 0.0003 1 -1 2 0 + -0.372 -0.19 0.0 -0.0027 1 -1 -2 2 + 0.418 0.0 0.0 0.0 0 0 4 0 + -0.330 -0.04 0.0 0.0 3 0 2 0 diff --git a/generate/template/astronomy.py b/generate/template/astronomy.py index d70870fe..c2cb2fb2 100644 --- a/generate/template/astronomy.py +++ b/generate/template/astronomy.py @@ -531,112 +531,7 @@ def _CalcMoon(time): I += 1 - $ASTRO_ADDSOL( 13.902, 14.06,-0.001, 0.2607,0, 0, 0, 4) - $ASTRO_ADDSOL( 0.403, -4.01,+0.394, 0.0023,0, 0, 0, 3) - $ASTRO_ADDSOL( 2369.912, 2373.36,+0.601, 28.2333,0, 0, 0, 2) - $ASTRO_ADDSOL( -125.154, -112.79,-0.725, -0.9781,0, 0, 0, 1) - $ASTRO_ADDSOL( 1.979, 6.98,-0.445, 0.0433,1, 0, 0, 4) - $ASTRO_ADDSOL( 191.953, 192.72,+0.029, 3.0861,1, 0, 0, 2) - $ASTRO_ADDSOL( -8.466, -13.51,+0.455, -0.1093,1, 0, 0, 1) - $ASTRO_ADDSOL( 22639.500,22609.07,+0.079, 186.5398,1, 0, 0, 0) - $ASTRO_ADDSOL( 18.609, 3.59,-0.094, 0.0118,1, 0, 0,-1) - $ASTRO_ADDSOL( -4586.465,-4578.13,-0.077, 34.3117,1, 0, 0,-2) - $ASTRO_ADDSOL( +3.215, 5.44,+0.192, -0.0386,1, 0, 0,-3) - $ASTRO_ADDSOL( -38.428, -38.64,+0.001, 0.6008,1, 0, 0,-4) - $ASTRO_ADDSOL( -0.393, -1.43,-0.092, 0.0086,1, 0, 0,-6) - $ASTRO_ADDSOL( -0.289, -1.59,+0.123, -0.0053,0, 1, 0, 4) - $ASTRO_ADDSOL( -24.420, -25.10,+0.040, -0.3000,0, 1, 0, 2) - $ASTRO_ADDSOL( 18.023, 17.93,+0.007, 0.1494,0, 1, 0, 1) - $ASTRO_ADDSOL( -668.146, -126.98,-1.302, -0.3997,0, 1, 0, 0) - $ASTRO_ADDSOL( 0.560, 0.32,-0.001, -0.0037,0, 1, 0,-1) - $ASTRO_ADDSOL( -165.145, -165.06,+0.054, 1.9178,0, 1, 0,-2) - $ASTRO_ADDSOL( -1.877, -6.46,-0.416, 0.0339,0, 1, 0,-4) - $ASTRO_ADDSOL( 0.213, 1.02,-0.074, 0.0054,2, 0, 0, 4) - $ASTRO_ADDSOL( 14.387, 14.78,-0.017, 0.2833,2, 0, 0, 2) - $ASTRO_ADDSOL( -0.586, -1.20,+0.054, -0.0100,2, 0, 0, 1) - $ASTRO_ADDSOL( 769.016, 767.96,+0.107, 10.1657,2, 0, 0, 0) - $ASTRO_ADDSOL( +1.750, 2.01,-0.018, 0.0155,2, 0, 0,-1) - $ASTRO_ADDSOL( -211.656, -152.53,+5.679, -0.3039,2, 0, 0,-2) - $ASTRO_ADDSOL( +1.225, 0.91,-0.030, -0.0088,2, 0, 0,-3) - $ASTRO_ADDSOL( -30.773, -34.07,-0.308, 0.3722,2, 0, 0,-4) - $ASTRO_ADDSOL( -0.570, -1.40,-0.074, 0.0109,2, 0, 0,-6) - $ASTRO_ADDSOL( -2.921, -11.75,+0.787, -0.0484,1, 1, 0, 2) - $ASTRO_ADDSOL( +1.267, 1.52,-0.022, 0.0164,1, 1, 0, 1) - $ASTRO_ADDSOL( -109.673, -115.18,+0.461, -0.9490,1, 1, 0, 0) - $ASTRO_ADDSOL( -205.962, -182.36,+2.056, +1.4437,1, 1, 0,-2) - $ASTRO_ADDSOL( 0.233, 0.36, 0.012, -0.0025,1, 1, 0,-3) - $ASTRO_ADDSOL( -4.391, -9.66,-0.471, 0.0673,1, 1, 0,-4) - - $ASTRO_ADDSOL( 0.283, 1.53,-0.111, +0.0060,1,-1, 0,+4) - $ASTRO_ADDSOL( 14.577, 31.70,-1.540, +0.2302,1,-1, 0, 2) - $ASTRO_ADDSOL( 147.687, 138.76,+0.679, +1.1528,1,-1, 0, 0) - $ASTRO_ADDSOL( -1.089, 0.55,+0.021, 0.0 ,1,-1, 0,-1) - $ASTRO_ADDSOL( 28.475, 23.59,-0.443, -0.2257,1,-1, 0,-2) - $ASTRO_ADDSOL( -0.276, -0.38,-0.006, -0.0036,1,-1, 0,-3) - $ASTRO_ADDSOL( 0.636, 2.27,+0.146, -0.0102,1,-1, 0,-4) - $ASTRO_ADDSOL( -0.189, -1.68,+0.131, -0.0028,0, 2, 0, 2) - $ASTRO_ADDSOL( -7.486, -0.66,-0.037, -0.0086,0, 2, 0, 0) - $ASTRO_ADDSOL( -8.096, -16.35,-0.740, 0.0918,0, 2, 0,-2) - $ASTRO_ADDSOL( -5.741, -0.04, 0.0 , -0.0009,0, 0, 2, 2) - $ASTRO_ADDSOL( 0.255, 0.0 , 0.0 , 0.0 ,0, 0, 2, 1) - $ASTRO_ADDSOL( -411.608, -0.20, 0.0 , -0.0124,0, 0, 2, 0) - $ASTRO_ADDSOL( 0.584, 0.84, 0.0 , +0.0071,0, 0, 2,-1) - $ASTRO_ADDSOL( -55.173, -52.14, 0.0 , -0.1052,0, 0, 2,-2) - $ASTRO_ADDSOL( 0.254, 0.25, 0.0 , -0.0017,0, 0, 2,-3) - $ASTRO_ADDSOL( +0.025, -1.67, 0.0 , +0.0031,0, 0, 2,-4) - $ASTRO_ADDSOL( 1.060, 2.96,-0.166, 0.0243,3, 0, 0,+2) - $ASTRO_ADDSOL( 36.124, 50.64,-1.300, 0.6215,3, 0, 0, 0) - $ASTRO_ADDSOL( -13.193, -16.40,+0.258, -0.1187,3, 0, 0,-2) - $ASTRO_ADDSOL( -1.187, -0.74,+0.042, 0.0074,3, 0, 0,-4) - $ASTRO_ADDSOL( -0.293, -0.31,-0.002, 0.0046,3, 0, 0,-6) - $ASTRO_ADDSOL( -0.290, -1.45,+0.116, -0.0051,2, 1, 0, 2) - $ASTRO_ADDSOL( -7.649, -10.56,+0.259, -0.1038,2, 1, 0, 0) - $ASTRO_ADDSOL( -8.627, -7.59,+0.078, -0.0192,2, 1, 0,-2) - $ASTRO_ADDSOL( -2.740, -2.54,+0.022, 0.0324,2, 1, 0,-4) - $ASTRO_ADDSOL( 1.181, 3.32,-0.212, 0.0213,2,-1, 0,+2) - $ASTRO_ADDSOL( 9.703, 11.67,-0.151, 0.1268,2,-1, 0, 0) - $ASTRO_ADDSOL( -0.352, -0.37,+0.001, -0.0028,2,-1, 0,-1) - $ASTRO_ADDSOL( -2.494, -1.17,-0.003, -0.0017,2,-1, 0,-2) - $ASTRO_ADDSOL( 0.360, 0.20,-0.012, -0.0043,2,-1, 0,-4) - $ASTRO_ADDSOL( -1.167, -1.25,+0.008, -0.0106,1, 2, 0, 0) - $ASTRO_ADDSOL( -7.412, -6.12,+0.117, 0.0484,1, 2, 0,-2) - $ASTRO_ADDSOL( -0.311, -0.65,-0.032, 0.0044,1, 2, 0,-4) - $ASTRO_ADDSOL( +0.757, 1.82,-0.105, 0.0112,1,-2, 0, 2) - $ASTRO_ADDSOL( +2.580, 2.32,+0.027, 0.0196,1,-2, 0, 0) - $ASTRO_ADDSOL( +2.533, 2.40,-0.014, -0.0212,1,-2, 0,-2) - $ASTRO_ADDSOL( -0.344, -0.57,-0.025, +0.0036,0, 3, 0,-2) - $ASTRO_ADDSOL( -0.992, -0.02, 0.0 , 0.0 ,1, 0, 2, 2) - $ASTRO_ADDSOL( -45.099, -0.02, 0.0 , -0.0010,1, 0, 2, 0) - $ASTRO_ADDSOL( -0.179, -9.52, 0.0 , -0.0833,1, 0, 2,-2) - $ASTRO_ADDSOL( -0.301, -0.33, 0.0 , 0.0014,1, 0, 2,-4) - $ASTRO_ADDSOL( -6.382, -3.37, 0.0 , -0.0481,1, 0,-2, 2) - $ASTRO_ADDSOL( 39.528, 85.13, 0.0 , -0.7136,1, 0,-2, 0) - $ASTRO_ADDSOL( 9.366, 0.71, 0.0 , -0.0112,1, 0,-2,-2) - $ASTRO_ADDSOL( 0.202, 0.02, 0.0 , 0.0 ,1, 0,-2,-4) - - $ASTRO_ADDSOL( 0.415, 0.10, 0.0 , 0.0013,0, 1, 2, 0) - $ASTRO_ADDSOL( -2.152, -2.26, 0.0 , -0.0066,0, 1, 2,-2) - $ASTRO_ADDSOL( -1.440, -1.30, 0.0 , +0.0014,0, 1,-2, 2) - $ASTRO_ADDSOL( 0.384, -0.04, 0.0 , 0.0 ,0, 1,-2,-2) - $ASTRO_ADDSOL( +1.938, +3.60,-0.145, +0.0401,4, 0, 0, 0) - $ASTRO_ADDSOL( -0.952, -1.58,+0.052, -0.0130,4, 0, 0,-2) - $ASTRO_ADDSOL( -0.551, -0.94,+0.032, -0.0097,3, 1, 0, 0) - $ASTRO_ADDSOL( -0.482, -0.57,+0.005, -0.0045,3, 1, 0,-2) - $ASTRO_ADDSOL( 0.681, 0.96,-0.026, 0.0115,3,-1, 0, 0) - $ASTRO_ADDSOL( -0.297, -0.27, 0.002, -0.0009,2, 2, 0,-2) - $ASTRO_ADDSOL( 0.254, +0.21,-0.003, 0.0 ,2,-2, 0,-2) - $ASTRO_ADDSOL( -0.250, -0.22, 0.004, 0.0014,1, 3, 0,-2) - $ASTRO_ADDSOL( -3.996, 0.0 , 0.0 , +0.0004,2, 0, 2, 0) - $ASTRO_ADDSOL( 0.557, -0.75, 0.0 , -0.0090,2, 0, 2,-2) - $ASTRO_ADDSOL( -0.459, -0.38, 0.0 , -0.0053,2, 0,-2, 2) - $ASTRO_ADDSOL( -1.298, 0.74, 0.0 , +0.0004,2, 0,-2, 0) - $ASTRO_ADDSOL( 0.538, 1.14, 0.0 , -0.0141,2, 0,-2,-2) - $ASTRO_ADDSOL( 0.263, 0.02, 0.0 , 0.0 ,1, 1, 2, 0) - $ASTRO_ADDSOL( 0.426, +0.07, 0.0 , -0.0006,1, 1,-2,-2) - $ASTRO_ADDSOL( -0.304, +0.03, 0.0 , +0.0003,1,-1, 2, 0) - $ASTRO_ADDSOL( -0.372, -0.19, 0.0 , -0.0027,1,-1,-2, 2) - $ASTRO_ADDSOL( +0.418, 0.0 , 0.0 , 0.0 ,0, 0, 4, 0) - $ASTRO_ADDSOL( -0.330, -0.04, 0.0 , 0.0 ,3, 0, 2, 0) + $ASTRO_ADDSOL() def ADDN(coeffn, p, q, r, s): return coeffn * (ex[p][1] * ex[q][2] * ex[r][3] * ex[s][4]).imag diff --git a/source/python/astronomy.py b/source/python/astronomy.py index c0b9c712..e71f5561 100644 --- a/source/python/astronomy.py +++ b/source/python/astronomy.py @@ -1158,793 +1158,688 @@ def _CalcMoon(time): I += 1 - # AddSol( 13.902, 14.06,-0.001, 0.2607,0, 0, 0, 4) + # AddSol(13.902000, 14.060000, -0.001000, 0.260700, 0.000000, 0.000000, 0.000000, 4.000000) z = ex[4][4] DLAM += 13.902 * z.imag DS += 14.06 * z.imag GAM1C += -0.001 * z.real SINPI += 0.2607 * z.real - - # AddSol( 0.403, -4.01,+0.394, 0.0023,0, 0, 0, 3) + # AddSol(0.403000, -4.010000, 0.394000, 0.002300, 0.000000, 0.000000, 0.000000, 3.000000) z = ex[3][4] DLAM += 0.403 * z.imag DS += -4.01 * z.imag GAM1C += 0.394 * z.real SINPI += 0.0023 * z.real - - # AddSol( 2369.912, 2373.36,+0.601, 28.2333,0, 0, 0, 2) + # AddSol(2369.912000, 2373.360000, 0.601000, 28.233300, 0.000000, 0.000000, 0.000000, 2.000000) z = ex[2][4] DLAM += 2369.912 * z.imag DS += 2373.36 * z.imag GAM1C += 0.601 * z.real SINPI += 28.2333 * z.real - - # AddSol( -125.154, -112.79,-0.725, -0.9781,0, 0, 0, 1) + # AddSol(-125.154000, -112.790000, -0.725000, -0.978100, 0.000000, 0.000000, 0.000000, 1.000000) z = ex[1][4] DLAM += -125.154 * z.imag DS += -112.79 * z.imag GAM1C += -0.725 * z.real SINPI += -0.9781 * z.real - - # AddSol( 1.979, 6.98,-0.445, 0.0433,1, 0, 0, 4) + # AddSol(1.979000, 6.980000, -0.445000, 0.043300, 1.000000, 0.000000, 0.000000, 4.000000) z = ex[1][1] * ex[4][4] DLAM += 1.979 * z.imag DS += 6.98 * z.imag GAM1C += -0.445 * z.real SINPI += 0.0433 * z.real - - # AddSol( 191.953, 192.72,+0.029, 3.0861,1, 0, 0, 2) + # AddSol(191.953000, 192.720000, 0.029000, 3.086100, 1.000000, 0.000000, 0.000000, 2.000000) z = ex[1][1] * ex[2][4] DLAM += 191.953 * z.imag DS += 192.72 * z.imag GAM1C += 0.029 * z.real SINPI += 3.0861 * z.real - - # AddSol( -8.466, -13.51,+0.455, -0.1093,1, 0, 0, 1) + # AddSol(-8.466000, -13.510000, 0.455000, -0.109300, 1.000000, 0.000000, 0.000000, 1.000000) z = ex[1][1] * ex[1][4] DLAM += -8.466 * z.imag DS += -13.51 * z.imag GAM1C += 0.455 * z.real SINPI += -0.1093 * z.real - - # AddSol( 22639.500,22609.07,+0.079, 186.5398,1, 0, 0, 0) + # AddSol(22639.500000, 22609.070000, 0.079000, 186.539800, 1.000000, 0.000000, 0.000000, 0.000000) z = ex[1][1] DLAM += 22639.500 * z.imag DS += 22609.07 * z.imag GAM1C += 0.079 * z.real SINPI += 186.5398 * z.real - - # AddSol( 18.609, 3.59,-0.094, 0.0118,1, 0, 0,-1) + # AddSol(18.609000, 3.590000, -0.094000, 0.011800, 1.000000, 0.000000, 0.000000, -1.000000) z = ex[1][1] * ex[-1][4] DLAM += 18.609 * z.imag DS += 3.59 * z.imag GAM1C += -0.094 * z.real SINPI += 0.0118 * z.real - - # AddSol( -4586.465,-4578.13,-0.077, 34.3117,1, 0, 0,-2) + # AddSol(-4586.465000, -4578.130000, -0.077000, 34.311700, 1.000000, 0.000000, 0.000000, -2.000000) z = ex[1][1] * ex[-2][4] DLAM += -4586.465 * z.imag DS += -4578.13 * z.imag GAM1C += -0.077 * z.real SINPI += 34.3117 * z.real - - # AddSol( +3.215, 5.44,+0.192, -0.0386,1, 0, 0,-3) + # AddSol(3.215000, 5.440000, 0.192000, -0.038600, 1.000000, 0.000000, 0.000000, -3.000000) z = ex[1][1] * ex[-3][4] DLAM += 3.215 * z.imag DS += 5.44 * z.imag GAM1C += 0.192 * z.real SINPI += -0.0386 * z.real - - # AddSol( -38.428, -38.64,+0.001, 0.6008,1, 0, 0,-4) + # AddSol(-38.428000, -38.640000, 0.001000, 0.600800, 1.000000, 0.000000, 0.000000, -4.000000) z = ex[1][1] * ex[-4][4] DLAM += -38.428 * z.imag DS += -38.64 * z.imag GAM1C += 0.001 * z.real SINPI += 0.6008 * z.real - - # AddSol( -0.393, -1.43,-0.092, 0.0086,1, 0, 0,-6) + # AddSol(-0.393000, -1.430000, -0.092000, 0.008600, 1.000000, 0.000000, 0.000000, -6.000000) z = ex[1][1] * ex[-6][4] DLAM += -0.393 * z.imag DS += -1.43 * z.imag GAM1C += -0.092 * z.real SINPI += 0.0086 * z.real - - # AddSol( -0.289, -1.59,+0.123, -0.0053,0, 1, 0, 4) + # AddSol(-0.289000, -1.590000, 0.123000, -0.005300, 0.000000, 1.000000, 0.000000, 4.000000) z = ex[1][2] * ex[4][4] DLAM += -0.289 * z.imag DS += -1.59 * z.imag GAM1C += 0.123 * z.real SINPI += -0.0053 * z.real - - # AddSol( -24.420, -25.10,+0.040, -0.3000,0, 1, 0, 2) + # AddSol(-24.420000, -25.100000, 0.040000, -0.300000, 0.000000, 1.000000, 0.000000, 2.000000) z = ex[1][2] * ex[2][4] DLAM += -24.420 * z.imag DS += -25.10 * z.imag GAM1C += 0.040 * z.real SINPI += -0.3000 * z.real - - # AddSol( 18.023, 17.93,+0.007, 0.1494,0, 1, 0, 1) + # AddSol(18.023000, 17.930000, 0.007000, 0.149400, 0.000000, 1.000000, 0.000000, 1.000000) z = ex[1][2] * ex[1][4] DLAM += 18.023 * z.imag DS += 17.93 * z.imag GAM1C += 0.007 * z.real SINPI += 0.1494 * z.real - - # AddSol( -668.146, -126.98,-1.302, -0.3997,0, 1, 0, 0) + # AddSol(-668.146000, -126.980000, -1.302000, -0.399700, 0.000000, 1.000000, 0.000000, 0.000000) z = ex[1][2] DLAM += -668.146 * z.imag DS += -126.98 * z.imag GAM1C += -1.302 * z.real SINPI += -0.3997 * z.real - - # AddSol( 0.560, 0.32,-0.001, -0.0037,0, 1, 0,-1) + # AddSol(0.560000, 0.320000, -0.001000, -0.003700, 0.000000, 1.000000, 0.000000, -1.000000) z = ex[1][2] * ex[-1][4] DLAM += 0.560 * z.imag DS += 0.32 * z.imag GAM1C += -0.001 * z.real SINPI += -0.0037 * z.real - - # AddSol( -165.145, -165.06,+0.054, 1.9178,0, 1, 0,-2) + # AddSol(-165.145000, -165.060000, 0.054000, 1.917800, 0.000000, 1.000000, 0.000000, -2.000000) z = ex[1][2] * ex[-2][4] DLAM += -165.145 * z.imag DS += -165.06 * z.imag GAM1C += 0.054 * z.real SINPI += 1.9178 * z.real - - # AddSol( -1.877, -6.46,-0.416, 0.0339,0, 1, 0,-4) + # AddSol(-1.877000, -6.460000, -0.416000, 0.033900, 0.000000, 1.000000, 0.000000, -4.000000) z = ex[1][2] * ex[-4][4] DLAM += -1.877 * z.imag DS += -6.46 * z.imag GAM1C += -0.416 * z.real SINPI += 0.0339 * z.real - - # AddSol( 0.213, 1.02,-0.074, 0.0054,2, 0, 0, 4) + # AddSol(0.213000, 1.020000, -0.074000, 0.005400, 2.000000, 0.000000, 0.000000, 4.000000) z = ex[2][1] * ex[4][4] DLAM += 0.213 * z.imag DS += 1.02 * z.imag GAM1C += -0.074 * z.real SINPI += 0.0054 * z.real - - # AddSol( 14.387, 14.78,-0.017, 0.2833,2, 0, 0, 2) + # AddSol(14.387000, 14.780000, -0.017000, 0.283300, 2.000000, 0.000000, 0.000000, 2.000000) z = ex[2][1] * ex[2][4] DLAM += 14.387 * z.imag DS += 14.78 * z.imag GAM1C += -0.017 * z.real SINPI += 0.2833 * z.real - - # AddSol( -0.586, -1.20,+0.054, -0.0100,2, 0, 0, 1) + # AddSol(-0.586000, -1.200000, 0.054000, -0.010000, 2.000000, 0.000000, 0.000000, 1.000000) z = ex[2][1] * ex[1][4] DLAM += -0.586 * z.imag DS += -1.20 * z.imag GAM1C += 0.054 * z.real SINPI += -0.0100 * z.real - - # AddSol( 769.016, 767.96,+0.107, 10.1657,2, 0, 0, 0) + # AddSol(769.016000, 767.960000, 0.107000, 10.165700, 2.000000, 0.000000, 0.000000, 0.000000) z = ex[2][1] DLAM += 769.016 * z.imag DS += 767.96 * z.imag GAM1C += 0.107 * z.real SINPI += 10.1657 * z.real - - # AddSol( +1.750, 2.01,-0.018, 0.0155,2, 0, 0,-1) + # AddSol(1.750000, 2.010000, -0.018000, 0.015500, 2.000000, 0.000000, 0.000000, -1.000000) z = ex[2][1] * ex[-1][4] DLAM += 1.750 * z.imag DS += 2.01 * z.imag GAM1C += -0.018 * z.real SINPI += 0.0155 * z.real - - # AddSol( -211.656, -152.53,+5.679, -0.3039,2, 0, 0,-2) + # AddSol(-211.656000, -152.530000, 5.679000, -0.303900, 2.000000, 0.000000, 0.000000, -2.000000) z = ex[2][1] * ex[-2][4] DLAM += -211.656 * z.imag DS += -152.53 * z.imag GAM1C += 5.679 * z.real SINPI += -0.3039 * z.real - - # AddSol( +1.225, 0.91,-0.030, -0.0088,2, 0, 0,-3) + # AddSol(1.225000, 0.910000, -0.030000, -0.008800, 2.000000, 0.000000, 0.000000, -3.000000) z = ex[2][1] * ex[-3][4] DLAM += 1.225 * z.imag DS += 0.91 * z.imag GAM1C += -0.030 * z.real SINPI += -0.0088 * z.real - - # AddSol( -30.773, -34.07,-0.308, 0.3722,2, 0, 0,-4) + # AddSol(-30.773000, -34.070000, -0.308000, 0.372200, 2.000000, 0.000000, 0.000000, -4.000000) z = ex[2][1] * ex[-4][4] DLAM += -30.773 * z.imag DS += -34.07 * z.imag GAM1C += -0.308 * z.real SINPI += 0.3722 * z.real - - # AddSol( -0.570, -1.40,-0.074, 0.0109,2, 0, 0,-6) + # AddSol(-0.570000, -1.400000, -0.074000, 0.010900, 2.000000, 0.000000, 0.000000, -6.000000) z = ex[2][1] * ex[-6][4] DLAM += -0.570 * z.imag DS += -1.40 * z.imag GAM1C += -0.074 * z.real SINPI += 0.0109 * z.real - - # AddSol( -2.921, -11.75,+0.787, -0.0484,1, 1, 0, 2) + # AddSol(-2.921000, -11.750000, 0.787000, -0.048400, 1.000000, 1.000000, 0.000000, 2.000000) z = ex[1][1] * ex[1][2] * ex[2][4] DLAM += -2.921 * z.imag DS += -11.75 * z.imag GAM1C += 0.787 * z.real SINPI += -0.0484 * z.real - - # AddSol( +1.267, 1.52,-0.022, 0.0164,1, 1, 0, 1) + # AddSol(1.267000, 1.520000, -0.022000, 0.016400, 1.000000, 1.000000, 0.000000, 1.000000) z = ex[1][1] * ex[1][2] * ex[1][4] DLAM += 1.267 * z.imag DS += 1.52 * z.imag GAM1C += -0.022 * z.real SINPI += 0.0164 * z.real - - # AddSol( -109.673, -115.18,+0.461, -0.9490,1, 1, 0, 0) + # AddSol(-109.673000, -115.180000, 0.461000, -0.949000, 1.000000, 1.000000, 0.000000, 0.000000) z = ex[1][1] * ex[1][2] DLAM += -109.673 * z.imag DS += -115.18 * z.imag GAM1C += 0.461 * z.real SINPI += -0.9490 * z.real - - # AddSol( -205.962, -182.36,+2.056, +1.4437,1, 1, 0,-2) + # AddSol(-205.962000, -182.360000, 2.056000, 1.443700, 1.000000, 1.000000, 0.000000, -2.000000) z = ex[1][1] * ex[1][2] * ex[-2][4] DLAM += -205.962 * z.imag DS += -182.36 * z.imag GAM1C += 2.056 * z.real SINPI += 1.4437 * z.real - - # AddSol( 0.233, 0.36, 0.012, -0.0025,1, 1, 0,-3) + # AddSol(0.233000, 0.360000, 0.012000, -0.002500, 1.000000, 1.000000, 0.000000, -3.000000) z = ex[1][1] * ex[1][2] * ex[-3][4] DLAM += 0.233 * z.imag DS += 0.36 * z.imag GAM1C += 0.012 * z.real SINPI += -0.0025 * z.real - - # AddSol( -4.391, -9.66,-0.471, 0.0673,1, 1, 0,-4) + # AddSol(-4.391000, -9.660000, -0.471000, 0.067300, 1.000000, 1.000000, 0.000000, -4.000000) z = ex[1][1] * ex[1][2] * ex[-4][4] DLAM += -4.391 * z.imag DS += -9.66 * z.imag GAM1C += -0.471 * z.real SINPI += 0.0673 * z.real - - - # AddSol( 0.283, 1.53,-0.111, +0.0060,1,-1, 0,+4) + # AddSol(0.283000, 1.530000, -0.111000, 0.006000, 1.000000, -1.000000, 0.000000, 4.000000) z = ex[1][1] * ex[-1][2] * ex[4][4] DLAM += 0.283 * z.imag DS += 1.53 * z.imag GAM1C += -0.111 * z.real SINPI += 0.0060 * z.real - - # AddSol( 14.577, 31.70,-1.540, +0.2302,1,-1, 0, 2) + # AddSol(14.577000, 31.700000, -1.540000, 0.230200, 1.000000, -1.000000, 0.000000, 2.000000) z = ex[1][1] * ex[-1][2] * ex[2][4] DLAM += 14.577 * z.imag DS += 31.70 * z.imag GAM1C += -1.540 * z.real SINPI += 0.2302 * z.real - - # AddSol( 147.687, 138.76,+0.679, +1.1528,1,-1, 0, 0) + # AddSol(147.687000, 138.760000, 0.679000, 1.152800, 1.000000, -1.000000, 0.000000, 0.000000) z = ex[1][1] * ex[-1][2] DLAM += 147.687 * z.imag DS += 138.76 * z.imag GAM1C += 0.679 * z.real SINPI += 1.1528 * z.real - - # AddSol( -1.089, 0.55,+0.021, 0.0 ,1,-1, 0,-1) + # AddSol(-1.089000, 0.550000, 0.021000, 0.000000, 1.000000, -1.000000, 0.000000, -1.000000) z = ex[1][1] * ex[-1][2] * ex[-1][4] DLAM += -1.089 * z.imag DS += 0.55 * z.imag GAM1C += 0.021 * z.real - - # AddSol( 28.475, 23.59,-0.443, -0.2257,1,-1, 0,-2) + # AddSol(28.475000, 23.590000, -0.443000, -0.225700, 1.000000, -1.000000, 0.000000, -2.000000) z = ex[1][1] * ex[-1][2] * ex[-2][4] DLAM += 28.475 * z.imag DS += 23.59 * z.imag GAM1C += -0.443 * z.real SINPI += -0.2257 * z.real - - # AddSol( -0.276, -0.38,-0.006, -0.0036,1,-1, 0,-3) + # AddSol(-0.276000, -0.380000, -0.006000, -0.003600, 1.000000, -1.000000, 0.000000, -3.000000) z = ex[1][1] * ex[-1][2] * ex[-3][4] DLAM += -0.276 * z.imag DS += -0.38 * z.imag GAM1C += -0.006 * z.real SINPI += -0.0036 * z.real - - # AddSol( 0.636, 2.27,+0.146, -0.0102,1,-1, 0,-4) + # AddSol(0.636000, 2.270000, 0.146000, -0.010200, 1.000000, -1.000000, 0.000000, -4.000000) z = ex[1][1] * ex[-1][2] * ex[-4][4] DLAM += 0.636 * z.imag DS += 2.27 * z.imag GAM1C += 0.146 * z.real SINPI += -0.0102 * z.real - - # AddSol( -0.189, -1.68,+0.131, -0.0028,0, 2, 0, 2) + # AddSol(-0.189000, -1.680000, 0.131000, -0.002800, 0.000000, 2.000000, 0.000000, 2.000000) z = ex[2][2] * ex[2][4] DLAM += -0.189 * z.imag DS += -1.68 * z.imag GAM1C += 0.131 * z.real SINPI += -0.0028 * z.real - - # AddSol( -7.486, -0.66,-0.037, -0.0086,0, 2, 0, 0) + # AddSol(-7.486000, -0.660000, -0.037000, -0.008600, 0.000000, 2.000000, 0.000000, 0.000000) z = ex[2][2] DLAM += -7.486 * z.imag DS += -0.66 * z.imag GAM1C += -0.037 * z.real SINPI += -0.0086 * z.real - - # AddSol( -8.096, -16.35,-0.740, 0.0918,0, 2, 0,-2) + # AddSol(-8.096000, -16.350000, -0.740000, 0.091800, 0.000000, 2.000000, 0.000000, -2.000000) z = ex[2][2] * ex[-2][4] DLAM += -8.096 * z.imag DS += -16.35 * z.imag GAM1C += -0.740 * z.real SINPI += 0.0918 * z.real - - # AddSol( -5.741, -0.04, 0.0 , -0.0009,0, 0, 2, 2) + # AddSol(-5.741000, -0.040000, 0.000000, -0.000900, 0.000000, 0.000000, 2.000000, 2.000000) z = ex[2][3] * ex[2][4] DLAM += -5.741 * z.imag DS += -0.04 * z.imag SINPI += -0.0009 * z.real - - # AddSol( 0.255, 0.0 , 0.0 , 0.0 ,0, 0, 2, 1) + # AddSol(0.255000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 2.000000, 1.000000) z = ex[2][3] * ex[1][4] DLAM += 0.255 * z.imag - - # AddSol( -411.608, -0.20, 0.0 , -0.0124,0, 0, 2, 0) + # AddSol(-411.608000, -0.200000, 0.000000, -0.012400, 0.000000, 0.000000, 2.000000, 0.000000) z = ex[2][3] DLAM += -411.608 * z.imag DS += -0.20 * z.imag SINPI += -0.0124 * z.real - - # AddSol( 0.584, 0.84, 0.0 , +0.0071,0, 0, 2,-1) + # AddSol(0.584000, 0.840000, 0.000000, 0.007100, 0.000000, 0.000000, 2.000000, -1.000000) z = ex[2][3] * ex[-1][4] DLAM += 0.584 * z.imag DS += 0.84 * z.imag SINPI += 0.0071 * z.real - - # AddSol( -55.173, -52.14, 0.0 , -0.1052,0, 0, 2,-2) + # AddSol(-55.173000, -52.140000, 0.000000, -0.105200, 0.000000, 0.000000, 2.000000, -2.000000) z = ex[2][3] * ex[-2][4] DLAM += -55.173 * z.imag DS += -52.14 * z.imag SINPI += -0.1052 * z.real - - # AddSol( 0.254, 0.25, 0.0 , -0.0017,0, 0, 2,-3) + # AddSol(0.254000, 0.250000, 0.000000, -0.001700, 0.000000, 0.000000, 2.000000, -3.000000) z = ex[2][3] * ex[-3][4] DLAM += 0.254 * z.imag DS += 0.25 * z.imag SINPI += -0.0017 * z.real - - # AddSol( +0.025, -1.67, 0.0 , +0.0031,0, 0, 2,-4) + # AddSol(0.025000, -1.670000, 0.000000, 0.003100, 0.000000, 0.000000, 2.000000, -4.000000) z = ex[2][3] * ex[-4][4] DLAM += 0.025 * z.imag DS += -1.67 * z.imag SINPI += 0.0031 * z.real - - # AddSol( 1.060, 2.96,-0.166, 0.0243,3, 0, 0,+2) + # AddSol(1.060000, 2.960000, -0.166000, 0.024300, 3.000000, 0.000000, 0.000000, 2.000000) z = ex[3][1] * ex[2][4] DLAM += 1.060 * z.imag DS += 2.96 * z.imag GAM1C += -0.166 * z.real SINPI += 0.0243 * z.real - - # AddSol( 36.124, 50.64,-1.300, 0.6215,3, 0, 0, 0) + # AddSol(36.124000, 50.640000, -1.300000, 0.621500, 3.000000, 0.000000, 0.000000, 0.000000) z = ex[3][1] DLAM += 36.124 * z.imag DS += 50.64 * z.imag GAM1C += -1.300 * z.real SINPI += 0.6215 * z.real - - # AddSol( -13.193, -16.40,+0.258, -0.1187,3, 0, 0,-2) + # AddSol(-13.193000, -16.400000, 0.258000, -0.118700, 3.000000, 0.000000, 0.000000, -2.000000) z = ex[3][1] * ex[-2][4] DLAM += -13.193 * z.imag DS += -16.40 * z.imag GAM1C += 0.258 * z.real SINPI += -0.1187 * z.real - - # AddSol( -1.187, -0.74,+0.042, 0.0074,3, 0, 0,-4) + # AddSol(-1.187000, -0.740000, 0.042000, 0.007400, 3.000000, 0.000000, 0.000000, -4.000000) z = ex[3][1] * ex[-4][4] DLAM += -1.187 * z.imag DS += -0.74 * z.imag GAM1C += 0.042 * z.real SINPI += 0.0074 * z.real - - # AddSol( -0.293, -0.31,-0.002, 0.0046,3, 0, 0,-6) + # AddSol(-0.293000, -0.310000, -0.002000, 0.004600, 3.000000, 0.000000, 0.000000, -6.000000) z = ex[3][1] * ex[-6][4] DLAM += -0.293 * z.imag DS += -0.31 * z.imag GAM1C += -0.002 * z.real SINPI += 0.0046 * z.real - - # AddSol( -0.290, -1.45,+0.116, -0.0051,2, 1, 0, 2) + # AddSol(-0.290000, -1.450000, 0.116000, -0.005100, 2.000000, 1.000000, 0.000000, 2.000000) z = ex[2][1] * ex[1][2] * ex[2][4] DLAM += -0.290 * z.imag DS += -1.45 * z.imag GAM1C += 0.116 * z.real SINPI += -0.0051 * z.real - - # AddSol( -7.649, -10.56,+0.259, -0.1038,2, 1, 0, 0) + # AddSol(-7.649000, -10.560000, 0.259000, -0.103800, 2.000000, 1.000000, 0.000000, 0.000000) z = ex[2][1] * ex[1][2] DLAM += -7.649 * z.imag DS += -10.56 * z.imag GAM1C += 0.259 * z.real SINPI += -0.1038 * z.real - - # AddSol( -8.627, -7.59,+0.078, -0.0192,2, 1, 0,-2) + # AddSol(-8.627000, -7.590000, 0.078000, -0.019200, 2.000000, 1.000000, 0.000000, -2.000000) z = ex[2][1] * ex[1][2] * ex[-2][4] DLAM += -8.627 * z.imag DS += -7.59 * z.imag GAM1C += 0.078 * z.real SINPI += -0.0192 * z.real - - # AddSol( -2.740, -2.54,+0.022, 0.0324,2, 1, 0,-4) + # AddSol(-2.740000, -2.540000, 0.022000, 0.032400, 2.000000, 1.000000, 0.000000, -4.000000) z = ex[2][1] * ex[1][2] * ex[-4][4] DLAM += -2.740 * z.imag DS += -2.54 * z.imag GAM1C += 0.022 * z.real SINPI += 0.0324 * z.real - - # AddSol( 1.181, 3.32,-0.212, 0.0213,2,-1, 0,+2) + # AddSol(1.181000, 3.320000, -0.212000, 0.021300, 2.000000, -1.000000, 0.000000, 2.000000) z = ex[2][1] * ex[-1][2] * ex[2][4] DLAM += 1.181 * z.imag DS += 3.32 * z.imag GAM1C += -0.212 * z.real SINPI += 0.0213 * z.real - - # AddSol( 9.703, 11.67,-0.151, 0.1268,2,-1, 0, 0) + # AddSol(9.703000, 11.670000, -0.151000, 0.126800, 2.000000, -1.000000, 0.000000, 0.000000) z = ex[2][1] * ex[-1][2] DLAM += 9.703 * z.imag DS += 11.67 * z.imag GAM1C += -0.151 * z.real SINPI += 0.1268 * z.real - - # AddSol( -0.352, -0.37,+0.001, -0.0028,2,-1, 0,-1) + # AddSol(-0.352000, -0.370000, 0.001000, -0.002800, 2.000000, -1.000000, 0.000000, -1.000000) z = ex[2][1] * ex[-1][2] * ex[-1][4] DLAM += -0.352 * z.imag DS += -0.37 * z.imag GAM1C += 0.001 * z.real SINPI += -0.0028 * z.real - - # AddSol( -2.494, -1.17,-0.003, -0.0017,2,-1, 0,-2) + # AddSol(-2.494000, -1.170000, -0.003000, -0.001700, 2.000000, -1.000000, 0.000000, -2.000000) z = ex[2][1] * ex[-1][2] * ex[-2][4] DLAM += -2.494 * z.imag DS += -1.17 * z.imag GAM1C += -0.003 * z.real SINPI += -0.0017 * z.real - - # AddSol( 0.360, 0.20,-0.012, -0.0043,2,-1, 0,-4) + # AddSol(0.360000, 0.200000, -0.012000, -0.004300, 2.000000, -1.000000, 0.000000, -4.000000) z = ex[2][1] * ex[-1][2] * ex[-4][4] DLAM += 0.360 * z.imag DS += 0.20 * z.imag GAM1C += -0.012 * z.real SINPI += -0.0043 * z.real - - # AddSol( -1.167, -1.25,+0.008, -0.0106,1, 2, 0, 0) + # AddSol(-1.167000, -1.250000, 0.008000, -0.010600, 1.000000, 2.000000, 0.000000, 0.000000) z = ex[1][1] * ex[2][2] DLAM += -1.167 * z.imag DS += -1.25 * z.imag GAM1C += 0.008 * z.real SINPI += -0.0106 * z.real - - # AddSol( -7.412, -6.12,+0.117, 0.0484,1, 2, 0,-2) + # AddSol(-7.412000, -6.120000, 0.117000, 0.048400, 1.000000, 2.000000, 0.000000, -2.000000) z = ex[1][1] * ex[2][2] * ex[-2][4] DLAM += -7.412 * z.imag DS += -6.12 * z.imag GAM1C += 0.117 * z.real SINPI += 0.0484 * z.real - - # AddSol( -0.311, -0.65,-0.032, 0.0044,1, 2, 0,-4) + # AddSol(-0.311000, -0.650000, -0.032000, 0.004400, 1.000000, 2.000000, 0.000000, -4.000000) z = ex[1][1] * ex[2][2] * ex[-4][4] DLAM += -0.311 * z.imag DS += -0.65 * z.imag GAM1C += -0.032 * z.real SINPI += 0.0044 * z.real - - # AddSol( +0.757, 1.82,-0.105, 0.0112,1,-2, 0, 2) + # AddSol(0.757000, 1.820000, -0.105000, 0.011200, 1.000000, -2.000000, 0.000000, 2.000000) z = ex[1][1] * ex[-2][2] * ex[2][4] DLAM += 0.757 * z.imag DS += 1.82 * z.imag GAM1C += -0.105 * z.real SINPI += 0.0112 * z.real - - # AddSol( +2.580, 2.32,+0.027, 0.0196,1,-2, 0, 0) + # AddSol(2.580000, 2.320000, 0.027000, 0.019600, 1.000000, -2.000000, 0.000000, 0.000000) z = ex[1][1] * ex[-2][2] DLAM += 2.580 * z.imag DS += 2.32 * z.imag GAM1C += 0.027 * z.real SINPI += 0.0196 * z.real - - # AddSol( +2.533, 2.40,-0.014, -0.0212,1,-2, 0,-2) + # AddSol(2.533000, 2.400000, -0.014000, -0.021200, 1.000000, -2.000000, 0.000000, -2.000000) z = ex[1][1] * ex[-2][2] * ex[-2][4] DLAM += 2.533 * z.imag DS += 2.40 * z.imag GAM1C += -0.014 * z.real SINPI += -0.0212 * z.real - - # AddSol( -0.344, -0.57,-0.025, +0.0036,0, 3, 0,-2) + # AddSol(-0.344000, -0.570000, -0.025000, 0.003600, 0.000000, 3.000000, 0.000000, -2.000000) z = ex[3][2] * ex[-2][4] DLAM += -0.344 * z.imag DS += -0.57 * z.imag GAM1C += -0.025 * z.real SINPI += 0.0036 * z.real - - # AddSol( -0.992, -0.02, 0.0 , 0.0 ,1, 0, 2, 2) + # AddSol(-0.992000, -0.020000, 0.000000, 0.000000, 1.000000, 0.000000, 2.000000, 2.000000) z = ex[1][1] * ex[2][3] * ex[2][4] DLAM += -0.992 * z.imag DS += -0.02 * z.imag - - # AddSol( -45.099, -0.02, 0.0 , -0.0010,1, 0, 2, 0) + # AddSol(-45.099000, -0.020000, 0.000000, -0.001000, 1.000000, 0.000000, 2.000000, 0.000000) z = ex[1][1] * ex[2][3] DLAM += -45.099 * z.imag DS += -0.02 * z.imag SINPI += -0.0010 * z.real - - # AddSol( -0.179, -9.52, 0.0 , -0.0833,1, 0, 2,-2) + # AddSol(-0.179000, -9.520000, 0.000000, -0.083300, 1.000000, 0.000000, 2.000000, -2.000000) z = ex[1][1] * ex[2][3] * ex[-2][4] DLAM += -0.179 * z.imag DS += -9.52 * z.imag SINPI += -0.0833 * z.real - - # AddSol( -0.301, -0.33, 0.0 , 0.0014,1, 0, 2,-4) + # AddSol(-0.301000, -0.330000, 0.000000, 0.001400, 1.000000, 0.000000, 2.000000, -4.000000) z = ex[1][1] * ex[2][3] * ex[-4][4] DLAM += -0.301 * z.imag DS += -0.33 * z.imag SINPI += 0.0014 * z.real - - # AddSol( -6.382, -3.37, 0.0 , -0.0481,1, 0,-2, 2) + # AddSol(-6.382000, -3.370000, 0.000000, -0.048100, 1.000000, 0.000000, -2.000000, 2.000000) z = ex[1][1] * ex[-2][3] * ex[2][4] DLAM += -6.382 * z.imag DS += -3.37 * z.imag SINPI += -0.0481 * z.real - - # AddSol( 39.528, 85.13, 0.0 , -0.7136,1, 0,-2, 0) + # AddSol(39.528000, 85.130000, 0.000000, -0.713600, 1.000000, 0.000000, -2.000000, 0.000000) z = ex[1][1] * ex[-2][3] DLAM += 39.528 * z.imag DS += 85.13 * z.imag SINPI += -0.7136 * z.real - - # AddSol( 9.366, 0.71, 0.0 , -0.0112,1, 0,-2,-2) + # AddSol(9.366000, 0.710000, 0.000000, -0.011200, 1.000000, 0.000000, -2.000000, -2.000000) z = ex[1][1] * ex[-2][3] * ex[-2][4] DLAM += 9.366 * z.imag DS += 0.71 * z.imag SINPI += -0.0112 * z.real - - # AddSol( 0.202, 0.02, 0.0 , 0.0 ,1, 0,-2,-4) + # AddSol(0.202000, 0.020000, 0.000000, 0.000000, 1.000000, 0.000000, -2.000000, -4.000000) z = ex[1][1] * ex[-2][3] * ex[-4][4] DLAM += 0.202 * z.imag DS += 0.02 * z.imag - - - # AddSol( 0.415, 0.10, 0.0 , 0.0013,0, 1, 2, 0) + # AddSol(0.415000, 0.100000, 0.000000, 0.001300, 0.000000, 1.000000, 2.000000, 0.000000) z = ex[1][2] * ex[2][3] DLAM += 0.415 * z.imag DS += 0.10 * z.imag SINPI += 0.0013 * z.real - - # AddSol( -2.152, -2.26, 0.0 , -0.0066,0, 1, 2,-2) + # AddSol(-2.152000, -2.260000, 0.000000, -0.006600, 0.000000, 1.000000, 2.000000, -2.000000) z = ex[1][2] * ex[2][3] * ex[-2][4] DLAM += -2.152 * z.imag DS += -2.26 * z.imag SINPI += -0.0066 * z.real - - # AddSol( -1.440, -1.30, 0.0 , +0.0014,0, 1,-2, 2) + # AddSol(-1.440000, -1.300000, 0.000000, 0.001400, 0.000000, 1.000000, -2.000000, 2.000000) z = ex[1][2] * ex[-2][3] * ex[2][4] DLAM += -1.440 * z.imag DS += -1.30 * z.imag SINPI += 0.0014 * z.real - - # AddSol( 0.384, -0.04, 0.0 , 0.0 ,0, 1,-2,-2) + # AddSol(0.384000, -0.040000, 0.000000, 0.000000, 0.000000, 1.000000, -2.000000, -2.000000) z = ex[1][2] * ex[-2][3] * ex[-2][4] DLAM += 0.384 * z.imag DS += -0.04 * z.imag - - # AddSol( +1.938, +3.60,-0.145, +0.0401,4, 0, 0, 0) + # AddSol(1.938000, 3.600000, -0.145000, 0.040100, 4.000000, 0.000000, 0.000000, 0.000000) z = ex[4][1] DLAM += 1.938 * z.imag DS += 3.60 * z.imag GAM1C += -0.145 * z.real SINPI += 0.0401 * z.real - - # AddSol( -0.952, -1.58,+0.052, -0.0130,4, 0, 0,-2) + # AddSol(-0.952000, -1.580000, 0.052000, -0.013000, 4.000000, 0.000000, 0.000000, -2.000000) z = ex[4][1] * ex[-2][4] DLAM += -0.952 * z.imag DS += -1.58 * z.imag GAM1C += 0.052 * z.real SINPI += -0.0130 * z.real - - # AddSol( -0.551, -0.94,+0.032, -0.0097,3, 1, 0, 0) + # AddSol(-0.551000, -0.940000, 0.032000, -0.009700, 3.000000, 1.000000, 0.000000, 0.000000) z = ex[3][1] * ex[1][2] DLAM += -0.551 * z.imag DS += -0.94 * z.imag GAM1C += 0.032 * z.real SINPI += -0.0097 * z.real - - # AddSol( -0.482, -0.57,+0.005, -0.0045,3, 1, 0,-2) + # AddSol(-0.482000, -0.570000, 0.005000, -0.004500, 3.000000, 1.000000, 0.000000, -2.000000) z = ex[3][1] * ex[1][2] * ex[-2][4] DLAM += -0.482 * z.imag DS += -0.57 * z.imag GAM1C += 0.005 * z.real SINPI += -0.0045 * z.real - - # AddSol( 0.681, 0.96,-0.026, 0.0115,3,-1, 0, 0) + # AddSol(0.681000, 0.960000, -0.026000, 0.011500, 3.000000, -1.000000, 0.000000, 0.000000) z = ex[3][1] * ex[-1][2] DLAM += 0.681 * z.imag DS += 0.96 * z.imag GAM1C += -0.026 * z.real SINPI += 0.0115 * z.real - - # AddSol( -0.297, -0.27, 0.002, -0.0009,2, 2, 0,-2) + # AddSol(-0.297000, -0.270000, 0.002000, -0.000900, 2.000000, 2.000000, 0.000000, -2.000000) z = ex[2][1] * ex[2][2] * ex[-2][4] DLAM += -0.297 * z.imag DS += -0.27 * z.imag GAM1C += 0.002 * z.real SINPI += -0.0009 * z.real - - # AddSol( 0.254, +0.21,-0.003, 0.0 ,2,-2, 0,-2) + # AddSol(0.254000, 0.210000, -0.003000, 0.000000, 2.000000, -2.000000, 0.000000, -2.000000) z = ex[2][1] * ex[-2][2] * ex[-2][4] DLAM += 0.254 * z.imag DS += 0.21 * z.imag GAM1C += -0.003 * z.real - - # AddSol( -0.250, -0.22, 0.004, 0.0014,1, 3, 0,-2) + # AddSol(-0.250000, -0.220000, 0.004000, 0.001400, 1.000000, 3.000000, 0.000000, -2.000000) z = ex[1][1] * ex[3][2] * ex[-2][4] DLAM += -0.250 * z.imag DS += -0.22 * z.imag GAM1C += 0.004 * z.real SINPI += 0.0014 * z.real - - # AddSol( -3.996, 0.0 , 0.0 , +0.0004,2, 0, 2, 0) + # AddSol(-3.996000, 0.000000, 0.000000, 0.000400, 2.000000, 0.000000, 2.000000, 0.000000) z = ex[2][1] * ex[2][3] DLAM += -3.996 * z.imag SINPI += 0.0004 * z.real - - # AddSol( 0.557, -0.75, 0.0 , -0.0090,2, 0, 2,-2) + # AddSol(0.557000, -0.750000, 0.000000, -0.009000, 2.000000, 0.000000, 2.000000, -2.000000) z = ex[2][1] * ex[2][3] * ex[-2][4] DLAM += 0.557 * z.imag DS += -0.75 * z.imag SINPI += -0.0090 * z.real - - # AddSol( -0.459, -0.38, 0.0 , -0.0053,2, 0,-2, 2) + # AddSol(-0.459000, -0.380000, 0.000000, -0.005300, 2.000000, 0.000000, -2.000000, 2.000000) z = ex[2][1] * ex[-2][3] * ex[2][4] DLAM += -0.459 * z.imag DS += -0.38 * z.imag SINPI += -0.0053 * z.real - - # AddSol( -1.298, 0.74, 0.0 , +0.0004,2, 0,-2, 0) + # AddSol(-1.298000, 0.740000, 0.000000, 0.000400, 2.000000, 0.000000, -2.000000, 0.000000) z = ex[2][1] * ex[-2][3] DLAM += -1.298 * z.imag DS += 0.74 * z.imag SINPI += 0.0004 * z.real - - # AddSol( 0.538, 1.14, 0.0 , -0.0141,2, 0,-2,-2) + # AddSol(0.538000, 1.140000, 0.000000, -0.014100, 2.000000, 0.000000, -2.000000, -2.000000) z = ex[2][1] * ex[-2][3] * ex[-2][4] DLAM += 0.538 * z.imag DS += 1.14 * z.imag SINPI += -0.0141 * z.real - - # AddSol( 0.263, 0.02, 0.0 , 0.0 ,1, 1, 2, 0) + # AddSol(0.263000, 0.020000, 0.000000, 0.000000, 1.000000, 1.000000, 2.000000, 0.000000) z = ex[1][1] * ex[1][2] * ex[2][3] DLAM += 0.263 * z.imag DS += 0.02 * z.imag - - # AddSol( 0.426, +0.07, 0.0 , -0.0006,1, 1,-2,-2) + # AddSol(0.426000, 0.070000, 0.000000, -0.000600, 1.000000, 1.000000, -2.000000, -2.000000) z = ex[1][1] * ex[1][2] * ex[-2][3] * ex[-2][4] DLAM += 0.426 * z.imag DS += 0.07 * z.imag SINPI += -0.0006 * z.real - - # AddSol( -0.304, +0.03, 0.0 , +0.0003,1,-1, 2, 0) + # AddSol(-0.304000, 0.030000, 0.000000, 0.000300, 1.000000, -1.000000, 2.000000, 0.000000) z = ex[1][1] * ex[-1][2] * ex[2][3] DLAM += -0.304 * z.imag DS += 0.03 * z.imag SINPI += 0.0003 * z.real - - # AddSol( -0.372, -0.19, 0.0 , -0.0027,1,-1,-2, 2) + # AddSol(-0.372000, -0.190000, 0.000000, -0.002700, 1.000000, -1.000000, -2.000000, 2.000000) z = ex[1][1] * ex[-1][2] * ex[-2][3] * ex[2][4] DLAM += -0.372 * z.imag DS += -0.19 * z.imag SINPI += -0.0027 * z.real - - # AddSol( +0.418, 0.0 , 0.0 , 0.0 ,0, 0, 4, 0) + # AddSol(0.418000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000) z = ex[4][3] DLAM += 0.418 * z.imag - - # AddSol( -0.330, -0.04, 0.0 , 0.0 ,3, 0, 2, 0) + # AddSol(-0.330000, -0.040000, 0.000000, 0.000000, 3.000000, 0.000000, 2.000000, 0.000000) z = ex[3][1] * ex[2][3] DLAM += -0.330 * z.imag DS += -0.04 * z.imag