From 6942e121b0f56d1f44cb47206d9e9284d1d5d6a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Berthomieu?= Date: Tue, 13 Jan 2026 23:47:58 +0100 Subject: [PATCH 01/15] more templates files for make check scripts, renaming of output_files/foo.res depending on the computation arguments, the seed is picked by bash and printed upon failure in test-suite.log --- Makefile.am | 60 ++--- configure.ac | 253 +++++++++--------- input_files/{F4SAT-31.ms => f4sat-31.ms} | 0 .../{F4SAT-byone-31.ms => f4sat-byone-31.ms} | 0 ...prime-bad.res => bug-2nd-prime-bad.g2.res} | 0 ...pty-tracer.res => bug-empty-tracer.g2.res} | 0 ...3_n_4_p_2.res => cp_d_3_n_4_p_2.P2.d0.res} | 0 .../{cyclic5-16.res => cyclic5-16.P2.d4.res} | 0 .../{cyclic5-31.res => cyclic5-31.P2.d4.res} | 0 .../{cyclic5-qq.res => cyclic5-qq.P2.d4.res} | 0 .../{eco10-31.res => eco10-31.P2.d0.res} | 0 output_files/eco11-31.res | 34 --- .../{eco6-16.res => eco6-16.P2.d4.res} | 0 .../{eco6-31.res => eco6-31.P2.d4.res} | 0 .../{eco6-qq.res => eco6-qq.P2.d4.res} | 0 .../{elim-31.res => elim-31.g2.e1.res} | 0 .../{elim-31.e2.res => elim-31.g2.e2.res} | 0 .../{elim-qq.res => elim-qq.g2.e1.res} | 0 .../{elim-qq.e2.res => elim-qq.g2.e2.res} | 0 output_files/{F4SAT-31.res => f4sat-31.res} | 0 ...{F4SAT-byone-31.res => f4sat-byone-31.res} | 0 ...{henrion5-qq.res => henrion5-qq.P2.d0.res} | 0 ...low-16.res => input-overflow-16.P2.d0.res} | 0 ...ssue_230.res => issue_230.P1.d0.p1024.res} | 0 output_files/issue_230.P1.d0.p128.res | 18 ++ ....res => issue_230_squared.P1.d0.p1024.res} | 0 output_files/issue_230_squared.P1.d0.p128.res | 18 ++ .../{kat6-31.res => kat6-31.P2.d0.res} | 0 .../{kat7-qq.res => kat7-qq.P2.d0.res} | 0 .../{linear-qq.res => linear-qq.P2.d0.res} | 0 .../{multy-16.res => multy-16.P2.d0.res} | 0 .../{multy-31.res => multy-31.P2.d0.res} | 0 .../{multy-qq.res => multy-qq.P2.d0.res} | 0 ..._radicalshape-no-square-qq.P1.d0.p1024.res | 18 ++ ...l_radicalshape-no-square-qq.P1.d0.p128.res | 18 ++ ...onradical_radicalshape-no-square-qq.p3.res | 3 - .../nonradical_radicalshape-no-square-qq.res | 16 -- ...onradical_radicalshape-qq.P1.d0.p1024.res} | 4 +- .../nonradical_radicalshape-qq.P1.d0.p128.res | 14 + .../nonradical_radicalshape-qq.p3.res | 3 - ...es => nonradical_shape-qq.P1.d0.p1024.res} | 17 +- .../nonradical_shape-qq.P1.d0.p128.res | 18 ++ output_files/nonradical_shape-qq.res | 16 -- ...hape-31.res => radical_shape-31.P2.d0.res} | 0 ...hape-qq.res => radical_shape-qq.P2.d0.res} | 0 ... realroot-extraction-exact-root.p1024.res} | 0 ...> realroot-extraction-exact-root.p128.res} | 0 output_files/realroot1.p1024.res | 3 + output_files/realroot1.p128.res | 3 + output_files/realroot1.p256.res | 3 - output_files/realroot1.res | 3 - output_files/reals_dim0-chgvar.p1024.res | 3 + output_files/reals_dim0-chgvar.p128.res | 3 + output_files/reals_dim0-chgvar.p256.res | 3 - output_files/reals_dim0-chgvar.res | 3 - output_files/reals_dim0-extract.p1024.res | 3 + output_files/reals_dim0-extract.p128.res | 3 + output_files/reals_dim0-extract.p256.res | 3 - output_files/reals_dim0-extract.res | 3 - ....p256.res => reals_dim0-swapvar.p1024.res} | 0 ...wapvar.res => reals_dim0-swapvar.p128.res} | 0 output_files/reals_dim0.p1024.res | 3 + output_files/reals_dim0.p128.res | 3 + output_files/reals_dim0.p256.res | 3 - output_files/reals_dim0.res | 3 - ...t-lifting2.res => test-lifting2.P2.d0.res} | 0 output_files/{xy-qq.res => xy-qq.P2.d0.res} | 0 test/diff/diff_bug_2nd_prime_bad.sh | 46 +--- test/diff/diff_bug_68.sh | 46 +--- test/diff/diff_bug_empty_tracer.sh | 46 +--- test/diff/diff_cp_d_3_n_4_p_2.sh | 2 + test/diff/diff_cyclic5-16.sh | 46 +--- test/diff/diff_cyclic5-31.sh | 46 +--- test/diff/diff_cyclic5-qq.sh | 6 +- test/diff/diff_eco10-31.sh | 2 + test/diff/diff_eco6-16.sh | 46 +--- test/diff/diff_eco6-31.sh | 90 +------ test/diff/diff_eco6-qq.sh | 90 +------ test/diff/diff_elim-31.sh | 90 +------ test/diff/diff_elim-qq.sh | 90 +------ .../{diff_F4SAT-31.sh => diff_f4sat-31.sh} | 2 +- ...SAT-byone-31.sh => diff_f4sat-byone-31.sh} | 2 +- test/diff/diff_groebner-g2.sh | 46 +--- test/diff/diff_henrion5-qq.sh | 8 +- test/diff/diff_input-overflow-16.sh | 47 +--- test/diff/diff_issue_230.sh | 45 +--- test/diff/diff_issue_230_squared.sh | 46 +--- test/diff/diff_kat6-31.sh | 2 + test/diff/diff_kat7-qq.sh | 4 + ...runcate_gb.sh => diff_kat8-qq-truncate.sh} | 0 test/diff/diff_linear-qq.sh | 2 + test/diff/diff_maxbitsize-bug.sh | 46 +--- test/diff/diff_mq_2_1.sh | 46 +--- test/diff/diff_multy-16.sh | 2 + test/diff/diff_multy-31.sh | 2 + test/diff/diff_multy-qq.sh | 4 + test/diff/diff_nf_16.sh | 6 +- test/diff/diff_nf_31.sh | 2 +- test/diff/diff_nf_8.sh | 6 +- test/diff/diff_nf_lm_bug.sh | 6 +- ...ff_nonradical_radicalshape-no-square-31.sh | 2 - ...ff_nonradical_radicalshape-no-square-qq.sh | 72 +---- test/diff/diff_nonradical_radicalshape-qq.sh | 46 +--- test/diff/diff_nonradical_shape-qq.sh | 46 +--- test/diff/diff_one-16.sh | 2 + test/diff/diff_one-31.sh | 46 +--- test/diff/diff_one-qq.sh | 46 +--- test/diff/diff_radical_shape-31.sh | 2 + test/diff/diff_radical_shape-qq.sh | 4 + .../diff_realroot-extraction-exact-root.sh | 90 +------ test/diff/diff_realroot1.sh | 90 +------ test/diff/diff_reals_dim0-chgvar.sh | 45 +--- test/diff/diff_reals_dim0-extract.sh | 90 +------ test/diff/diff_reals_dim0-swapvar.sh | 90 +------ test/diff/diff_reals_dim0.sh | 90 +------ ...groebner.sh => diff_source-gb-elim-red.sh} | 105 +++----- test/diff/diff_source-gb-lm.sh | 49 ++++ test/diff/diff_source-gb-red.sh | 49 ++++ test/diff/diff_source-noarg.sh | 49 ++++ test/diff/diff_source-param-fullnf-qq.sh | 51 ++++ test/diff/diff_source-param-fullnf.sh | 49 ++++ test/diff/diff_source-param-nonf-qq.sh | 51 ++++ test/diff/diff_source-param-nonf.sh | 49 ++++ test/diff/diff_source-real-param-nonf.sh | 193 +++++++++++++ test/diff/diff_source-real.sh | 193 +++++++++++++ test/diff/diff_source.sh | 108 ++------ test/diff/diff_test-lifting2.sh | 4 + test/diff/diff_xy-qq.sh | 4 + 128 files changed, 1205 insertions(+), 2038 deletions(-) rename input_files/{F4SAT-31.ms => f4sat-31.ms} (100%) rename input_files/{F4SAT-byone-31.ms => f4sat-byone-31.ms} (100%) rename output_files/{bug-2nd-prime-bad.res => bug-2nd-prime-bad.g2.res} (100%) rename output_files/{bug-empty-tracer.res => bug-empty-tracer.g2.res} (100%) rename output_files/{cp_d_3_n_4_p_2.res => cp_d_3_n_4_p_2.P2.d0.res} (100%) rename output_files/{cyclic5-16.res => cyclic5-16.P2.d4.res} (100%) rename output_files/{cyclic5-31.res => cyclic5-31.P2.d4.res} (100%) rename output_files/{cyclic5-qq.res => cyclic5-qq.P2.d4.res} (100%) rename output_files/{eco10-31.res => eco10-31.P2.d0.res} (100%) delete mode 100644 output_files/eco11-31.res rename output_files/{eco6-16.res => eco6-16.P2.d4.res} (100%) rename output_files/{eco6-31.res => eco6-31.P2.d4.res} (100%) rename output_files/{eco6-qq.res => eco6-qq.P2.d4.res} (100%) rename output_files/{elim-31.res => elim-31.g2.e1.res} (100%) rename output_files/{elim-31.e2.res => elim-31.g2.e2.res} (100%) rename output_files/{elim-qq.res => elim-qq.g2.e1.res} (100%) rename output_files/{elim-qq.e2.res => elim-qq.g2.e2.res} (100%) rename output_files/{F4SAT-31.res => f4sat-31.res} (100%) rename output_files/{F4SAT-byone-31.res => f4sat-byone-31.res} (100%) rename output_files/{henrion5-qq.res => henrion5-qq.P2.d0.res} (100%) rename output_files/{input-overflow-16.res => input-overflow-16.P2.d0.res} (100%) rename output_files/{issue_230.res => issue_230.P1.d0.p1024.res} (100%) create mode 100644 output_files/issue_230.P1.d0.p128.res rename output_files/{issue_230_squared.res => issue_230_squared.P1.d0.p1024.res} (100%) create mode 100644 output_files/issue_230_squared.P1.d0.p128.res rename output_files/{kat6-31.res => kat6-31.P2.d0.res} (100%) rename output_files/{kat7-qq.res => kat7-qq.P2.d0.res} (100%) rename output_files/{linear-qq.res => linear-qq.P2.d0.res} (100%) rename output_files/{multy-16.res => multy-16.P2.d0.res} (100%) rename output_files/{multy-31.res => multy-31.P2.d0.res} (100%) rename output_files/{multy-qq.res => multy-qq.P2.d0.res} (100%) create mode 100644 output_files/nonradical_radicalshape-no-square-qq.P1.d0.p1024.res create mode 100644 output_files/nonradical_radicalshape-no-square-qq.P1.d0.p128.res delete mode 100644 output_files/nonradical_radicalshape-no-square-qq.p3.res delete mode 100644 output_files/nonradical_radicalshape-no-square-qq.res rename output_files/{nonradical_radicalshape-qq.res => nonradical_radicalshape-qq.P1.d0.p1024.res} (72%) create mode 100644 output_files/nonradical_radicalshape-qq.P1.d0.p128.res delete mode 100644 output_files/nonradical_radicalshape-qq.p3.res rename output_files/{nonradical_shape-qq.p1024.res => nonradical_shape-qq.P1.d0.p1024.res} (93%) create mode 100644 output_files/nonradical_shape-qq.P1.d0.p128.res delete mode 100644 output_files/nonradical_shape-qq.res rename output_files/{radical_shape-31.res => radical_shape-31.P2.d0.res} (100%) rename output_files/{radical_shape-qq.res => radical_shape-qq.P2.d0.res} (100%) rename output_files/{realroot-extraction-exact-root.p256.res => realroot-extraction-exact-root.p1024.res} (100%) rename output_files/{realroot-extraction-exact-root.res => realroot-extraction-exact-root.p128.res} (100%) create mode 100644 output_files/realroot1.p1024.res create mode 100644 output_files/realroot1.p128.res delete mode 100644 output_files/realroot1.p256.res delete mode 100644 output_files/realroot1.res create mode 100644 output_files/reals_dim0-chgvar.p1024.res create mode 100644 output_files/reals_dim0-chgvar.p128.res delete mode 100644 output_files/reals_dim0-chgvar.p256.res delete mode 100644 output_files/reals_dim0-chgvar.res create mode 100644 output_files/reals_dim0-extract.p1024.res create mode 100644 output_files/reals_dim0-extract.p128.res delete mode 100644 output_files/reals_dim0-extract.p256.res delete mode 100644 output_files/reals_dim0-extract.res rename output_files/{reals_dim0-swapvar.p256.res => reals_dim0-swapvar.p1024.res} (100%) rename output_files/{reals_dim0-swapvar.res => reals_dim0-swapvar.p128.res} (100%) create mode 100644 output_files/reals_dim0.p1024.res create mode 100644 output_files/reals_dim0.p128.res delete mode 100644 output_files/reals_dim0.p256.res delete mode 100644 output_files/reals_dim0.res rename output_files/{test-lifting2.res => test-lifting2.P2.d0.res} (100%) rename output_files/{xy-qq.res => xy-qq.P2.d0.res} (100%) rename test/diff/{diff_F4SAT-31.sh => diff_f4sat-31.sh} (98%) rename test/diff/{diff_F4SAT-byone-31.sh => diff_f4sat-byone-31.sh} (97%) rename test/diff/{diff_truncate_gb.sh => diff_kat8-qq-truncate.sh} (100%) rename test/diff/{diff_source-groebner.sh => diff_source-gb-elim-red.sh} (60%) create mode 100644 test/diff/diff_source-gb-lm.sh create mode 100644 test/diff/diff_source-gb-red.sh create mode 100644 test/diff/diff_source-noarg.sh create mode 100644 test/diff/diff_source-param-fullnf-qq.sh create mode 100644 test/diff/diff_source-param-fullnf.sh create mode 100644 test/diff/diff_source-param-nonf-qq.sh create mode 100644 test/diff/diff_source-param-nonf.sh create mode 100644 test/diff/diff_source-real-param-nonf.sh create mode 100644 test/diff/diff_source-real.sh diff --git a/Makefile.am b/Makefile.am index f3e27587..6356a570 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,61 +13,61 @@ check_PROGRAMS = neogb_io \ fglm_build_matrixn_nonradical_radicalshape-31 \ line_endings_support -checkdiff = test/diff/diff_cp_d_3_n_4_p_2.sh \ +checkdiff = test/diff/diff_bug_2nd_prime_bad.sh \ + test/diff/diff_bug_68.sh \ + test/diff/diff_bug_empty_tracer.sh \ + test/diff/diff_choice-linear-form-qq.sh \ + test/diff/diff_choice-linear-form-qq-real-roots.sh \ + test/diff/diff_cp_d_3_n_4_p_2.sh \ test/diff/diff_cyclic5-16.sh \ test/diff/diff_cyclic5-31.sh \ test/diff/diff_cyclic5-qq.sh \ + test/diff/diff_eco10-31.sh \ test/diff/diff_eco6-16.sh \ test/diff/diff_eco6-31.sh \ test/diff/diff_eco6-qq.sh \ - test/diff/diff_groebner-g2.sh \ - test/diff/diff_henrion5-qq.sh \ - test/diff/diff_eco10-31.sh \ - test/diff/diff_truncate_gb.sh \ test/diff/diff_elim-31.sh \ test/diff/diff_elim-qq.sh \ - test/diff/diff_F4SAT-31.sh \ - test/diff/diff_F4SAT-byone-31.sh \ + test/diff/diff_f4sat-31.sh \ + test/diff/diff_f4sat-byone-31.sh \ + test/diff/diff_f4sat-field-char.sh \ + test/diff/diff_f4sat-is-saturated-check.sh \ + test/diff/diff_f4sat-zero-input.sh \ + test/diff/diff_groebner-g2.sh \ + test/diff/diff_henrion5-qq.sh \ + test/diff/diff_input-overflow-16.sh \ + test/diff/diff_issue_230.sh \ + test/diff/diff_issue_230_squared.sh \ test/diff/diff_kat6-31.sh \ test/diff/diff_kat7-qq.sh \ + test/diff/diff_kat8-qq-truncate.sh \ + test/diff/diff_linear-qq.sh \ + test/diff/diff_maxbitsize-bug.sh \ + test/diff/diff_mq_2_1.sh \ test/diff/diff_multy-16.sh \ test/diff/diff_multy-31.sh \ test/diff/diff_multy-qq.sh \ - test/diff/diff_nonradical_shape-qq.sh \ - test/diff/diff_nonradical_radicalshape-qq.sh \ + test/diff/diff_nf_16.sh \ + test/diff/diff_nf_31.sh \ + test/diff/diff_nf_8.sh \ + test/diff/diff_nf_lm_bug.sh \ test/diff/diff_nonradical_radicalshape-no-square-31.sh \ test/diff/diff_nonradical_radicalshape-no-square-qq.sh \ + test/diff/diff_nonradical_radicalshape-qq.sh \ + test/diff/diff_nonradical_shape-qq.sh \ test/diff/diff_one-16.sh \ test/diff/diff_one-31.sh \ test/diff/diff_one-qq.sh \ test/diff/diff_radical_shape-31.sh \ test/diff/diff_radical_shape-qq.sh \ - test/diff/diff_realroot-extraction-exact-root.sh \ - test/diff/diff_reals_dim0.sh \ test/diff/diff_realroot1.sh \ + test/diff/diff_realroot-extraction-exact-root.sh \ test/diff/diff_reals_dim0-chgvar.sh \ test/diff/diff_reals_dim0-extract.sh \ + test/diff/diff_reals_dim0.sh \ test/diff/diff_reals_dim0-swapvar.sh \ - test/diff/diff_choice-linear-form-qq.sh \ - test/diff/diff_choice-linear-form-qq-real-roots.sh \ - test/diff/diff_bug_empty_tracer.sh \ - test/diff/diff_bug_2nd_prime_bad.sh \ - test/diff/diff_bug_68.sh \ - test/diff/diff_mq_2_1.sh \ - test/diff/diff_xy-qq.sh \ test/diff/diff_test-lifting2.sh \ - test/diff/diff_linear-qq.sh \ - test/diff/diff_input-overflow-16.sh \ - test/diff/diff_nf_8.sh \ - test/diff/diff_nf_16.sh \ - test/diff/diff_nf_31.sh \ - test/diff/diff_nf_lm_bug.sh \ - test/diff/diff_f4sat-field-char.sh \ - test/diff/diff_f4sat-zero-input.sh \ - test/diff/diff_f4sat-is-saturated-check.sh \ - test/diff/diff_maxbitsize-bug.sh \ - test/diff/diff_issue_230.sh \ - test/diff/diff_issue_230_squared.sh + test/diff/diff_xy-qq.sh # dist_check_DATA = test/input_files neogb_io_SOURCES = test/neogb/io/validate_input_data.c diff --git a/configure.ac b/configure.ac index 3e3e70fe..abad38c2 100644 --- a/configure.ac +++ b/configure.ac @@ -99,97 +99,162 @@ AC_CONFIG_LINKS([ input_files/line_endings/in3_unix.ms:input_files/line_endings/in3_unix.ms input_files/line_endings/in4_unix.ms:input_files/line_endings/in4_unix.ms test/diff/diff_source.sh:test/diff/diff_source.sh - test/diff/diff_source-groebner.sh:test/diff/diff_source-groebner.sh + test/diff/diff_source-gb-lm.sh:test/diff/diff_source-gb-lm.sh + test/diff/diff_source-gb-red.sh:test/diff/diff_source-gb-red.sh + test/diff/diff_source-gb-elim-red.sh:test/diff/diff_source-gb-elim-red.sh + test/diff/diff_source-noarg.sh:test/diff/diff_source-noarg.sh + test/diff/diff_source-param-fullnf-qq.sh:test/diff/diff_source-param-fullnf-qq.sh + test/diff/diff_source-param-fullnf.sh:test/diff/diff_source-param-fullnf.sh + test/diff/diff_source-param-nonf-qq.sh:test/diff/diff_source-param-nonf-qq.sh + test/diff/diff_source-param-nonf.sh:test/diff/diff_source-param-nonf.sh + test/diff/diff_source-real-param-nonf.sh:test/diff/diff_source-real-param-nonf.sh + test/diff/diff_source-real.sh:test/diff/diff_source-real.sh + input_files/bug-2nd-prime-bad.ms:input_files/bug-2nd-prime-bad.ms + output_files/bug-2nd-prime-bad.g2.res:output_files/bug-2nd-prime-bad.g2.res + test/diff/diff_bug_2nd_prime_bad.sh:test/diff/diff_bug_2nd_prime_bad.sh + input_files/bug_68.ms:input_files/bug_68.ms + output_files/bug_68.res:output_files/bug_68.res + test/diff/diff_bug_68.sh:test/diff/diff_bug_68.sh + input_files/bug-empty-tracer.ms:input_files/bug-empty-tracer.ms + output_files/bug-empty-tracer.g2.res:output_files/bug-empty-tracer.g2.res + test/diff/diff_bug_empty_tracer.sh:test/diff/diff_bug_empty_tracer.sh + input_files/choice-linear-form-qq.ms:input_files/choice-linear-form-qq.ms + output_files/choice-linear-form-qq.res:output_files/choice-linear-form-qq.res + test/diff/diff_choice-linear-form-qq.sh:test/diff/diff_choice-linear-form-qq.sh + input_files/choice-linear-form-qq-real-roots.ms:input_files/choice-linear-form-qq-real-roots.ms + output_files/choice-linear-form-qq-real-roots.res:output_files/choice-linear-form-qq-real-roots.res + test/diff/diff_choice-linear-form-qq-real-roots.sh:test/diff/diff_choice-linear-form-qq-real-roots.sh input_files/cp_d_3_n_4_p_2.ms:input_files/cp_d_3_n_4_p_2.ms - output_files/cp_d_3_n_4_p_2.res:output_files/cp_d_3_n_4_p_2.res + output_files/cp_d_3_n_4_p_2.res:output_files/cp_d_3_n_4_p_2.P2.d0.res test/diff/diff_cp_d_3_n_4_p_2.sh:test/diff/diff_cp_d_3_n_4_p_2.sh input_files/cyclic5-16.ms:input_files/cyclic5-16.ms - output_files/cyclic5-16.res:output_files/cyclic5-16.res + output_files/cyclic5-16.res:output_files/cyclic5-16.P2.d4.res test/diff/diff_cyclic5-16.sh:test/diff/diff_cyclic5-16.sh input_files/cyclic5-31.ms:input_files/cyclic5-31.ms - output_files/cyclic5-31.res:output_files/cyclic5-31.res + output_files/cyclic5-31.res:output_files/cyclic5-31.P2.d4.res test/diff/diff_cyclic5-31.sh:test/diff/diff_cyclic5-31.sh + input_files/cyclic5-qq.ms:input_files/cyclic5-qq.ms + output_files/cyclic5-qq.res:output_files/cyclic5-qq.P2.d4.res + output_files/cyclic5-qq.g2.res:output_files/cyclic5-qq.g2.res + output_files/cyclic5-qq.g2.e1.res:output_files/cyclic5-qq.g2.e1.res + output_files/cyclic5-qq.g2.e2.res:output_files/cyclic5-qq.g2.e2.res + test/diff/diff_cyclic5-qq.sh:test/diff/diff_cyclic5-qq.sh + input_files/eco10-31.ms:input_files/eco10-31.ms + output_files/eco10-31.res:output_files/eco10-31.P2.d0.res + test/diff/diff_eco10-31.sh:test/diff/diff_eco10-31.sh input_files/eco6-16.ms:input_files/eco6-16.ms - output_files/eco6-16.res:output_files/eco6-16.res + output_files/eco6-16.res:output_files/eco6-16.P2.d4.res test/diff/diff_eco6-16.sh:test/diff/diff_eco6-16.sh input_files/eco6-31.ms:input_files/eco6-31.ms - output_files/eco6-31.res:output_files/eco6-31.res + output_files/eco6-31.res:output_files/eco6-31.P2.d4.res test/diff/diff_eco6-31.sh:test/diff/diff_eco6-31.sh input_files/eco6-qq.ms:input_files/eco6-qq.ms - output_files/eco6-qq.res:output_files/eco6-qq.res + output_files/eco6-qq.res:output_files/eco6-qq.P2.d4.res test/diff/diff_eco6-qq.sh:test/diff/diff_eco6-qq.sh + input_files/elim-31.ms:input_files/elim-31.ms + output_files/elim-31.g2.e1.res:output_files/elim-31.g2.e1.res + output_files/elim-31.g2.e2.res:output_files/elim-31.g2.e2.res + test/diff/diff_elim-31.sh:test/diff/diff_elim-31.sh + input_files/elim-qq.ms:input_files/elim-qq.ms + output_files/elim-qq.g2.e1.res:output_files/elim-qq.g2.e1.res + output_files/elim-qq.g2.e2.res:output_files/elim-qq.g2.e2.res + test/diff/diff_elim-qq.sh:test/diff/diff_elim-qq.sh + input_files/f4sat-31.ms:input_files/f4sat-31.ms + output_files/f4sat-31.res:output_files/f4sat-31.res + test/diff/diff_f4sat-31.sh:test/diff/diff_f4sat-31.sh + input_files/f4sat-byone-31.ms:input_files/f4sat-byone-31.ms + output_files/f4sat-byone-31.res:output_files/f4sat-byone-31.res + test/diff/diff_f4sat-byone-31.sh:test/diff/diff_f4sat-byone-31.sh + input_files/f4sat-field-char.ms:input_files/f4sat-field-char.ms + output_files/f4sat-field-char.res:output_files/f4sat-field-char.res + test/diff/diff_f4sat-field-char.sh:test/diff/diff_f4sat-field-char.sh + input_files/f4sat-is-saturated-check.ms:input_files/f4sat-is-saturated-check.ms + output_files/f4sat-is-saturated-check.res:output_files/f4sat-is-saturated-check.res + test/diff/diff_f4sat-is-saturated-check.sh:test/diff/diff_f4sat-is-saturated-check.sh + input_files/f4sat-zero-input.ms:input_files/f4sat-zero-input.ms + output_files/f4sat-zero-input.res:output_files/f4sat-zero-input.res + test/diff/diff_f4sat-zero-input.sh:test/diff/diff_f4sat-zero-input.sh input_files/groebner-g2.ms:input_files/groebner-g2.ms output_files/groebner-g2.g2.res:output_files/groebner-g2.g2.res test/diff/diff_groebner-g2.sh:test/diff/diff_groebner-g2.sh - input_files/cyclic5-qq.ms:input_files/cyclic5-qq.ms - output_files/cyclic5-qq.res:output_files/cyclic5-qq.res - output_files/cyclic5-qq.g2.res:output_files/cyclic5-qq.g2.res - output_files/cyclic5-qq.g2.e1.res:output_files/cyclic5-qq.g2.e1.res - output_files/cyclic5-qq.g2.e2.res:output_files/cyclic5-qq.g2.e2.res - test/diff/diff_cyclic5-qq.sh:test/diff/diff_cyclic5-qq.sh input_files/henrion5-qq.ms:input_files/henrion5-qq.ms - output_files/henrion5-qq.res:output_files/henrion5-qq.res + output_files/henrion5-qq.P2.d0.res:output_files/henrion5-qq.P2.d0.res output_files/henrion5-qq.g2.res:output_files/henrion5-qq.g2.res output_files/henrion5-qq.g2.e1.res:output_files/henrion5-qq.g2.e1.res output_files/henrion5-qq.g2.e2.res:output_files/henrion5-qq.g2.e2.res test/diff/diff_henrion5-qq.sh:test/diff/diff_henrion5-qq.sh - input_files/eco10-31.ms:input_files/eco10-31.ms - output_files/eco10-31.res:output_files/eco10-31.res - test/diff/diff_eco10-31.sh:test/diff/diff_eco10-31.sh - input_files/elim-31.ms:input_files/elim-31.ms - output_files/elim-31.res:output_files/elim-31.res - output_files/elim-31.e2.res:output_files/elim-31.e2.res - test/diff/diff_elim-31.sh:test/diff/diff_elim-31.sh - input_files/elim-qq.ms:input_files/elim-qq.ms - output_files/elim-qq.res:output_files/elim-qq.res - output_files/elim-qq.e2.res:output_files/elim-qq.e2.res - test/diff/diff_elim-qq.sh:test/diff/diff_elim-qq.sh - input_files/F4SAT-31.ms:input_files/F4SAT-31.ms - output_files/F4SAT-31.res:output_files/F4SAT-31.res - test/diff/diff_F4SAT-31.sh:test/diff/diff_F4SAT-31.sh - input_files/F4SAT-byone-31.ms:input_files/F4SAT-byone-31.ms - output_files/F4SAT-byone-31.res:output_files/F4SAT-byone-31.res - test/diff/diff_F4SAT-byone-31.sh:test/diff/diff_F4SAT-byone-31.sh + input_files/input-overflow-16.ms:input_files/input-overflow-16.ms + output_files/input-overflow-16.P2.d0.res:output_files/input-overflow-16.P2.d0.res + test/diff/diff_input-overflow-16.sh:test/diff/diff_input-overflow-16.sh + input_files/issue_230.ms:input_files/issue_230.ms + output_files/issue_230.P1.d0.p128.res:output_files/issue_230.P1.d0.p128.res + output_files/issue_230.P1.d0.p1024.res:output_files/issue_230.P1.d0.p1024.res + test/diff/diff_issue_230.sh:test/diff/diff_issue_230.sh + input_files/issue_230_squared.ms:input_files/issue_230_squared.ms + output_files/issue_230_squared.P1.d0.p128.res:output_files/issue_230_squared.P1.d0.p128.res + output_files/issue_230_squared.P1.d0.p1024.res:output_files/issue_230_squared.P1.d0.p1024.res + test/diff/diff_issue_230_squared.sh:test/diff/diff_issue_230_squared.sh input_files/kat6-31.ms:input_files/kat6-31.ms - output_files/kat6-31.res:output_files/kat6-31.res + output_files/kat6-31.P2.d0.res:output_files/kat6-31.P2.d0.res test/diff/diff_kat6-31.sh:test/diff/diff_kat6-31.sh input_files/kat7-qq.ms:input_files/kat7-qq.ms - output_files/kat7-qq.res:output_files/kat7-qq.res + output_files/kat7-qq.P2.d0.res:output_files/kat7-qq.P2.d0.res test/diff/diff_kat7-qq.sh:test/diff/diff_kat7-qq.sh + test/diff/diff_kat8-qq-truncate.sh:test/diff/diff_kat8-qq-truncate.sh + input_files/kat8-qq-truncate.ms:input_files/kat8-qq-truncate.ms + output_files/kat8-qq-truncate.res:output_files/kat8-qq-truncate.res + input_files/linear-qq.ms:input_files/linear-qq.ms + output_files/linear-qq.P2.d0.res:output_files/linear-qq.P2.d0.res + test/diff/diff_linear-qq.sh:test/diff/diff_linear-qq.sh + input_files/maxbitsize-bug.ms:input_files/maxbitsize-bug.ms + output_files/maxbitsize-bug.res:output_files/maxbitsize-bug.res + test/diff/diff_maxbitsize-bug.sh:test/diff/diff_maxbitsize-bug.sh + input_files/mq_2_1.ms:input_files/mq_2_1.ms + output_files/mq_2_1.res:output_files/mq_2_1.res + test/diff/diff_mq_2_1.sh:test/diff/diff_mq_2_1.sh input_files/multy-16.ms:input_files/multy-16.ms - output_files/multy-16.res:output_files/multy-16.res + output_files/multy-16.P2.d0.res:output_files/multy-16.P2.d0.res test/diff/diff_multy-16.sh:test/diff/diff_multy-16.sh input_files/multy-31.ms:input_files/multy-31.ms - output_files/multy-31.res:output_files/multy-31.res + output_files/multy-31.P2.d0.res:output_files/multy-31.P2.d0.res test/diff/diff_multy-31.sh:test/diff/diff_multy-31.sh input_files/multy-qq.ms:input_files/multy-qq.ms - output_files/multy-qq.res:output_files/multy-qq.res + output_files/multy-qq.P2.d0.res:output_files/multy-qq.P2.d0.res test/diff/diff_multy-qq.sh:test/diff/diff_multy-qq.sh + input_files/nf-8.ms:input_files/nf-8.ms + output_files/nf-8.res:output_files/nf-8.res + test/diff/diff_nf_8.sh:test/diff/diff_nf_8.sh + input_files/nf-16.ms:input_files/nf-16.ms + output_files/nf-16.res:output_files/nf-16.res + test/diff/diff_nf_16.sh:test/diff/diff_nf_16.sh + input_files/nf-31.ms:input_files/nf-31.ms + output_files/nf-31.res:output_files/nf-31.res + test/diff/diff_nf_31.sh:test/diff/diff_nf_31.sh + input_files/nf-lm-bug.ms:input_files/nf-lm-bug.ms + output_files/nf-lm-bug.res:output_files/nf-lm-bug.res + test/diff/diff_nf_lm_bug.sh:test/diff/diff_nf_lm_bug.sh input_files/nonradical_shape-31.ms:input_files/nonradical_shape-31.ms output_files/nonradical_shape-31.res:output_files/nonradical_shape-31.res input_files/nonradical_shape-qq.ms:input_files/nonradical_shape-qq.ms - output_files/nonradical_shape-qq.res:output_files/nonradical_shape-qq.res - output_files/nonradical_shape-qq.p1024.res:output_files/nonradical_shape-qq.p1024.res + output_files/nonradical_shape-qq.P1.d0.p128.res:output_files/nonradical_shape-qq.P1.d0.p128.res + output_files/nonradical_shape-qq.P1.d0.p1024.res:output_files/nonradical_shape-qq.P1.d0.p1024.res test/diff/diff_nonradical_shape-qq.sh:test/diff/diff_nonradical_shape-qq.sh input_files/nonradical_radicalshape-31.ms:input_files/nonradical_radicalshape-31.ms output_files/nonradical_radicalshape-31.res:output_files/nonradical_radicalshape-31.res input_files/nonradical_radicalshape-qq.ms:input_files/nonradical_radicalshape-qq.ms - output_files/nonradical_radicalshape-qq.res:output_files/nonradical_radicalshape-qq.res - output_files/nonradical_radicalshape-qq.p3.res:output_files/nonradical_radicalshape-qq.p3.res + output_files/nonradical_radicalshape-qq.P1.d0.p128.res:output_files/nonradical_radicalshape-qq.P1.d0.p128.res + output_files/nonradical_radicalshape-qq.P1.d0.p1024.res:output_files/nonradical_radicalshape-qq.P1.d0.p1024.res test/diff/diff_nonradical_radicalshape-qq.sh:test/diff/diff_nonradical_radicalshape-qq.sh input_files/nonradical_radicalshape-no-square-31.ms:input_files/nonradical_radicalshape-no-square-31.ms output_files/nonradical_radicalshape-no-square-31.c0.res:output_files/nonradical_radicalshape-no-square-31.c0.res test/diff/diff_nonradical_radicalshape-no-square-31.sh:test/diff/diff_nonradical_radicalshape-no-square-31.sh input_files/nonradical_radicalshape-no-square-qq.ms:input_files/nonradical_radicalshape-no-square-qq.ms - output_files/nonradical_radicalshape-no-square-qq.res:output_files/nonradical_radicalshape-no-square-qq.res - output_files/nonradical_radicalshape-no-square-qq.p3.res:output_files/nonradical_radicalshape-no-square-qq.p3.res + output_files/nonradical_radicalshape-no-square-qq.P1.d0.p128.res:output_files/nonradical_radicalshape-no-square-qq.P1.d0.p128.res + output_files/nonradical_radicalshape-no-square-qq.P1.d0.p1024.res:output_files/nonradical_radicalshape-no-square-qq.P1.d0.p1024.res test/diff/diff_nonradical_radicalshape-no-square-qq.sh:test/diff/diff_nonradical_radicalshape-no-square-qq.sh input_files/one-16.ms:input_files/one-16.ms output_files/one-16.res:output_files/one-16.res test/diff/diff_one-16.sh:test/diff/diff_one-16.sh - input_files/kat8-qq-truncate.ms:input_files/kat8-qq-truncate.ms - output_files/kat8-qq-truncate.res:output_files/kat8-qq-truncate.res - test/diff/diff_truncate_gb.sh:test/diff/diff_truncate_gb.sh input_files/one-31.ms:input_files/one-31.ms output_files/one-31.res:output_files/one-31.res output_files/one-31.g1.res:output_files/one-31.g1.res @@ -199,94 +264,40 @@ AC_CONFIG_LINKS([ output_files/one-qq.g2.res:output_files/one-qq.g2.res test/diff/diff_one-qq.sh:test/diff/diff_one-qq.sh input_files/radical_shape-31.ms:input_files/radical_shape-31.ms - output_files/radical_shape-31.res:output_files/radical_shape-31.res + output_files/radical_shape-31.P2.d0.res:output_files/radical_shape-31.P2.d0.res test/diff/diff_radical_shape-31.sh:test/diff/diff_radical_shape-31.sh input_files/radical_shape-qq.ms:input_files/radical_shape-qq.ms - output_files/radical_shape-qq.res:output_files/radical_shape-qq.res + output_files/radical_shape-qq.P2.d0.res:output_files/radical_shape-qq.P2.d0.res test/diff/diff_radical_shape-qq.sh:test/diff/diff_radical_shape-qq.sh - input_files/choice-linear-form-qq.ms:input_files/choice-linear-form-qq.ms - output_files/choice-linear-form-qq.res:output_files/choice-linear-form-qq.res - test/diff/diff_choice-linear-form-qq.sh:test/diff/diff_choice-linear-form-qq.sh - input_files/choice-linear-form-qq-real-roots.ms:input_files/choice-linear-form-qq-real-roots.ms - output_files/choice-linear-form-qq-real-roots.res:output_files/choice-linear-form-qq-real-roots.res - test/diff/diff_choice-linear-form-qq-real-roots.sh:test/diff/diff_choice-linear-form-qq-real-roots.sh - input_files/reals_dim0.ms:input_files/reals_dim0.ms - output_files/reals_dim0.res:output_files/reals_dim0.res - output_files/reals_dim0.p256.res:output_files/reals_dim0.p256.res - test/diff/diff_reals_dim0.sh:test/diff/diff_reals_dim0.sh input_files/realroot1.ms:input_files/realroot1.ms - output_files/realroot1.res:output_files/realroot1.res - output_files/realroot1.p256.res:output_files/realroot1.p256.res + output_files/realroot1.p128.res:output_files/realroot1.p128.res + output_files/realroot1.p1024.res:output_files/realroot1.p1024.res test/diff/diff_realroot1.sh:test/diff/diff_realroot1.sh input_files/realroot-extraction-exact-root.ms:input_files/realroot-extraction-exact-root.ms - output_files/realroot-extraction-exact-root.res:output_files/realroot-extraction-exact-root.res - output_files/realroot-extraction-exact-root.p256.res:output_files/realroot-extraction-exact-root.p256.res + output_files/realroot-extraction-exact-root.p128.res:output_files/realroot-extraction-exact-root.p128.res + output_files/realroot-extraction-exact-root.p1024.res:output_files/realroot-extraction-exact-root.p1024.res test/diff/diff_realroot-extraction-exact-root.sh:test/diff/diff_realroot-extraction-exact-root.sh - input_files/reals_dim0-extract.ms:input_files/reals_dim0-extract.ms - output_files/reals_dim0-extract.res:output_files/reals_dim0-extract.res - output_files/reals_dim0-extract.p256.res:output_files/reals_dim0-extract.p256.res - test/diff/diff_reals_dim0-extract.sh:test/diff/diff_reals_dim0-extract.sh input_files/reals_dim0-chgvar.ms:input_files/reals_dim0-chgvar.ms - output_files/reals_dim0-chgvar.res:output_files/reals_dim0-chgvar.res - output_files/reals_dim0-chgvar.p256.res:output_files/reals_dim0-chgvar.p256.res + output_files/reals_dim0-chgvar.p128.res:output_files/reals_dim0-chgvar.p128.res + output_files/reals_dim0-chgvar.p1024.res:output_files/reals_dim0-chgvar.p1024.res test/diff/diff_reals_dim0-chgvar.sh:test/diff/diff_reals_dim0-chgvar.sh + input_files/reals_dim0-extract.ms:input_files/reals_dim0-extract.ms + output_files/reals_dim0-extract.p128.res:output_files/reals_dim0-extract.p128.res + output_files/reals_dim0-extract.p1024.res:output_files/reals_dim0-extract.p1024.res + test/diff/diff_reals_dim0-extract.sh:test/diff/diff_reals_dim0-extract.sh + input_files/reals_dim0.ms:input_files/reals_dim0.ms + output_files/reals_dim0.p128.res:output_files/reals_dim0.p128.res + output_files/reals_dim0.p1024.res:output_files/reals_dim0.p1024.res + test/diff/diff_reals_dim0.sh:test/diff/diff_reals_dim0.sh input_files/reals_dim0-swapvar.ms:input_files/reals_dim0-swapvar.ms - output_files/reals_dim0-swapvar.res:output_files/reals_dim0-swapvar.res - output_files/reals_dim0-swapvar.p256.res:output_files/reals_dim0-swapvar.p256.res + output_files/reals_dim0-swapvar.p128.res:output_files/reals_dim0-swapvar.p128.res + output_files/reals_dim0-swapvar.p1024.res:output_files/reals_dim0-swapvar.p1024.res test/diff/diff_reals_dim0-swapvar.sh:test/diff/diff_reals_dim0-swapvar.sh - input_files/bug-empty-tracer.ms:input_files/bug-empty-tracer.ms - output_files/bug-empty-tracer.res:output_files/bug-empty-tracer.res - test/diff/diff_bug_empty_tracer.sh:test/diff/diff_bug_empty_tracer.sh - input_files/bug-2nd-prime-bad.ms:input_files/bug-2nd-prime-bad.ms - output_files/bug-2nd-prime-bad.res:output_files/bug-2nd-prime-bad.res - test/diff/diff_bug_2nd_prime_bad.sh:test/diff/diff_bug_2nd_prime_bad.sh - input_files/xy-qq.ms:input_files/xy-qq.ms - output_files/xy-qq.res:output_files/xy-qq.res - test/diff/diff_xy-qq.sh:test/diff/diff_xy-qq.sh input_files/test-lifting2.ms:input_files/test-lifting2.ms - output_files/test-lifting2.res:output_files/test-lifting2.res + output_files/test-lifting2.P2.d0.res:output_files/test-lifting2.P2.d0.res test/diff/diff_test-lifting2.sh:test/diff/diff_test-lifting2.sh - input_files/linear-qq.ms:input_files/linear-qq.ms - output_files/linear-qq.res:output_files/linear-qq.res - test/diff/diff_linear-qq.sh:test/diff/diff_linear-qq.sh - input_files/bug_68.ms:input_files/bug_68.ms - output_files/bug_68.res:output_files/bug_68.res - test/diff/diff_bug_68.sh:test/diff/diff_bug_68.sh - input_files/mq_2_1.ms:input_files/mq_2_1.ms - output_files/mq_2_1.res:output_files/mq_2_1.res - test/diff/diff_mq_2_1.sh:test/diff/diff_mq_2_1.sh - input_files/input-overflow-16.ms:input_files/input-overflow-16.ms - output_files/input-overflow-16.res:output_files/input-overflow-16.res - test/diff/diff_input-overflow-16.sh:test/diff/diff_input-overflow-16.sh - input_files/nf-8.ms:input_files/nf-8.ms - output_files/nf-8.res:output_files/nf-8.res - test/diff/diff_nf_8.sh:test/diff/diff_nf_8.sh - input_files/nf-16.ms:input_files/nf-16.ms - output_files/nf-16.res:output_files/nf-16.res - test/diff/diff_nf_16.sh:test/diff/diff_nf_16.sh - input_files/nf-31.ms:input_files/nf-31.ms - output_files/nf-31.res:output_files/nf-31.res - test/diff/diff_nf_31.sh:test/diff/diff_nf_31.sh - input_files/nf-lm-bug.ms:input_files/nf-lm-bug.ms - output_files/nf-lm-bug.res:output_files/nf-lm-bug.res - test/diff/diff_nf_lm_bug.sh:test/diff/diff_nf_lm_bug.sh - input_files/f4sat-field-char.ms:input_files/f4sat-field-char.ms - output_files/f4sat-field-char.res:output_files/f4sat-field-char.res - test/diff/diff_f4sat-field-char.sh:test/diff/diff_f4sat-field-char.sh - input_files/f4sat-zero-input.ms:input_files/f4sat-zero-input.ms - output_files/f4sat-zero-input.res:output_files/f4sat-zero-input.res - test/diff/diff_f4sat-zero-input.sh:test/diff/diff_f4sat-zero-input.sh - input_files/f4sat-is-saturated-check.ms:input_files/f4sat-is-saturated-check.ms - output_files/f4sat-is-saturated-check.res:output_files/f4sat-is-saturated-check.res - test/diff/diff_f4sat-is-saturated-check.sh:test/diff/diff_f4sat-is-saturated-check.sh - input_files/maxbitsize-bug.ms:input_files/maxbitsize-bug.ms - output_files/maxbitsize-bug.res:output_files/maxbitsize-bug.res - test/diff/diff_maxbitsize-bug.sh:test/diff/diff_maxbitsize-bug.sh - input_files/issue_230.ms:input_files/issue_230.ms - output_files/issue_230.res:output_files/issue_230.res - test/diff/diff_issue_230.sh:test/diff/diff_issue_230.sh - input_files/issue_230_squared.ms:input_files/issue_230_squared.ms - output_files/issue_230_squared.res:output_files/issue_230_squared.res - test/diff/diff_issue_230_squared.sh:test/diff/diff_issue_230_squared.sh + input_files/xy-qq.ms:input_files/xy-qq.ms + output_files/xy-qq.P2.d0.res:output_files/xy-qq.P2.d0.res + test/diff/diff_xy-qq.sh:test/diff/diff_xy-qq.sh ]) AC_OUTPUT diff --git a/input_files/F4SAT-31.ms b/input_files/f4sat-31.ms similarity index 100% rename from input_files/F4SAT-31.ms rename to input_files/f4sat-31.ms diff --git a/input_files/F4SAT-byone-31.ms b/input_files/f4sat-byone-31.ms similarity index 100% rename from input_files/F4SAT-byone-31.ms rename to input_files/f4sat-byone-31.ms diff --git a/output_files/bug-2nd-prime-bad.res b/output_files/bug-2nd-prime-bad.g2.res similarity index 100% rename from output_files/bug-2nd-prime-bad.res rename to output_files/bug-2nd-prime-bad.g2.res diff --git a/output_files/bug-empty-tracer.res b/output_files/bug-empty-tracer.g2.res similarity index 100% rename from output_files/bug-empty-tracer.res rename to output_files/bug-empty-tracer.g2.res diff --git a/output_files/cp_d_3_n_4_p_2.res b/output_files/cp_d_3_n_4_p_2.P2.d0.res similarity index 100% rename from output_files/cp_d_3_n_4_p_2.res rename to output_files/cp_d_3_n_4_p_2.P2.d0.res diff --git a/output_files/cyclic5-16.res b/output_files/cyclic5-16.P2.d4.res similarity index 100% rename from output_files/cyclic5-16.res rename to output_files/cyclic5-16.P2.d4.res diff --git a/output_files/cyclic5-31.res b/output_files/cyclic5-31.P2.d4.res similarity index 100% rename from output_files/cyclic5-31.res rename to output_files/cyclic5-31.P2.d4.res diff --git a/output_files/cyclic5-qq.res b/output_files/cyclic5-qq.P2.d4.res similarity index 100% rename from output_files/cyclic5-qq.res rename to output_files/cyclic5-qq.P2.d4.res diff --git a/output_files/eco10-31.res b/output_files/eco10-31.P2.d0.res similarity index 100% rename from output_files/eco10-31.res rename to output_files/eco10-31.P2.d0.res diff --git a/output_files/eco11-31.res b/output_files/eco11-31.res deleted file mode 100644 index 77b72711..00000000 --- a/output_files/eco11-31.res +++ /dev/null @@ -1,34 +0,0 @@ -[0, [1073741827, -12, -512, -['x0', 'x1', 'x2', 'x3', 'x4', 'x5', 'x6', 'x7', 'x8', 'x9', 'x10', 'A'], -[1,8,27,64,125,216,343,512,729,1000,1331,1], -[1, -[[512, -[424283663, 42729078, 936564060, 835883504, 519801648, 153230999, 412829805, 778067223, 187789135, 329982181, 720739074, 693953395, 599358665, 1007093414, 104957748, 173576343, 375741938, 291758854, 276784044, 107144997, 234921517, 214715841, 675319479, 1054556204, 411493725, 954066382, 328732920, 345954112, 240787551, 588164036, 420503770, 454912519, 706247589, 1004226155, 971042647, 984501138, 632222320, 452185806, 942071936, 1036270607, 395034653, 436996827, 1024554927, 761569288, 81544015, 503928336, 564898841, 880427893, 897464474, 324249542, 691531198, 410101336, 570361835, 187601138, 807030453, 689235592, 518233303, 185217732, 205107578, 638980857, 100568993, 402954964, 152234775, 874569469, 537755143, 420107011, 1028185248, 910224844, 180977515, 682262433, 179933936, 113275723, 190426610, 1010716826, 351744908, 60517632, 1021101954, 573298909, 630779435, 163832687, 641621277, 314855463, 662852904, 629798645, 715350615, 140137783, 725875865, 897605072, 614413047, 234020602, 528672076, 334709269, 691135008, 352122466, 524449366, 1028696113, 504330226, 254781593, 513421111, 578483771, 114860732, 477546472, 203952125, 764432575, 730175148, 304668442, 589710854, 35219637, 971777736, 774662272, 543424300, 39399066, 767318716, 862780752, 697057031, 773316961, 409313109, 858791901, 498666494, 52862861, 107743971, 924797931, 847900295, 408537231, 312065478, 177079970, 552014854, 624887636, 326180238, 630261753, 370546123, 740204351, 742706397, 317800163, 26620904, 482734917, 1014029855, 469864426, 400816727, 775281387, 276860152, 641771631, 287737826, 306258422, 450759553, 874117032, 28366526, 88649332, 861722550, 743842378, 762742733, 542225293, 970024549, 704372774, 872856832, 75169901, 547429313, 873064238, 390484512, 508704543, 23382015, 85910391, 425590706, 1014605801, 310659284, 368394668, 207479879, 445085370, 908332267, 869277895, 694109141, 51237589, 913714968, 237090131, 960674615, 676090041, 762454612, 720788253, 691319487, 349997334, 588222284, 202230700, 586268299, 377000243, 146078175, 630209532, 91118043, 277891945, 48146112, 146227980, 514759480, 684222032, 1034182413, 203015468, 767684523, 575639402, 115768187, 1010259735, 727458832, 876422254, 655697661, 246224276, 660577239, 211399802, 297240628, 332789973, 103513279, 821968933, 1024158316, 554145777, 448883869, 471673907, 104032153, 161643254, 449626798, 1071982422, 537750212, 956937795, 610097762, 558605151, 1067926484, 802666907, 951635879, 629508056, 963230116, 905996800, 698898475, 667203681, 906465291, 133915141, 19757717, 663490179, 628061042, 801523241, 496889307, 858546668, 201158401, 426695642, 490598891, 613127706, 209967778, 394738077, 948501937, 928977665, 686756312, 797018225, 11164416, 421875708, 114992383, 262708797, 180000370, 626933571, 661282623, 946179422, 6421635, 742335862, 399205512, 838329205, 573698692, 729259213, 697142040, 213694386, 702817109, 438972271, 326103512, 168592033, 349774023, 28532182, 990292641, 378793024, 124607512, 121179370, 232090614, 470862573, 476968520, 910086823, 959625680, 772250150, 1030246458, 659232010, 940343527, 650912886, 123164122, 121324177, 195865589, 382062971, 318101737, 194242161, 236817480, 1027739292, 1040709275, 216227338, 163936821, 41943602, 1073629221, 37760162, 1000585711, 108364984, 165803642, 291916473, 640302395, 72541650, 196920383, 361938862, 7160366, 65287615, 914352218, 122842953, 208214535, 1004708630, 280402270, 582956854, 711328003, 214972902, 547762158, 65833401, 809723322, 10314835, 1065641427, 521658648, 597205869, 667704608, 555209068, 495505477, 988365523, 950245773, 482549615, 1054552724, 528073798, 832573492, 314538445, 32566694, 991801437, 958769422, 933935292, 235543279, 629864529, 638386296, 306223679, 499197091, 933423860, 741588157, 580546888, 990782818, 399991467, 791180410, 405416211, 41256111, 12267356, 753811095, 454426291, 933253174, 618481711, 975525833, 337259158, 1036001925, 806421510, 949907058, 282879521, 107938918, 770933790, 200865421, 500828059, 238159790, 954205559, 154677585, 607909342, 138366336, 456692442, 364992117, 819047642, 302947858, 520243511, 500059368, 784598327, 296966192, 499194890, 602791857, 911072159, 640476352, 638379540, 258919460, 500354843, 480268134, 1044939014, 939589360, 865266161, 690957720, 22187484, 97384164, 143390699, 228972772, 370446908, 470899756, 39881157, 69584682, 817114310, 746469009, 241981167, 531569507, 619356691, 455143841, 58975935, 1016656183, 225430562, 844187325, 1046062816, 613289936, 992346483, 963414971, 840332991, 994235762, 164017192, 88709213, 399055970, 234602836, 578380291, 955163882, 664945277, 518788322, 155576506, 13510589, 643686901, 318977817, 592745834, 798094428, 671629832, 1045549131, 296196595, 450955598, 24794666, 288042188, 492364834, 346361851, 614960512, 1058710621, 686699622, 191717331, 495932723, 965020245, 844209533, 1049837591, 140339657, 967454766, 505904204, 1050464285, 675056897, 521088108, 83772000, 326780739, 326736443, 143323501, 480483917, 828207850, 830485950, 572250207, 220371530, 464777904, 743614799, 127812365, 703581324, 17988593, 443654222, 252802475, 856841214, 815769537, 144145938, 719764303, 759096397, 671703785, 36383910, 1049750456, 126259907, 784776816, 287930308, 183760864, 1069361960, 821154138, 246811398, 235051895, 287063443, 377585767, 939708224, 124107578, 439018998, 703803586, 620437969, 322438051, 46959386, 1067947710, 251836708, 1057098776, 692258556, 253839650, 973154101, 127596297, 586017350, 722960512, 176521505, 528816082, 921484373, 611970273, 645984033, 355355654, 655170845, 152518272, 915351111, 584981066, 686046642, 626083505, 718469399, 536790509, 1]], -[0, -[1]], -[ -[[511, -[966402969, 485068469, 41089870, 759519898, 983261374, 1051192504, 129058868, 915428098, 867812880, 577949065, 840439112, 128003470, 803146744, 183033078, 580891711, 191704787, 592273620, 1004298873, 806088624, 49177199, 558504638, 579823120, 828383884, 1010380825, 883975927, 21959856, 956243931, 49458068, 583684168, 600530589, 488247882, 766054376, 410788609, 99104540, 27902717, 845914412, 135186268, 848066237, 658387710, 326557733, 52283452, 65489085, 611028292, 154800362, 514565955, 814128024, 282054152, 223213056, 815320121, 100615866, 235576099, 465391159, 316626075, 19785584, 1065136543, 920425649, 519800843, 115200945, 122468213, 604966030, 1050607689, 1019465649, 884485434, 117190978, 1057047846, 966571576, 566064911, 954620967, 367092963, 615184715, 22591641, 711052603, 6493213, 965906049, 104569477, 679517408, 407603124, 341620398, 557691698, 293897490, 603291429, 469096487, 870031579, 776627654, 377950346, 617580325, 109424068, 75966651, 954441951, 524881348, 830374961, 875836037, 1047169619, 930721861, 286268518, 106844673, 287946222, 487270128, 859967480, 266248510, 399011498, 800526114, 1067835822, 14385601, 468752297, 35438534, 487113908, 714544337, 512924988, 1047127023, 168890067, 700478848, 391572757, 472181443, 309541031, 164405167, 438627983, 119980963, 632677119, 413744736, 1044369427, 420217233, 739037224, 185339274, 84346723, 223286156, 398565829, 763266150, 808938463, 805461831, 444963991, 776923024, 219489198, 678056709, 609105047, 1069886211, 640695066, 354319022, 1058862995, 158327226, 474081515, 917880887, 340031066, 636555029, 978935017, 158482841, 222945086, 257590372, 144961988, 413754693, 462563459, 253383206, 564291906, 652932259, 84325889, 240899847, 546981188, 977971449, 896563224, 109975404, 932383739, 69124230, 281606621, 764467834, 14522861, 461810287, 702061118, 440465003, 107495367, 275476728, 1058146982, 119409881, 1071468403, 791214998, 276515640, 1026986999, 880144629, 240712152, 1028296397, 427637193, 34043701, 817274492, 1004158470, 542561384, 1055784902, 593725288, 1060705091, 29255436, 617375550, 19051348, 209038356, 239965278, 87036825, 34348406, 532712159, 85565167, 865784889, 199512261, 182776834, 852679177, 604063134, 376353309, 25491949, 877244750, 962473140, 246066548, 34498853, 824174977, 349711275, 904287383, 657046054, 430951927, 830425403, 676420191, 269907822, 929702369, 510023749, 1073372758, 490616243, 109595101, 112856987, 600064226, 950609929, 193753294, 841123758, 961264924, 566986970, 326941021, 41215701, 601726594, 685269499, 506989318, 996713293, 94570349, 327464182, 920483461, 825270223, 365205778, 637591991, 204164666, 371303077, 375731612, 151421851, 193227699, 471002617, 6312856, 12988610, 515954753, 35811598, 371004528, 398291810, 743528413, 993186881, 477833654, 253852696, 511748964, 805234666, 203731350, 644581332, 965887609, 262494891, 487856956, 1057022922, 298339501, 117876804, 238349871, 666098549, 1066713563, 844265770, 57838126, 869205383, 662391195, 545783145, 72690419, 651083533, 618102783, 1017193055, 86869198, 504624338, 394298554, 275035404, 737508891, 167196862, 577999256, 482873085, 1050227326, 1000906781, 149298596, 13924885, 97775514, 33134843, 490682690, 216508351, 698797941, 493985174, 750151734, 106718513, 476740983, 408387442, 272741978, 26045428, 684801875, 829682782, 1066363989, 927508185, 1043733194, 482396316, 158741596, 169315987, 172758058, 444038990, 661457452, 659235496, 958601796, 1042881202, 889106197, 462189551, 203532470, 298008013, 579948309, 149614580, 942207583, 90508795, 389600507, 1067184504, 805815105, 128605529, 862276311, 508421697, 11352942, 507027078, 874510193, 58846056, 439442815, 459354658, 103811886, 839281620, 640419226, 217490354, 564815039, 403187317, 473032637, 974054210, 111016941, 683437603, 399673874, 334442913, 831870785, 625929670, 898504441, 894557797, 619601419, 821766353, 871215794, 677672898, 638186254, 814803852, 212251902, 303261776, 315770604, 1037434489, 784073200, 775244987, 541566819, 623345207, 739845545, 720537939, 582403237, 77415500, 245604972, 323233176, 748539672, 406657351, 418438393, 175355294, 563724753, 1061080612, 310660222, 179262202, 290647036, 82118265, 949025190, 748178530, 402275381, 7003221, 964332061, 214694489, 748412889, 969307435, 985801094, 423666116, 760600408, 844649596, 68040689, 455030568, 413514510, 685846688, 531842481, 783120872, 901531177, 497284038, 426041057, 699592992, 448742864, 460674529, 506852569, 646811970, 6555676, 869282207, 986198586, 970218987, 238222932, 941658470, 314286756, 432039196, 293657764, 142051285, 20515603, 412173784, 1047405910, 621040168, 743632617, 994805400, 114905831, 998298361, 384755459, 331236853, 961864271, 945888418, 668521880, 467596026, 584256120, 848552632, 838922441, 16353439, 1015283667, 422055369, 677099190, 239359059, 457482925, 974009005, 482951468, 341894981, 4971333, 766971365, 816841533, 316423196, 176429724, 1034472520, 979840396, 690401983, 664743620, 62198844, 692160209, 245552000, 168547591, 911343541, 651722231, 366645846, 1300409, 757267365, 1047700463, 478891197, 385291750, 549328104, 931724899, 907700357, 689072803, 969958106, 141659735, 400322221, 542708566, 225441988, 575095360, 79629075, 794939308, 727106630, 385782842, 668378346, 1023050275, 44047700, 758018109, 635867878, 1028962226, 732352911, 745417387, 815945406, 717592064, 587904860, 196846115, 945928700, 297861051, 381335917, 725758955, 416284590, 254427587, 56465711, 73508015, 816288096, 721293285, 694816001, 182114914, 130303321, 301555932, 290750879, 853747708, 257395474, 1027039086, 499855957, 58597087, 993441097, 174034864]]], -[[511, -[333135678, 519639382, 72976253, 711125540, 690924048, 185298705, 793654563, 733785171, 188432555, 646355144, 887981596, 553541215, 9427659, 52942574, 470928090, 359609582, 553425991, 323930067, 759605519, 613457687, 194134353, 632846814, 686814568, 225495576, 510573498, 1069113111, 912343386, 440999140, 412543554, 582241212, 527672378, 896538531, 868188317, 1031294222, 284518270, 547264935, 838822683, 164875059, 7198752, 954057198, 329323396, 876364281, 343207835, 323930694, 238044747, 219327078, 790533751, 1066433058, 57380401, 899000295, 795827334, 158103103, 355960127, 351665765, 46391902, 937460904, 530519242, 186981842, 918642110, 462467593, 1003622136, 369093088, 1051889913, 910552585, 631847015, 301618060, 619529327, 485973974, 333223045, 828150500, 1002523417, 878412023, 342859429, 878598132, 33632560, 414374934, 311591544, 753483353, 603510169, 660472112, 408432013, 226244120, 993667430, 190665440, 968168227, 85782732, 542102568, 2807588, 490166215, 1035426294, 622009030, 534646620, 102455221, 993531545, 81111334, 932666272, 106647629, 304217739, 957018863, 283201645, 234250849, 325706152, 941995011, 808611902, 786611491, 206502569, 259874410, 243054651, 224496820, 888047223, 500984747, 618305169, 543544657, 852849793, 98069992, 685467208, 191771840, 612835637, 900941452, 367537565, 1050719769, 431806115, 771861097, 509108762, 891380505, 375833899, 865135676, 272139671, 299414494, 84382845, 182491572, 907718954, 40857204, 392811927, 694135659, 820872686, 988526800, 847687317, 615094946, 141972029, 8379192, 991095730, 975950843, 808230746, 348403031, 556672975, 386935726, 87027856, 170382795, 109727048, 925091364, 986104319, 734173621, 689215437, 44674215, 639954379, 947706109, 104506542, 360983627, 82706329, 103497285, 8608239, 964200397, 291311426, 169412982, 511381297, 828682695, 642097014, 21775203, 204969571, 598594372, 93154834, 284231798, 368970304, 38618512, 761320837, 652591521, 344714772, 950411530, 393349632, 781273019, 1013146703, 217875267, 828965856, 169383516, 24413938, 853721141, 1046760808, 1046288957, 969225439, 284148508, 107815051, 403248798, 499693671, 131839672, 335200415, 546459524, 593011086, 698061665, 653926500, 206782084, 689836106, 336427579, 821301297, 142413122, 882557773, 222937837, 495014584, 936167545, 169288111, 37770947, 35695228, 997775646, 1018885834, 818587036, 665682720, 32037796, 296993467, 1014758580, 808198104, 809861431, 582159232, 749850448, 421215827, 919871722, 987771012, 693097737, 617704033, 237599820, 437948100, 1032024005, 934817512, 1025703628, 242148321, 1041194208, 271855325, 443655430, 130742667, 687405066, 213764691, 975398375, 403491564, 271617200, 989967090, 366748736, 295552070, 339385634, 36004502, 774835103, 1014089663, 1018040141, 841600926, 461297802, 586498117, 234488612, 747755374, 702800515, 103743532, 704579097, 788126150, 427749323, 665534538, 1044415083, 932433858, 904803926, 872085091, 764044586, 198489264, 464768061, 622701713, 268255070, 129464621, 181705363, 346068076, 403104307, 272228514, 504501201, 361551077, 1057462034, 994489682, 653682565, 518194268, 616378894, 98295017, 797917501, 1069441500, 81406567, 581863881, 783101011, 307180086, 542912417, 863793963, 418536900, 152674707, 411794171, 608084535, 503091517, 971183655, 767664574, 502658538, 980180539, 65060677, 678347572, 20774188, 403523355, 943594078, 373372420, 98422845, 913363481, 355996906, 939385216, 32224191, 267017412, 158924125, 616110503, 553408299, 857028759, 546868633, 3556957, 257357074, 865368279, 642569211, 650829714, 856128820, 567099733, 198940460, 759509581, 11350412, 490236268, 5320799, 674185446, 893342818, 331672055, 394108500, 934265572, 634555044, 548781171, 439105550, 328661678, 1050223486, 998592739, 994151188, 344528141, 639544755, 319095007, 900794345, 1060779772, 448726958, 474775552, 1029215230, 319790781, 256637798, 401948975, 3706506, 376310321, 695863954, 584396967, 1043505960, 303537149, 803566766, 938990680, 855229219, 132812250, 893002027, 769993298, 615529267, 215761280, 750642217, 436532874, 639572829, 725060658, 728974500, 222797139, 443661695, 148076900, 307438796, 760908664, 1057658057, 1000584962, 70403532, 570869221, 59814522, 641219071, 69135317, 458942027, 1030452320, 588315524, 799039781, 60023674, 553637527, 597413230, 105408060, 92294936, 181313116, 468588072, 465707751, 512791290, 816878033, 464280393, 684273729, 524770730, 375974707, 842740899, 49928896, 431871699, 152492854, 404606511, 998559022, 563223867, 457447294, 701623131, 1014591275, 11173289, 639040887, 682792950, 924698452, 624124851, 714539496, 58026675, 157659079, 717661947, 976423402, 842677166, 89726149, 939491362, 719795073, 884451616, 643536118, 964575871, 894278091, 736930831, 621556170, 163004760, 367245630, 988257127, 477790073, 852945496, 139468846, 746537216, 633928015, 1070419415, 902695896, 34228288, 511315339, 357911677, 959307658, 937433726, 186469480, 672532295, 865448270, 652509742, 434781249, 1009313863, 230886340, 47291117, 128924539, 528184667, 1018680975, 54294298, 413517353, 207069261, 369460251, 171728702, 377119007, 1050383214, 18250592, 519475267, 177739484, 16236548, 438634632, 958513549, 837547262, 218005221, 901324078, 333869668, 144749059, 885659502, 518897810, 453294456, 207696318, 494373347, 865173173, 68898146, 237009482, 136895003, 959747789, 130684052, 581078117, 331408796, 629604811, 968401565, 459436080, 8157487, 777165367, 654693933, 1025744443, 523668593, 50930359, 636613843, 1012380970, 21403907, 521774185, 184641204, 22909095, 525337833, 106481133, 772471715, 17047954, 315995169, 874382642, 685108764, 1053695112]]], -[[511, -[543710797, 1052269848, 855125705, 426501989, 1028888386, 232439723, 548552514, 122546623, 447505063, 37693568, 780095556, 1011662837, 902864793, 590484428, 1030694488, 830112457, 1039404640, 1028536500, 816332255, 606195336, 1041317156, 539830997, 381218044, 161910325, 737416170, 1884618, 990294396, 577560608, 471961110, 713160758, 18586880, 539946562, 343356604, 260011938, 900028143, 370989510, 174866030, 931152664, 561749619, 739678490, 829616589, 352921530, 97900262, 480696265, 940224694, 789303126, 194329780, 118744506, 535178192, 395341411, 464319612, 351520274, 1037846750, 308268696, 213449816, 253830329, 406028369, 74004538, 342790516, 188886079, 958919503, 450922183, 26273209, 854529772, 265195825, 285810976, 416690466, 24758555, 704951442, 646026668, 637038946, 783392093, 106771638, 1034247055, 492710524, 838108405, 182308444, 704641494, 969795428, 26495425, 237763740, 522142475, 765853237, 794932079, 287834459, 483876810, 201177843, 167758834, 287227338, 196575115, 294617644, 909551121, 782326714, 227911711, 724769585, 690091450, 63926041, 403550555, 540484624, 62945835, 983189693, 758273902, 459942535, 156667601, 279107799, 880732261, 644163254, 343539376, 615305811, 907310059, 193774491, 317720542, 901177689, 112178205, 34951072, 84838840, 363289395, 551646238, 773658078, 917329568, 949160619, 297851661, 904107746, 1031518881, 791182828, 930665678, 79326535, 685469599, 730507549, 213757924, 79538213, 1049105263, 1025738768, 281447938, 944246947, 140948586, 513348606, 811522557, 285969289, 260441956, 137168308, 233162971, 607857369, 98621324, 285470129, 93906951, 206503605, 669473414, 513067725, 183848540, 116736233, 719897797, 1012410497, 655654662, 36389458, 79496805, 556197288, 698719519, 478025407, 422974479, 680936889, 837552437, 1023312423, 95231967, 725575550, 279977970, 704593815, 807455585, 975261386, 662367638, 946079203, 147462126, 555601214, 975908502, 303755021, 517014402, 378588843, 768860197, 93407368, 304874433, 869782085, 566746722, 384606263, 496889290, 377368437, 413919251, 282447379, 227949046, 615009566, 496681861, 124277968, 472369274, 920174433, 878300434, 468898758, 681640605, 1065729859, 12708952, 420591283, 1018209272, 22586654, 253539556, 294149451, 993500351, 110360946, 334182268, 397701677, 378442574, 705956280, 775763403, 319177434, 23879415, 791182466, 469829232, 888419062, 249609166, 627607141, 478338297, 382963236, 332238482, 404408068, 310339180, 245486012, 485823756, 3673375, 379210598, 443887577, 687578028, 590035636, 103211862, 698372441, 792062599, 889600195, 807895711, 672366478, 250448966, 769851993, 884264489, 3326214, 85787219, 871163876, 508454683, 343986298, 100184485, 23966129, 772088545, 17817830, 283480224, 144131721, 233625609, 653657952, 11502017, 252443878, 923596442, 336239699, 378880938, 522530011, 827031267, 874999483, 478678188, 721089909, 451918359, 819521603, 81436373, 878728954, 194708886, 871859321, 226504970, 559075325, 336355687, 173263649, 784996928, 875558627, 761340124, 301426478, 59456135, 126830172, 808448778, 439732488, 643831427, 590725147, 242417896, 372412358, 31910719, 489369379, 963970627, 213376118, 599307608, 442252341, 67603011, 940458473, 252155487, 145142622, 990354115, 594118974, 1018151143, 581291190, 696603212, 999749417, 1018705619, 987561559, 144652961, 651244485, 308215202, 995647774, 494491222, 603509224, 522335413, 243668617, 942184614, 1020054776, 185482917, 369514595, 875326689, 364994249, 832743479, 356678447, 460898406, 237519396, 231054790, 156285271, 283974101, 337743871, 218133864, 377299641, 1048527790, 62301624, 959097099, 193486383, 882390690, 753310389, 674646179, 587600472, 854791408, 434834535, 122909883, 523893704, 1006566287, 480698708, 751645283, 375240092, 492663467, 901194027, 297634639, 190182365, 808182026, 278183167, 314676878, 306382638, 322830680, 395360658, 43259080, 165526033, 126600810, 193815549, 624048798, 546982204, 109264065, 558542640, 314705039, 236056112, 582697374, 965970999, 308601769, 571934415, 316411158, 543382818, 1053638019, 888789886, 530199682, 327130586, 103147125, 791723884, 443399218, 1055896200, 581586507, 282125138, 248230063, 74846301, 698888985, 321670912, 343459604, 62821524, 817769049, 965621722, 507705429, 69777501, 861152800, 830011931, 1058027999, 743196305, 882725216, 226578410, 195444202, 142300573, 497235456, 893452413, 564317143, 758832704, 819596263, 632343939, 69100126, 357750619, 230315155, 304803846, 1035660279, 726189374, 420940193, 308225967, 266119465, 783065047, 980207393, 337370033, 29062172, 659757805, 277372142, 322585171, 56205683, 402278775, 427907595, 23365601, 66440774, 772684601, 176272292, 1395491, 358725385, 896700111, 329609913, 613611360, 966475241, 81107161, 10233294, 592351485, 723768693, 358141098, 56446757, 813126168, 707745972, 245759808, 539885193, 839320198, 330046928, 685097821, 990366061, 364032505, 59494699, 539596975, 756759878, 638698731, 887013695, 883930257, 561717399, 297119760, 787532740, 477430321, 1040706326, 254864675, 987598594, 36378558, 744010434, 776706813, 296327902, 557389366, 265491337, 404294756, 924527449, 980138014, 316892215, 745269654, 651697395, 132372205, 1022110062, 320355576, 910592560, 102899605, 157817016, 681484770, 96591340, 799351677, 612594921, 431038277, 437503265, 325700740, 537875436, 207194695, 856950499, 97051036, 905283565, 87778879, 803683310, 651972259, 946542684, 680951058, 371937416, 930492302, 19212485, 642831655, 369677778, 854297830, 150775954, 899591576, 376102136, 945761015, 947231381, 346862469, 45590956, 755332358, 558611634, 44006648, 431358368, 625942964, 726675193]]], -[[511, -[539150668, 601602120, 834511258, 936322143, 346345557, 18237589, 786362115, 787320945, 392873410, 137732841, 1055772302, 531764703, 124442516, 896649985, 53908491, 671472506, 994154828, 480523657, 628914480, 238002160, 102735887, 144376307, 478216819, 23022582, 357006858, 1311401, 576965630, 517208969, 835808492, 800775583, 973965660, 559295222, 911160742, 547065768, 617605210, 1011077825, 820315236, 382203947, 358214560, 423868838, 68926088, 526585468, 726808103, 378923118, 83076765, 256988407, 123336403, 111045065, 833019305, 767781640, 314476538, 109205368, 813010752, 780030277, 827991088, 818108613, 764411762, 772052442, 851296182, 987701416, 481478214, 43326133, 616850387, 217799058, 597090000, 259737206, 713129584, 286907826, 522305360, 472449970, 923449572, 191468054, 339648027, 718691755, 299532216, 187762286, 149300380, 487555978, 360024979, 45218106, 315546235, 134876486, 18074598, 28153162, 107787126, 767710549, 97197305, 295828280, 580927901, 514212425, 1042260363, 1047113459, 305051184, 294469988, 898893942, 980589745, 999716603, 907437256, 603163331, 357233768, 755053970, 174327108, 80892543, 774045469, 701509643, 913109419, 68450940, 364220220, 353881500, 80270563, 703022663, 327503526, 301413449, 549960976, 904413451, 352472291, 627563271, 498912193, 294565837, 1027445961, 595696903, 226253267, 622251890, 217116558, 513863319, 1052106410, 185511840, 122551876, 177684248, 244541405, 675270971, 1039309290, 635695791, 646441085, 740015079, 844711193, 597104430, 365826258, 253481442, 391412040, 539913746, 715884108, 459797853, 409019427, 574419979, 96302971, 955641031, 765003804, 597967031, 862742255, 739808307, 138434734, 651707957, 26929741, 920597363, 689573584, 5235679, 12511254, 1033212787, 460885692, 728569203, 1059969546, 395077111, 466559970, 559819594, 490282668, 707650000, 669123569, 749875700, 342143061, 487895505, 195329779, 828461305, 208980459, 996079024, 1000926218, 730872543, 164397572, 327610408, 476421840, 271210639, 958327471, 301055089, 67388439, 411196718, 351337925, 571893354, 219927555, 22328303, 437248175, 40583053, 129548484, 1072297269, 281824260, 279696682, 407225014, 103256148, 489009505, 963275470, 614159103, 753106109, 932836471, 44994092, 479689704, 458171546, 310030875, 238462302, 584724264, 1047049879, 359022727, 377145880, 758992592, 954256007, 176284489, 917512859, 201783320, 559008914, 423715145, 434540276, 623658965, 619220065, 249488042, 322799736, 677502964, 1048110415, 1017594837, 802903120, 75517964, 290136662, 17804088, 669830639, 479844155, 898182203, 331127775, 182310820, 463069199, 530847694, 336857055, 35923765, 103730231, 580716611, 244713689, 886107921, 1005521700, 501632749, 792487817, 916556721, 263092233, 4579477, 156895871, 162377883, 899543211, 807854153, 627215856, 1026211222, 644071260, 836152618, 316480806, 632163110, 59436402, 771083126, 173862623, 634056460, 623761056, 717611096, 675261531, 55236148, 1031582610, 344293282, 397409179, 1010213035, 801766087, 334631903, 76289929, 666134776, 76470121, 944709888, 1014883621, 921247136, 388892479, 237436333, 187506368, 679614858, 184744626, 264236264, 820780410, 1043749936, 798104966, 809046482, 1064205276, 923140710, 91053806, 99235102, 561203318, 502240799, 696921042, 27575547, 893482446, 517489422, 348275859, 539448832, 606011940, 858686656, 300228018, 468896943, 242056956, 22032408, 112876787, 206136539, 637823909, 218057316, 662815273, 274437576, 987392764, 21055250, 125590596, 810962396, 916823199, 480596590, 292461266, 214603911, 541236351, 923846778, 952901034, 195817839, 1064010943, 817837233, 717399862, 186508854, 524028650, 687856635, 352347355, 394635622, 415978858, 397415364, 88288833, 1023576808, 793495456, 384334305, 168526714, 252968122, 84162088, 826264697, 319807938, 224346526, 258663174, 601557274, 42583153, 483255247, 478418566, 722077144, 611144692, 360387542, 686807878, 135441014, 906021056, 172810119, 779571971, 97960050, 326167754, 529832077, 978051339, 600170246, 506365719, 562883263, 931707969, 903961000, 322988341, 147041704, 996391125, 1012392301, 57162284, 1022981491, 120641385, 851165420, 500862478, 648785682, 598013188, 288538442, 277445296, 277403412, 208839925, 477285217, 787653926, 477305238, 468760100, 918974821, 216404539, 155623219, 211929375, 794359844, 221493692, 756667489, 960432121, 130808653, 803031393, 31333431, 67093947, 864693800, 34841614, 282542325, 49648254, 403578980, 539321062, 872035108, 547279453, 346640957, 587378334, 354199092, 188588061, 751398497, 769712314, 428707509, 834780543, 584274069, 281232654, 424444125, 1027790610, 579382886, 394912524, 1045711148, 56588862, 651118454, 682274618, 428613657, 1064016353, 41040996, 302052459, 667739329, 193950501, 195564229, 976323107, 275324376, 192368092, 968131622, 100834501, 261985583, 292986235, 360812381, 146806975, 95273529, 958855724, 259832700, 795674527, 627373450, 1001508373, 775033638, 5966207, 1029138280, 1009507645, 785328759, 397660316, 227073651, 325334533, 927434660, 202534141, 836143337, 9746356, 1064101650, 1022308901, 921985475, 680978516, 921572806, 671934589, 744073872, 262651638, 580430528, 723413425, 540369492, 913492572, 1010043291, 595209459, 429241570, 469315370, 432782547, 676159375, 987296998, 968172791, 300451452, 134910801, 586297552, 1045441568, 29662382, 335383832, 487920090, 453262672, 998793307, 401446620, 551682281, 425010949, 279842649, 130657252, 409967009, 744815956, 41449526, 169857331, 413554116, 431579950, 1058658050, 338084203, 114306987, 239651876, 783398254, 1007317276, 736493298, 752242577, 782809379, 888405698, 378669502, 13340652, 669338514, 198468921]]], -[[511, -[509847918, 305622963, 171211395, 619187957, 327214552, 996417590, 551668917, 352667404, 221741512, 838227925, 56596109, 323481371, 941225028, 265482193, 217367282, 576182481, 959421259, 405424784, 827978784, 163217173, 306691524, 839476938, 459077202, 546264908, 1067794828, 776866662, 310567784, 376617179, 214819377, 890569373, 898197076, 687856370, 461548149, 513256939, 386141671, 837640776, 449281677, 421178030, 412683495, 618473376, 273129823, 321769164, 975423122, 826419249, 1052638166, 77753872, 925720343, 611011084, 467249650, 1042053531, 741169430, 336147977, 881304285, 642959226, 243873903, 548172329, 303225584, 594184614, 679920354, 420601149, 546749079, 691355433, 337566623, 467593306, 704125741, 136304911, 936235508, 832059489, 648748591, 649661403, 814080966, 877581868, 27439331, 254670624, 976407660, 486528238, 101037774, 779860267, 921476924, 525197492, 604638109, 926407670, 675575891, 283872698, 174127574, 749164763, 190704438, 863598164, 223837182, 440004524, 738236676, 620834198, 950168782, 284783326, 789584969, 765673104, 941561780, 796835713, 653906966, 325528484, 34975553, 676135496, 899365861, 179882873, 908139565, 286728888, 946718912, 323424234, 280218600, 1038951072, 395531827, 739565486, 1020623783, 426749233, 205759270, 969805328, 876693110, 328019961, 259687066, 981056640, 240041150, 64095335, 113330799, 173778444, 963524813, 983530792, 585438183, 845303902, 840063053, 253192132, 782983737, 374352834, 768260410, 1013278995, 50502388, 762909388, 157119279, 33297142, 374880063, 296130418, 99630526, 780724401, 415554599, 771324308, 788030232, 101029784, 684742621, 390484708, 601951104, 6973250, 379442348, 626801253, 828020485, 322000502, 810521349, 128734603, 774362313, 254892517, 866022811, 564625382, 215909823, 255875332, 211103871, 514471534, 582999648, 458210853, 575511100, 1042019943, 72158989, 304404145, 51576570, 620037700, 1004263149, 517728000, 588465698, 11630285, 16695416, 114695033, 626199618, 345015473, 473170201, 752600778, 625557784, 965827160, 578188759, 311180199, 950590334, 751626021, 506658458, 974385875, 995951370, 615092717, 770723570, 575479850, 40240140, 726933702, 977032278, 490846287, 445054981, 128772465, 324492003, 7452914, 740661774, 177329014, 315806185, 536469706, 953480887, 183950572, 94761062, 992927293, 741949723, 169689758, 122756387, 193338200, 286225533, 649876913, 479651636, 844080216, 492646950, 254144337, 914672758, 469203116, 87936711, 417732201, 278615351, 634564037, 861951238, 909136045, 265004446, 1019052618, 860499106, 779130216, 391365486, 1033453427, 895003205, 78432814, 349939845, 635389384, 411047319, 855949062, 581557440, 691356820, 911934465, 205579418, 468922251, 817374261, 67816796, 428801646, 188688463, 455273532, 161765831, 746141474, 870457266, 302629531, 491790800, 917111751, 65432849, 446933225, 928576825, 789437034, 603911684, 228233353, 235905457, 766114103, 142095763, 380396431, 47538626, 717842863, 181516964, 536487533, 576887773, 1040440982, 582546866, 79414453, 39816346, 752631059, 303280110, 1060895315, 808295338, 3886622, 375051733, 185373198, 1050559031, 341875329, 981802189, 40327191, 82370841, 181478204, 521416523, 560922946, 628741652, 489078495, 408476964, 521836914, 318871469, 206305596, 845121781, 843510325, 238977270, 237619802, 505630101, 1017730021, 723604076, 1008711273, 698780801, 287457778, 439322970, 535003462, 363668975, 783089504, 407787708, 1009222847, 1052511970, 1027112364, 936301865, 205693622, 12225931, 254358287, 72263702, 847980045, 326078496, 767897568, 168597459, 604855825, 271590798, 741673707, 916790228, 901103979, 430156686, 74050076, 406880620, 311807844, 1040992945, 968290473, 777084211, 126337129, 439015003, 504384918, 1036375190, 674994399, 324368563, 620160520, 343809198, 52931799, 78488586, 928193715, 261580734, 49791920, 377139858, 410712835, 841506078, 109106338, 548570590, 164255728, 768081281, 39983885, 302150711, 480825082, 392693411, 249639580, 264601020, 630632227, 168244725, 197832097, 502919863, 199172641, 1046018793, 456339513, 203803641, 143485826, 846835963, 190519895, 756861417, 62162458, 116459219, 192624125, 268861747, 732147680, 656609536, 419191103, 318408287, 803852072, 367499538, 752759887, 662247982, 620211194, 773555866, 149189390, 731052688, 1052644610, 739157732, 251533872, 693676410, 1002385190, 178792891, 898885099, 428875223, 278467381, 404881478, 373581394, 297004920, 319593887, 943274563, 877115663, 818076140, 150327520, 638438168, 390446461, 513532231, 699368106, 1018175920, 645230556, 354132057, 176230356, 71246945, 420823729, 247558845, 481032203, 914972899, 1049060565, 205239586, 52952909, 408709960, 910392472, 51059564, 813071346, 83280511, 449211393, 754721027, 820620682, 652263411, 661979453, 649440140, 132639731, 450446432, 304256158, 878773059, 528431467, 484736602, 733240958, 522847984, 109211381, 315267785, 22753446, 993554312, 757866853, 835278228, 11316425, 173709408, 328974159, 397558084, 490822363, 689950485, 698256019, 206998372, 286630809, 108577525, 130118133, 503571056, 310314209, 292006353, 320254260, 53234065, 599751037, 723989003, 512409976, 588392138, 712789265, 436326986, 594793500, 775691374, 661687876, 467071269, 576452831, 363408662, 353474674, 329288902, 287237077, 65478017, 390139558, 518750631, 912687498, 48786565, 545827008, 37147769, 806568960, 717605160, 215870346, 38746597, 867798851, 607975192, 1057723516, 229130355, 640374689, 159727958, 322474660, 972857235, 776665170, 1002914827, 495702648, 746909963, 1055582940, 339845609, 622266076, 389542451, 241326179, 779266479, 98433262, 50819045, 438683682, 865676296, 417166172]]], -[[511, -[875429488, 551314340, 9360205, 682034507, 41026333, 297843709, 312807227, 287315005, 554675332, 305962695, 541922344, 467511192, 34839974, 537402310, 823275692, 676331102, 140388267, 923982525, 22918228, 209605207, 61335362, 385913222, 1048030762, 899879812, 946431035, 178439319, 780658666, 227650521, 124061790, 922348054, 125184475, 226907654, 312046845, 662269133, 23475365, 632899437, 697760176, 82790296, 71101764, 791898542, 598762822, 197834152, 895654857, 318416786, 755337698, 598214271, 92729544, 490714219, 491086119, 694648457, 231066890, 115590526, 975171905, 309442163, 616407061, 150769252, 162577365, 271283757, 585253756, 808377330, 550911492, 578404840, 611776361, 944747339, 493190132, 488936897, 1002937061, 1063519425, 63236078, 204267755, 424945651, 806024832, 920988460, 1048893428, 479578813, 746291069, 756567752, 749468447, 165126972, 650481384, 1024919682, 850877585, 941960103, 819490595, 35970049, 981854402, 750591637, 564776696, 725420111, 626264109, 9969030, 248178661, 825513170, 629747107, 359451533, 951472833, 3144692, 726702201, 169608957, 439171314, 213515076, 162021629, 187343097, 1021838393, 980587805, 976385773, 743917506, 624395835, 641689792, 618102681, 452776693, 228705396, 1009728394, 534289626, 709659865, 914746082, 493816475, 709767981, 248201220, 641556902, 621521485, 1009351435, 76543570, 537556253, 76267825, 992874979, 1049761960, 1066212338, 609517961, 760171865, 635835602, 56567515, 524236467, 685106574, 84757177, 649443702, 560493860, 168021317, 667215170, 491328535, 234517033, 473666636, 837930523, 174519468, 181449342, 884077912, 533340469, 860996280, 423798343, 180828869, 120796895, 422425286, 715946088, 184729351, 276280898, 490489606, 118744616, 286174555, 976000417, 415783793, 916077554, 742721670, 66606702, 496361881, 335334820, 757279916, 945441010, 787371591, 791600758, 574682579, 346714887, 322779494, 337593500, 402601469, 294182798, 359900531, 888863651, 956357148, 85375298, 672667108, 764981905, 344888067, 729276389, 229096963, 1038003351, 489155736, 353833097, 510060477, 66731551, 542691558, 846149749, 603670835, 609890866, 680191548, 564702699, 216586565, 932613854, 820570497, 101704174, 448206105, 445015672, 250469590, 885514901, 232712212, 14240155, 662287550, 352375881, 976332697, 539138893, 583236321, 503530513, 470383304, 1015387663, 479707965, 149961857, 129982624, 118167274, 731556401, 226516508, 515338428, 346813395, 796140274, 965608057, 158687186, 852790120, 644270888, 342064407, 612955936, 24270283, 867311668, 614167902, 775331325, 224276251, 797260502, 769980629, 895893155, 843431461, 28935361, 1067371782, 48381105, 823258362, 52387537, 731724082, 871743327, 61746695, 381092568, 805535249, 571651220, 870175810, 681758343, 910583371, 905803438, 866977042, 362313125, 20808461, 290618956, 539849597, 981136314, 35382099, 60641032, 435277036, 789950912, 49114870, 1021164307, 840904601, 884746991, 372867980, 543680107, 216578517, 837782262, 772716163, 329322014, 1062296489, 306859006, 997639629, 56073859, 420507407, 67666363, 266278392, 800876253, 337225812, 753754363, 843509104, 724200517, 525956752, 429272583, 148163712, 93865799, 755006903, 266396590, 840728453, 476188380, 475568841, 207318842, 651069374, 412476543, 1013599863, 389929433, 892531228, 259061657, 716332437, 965996110, 783287940, 78270185, 82740969, 1842207, 858440000, 237164698, 52178819, 280363057, 798839141, 1053068605, 738486698, 217340599, 722754404, 636569964, 247808789, 742753789, 655718973, 117409260, 599265987, 898944412, 573030642, 366038709, 617264046, 1021487114, 646634759, 613921558, 99205201, 830472211, 390532272, 173812810, 1044718134, 51098899, 481940725, 717718003, 991303408, 595810185, 766257376, 821322531, 901411400, 764375510, 324026603, 837514699, 172878500, 744620193, 612930607, 260240364, 110956109, 1027906915, 521585494, 806898369, 262803257, 979597075, 305214995, 354640165, 544857318, 365573370, 602277298, 952412467, 865185041, 458053929, 379538988, 505354873, 113097027, 337618277, 197504375, 958129817, 205934250, 403981464, 306444372, 719894548, 543390208, 437282251, 820184299, 82176381, 297796004, 362922348, 571527110, 752996771, 611618947, 58874105, 585173816, 966553956, 764408996, 550150011, 733957480, 494844963, 381553456, 516857927, 312756365, 306849920, 866713544, 81298854, 168018797, 300563669, 998073317, 483731065, 327723208, 1035863390, 511494753, 1037892358, 619846201, 126183013, 650282138, 145472326, 594583700, 642622743, 274095815, 1060887963, 937689574, 855485481, 249732062, 28621593, 73340682, 705322135, 418975018, 1054369946, 179400180, 5369340, 589987253, 427327155, 577184485, 243972222, 1057701744, 354984423, 78918931, 1061009337, 170349106, 330764375, 380421118, 405324497, 777657820, 342761619, 685271749, 482815450, 1010572527, 869305973, 838878926, 84992659, 160908326, 515044777, 801975693, 912982393, 871715175, 943790984, 567553834, 745079211, 312148077, 807675156, 573284069, 115242172, 608891114, 299150941, 957598109, 1043569839, 222039123, 528677478, 551571662, 87001681, 797653834, 69618201, 635202491, 24740519, 1019530996, 336658811, 210254743, 803531109, 277769101, 928070006, 141564989, 175528593, 985345232, 479595540, 1045074018, 603794, 1046813438, 208656767, 2695413, 451400493, 876875890, 937439155, 811179083, 731333374, 139896979, 360119476, 991704521, 493112547, 336157665, 674867065, 826652086, 906362773, 387943046, 1016047658, 856171051, 242186159, 960586490, 616039532, 164351602, 550790245, 470464498, 131877754, 924975002, 264182296, 694923686, 307692290, 749731251, 48378975, 212204586, 976484028, 1677178, 5721747]]], -[[511, -[205283110, 398266379, 667165839, 1023404018, 200412667, 385676737, 300392964, 616891834, 805220812, 223836916, 620607679, 702932217, 463935266, 815304705, 296998979, 627997889, 259429349, 995642603, 390718365, 1024139865, 448770410, 326411912, 1057228871, 634344677, 1067091918, 568570072, 839461138, 996454588, 296597843, 372222069, 392838228, 725891465, 358382245, 646731296, 336791310, 772415831, 220366514, 196186001, 521142892, 364706925, 1028535629, 517265516, 136423352, 502387051, 226552837, 997081850, 304299333, 339893481, 891849538, 789356228, 867766819, 328606658, 857253592, 321824834, 128220337, 360749906, 942801424, 1063653989, 840411276, 1058246433, 296782737, 1046964064, 675663279, 786701494, 304718686, 958409252, 64164347, 216000525, 35966345, 848727310, 274318755, 323240333, 547841504, 417521604, 118154338, 231393693, 285793291, 134941286, 246163468, 912337210, 815727103, 247137205, 722035168, 349035370, 86737644, 457726582, 813433350, 600995341, 203271139, 972137076, 588980944, 117555263, 738577056, 572864998, 49415550, 178556784, 804107327, 930424019, 186089016, 527442180, 675632133, 485541906, 140872679, 679563516, 1001335014, 766092595, 263988193, 1037593514, 710401001, 763024601, 815303823, 499084088, 982608590, 579326323, 253827823, 162197071, 17396868, 897398216, 614280118, 203056199, 1048466478, 341580109, 55839299, 318118040, 666043244, 68717911, 431790819, 220462192, 862888139, 753915627, 506281783, 1066390936, 743922298, 757629466, 357507165, 44316977, 973414888, 287764578, 687859681, 757170329, 308434210, 770995823, 1065088908, 969047718, 601064719, 263321143, 411622790, 672754488, 600377242, 774863432, 929225726, 849769747, 1025177571, 111411364, 675138453, 67445726, 672292037, 379659427, 504628608, 969672044, 296641671, 889934217, 352201958, 269597143, 143555883, 874188170, 39010579, 4056320, 481363738, 1069632565, 373424596, 765958545, 497659426, 368460908, 432763906, 613254150, 971215063, 953302111, 138336791, 133176328, 489699943, 656920271, 198093342, 605899687, 670793243, 72420573, 908437961, 197838166, 99100490, 385373432, 128728186, 1040662209, 190784405, 558373870, 509110422, 651694061, 1020439846, 128793572, 1056006936, 919479098, 738658354, 695430482, 49423515, 896900655, 497690733, 460384048, 39075376, 138950941, 966744733, 464255488, 55691847, 816286723, 111888940, 746673678, 1068501762, 127439195, 406131836, 623673811, 107090661, 657499629, 620827991, 617787827, 138217783, 1045342723, 445463479, 472249171, 287700765, 468150897, 698536626, 823080, 452374907, 298136215, 13149893, 590907019, 905441909, 304205362, 819562126, 119975359, 69446362, 274519266, 85577714, 753489035, 774100659, 692454324, 251082383, 86488245, 682134662, 1005583993, 1044430831, 485706369, 394317385, 343923327, 916835593, 455642545, 372584889, 764849263, 396946029, 781355076, 4673538, 471361887, 730455242, 967389793, 1054047189, 176174223, 1038777297, 400874872, 453207839, 690018389, 209406219, 768726958, 752059477, 430613771, 158616158, 319802171, 61543031, 171212600, 690194098, 853747078, 358257708, 1069420145, 103772505, 35967115, 219778987, 775286013, 160730626, 828594227, 1039257932, 354642118, 1011493524, 499632448, 966376261, 711323081, 520601241, 169106405, 957844712, 456880037, 493908615, 626905667, 171983947, 439431666, 438234072, 60851586, 389872581, 277977368, 713913643, 669665258, 948579531, 540551681, 1041437215, 985431013, 946289609, 401126852, 18637214, 304813175, 644779867, 670183710, 532098152, 807105502, 836638779, 752016302, 721005760, 63578814, 5399356, 763002241, 408546631, 51120765, 664616816, 625177110, 809096715, 800951025, 853377222, 677984376, 687336259, 862718868, 208426186, 232985357, 94684689, 172036771, 293185699, 714725126, 385997796, 722156153, 915879090, 313677584, 572178325, 433136769, 604693121, 689115495, 343158643, 743409792, 662793863, 264937216, 730736636, 1069917997, 63453042, 1047618243, 359600439, 5297708, 88229456, 918084301, 986502166, 174343763, 587168530, 475265086, 388024622, 833228109, 602502026, 950511526, 743782601, 58103980, 919851916, 619744832, 373501372, 872116741, 528487161, 1050932900, 184336104, 685950390, 792381445, 22472313, 833813634, 546373497, 914250805, 241740421, 79792440, 20884901, 348454670, 336629330, 879822479, 451205571, 590705048, 128460682, 614094421, 480165343, 524802791, 1033199128, 434863188, 133274700, 235417332, 687858971, 336747872, 326395679, 445678326, 466081910, 410777254, 459200152, 492453470, 217416116, 1046049971, 875572054, 606812432, 510759285, 493870635, 420439717, 1015982105, 117217168, 826625847, 483049467, 525250338, 467287667, 40902367, 45022330, 646416061, 766507604, 997774509, 875350624, 312803667, 195668703, 420326868, 460596658, 682871969, 251456967, 752897451, 1065650294, 377356023, 542909782, 654622183, 966979915, 771439023, 404721829, 568364319, 370599635, 595926092, 545995846, 865083103, 180765523, 623122227, 913337258, 33340614, 139562079, 309070031, 248245065, 390341604, 690838308, 754461908, 788490291, 99449936, 989754928, 238975720, 106727709, 1036504782, 846331492, 338962055, 1032163542, 564220744, 583514405, 94233301, 354520917, 768328197, 33927806, 761678135, 453568047, 138986870, 544589353, 401776221, 862195542, 914935969, 273338759, 157421464, 817139006, 246656915, 523925460, 919044820, 521691876, 317708553, 988892852, 401408090, 341567590, 492246128, 1065026287, 598410771, 1027476703, 767283705, 199168310, 186381658, 1024798419, 215286576, 569065855, 748088766, 293490541, 484943007, 846419404, 631703914, 5492375, 414287489, 511205858, 1018747500, 1072929342, 408847539, 769910898, 804584950, 499817896]]], -[[511, -[976032580, 484658913, 562027175, 10614388, 119355337, 502193774, 1042131860, 156225339, 914860051, 627298998, 1066476693, 695911894, 318685719, 567882012, 25082318, 910909014, 475698614, 586304999, 675033641, 84709471, 772848234, 569395086, 714414399, 826513728, 622958226, 146108915, 381796924, 916429186, 278820285, 528001649, 99698679, 77582241, 981427100, 928173978, 131852068, 651480944, 876857469, 50753964, 252427746, 483116529, 303720452, 722404215, 28378980, 914843383, 110969718, 235869145, 194381191, 1010370341, 541795027, 993758468, 729208620, 690190666, 494397882, 184659757, 91685513, 238999184, 978313741, 1055994809, 912579944, 1017963073, 1048740313, 141205803, 834326581, 320471990, 460315424, 356198473, 498037840, 140298562, 529059485, 724752382, 305901657, 197768355, 693705005, 233593579, 562941575, 956139614, 1056151267, 574025251, 394195445, 448314529, 986985135, 738311205, 864513524, 952526526, 535862013, 980592822, 1071934017, 773405331, 226149823, 210318465, 96292947, 189329658, 647620087, 463416101, 909819443, 921079443, 330405510, 59918161, 666469185, 145497504, 646801363, 885963792, 84787557, 201171774, 802035609, 241977045, 797781309, 485022828, 419385232, 240573780, 809511492, 132429528, 973628122, 338109759, 645318084, 812721982, 127579032, 417001380, 12063747, 539628602, 676439417, 226631001, 934071720, 294980020, 183435568, 719750436, 1001413818, 295114450, 143972215, 1023955443, 416255598, 648424312, 152341622, 410116634, 534091826, 239986659, 673086420, 756787188, 987685673, 576712325, 1065564839, 524981369, 567458907, 847063208, 545078617, 207705935, 132795624, 664964802, 663025952, 719858220, 40890160, 598158355, 609061587, 1067844272, 76328759, 1031064670, 477750773, 129677772, 31988382, 1068943941, 531462870, 756187550, 569618743, 416718211, 1018848103, 1031266904, 156522856, 603602625, 501582684, 705113848, 768458156, 723504682, 936409649, 615200302, 683994190, 137114281, 126165751, 172374681, 352987062, 308950578, 671543960, 339437828, 275739149, 60107816, 715397596, 629566768, 522080481, 203866433, 1000170238, 88361184, 410642021, 829757798, 873432812, 187753327, 110508330, 970861143, 778902720, 716090458, 359859433, 289442285, 131172574, 12537141, 1054865614, 464916582, 467347170, 654264159, 852537729, 98994941, 771675932, 165187597, 187542882, 268274488, 484524235, 1064372502, 494297354, 579315972, 155327294, 95951987, 154678601, 757065600, 942233995, 496778699, 87166708, 24204608, 682356495, 925379870, 241595761, 937906614, 609958722, 1023372500, 462970827, 484090665, 968647339, 618251947, 661638124, 148063332, 292962408, 766744079, 832635071, 534999534, 1071961667, 889536013, 392996145, 429878477, 464275686, 641324200, 966947615, 527333691, 563712069, 68979157, 334579545, 748927676, 224494634, 578111440, 401184595, 55332335, 210911539, 424835730, 716803169, 894790279, 766160801, 64754122, 131270908, 468945915, 457245547, 286191869, 1059935454, 427803369, 1068581047, 310384548, 574275756, 678375948, 954917115, 555852983, 1007742983, 783860457, 295540534, 859639455, 502797879, 859526770, 820838099, 335170449, 432272348, 78540452, 921600579, 876183023, 754384470, 344410132, 684406837, 844837783, 380851459, 734859485, 66826467, 965372889, 39848840, 566873885, 420429977, 246497398, 1028699831, 940552246, 18602470, 901918512, 1062379918, 919485028, 451081609, 561718208, 165398966, 49149912, 913000008, 582183221, 649512380, 708223699, 411538777, 140687281, 494269275, 676532858, 999657919, 471583744, 629747856, 884564884, 577743896, 702976056, 518240330, 503753865, 90786961, 328193802, 887689440, 466944628, 663162393, 1039190765, 708138630, 373559444, 397151160, 600218902, 210103548, 70537671, 509745565, 67036631, 900683273, 270016996, 725883049, 62316764, 380093727, 208692330, 614607007, 586557528, 247720102, 596151084, 994944782, 146942364, 446522791, 162225170, 649859959, 998864431, 131753427, 207478394, 304953684, 648472323, 1059428967, 404407738, 894997015, 714244298, 716969939, 345106353, 488736025, 786513579, 605950025, 166480221, 947477392, 814694445, 311449148, 738028465, 1040395257, 255391366, 657340285, 618499259, 625723492, 897247624, 288303587, 164934803, 1000433624, 206553618, 265838173, 733753753, 916242973, 370498860, 953166523, 923955581, 1068232957, 339342597, 624445759, 193596067, 157945512, 244098839, 713855746, 153028677, 115097711, 1033133891, 856128859, 885088153, 1035736757, 152847358, 360008789, 412433486, 366260720, 84130580, 433539903, 693424647, 340946871, 414828478, 909392519, 516681586, 486033742, 202235647, 1036543746, 1026652728, 904140449, 691692994, 595640763, 1053670168, 969352092, 585839750, 770246233, 101888311, 711619028, 155471307, 897701704, 564286660, 962875387, 518807237, 324018604, 349945468, 968663824, 519628413, 993651586, 712237203, 691321168, 611937557, 798322191, 82594348, 125419137, 593494767, 296244508, 905247216, 679463643, 765903809, 556786116, 421933987, 987531018, 892115876, 220275708, 36160265, 75272030, 294672845, 650877949, 927158683, 952040941, 216475991, 946322288, 638463684, 252464909, 1025775872, 302874832, 878149783, 907287371, 703662472, 302008227, 116230216, 289686933, 642310185, 404561417, 681799070, 216426397, 773293052, 912996445, 527350592, 839192365, 898726203, 531075914, 476568478, 124218008, 657325665, 537463041, 822471141, 356348804, 737349973, 534749999, 21770017, 160839988, 77769440, 1005338810, 381991247, 832914799, 586647862, 698162420, 908554356, 280760801, 370987072, 522137381, 358435256, 46807551, 982359651, 459254009, 568307673, 849397602, 870628079, 554831839, 731000042, 618126442, 1012437445, 610039908, 903599377]]], -[[511, -[568445555, 1001018132, 210129534, 201461486, 575555254, 599355249, 705969158, 587237152, 70219897, 437841346, 620048092, 950900710, 635612054, 107672937, 64442529, 474234033, 319902511, 790764551, 696690392, 625349788, 216167049, 647934407, 601829234, 316713124, 959468073, 890390290, 550213064, 848765517, 1031957093, 35924606, 450355559, 56784769, 723318890, 137839557, 618868025, 1013621296, 401380749, 499595681, 117001336, 576392423, 255902269, 1042287485, 809044006, 319827704, 1047993650, 531146247, 588161162, 950603669, 372614956, 584057738, 980421508, 16412489, 318304485, 25743002, 514829532, 519919653, 866474780, 586650688, 627148358, 867440321, 1020056726, 227970104, 785620281, 540960061, 11188902, 164481251, 1056878430, 423910038, 331993153, 140326267, 204749594, 122347053, 781836028, 343632211, 72299856, 1005385579, 342538900, 369792203, 75334872, 798760794, 1019038899, 967649994, 183311206, 894680559, 296812657, 409392262, 186936732, 700785184, 974062704, 578142925, 354295350, 13710407, 284489904, 180302808, 642300744, 287568893, 123290333, 303961121, 912218261, 868163562, 460453045, 856425613, 130547691, 828948785, 722312019, 487340339, 78413657, 823953556, 994611875, 129005286, 660208235, 452338672, 1056978236, 1000748275, 932871633, 1031185115, 111875335, 989211361, 611299588, 179075204, 557092494, 883557632, 57963631, 716847038, 564504734, 940079003, 9262629, 447162836, 742954502, 857499395, 1067036278, 606183035, 958273967, 197038409, 75740630, 315144423, 942045931, 1563200, 615953847, 487085156, 369664634, 448203438, 490010249, 117410692, 32516802, 913213116, 33040316, 216316066, 224258015, 145815334, 270550176, 688649646, 198813395, 729979992, 43980389, 575622721, 775658400, 774748436, 878359227, 710108420, 800077224, 1024721633, 712291478, 336938327, 483559572, 793449289, 492410147, 823954766, 458876942, 582509814, 496130006, 91444795, 658527903, 581233498, 120907542, 37957020, 884067785, 714346510, 639458320, 651221303, 905724240, 4421526, 761310950, 917499208, 784913371, 712392812, 1030185773, 178374723, 1023526041, 246654123, 240640004, 356128144, 314146779, 386991547, 1031286673, 585808761, 424281984, 783593177, 413098569, 695256834, 821860336, 18250385, 873018483, 881216361, 672176622, 832162248, 370518255, 663434585, 840823837, 24047331, 369850939, 532854954, 1028156271, 312186809, 371925402, 367546597, 31905660, 473768801, 1012719881, 93636033, 493084183, 1053834960, 468313919, 568093815, 602847580, 1017577667, 207998378, 1003675515, 496314798, 151066300, 978125333, 126584240, 339259874, 997826639, 563273660, 68157680, 62574253, 296616205, 827793390, 175667996, 339664411, 500765263, 988756765, 583580283, 656386256, 263531485, 704047753, 714555384, 1053680415, 150465210, 262295141, 679495827, 988623915, 436202004, 27172738, 880613704, 161180770, 669806614, 788392107, 611314597, 820517289, 92172266, 924943323, 120045421, 444828770, 390485729, 443348872, 774889069, 638498083, 1004294698, 804170021, 772224901, 220505418, 404629282, 666486837, 1031025712, 1020583972, 734589098, 688464466, 1073244225, 665809222, 615672998, 515319907, 798334329, 7103917, 492871898, 525628108, 878088539, 964868135, 954377814, 1017762948, 790070967, 544521511, 380321957, 787033804, 145614540, 613502718, 411075003, 783103409, 912089932, 667446541, 323231129, 869220944, 336142034, 744884336, 441233124, 256191725, 927971528, 644924736, 14768062, 250321328, 202214259, 625900286, 987064067, 210430091, 779234148, 381446024, 140622598, 540696863, 894724487, 993553508, 99974801, 332379685, 789154030, 674353762, 629836752, 22616503, 739345030, 397162975, 704561489, 68536534, 398334507, 467724773, 681511247, 234293976, 971750012, 748093987, 945108717, 418291998, 1073167346, 533850676, 397432460, 351015994, 54365500, 835967526, 844890029, 206655180, 878674062, 361779590, 163487795, 889987202, 101048768, 626670108, 594881073, 188486077, 863254164, 229081441, 856715490, 66700614, 1066751992, 50985020, 12509507, 277537230, 956073964, 723466773, 530576959, 506545720, 605131774, 331089012, 521105360, 81261431, 80287394, 898309076, 1036719398, 532109289, 694774114, 458362865, 812787414, 977004107, 600570357, 333028485, 203882780, 933389781, 507492921, 309104256, 630696217, 737075367, 348882319, 678357226, 853414354, 366028354, 559414216, 576567031, 553469845, 814195840, 733581528, 812721323, 254672462, 865589055, 675471625, 1008896332, 950606308, 647043741, 204903336, 839496574, 602363656, 709737253, 867733699, 768092113, 228970698, 299366351, 155631743, 577248555, 214123413, 549564456, 1054983902, 231046444, 779712667, 614737638, 735658482, 157629454, 835180431, 328417268, 891164584, 443491477, 67963094, 7108659, 1007437658, 1062681260, 166900476, 474298406, 285848239, 837589202, 440647834, 498023745, 366353056, 725560499, 199234507, 560342289, 766223259, 625247210, 240048631, 1050027741, 185749956, 854037373, 1007572447, 79444709, 939657214, 895521425, 863512265, 663157060, 903675441, 224547005, 1031683334, 825918184, 1026564060, 1062392043, 678112380, 798678432, 482053615, 580050680, 284201697, 501511568, 242107183, 900522885, 435737111, 714811971, 616356519, 207699097, 610780966, 1072851765, 203305722, 720174464, 322399756, 869554615, 26826991, 551931337, 158130625, 58538082, 441418853, 926360467, 286465146, 20878790, 279040395, 155181873, 374882869, 711403964, 113064239, 518803494, 293097562, 1064866251, 425144302, 1060743544, 855321894, 187749583, 556297098, 882561418, 283439019, 783756808, 847655177, 329648839, 397047440, 4793089, 9967982, 64418406, 763126451, 149600194, 924499722, 47879079, 1059627514, 301308542, 744016]]], -[[511, -[925012200, 1042990416, 871370074, 1072279036, 1055725627, 26311728, 198110949, 809291564, 905367623, 462068810, 1046253306, 2999526, 60787555, 278113086, 731377728, 50155284, 34610056, 976784230, 818170674, 681113422, 592462695, 702700332, 187237179, 724183578, 363476256, 640323064, 143906043, 417565359, 44713596, 996677069, 320220491, 831851945, 1072233461, 542961764, 967784529, 832887823, 753872333, 718165429, 261317607, 89959081, 554766788, 745788239, 744840326, 74722696, 399304905, 848897115, 799421649, 446680656, 363215826, 175837328, 8876285, 650057261, 392575109, 276846177, 546981613, 620273316, 968297852, 648701511, 561940253, 25801538, 558324900, 800001838, 617998894, 208162552, 843989564, 376898706, 568783488, 940659774, 758390846, 239162165, 759108936, 477421921, 527384673, 546696525, 81398462, 896949736, 702074832, 473320458, 1647353, 1007534593, 426108617, 285965908, 407428226, 278725052, 349975386, 908769715, 331465350, 249045239, 703204771, 270746854, 791672190, 811953711, 759079225, 790959690, 627093517, 627907765, 634221171, 448392242, 893524279, 1019534506, 965825955, 243787423, 301384512, 703593221, 865801547, 574401712, 4545219, 408960584, 615793516, 730038674, 668705097, 278836053, 334917112, 502315502, 200555087, 190870051, 1046353999, 243935205, 1021334910, 98277758, 732685047, 393623520, 19960332, 310604038, 634159576, 155605698, 762501846, 651026121, 152768511, 371830668, 578051390, 991217626, 299893410, 306781398, 204865390, 480489310, 396615682, 668178729, 895447856, 734387294, 1057613305, 585855599, 682770645, 536917215, 1033341267, 1020253680, 727400040, 784097345, 355177113, 896555667, 309862640, 85084792, 102847855, 928011555, 252988708, 351685367, 493780732, 676105837, 416666472, 563033651, 163152877, 797756108, 792689831, 643309015, 261338295, 784603608, 216825815, 622304546, 134976541, 647409186, 241688858, 142143645, 268234615, 538410695, 559684977, 902604412, 913245760, 938948959, 52884516, 581653420, 107279442, 988687104, 871036432, 654473332, 641421069, 696854818, 982298178, 929308643, 371519981, 135294313, 1014808093, 973699345, 126973378, 212010395, 625971773, 707193702, 801691687, 60831513, 728279790, 822320123, 247230388, 1058261354, 1064161777, 617640036, 654287689, 450303960, 833378511, 1024689000, 190421526, 930693481, 1045261089, 787958919, 106097944, 231010235, 103370448, 394028432, 301364181, 327258252, 1052178199, 143592629, 104730262, 192913579, 278978005, 302610934, 767598667, 476309785, 920523182, 802884909, 1041894614, 72650498, 1062558130, 191722890, 695552800, 929009272, 423777747, 894358014, 430613702, 730236931, 796168175, 724261711, 741849429, 948782919, 989805576, 296572332, 1029203806, 238715261, 855478265, 1022251489, 688663648, 677169026, 1072800076, 521984653, 60279798, 618666421, 56891769, 177726590, 53928714, 613655221, 38558375, 249035957, 903711661, 373294386, 492153147, 880294378, 899578204, 1045607864, 634571760, 764926758, 841725867, 496728431, 641404635, 812854515, 452148051, 298279038, 573731215, 473906068, 45368698, 594160979, 895291183, 213984805, 235390488, 683401762, 471666786, 683781050, 737118843, 944524004, 479464670, 313907465, 456934321, 705777667, 168343746, 469502781, 325807482, 721722047, 611901818, 507250080, 763469414, 886522840, 633864422, 437571838, 489227156, 598454324, 669865835, 1052541850, 955473347, 682917110, 145723748, 39007559, 821014758, 614110791, 768164498, 452873040, 951429111, 785188102, 315132429, 1073388089, 708613167, 824162507, 540220179, 511192718, 765189447, 425350238, 694390678, 998882067, 25023393, 552844524, 462107422, 545834973, 517530136, 496390488, 318864309, 638363609, 358031659, 100549165, 157248533, 152331663, 724075007, 204745394, 542730554, 353014042, 467209381, 758258348, 7843448, 386039296, 603785863, 537739309, 86424438, 183136609, 216645219, 147280517, 748269154, 246366631, 800439682, 946603670, 380996877, 1065356049, 435330573, 867231264, 822335947, 17202894, 637867342, 178874279, 765051241, 639540428, 624308642, 78105631, 26545159, 596186297, 313100448, 1015569452, 515049584, 308668593, 385833767, 205154403, 483635068, 776089822, 780728827, 736833976, 539651443, 997417112, 1019344348, 914291995, 373052680, 89574524, 728040280, 205018042, 30736894, 490197543, 688465897, 419589908, 176980382, 884885175, 539521786, 528319109, 698573377, 69961924, 455654551, 131556205, 881783261, 344344646, 241887469, 586867574, 49194025, 939941923, 214431127, 611187919, 375707829, 543632244, 331061001, 190728430, 538450331, 755928397, 415040956, 362404397, 263167181, 266748461, 153415273, 59800466, 13103370, 29777805, 997819519, 505559078, 450191334, 317863225, 813005769, 574576071, 761724260, 927774450, 953424163, 347793994, 299895553, 148043993, 576969272, 745076388, 33076314, 236040661, 131488910, 375519473, 322521640, 445091147, 386900012, 865759928, 988213526, 493653018, 62308359, 1023140910, 138036486, 138017924, 665358594, 742543248, 193193442, 441919418, 710258952, 318193866, 275146515, 829324683, 393673347, 157822069, 808169625, 489269313, 820741490, 428060481, 333600226, 891960388, 652561844, 659571782, 471264589, 858163182, 43323194, 413342338, 784852016, 195244478, 573918721, 889793062, 826718279, 750850957, 552482878, 499433094, 184540660, 813790432, 46348521, 18471923, 897485863, 329114365, 650578804, 159258485, 1043105427, 504182203, 115656793, 335004745, 566804506, 809255354, 610282215, 525212855, 163854287, 845156597, 420136540, 753074558, 929085586, 600100856, 486074979, 635778835, 964033718, 545737222, 1056695022, 916667904, 622264773, 2363420, 644821514, 807628646, 885332749, 315044010]]], -[[511, -[910738567, 949959484, 34730735, 520153784, 821364767, 413604559, 634448038, 180587016, 22101068, 591432165, 1048971906, 718092229, 486584706, 206344266, 712464766, 793378893, 663017356, 610583401, 500080675, 843288886, 622194585, 956025594, 48713639, 222727694, 762347648, 889320799, 718807638, 838369726, 963834341, 805851743, 118044473, 736387407, 859603507, 904058959, 709740067, 221400686, 362653407, 214741914, 370171109, 278669539, 717566927, 726023352, 564118444, 183172119, 1593988, 678334953, 1041836590, 928238868, 632485913, 146935232, 689615265, 622801523, 544869222, 81356331, 77382337, 443693663, 133141193, 821330205, 250113555, 693269635, 1056673959, 217753537, 563839432, 78162007, 7588871, 278532498, 174148558, 964184842, 562766109, 57608405, 335361990, 502676945, 1015073362, 784005805, 949664688, 966017295, 132730349, 474376351, 222140176, 253784914, 556736845, 804616941, 71417615, 564363180, 878985699, 855944409, 486620259, 356897299, 370781863, 160935230, 146988272, 965146380, 746123153, 193279128, 560967106, 1056270361, 454755152, 1028030342, 598217441, 498322415, 787174285, 962413862, 632840318, 143840670, 250756920, 761645943, 447935918, 920387401, 62832669, 122276311, 453164326, 158726135, 265681029, 809056603, 389279389, 126222734, 348003331, 33433710, 49468519, 453384501, 441096824, 254324228, 927697919, 261008612, 696314140, 160797217, 764714622, 374940319, 534576756, 978307757, 1020419921, 429721862, 937185694, 479178705, 260071847, 414241967, 294152155, 1038509639, 1020037280, 46855737, 999931026, 939433422, 990162011, 335110810, 306928025, 792714169, 237226253, 518654602, 458812445, 547600623, 143249901, 142506525, 44860309, 295947677, 613369900, 320035542, 944697372, 753444372, 554104169, 302399424, 982634279, 163670747, 285841064, 110887820, 256863354, 186671231, 1031582917, 49876494, 481351642, 102275049, 680293400, 333649748, 164014156, 44491094, 345296924, 299526080, 984456825, 97739592, 636581845, 135867789, 392589989, 145879072, 664282291, 773339214, 924460576, 402785041, 541479173, 25190295, 137093558, 423447653, 123880273, 925000265, 1023306448, 225434981, 182554065, 594019476, 758913510, 213339589, 730650464, 751337860, 289123349, 1002893390, 1049092188, 623047445, 625835631, 605219369, 22185896, 895473776, 11341267, 602535713, 797954103, 890467634, 600863511, 454421920, 1061095697, 716051397, 1017629729, 457936120, 747891982, 107099498, 598273036, 298704001, 669689186, 632090492, 704234322, 600601188, 682085149, 538249081, 332391238, 987377273, 102876486, 115202480, 1066190734, 276810621, 209139456, 317746730, 310986050, 794759145, 464481561, 599318662, 1065315376, 316861540, 564059508, 63000293, 497391067, 613627740, 578199753, 595086966, 1018963585, 991342763, 159901670, 744280081, 760834096, 801807243, 106651321, 876657882, 1072766287, 84329919, 774273262, 921538014, 247026146, 222040497, 669461658, 224032065, 27353407, 775606892, 1023517242, 184335510, 630549032, 605152108, 335279570, 873810745, 1070391953, 418660003, 769416724, 14214830, 122889280, 960448469, 380445455, 543621351, 290052544, 85665707, 997845912, 1036215809, 1046581680, 580088746, 986925047, 859030899, 301813812, 309681397, 943737630, 655305007, 779773833, 635441963, 821482001, 147714588, 369306041, 728771529, 1002007880, 661682801, 948764784, 121815041, 642693577, 89799889, 1014385612, 513837267, 425066398, 566954960, 294666904, 154532075, 974039564, 813766265, 673962527, 425863031, 481285747, 793181360, 653466402, 532227158, 976124006, 155211915, 129214876, 510791909, 122137276, 437174522, 850189927, 345139456, 28058997, 981091988, 855558469, 770262396, 1037329684, 883863845, 710628660, 623771315, 775490083, 488104614, 24085144, 537821420, 445286604, 135087802, 894304723, 345572713, 492075267, 218452654, 926261412, 341919280, 597052056, 495939201, 984767456, 949959072, 470435716, 993823764, 491796368, 276950192, 178210615, 748358853, 921918467, 630098705, 96156262, 771481549, 808409806, 144430849, 230644643, 423607765, 1011489865, 416229264, 734626116, 292956337, 170729699, 107016503, 254355823, 765575832, 755908202, 223832148, 492860107, 558747241, 873522416, 409555264, 345582446, 102716055, 726126579, 1003726964, 923726517, 198007534, 584616455, 110815518, 428623644, 1056294369, 558629045, 447785426, 277803553, 447590378, 857716462, 95830980, 654793492, 1038601940, 568379735, 964724978, 281375242, 697354212, 119971218, 241209345, 768289949, 782293678, 555930457, 607443423, 659668073, 479753081, 564437448, 943313344, 750274971, 474571862, 358639393, 373150318, 675242293, 381205479, 798466644, 353085266, 736168134, 311753632, 630029636, 548775986, 549248640, 515127757, 244790062, 943663043, 483481140, 190921648, 879912732, 326749973, 329912776, 1062149365, 879509158, 960117960, 254386282, 778409757, 794428371, 700224152, 556987604, 1011348715, 978469682, 753785195, 561322238, 941935582, 640408003, 777603866, 24606703, 228625182, 909495999, 801553358, 678385990, 1059498269, 545413976, 75825833, 971317264, 1057625552, 935788334, 321168478, 21648756, 45305952, 70290239, 930019761, 995059663, 679077301, 417687558, 218357046, 1001078421, 381545136, 1038585965, 192865970, 223948331, 298381751, 914721876, 1022127197, 823262638, 103467855, 816503336, 722713617, 67516161, 605811954, 114211124, 418046058, 252652862, 985245420, 439557529, 195158056, 602276495, 767326499, 340332226, 173047577, 954641744, 791837949, 550582525, 393383920, 609491641, 324181609, 624888872, 73987113, 259563870, 549598284, 401287627, 276940459, 60122096, 610954617, 974374721, 717302601, 838760137, 375560666, 917646481, 517100824, 784300409, 838763511]]] -]]]]]: diff --git a/output_files/eco6-16.res b/output_files/eco6-16.P2.d4.res similarity index 100% rename from output_files/eco6-16.res rename to output_files/eco6-16.P2.d4.res diff --git a/output_files/eco6-31.res b/output_files/eco6-31.P2.d4.res similarity index 100% rename from output_files/eco6-31.res rename to output_files/eco6-31.P2.d4.res diff --git a/output_files/eco6-qq.res b/output_files/eco6-qq.P2.d4.res similarity index 100% rename from output_files/eco6-qq.res rename to output_files/eco6-qq.P2.d4.res diff --git a/output_files/elim-31.res b/output_files/elim-31.g2.e1.res similarity index 100% rename from output_files/elim-31.res rename to output_files/elim-31.g2.e1.res diff --git a/output_files/elim-31.e2.res b/output_files/elim-31.g2.e2.res similarity index 100% rename from output_files/elim-31.e2.res rename to output_files/elim-31.g2.e2.res diff --git a/output_files/elim-qq.res b/output_files/elim-qq.g2.e1.res similarity index 100% rename from output_files/elim-qq.res rename to output_files/elim-qq.g2.e1.res diff --git a/output_files/elim-qq.e2.res b/output_files/elim-qq.g2.e2.res similarity index 100% rename from output_files/elim-qq.e2.res rename to output_files/elim-qq.g2.e2.res diff --git a/output_files/F4SAT-31.res b/output_files/f4sat-31.res similarity index 100% rename from output_files/F4SAT-31.res rename to output_files/f4sat-31.res diff --git a/output_files/F4SAT-byone-31.res b/output_files/f4sat-byone-31.res similarity index 100% rename from output_files/F4SAT-byone-31.res rename to output_files/f4sat-byone-31.res diff --git a/output_files/henrion5-qq.res b/output_files/henrion5-qq.P2.d0.res similarity index 100% rename from output_files/henrion5-qq.res rename to output_files/henrion5-qq.P2.d0.res diff --git a/output_files/input-overflow-16.res b/output_files/input-overflow-16.P2.d0.res similarity index 100% rename from output_files/input-overflow-16.res rename to output_files/input-overflow-16.P2.d0.res diff --git a/output_files/issue_230.res b/output_files/issue_230.P1.d0.p1024.res similarity index 100% rename from output_files/issue_230.res rename to output_files/issue_230.P1.d0.p1024.res diff --git a/output_files/issue_230.P1.d0.p128.res b/output_files/issue_230.P1.d0.p128.res new file mode 100644 index 00000000..b88de882 --- /dev/null +++ b/output_files/issue_230.P1.d0.p128.res @@ -0,0 +1,18 @@ +[0, [0, +4, +6, +['z', 'y', 'x', 'A'], +[1,4,9,1], +[1, +[[6, [83273137416, 7761391038, 298505503, 6061146, 68488, 408, 1]], +[5, [7761391038, 597011006, 18183438, 273952, 2040, 6]], +[ +[[5, [-30953329224, -2383425124, -72648782, -1095128, -8158, -24]], +1], +[[5, [-51454687746, -3993436310, -122821118, -1870252, -14092, -42]], +1], +[[5, [-29207416032, -2272198314, -70009862, -1067478, -8050, -24]], +1] +]]]],[1, +[[[4, 4], [11, 11], [6, 6]], [[3, 3], [3, 3], [6, 6]], [[4, 4], [7, 7], [4, 4]], [[5, 5], [11, 11], [2, 2]], [[5, 5], [3, 3], [4, 4]], [[3, 3], [7, 7], [2, 2]]] +]]: diff --git a/output_files/issue_230_squared.res b/output_files/issue_230_squared.P1.d0.p1024.res similarity index 100% rename from output_files/issue_230_squared.res rename to output_files/issue_230_squared.P1.d0.p1024.res diff --git a/output_files/issue_230_squared.P1.d0.p128.res b/output_files/issue_230_squared.P1.d0.p128.res new file mode 100644 index 00000000..280c085e --- /dev/null +++ b/output_files/issue_230_squared.P1.d0.p128.res @@ -0,0 +1,18 @@ +[0, [0, +4, +48, +['z', 'y', 'x', 'A'], +[1,4,9,1], +[1, +[[6, [83273137416, 7761391038, 298505503, 6061146, 68488, 408, 1]], +[5, [7761391038, 597011006, 18183438, 273952, 2040, 6]], +[ +[[5, [-30953329224, -2383425124, -72648782, -1095128, -8158, -24]], +1], +[[5, [-51454687746, -3993436310, -122821118, -1870252, -14092, -42]], +1], +[[5, [-29207416032, -2272198314, -70009862, -1067478, -8050, -24]], +1] +]]]],[1, +[[[4, 4], [11, 11], [6, 6]], [[3, 3], [3, 3], [6, 6]], [[4, 4], [7, 7], [4, 4]], [[5, 5], [11, 11], [2, 2]], [[5, 5], [3, 3], [4, 4]], [[3, 3], [7, 7], [2, 2]]] +]]: diff --git a/output_files/kat6-31.res b/output_files/kat6-31.P2.d0.res similarity index 100% rename from output_files/kat6-31.res rename to output_files/kat6-31.P2.d0.res diff --git a/output_files/kat7-qq.res b/output_files/kat7-qq.P2.d0.res similarity index 100% rename from output_files/kat7-qq.res rename to output_files/kat7-qq.P2.d0.res diff --git a/output_files/linear-qq.res b/output_files/linear-qq.P2.d0.res similarity index 100% rename from output_files/linear-qq.res rename to output_files/linear-qq.P2.d0.res diff --git a/output_files/multy-16.res b/output_files/multy-16.P2.d0.res similarity index 100% rename from output_files/multy-16.res rename to output_files/multy-16.P2.d0.res diff --git a/output_files/multy-31.res b/output_files/multy-31.P2.d0.res similarity index 100% rename from output_files/multy-31.res rename to output_files/multy-31.P2.d0.res diff --git a/output_files/multy-qq.res b/output_files/multy-qq.P2.d0.res similarity index 100% rename from output_files/multy-qq.res rename to output_files/multy-qq.P2.d0.res diff --git a/output_files/nonradical_radicalshape-no-square-qq.P1.d0.p1024.res b/output_files/nonradical_radicalshape-no-square-qq.P1.d0.p1024.res new file mode 100644 index 00000000..1dccf9eb --- /dev/null +++ b/output_files/nonradical_radicalshape-no-square-qq.P1.d0.p1024.res @@ -0,0 +1,18 @@ +[0, [0, +4, +8, +['x', 'y', 'z', 'A'], +[1,2,3,1], +[1, +[[1, [46428, 265699]], +[0, [265699]], +[ +[[0, [168164]], +1], +[[0, [178907]], +1], +[[0, [-190802]], +1] +]]]],[1, +[[[-20453810548688343696127635118963540703864606495884571100302099023610386590738316682274356238327352454121955924487747633789397481906153787763726638255750639192084918880367651766747636440093961425851253624218451475360082223327214286373676006670463595011704567548473397345237077716608311625706835334895037728222188273046342617528978536238404526417235269936298652319258243767931918030066449329010512218752842429429924765150457547001242643454343651959051947524950272729487421343865465695197277064854619998870733508347918332216339071974811021731345904855045421097160148549685898792376242803458511974259674016713085957946895 / 2^2048, -10226905274344171848063817559481770351932303247942285550151049511805193295369158341137178119163676227060977962243873816894698740953076893881863319127875319596042459440183825883373818220046980712925626812109225737680041111663607143186838003335231797505852283774236698672618538858304155812853417667447518864111094136523171308764489268119202263208617634968149326159629121883965959015033224664505256109376421214714962382575228773500621321727171825979525973762475136364743710671932732847598638532427309999435366754173959166108169535987405510865672952427522710548580074274842949396188121401729255987129837008356542978973447 / 2^2047], [-1360030195164462037669740110929067077639352490113527925805221253514821630145728285585670183396279690328190326326654882257186338669165314703000137392077666595532611238928194900005916617330362903480668511151335340092947297849421519443911618020724051518442944486630138621689366430629193528348937937541650752703851239476754098184754526452898747133649410113971102238916152765228213105586324306222379533342605574216991876218592010017509439301993240133529659579282084172004117294117252678609370632181213540107412377120698033267312182731514145218689011099247464956913203292834173446474742093744184249370731659015933876111417 / 2^2044, -21760483122631392602715841774865073242229639841816446812883540056237146082331652569370722934340475045251045221226478116114981418706645035248002198273242665528521779822851118400094665877285806455690696178421365441487156765590744311102585888331584824295087111786082217947029862890067096453583007000666412043261619831628065570956072423246379954138390561823537635822658444243651409689381188899558072533481689187471870019497472160280151028831891842136474553268513346752065876705876042857749930114899416641718598033931168532276994923704226323499024177587959439310611252685346775143595873499906947989931706544254942017782671 / 2^2048], [23207273615701537510457321638213181735560373496276063456386866974518380760959850500768961959666370346515172297900330772473803063334946570091663911612911999352585492092314102259692814919024333555191782391047602212136095765890910898103459298213278673529550051719653559384088894784164857370234506764638347022075176416318523965353846023354344927864830308356043240288165787132852131395380335059072475395224184969554057378750729055463304267598152264938340130418255761859444702595396271411092926301279650846938308406435381613327120713178432319452345694311222238030615058297716329662608952447524386918203029909712484401823121 / 2^2048, 11603636807850768755228660819106590867780186748138031728193433487259190380479925250384480979833185173257586148950165386236901531667473285045831955806455999676292746046157051129846407459512166777595891195523801106068047882945455449051729649106639336764775025859826779692044447392082428685117253382319173511037588208159261982676923011677172463932415154178021620144082893566426065697690167529536237697612092484777028689375364527731652133799076132469170065209127880929722351297698135705546463150639825423469154203217690806663560356589216159726172847155611119015307529148858164831304476223762193459101514954856242200911561 / 2^2047]]] +]]: diff --git a/output_files/nonradical_radicalshape-no-square-qq.P1.d0.p128.res b/output_files/nonradical_radicalshape-no-square-qq.P1.d0.p128.res new file mode 100644 index 00000000..780d41e4 --- /dev/null +++ b/output_files/nonradical_radicalshape-no-square-qq.P1.d0.p128.res @@ -0,0 +1,18 @@ +[0, [0, +4, +8, +['x', 'y', 'z', 'A'], +[1,2,3,1], +[1, +[[1, [46428, 265699]], +[0, [265699]], +[ +[[0, [168164]], +1], +[[0, [178907]], +1], +[[0, [-190802]], +1] +]]]],[1, +[[[-9160770690943530408097786933240712863163435739931642484132112445430121835597 / 2^253, -73286165527548243264782295465925702905307485919453139873056899563440974684775 / 2^256], [-38983991865194314947825950069344121600579929067432990697381695042329316791731 / 2^255, -77967983730388629895651900138688243201159858134865981394763390084658633583461 / 2^256], [83151845549506790462923048568597059809105866466089638650715982912535767773153 / 2^256, 41575922774753395231461524284298529904552933233044819325357991456267883886577 / 2^255]]] +]]: diff --git a/output_files/nonradical_radicalshape-no-square-qq.p3.res b/output_files/nonradical_radicalshape-no-square-qq.p3.res deleted file mode 100644 index 6cb273a8..00000000 --- a/output_files/nonradical_radicalshape-no-square-qq.p3.res +++ /dev/null @@ -1,3 +0,0 @@ -[0, [1, -[[[-11 / 2^4, -5 / 2^3], [-11 / 2^4, -5 / 2^3], [11 / 2^4, 3 / 2^2]]] -]]: diff --git a/output_files/nonradical_radicalshape-no-square-qq.res b/output_files/nonradical_radicalshape-no-square-qq.res deleted file mode 100644 index 691168bc..00000000 --- a/output_files/nonradical_radicalshape-no-square-qq.res +++ /dev/null @@ -1,16 +0,0 @@ -[0, [0, -4, -8, -['x', 'y', 'z', 'A'], -[7/864,75/864,-18/864,117/864], -[1, -[[1, [-1386893, 2391291]], -[0, [2391291]], -[ -[[0, [1513476]], -1], -[[0, [1610163]], -1], -[[0, [-1717218]], -1] -]]]]]: diff --git a/output_files/nonradical_radicalshape-qq.res b/output_files/nonradical_radicalshape-qq.P1.d0.p1024.res similarity index 72% rename from output_files/nonradical_radicalshape-qq.res rename to output_files/nonradical_radicalshape-qq.P1.d0.p1024.res index 484c3978..60380a67 100644 --- a/output_files/nonradical_radicalshape-qq.res +++ b/output_files/nonradical_radicalshape-qq.P1.d0.p1024.res @@ -9,4 +9,6 @@ [ [[0, [-1]], 1] -]]]]]: +]]]],[1, +[[[1, 1], [3, 3]]] +]]: diff --git a/output_files/nonradical_radicalshape-qq.P1.d0.p128.res b/output_files/nonradical_radicalshape-qq.P1.d0.p128.res new file mode 100644 index 00000000..60380a67 --- /dev/null +++ b/output_files/nonradical_radicalshape-qq.P1.d0.p128.res @@ -0,0 +1,14 @@ +[0, [0, +2, +6, +['y', 'x'], +[0, 1], +[1, +[[1, [-3, 1]], +[0, [1]], +[ +[[0, [-1]], +1] +]]]],[1, +[[[1, 1], [3, 3]]] +]]: diff --git a/output_files/nonradical_radicalshape-qq.p3.res b/output_files/nonradical_radicalshape-qq.p3.res deleted file mode 100644 index e0e84b07..00000000 --- a/output_files/nonradical_radicalshape-qq.p3.res +++ /dev/null @@ -1,3 +0,0 @@ -[0, [1, -[[[3, 3], [1, 1]]] -]]: diff --git a/output_files/nonradical_shape-qq.p1024.res b/output_files/nonradical_shape-qq.P1.d0.p1024.res similarity index 93% rename from output_files/nonradical_shape-qq.p1024.res rename to output_files/nonradical_shape-qq.P1.d0.p1024.res index 73b55a64..248e7baa 100644 --- a/output_files/nonradical_shape-qq.p1024.res +++ b/output_files/nonradical_shape-qq.P1.d0.p1024.res @@ -1,3 +1,18 @@ -[0, [1, +[0, [0, +4, +18, +['x1', 'x2', 'x3', 'x4'], +[0, 0, 0, 1], +[1, +[[4, [-9, 3, 8, 17, 5]], +[3, [3, 16, 51, 20]], +[ +[[3, [-1482814286602093677141, 988542638259789810687, 988542578445336685687, 2471358263210272159703]], +729980468750000], +[[3, [1232738891496063441669, -821825860583780645483, -821825947741983770483, -2054564712986826509027]], +145996093750000], +[[3, [7296357631087314445713, -4864238186321243499466, -4864238670177444671341, -12160596416621204429554]], +221405029296875] +]]]],[1, [[[-121722272026806639175856903448929079302848245474621385201239705897079472942038956314423425753112602377323173273174623183253070934886329550162115952343737243158086979185162746275824177474560982414644740502255844544648901616361099177697297175384973010766534875461537061482054482628866692571871217860524253137660670103 / 2^1024, -60861136013403319587928451724464539651424122737310692600619852948539736471019478157211712876556301188661586636587311591626535467443164775081057976171868621579043489592581373137912088737280491207322370251127922272324450808180549588848648587692486505383267437730768530741027241314433346285935608930262126568830335051 / 2^1023], [252984634308875205806967596955718077650558918408715819253084888140725924207082192196031120855505004873563811770654313903159684496722108827746523775474053335182918310694389344612271370978919546452867868777549561023444186404465571443864425337398327435421017000697036246972830310025928915784766084100646684762102406757 / 2^1023, 505969268617750411613935193911436155301117836817431638506169776281451848414164384392062241711010009747127623541308627806319368993444217655493047550948106670365836621388778689224542741957839092905735737555099122046888372808931142887728850674796654870842034001394072493945660620051857831569532168201293369524204813515 / 2^1024], [1974753744297339254025542889635096362532383855582341518499522801642374084092110859263964427763533465989029469814452603178688540020753960481831921556427738414024151152302576007040120358917118165579307881644576209105210581038098050471546721436117420459659492440224046057894899482864113381959777192895928395858673591553 / 2^1024, 987376872148669627012771444817548181266191927791170759249761400821187042046055429631982213881766732994514734907226301589344270010376980240915960778213869207012075576151288003520060179458559082789653940822288104552605290519049025235773360718058710229829746220112023028947449741432056690979888596447964197929336795777 / 2^1023], [-3, -3]], [[-11855206750113502103311882662209982064575230534577529423462242275842091439842813214031337036221924814437879130371418472770149651281421671062025062338772776474389722140089795968182576295998995858971790395717140300973635234472493288476256447928440277530740102637963484726595576292634279100763694292326663036702607427543841991927506802326057628760700178593810835827803491594755224586488438286417795818513476022179774186591106108926429614085371372017654174291965272414486725787665842213619150037367207212182764917655436072435576611246918873636658140669435974032330096298896498727882911020853377752965450048535834260147 / 2^2048, -5927603375056751051655941331104991032287615267288764711731121137921045719921406607015668518110962407218939565185709236385074825640710835531012531169386388237194861070044897984091288147999497929485895197858570150486817617236246644238128223964220138765370051318981742363297788146317139550381847146163331518351303713771920995963753401163028814380350089296905417913901745797377612293244219143208897909256738011089887093295553054463214807042685686008827087145982636207243362893832921106809575018683603606091382458827718036217788305623459436818329070334717987016165048149448249363941455510426688876482725024267917036031 / 2^2047], [-87766499740221212517055741548149918006923791790721323169884042413368942724451188047450970152683820775740399780196624716394452867849910116336425427687673643829485166464757216313191244491987656373837024841590404594195192941518972356717040559527627312280393327618747555137249240070309120250567722314956827374258441221047502360508641776665692884847270085262687211927307499288788186778792717534165771409919099948678060198017463786809808646143167440312090720089060080142122607468007960787878667366584876801598178103165656962197600427467900872554434459692495667541631520205269921092731388559652033095807227249814995964517 / 2^2046, -43883249870110606258527870774074959003461895895360661584942021206684471362225594023725485076341910387870199890098312358197226433924955058168212713843836821914742583232378608156595622245993828186918512420795202297097596470759486178358520279763813656140196663809373777568624620035154560125283861157478413687129220610523751180254320888332846442423635042631343605963653749644394093389396358767082885704959549974339030099008731893404904323071583720156045360044530040071061303734003980393939333683292438400799089051582828481098800213733950436277217229846247833770815760102634960546365694279826016547903613624907497884531 / 2^2045], [115676285979987668623791853160363481780249228052280811113422561272838982588733358466669492460248451015256978427094642819088814092288836871382049080935273195076047762827925232128661583219642515276453237947125599264787184185526438494497717312497778937446677379332799956583765488158033876811672963391606709022398459007020002160201998868524558142645197788338793216534542662429367113547729039548846155349276301633468174074766226108267439001687312584883723979919129893994234052124557922445211440504776986722123528844760054064954063311530233974931001715413080554431331264125877368320914425991569952546803305119145589184781 / 2^2048, 14459535747498458577973981645045435222531153506535101389177820159104872823591669808333686557531056376907122303386830352386101761536104608922756135116909149384505970353490654016082697902455314409556654743390699908098398023190804811812214664062222367180834672416599994572970686019754234601459120423950838627799807375877500270025249858565569767830649723542349152066817832803670889193466129943605769418659537704183521759345778263533429875210914073110465497489891236749279256515569740305651430063097123340265441105595006758119257913941279246866375214426635069303916408015734671040114303248946244068350413139893199029519 / 2^2045], [19390203642786604380428926013201971176266461601829290419278207256514793083320734535918320846913748078213230776553138811696471735490294552657052891431868969872378526420380597655050118650233791264077634583030440540966075331185571853697102856603085702282348987511221783025732545534924639485164531439474358231313148600033801005452410984871938741696913705621195793234846683395598615715625076188490155155718506270035566162231077114414559010691380987542642218567939972338736275410826492125835094261036158794081807125548394018761027598361011799182929315099833662401326161281259937762787191087162971288916133512166635757738393 / 2^2048, 9695101821393302190214463006600985588133230800914645209639103628257396541660367267959160423456874039106615388276569405848235867745147276328526445715934484936189263210190298827525059325116895632038817291515220270483037665592785926848551428301542851141174493755610891512866272767462319742582265719737179115656574300016900502726205492435969370848456852810597896617423341697799307857812538094245077577859253135017783081115538557207279505345690493771321109283969986169368137705413246062917547130518079397040903562774197009380513799180505899591464657549916831200663080640629968881393595543581485644458066756083317878869197 / 2^2047]]] ]]: diff --git a/output_files/nonradical_shape-qq.P1.d0.p128.res b/output_files/nonradical_shape-qq.P1.d0.p128.res new file mode 100644 index 00000000..e94f3cd4 --- /dev/null +++ b/output_files/nonradical_shape-qq.P1.d0.p128.res @@ -0,0 +1,18 @@ +[0, [0, +4, +18, +['x1', 'x2', 'x3', 'x4'], +[0, 0, 0, 1], +[1, +[[4, [-9, 3, 8, 17, 5]], +[3, [3, 16, 51, 20]], +[ +[[3, [-1482814286602093677141, 988542638259789810687, 988542578445336685687, 2471358263210272159703]], +729980468750000], +[[3, [1232738891496063441669, -821825860583780645483, -821825947741983770483, -2054564712986826509027]], +145996093750000], +[[3, [7296357631087314445713, -4864238186321243499466, -4864238670177444671341, -12160596416621204429554]], +221405029296875] +]]]],[1, +[[[-115203040021200353450022457672539689739026213 / 2^127, -230406080042400706900044915345079379478052425 / 2^128], [478870439497146961117668527449197846913043069 / 2^127, 957740878994293922235337054898395693826086139 / 2^128], [3737978774931185957449720932401959963609098941 / 2^128, 1868989387465592978724860466200979981804549471 / 2^127], [-3, -3]], [[-10619324968616190157610352189663022362975726053662700604470028253425049093 / 2^254, -42477299874464760630441408758652089451902904214650802417880113013700008287 / 2^256], [-628936130255479040062686968423007254524222113398356454090940780069875998873 / 2^255, -628936130255479040062686968423007254524222113398356454090940780069875607963 / 2^255], [414469050730746373321452878806648574793871039984690488674036351568096206761 / 2^256, 103617262682686593330363219701662143698467759996172622168509087892024814533 / 2^254], [69475253542389717254142591005212744711961990799384338423674550404747877783961 / 2^256, 34737626771194858627071295502606372355980995399692169211837275202373938891981 / 2^255]]] +]]: diff --git a/output_files/nonradical_shape-qq.res b/output_files/nonradical_shape-qq.res deleted file mode 100644 index abbfe320..00000000 --- a/output_files/nonradical_shape-qq.res +++ /dev/null @@ -1,16 +0,0 @@ -[0, [0, -4, -18, -['x1', 'x2', 'x3', 'x4'], -[0, 0, 0, 1], -[1, -[[4, [-9, 3, 8, 17, 5]], -[3, [3, 16, 51, 20]], -[ -[[3, [-1482814286602093677141, 988542638259789810687, 988542578445336685687, 2471358263210272159703]], -729980468750000], -[[3, [1232738891496063441669, -821825860583780645483, -821825947741983770483, -2054564712986826509027]], -145996093750000], -[[3, [7296357631087314445713, -4864238186321243499466, -4864238670177444671341, -12160596416621204429554]], -221405029296875] -]]]]]: diff --git a/output_files/radical_shape-31.res b/output_files/radical_shape-31.P2.d0.res similarity index 100% rename from output_files/radical_shape-31.res rename to output_files/radical_shape-31.P2.d0.res diff --git a/output_files/radical_shape-qq.res b/output_files/radical_shape-qq.P2.d0.res similarity index 100% rename from output_files/radical_shape-qq.res rename to output_files/radical_shape-qq.P2.d0.res diff --git a/output_files/realroot-extraction-exact-root.p256.res b/output_files/realroot-extraction-exact-root.p1024.res similarity index 100% rename from output_files/realroot-extraction-exact-root.p256.res rename to output_files/realroot-extraction-exact-root.p1024.res diff --git a/output_files/realroot-extraction-exact-root.res b/output_files/realroot-extraction-exact-root.p128.res similarity index 100% rename from output_files/realroot-extraction-exact-root.res rename to output_files/realroot-extraction-exact-root.p128.res diff --git a/output_files/realroot1.p1024.res b/output_files/realroot1.p1024.res new file mode 100644 index 00000000..7aa6d61c --- /dev/null +++ b/output_files/realroot1.p1024.res @@ -0,0 +1,3 @@ +[0, [1, +[[[2410312426921032588580116606028314112912093247945688951359675039065257391591803200669085024107346049663448766280888004787862416978794958324969612987890774651455213339381625224770782077917681499676845543137387820057597345857904599109461387122099507964997815641342300677629473355281617428411794163967785870370368969109221591943054232011562758450080579587850900993714892283476646631181515063804873375182260506246992837898705971012525843324401232986857004760339316735 / 2^2048, 2410312426921032588580116606028314112912093247945688951359675039065257391591803200669085024107346049663448766280888004787862416978794958324969612987890774651455213339381625224770782077917681499676845543137387820057597345857904599109461387122099507964997815641342300677629473355281617428411794163967785870370368969109221591943054232011562758450080579587850900993714892283476646631181515063804873375182260506246992837898705971012525843324401232986857004760339316737 / 2^2048], [316350937758347701346133245459517540456385896585496644349663671414600407040834985561402038757799827910099324174044708498799894936176455628815547700507931013419273944507476003761855833096727225077100078508080645818674215465655603297023600844581473207935003938230931053440388648595872036684910387401725668224099725185767519142334289140137971095606512585990299067615583918612000772139096130795562481473293558971837340908411998266480587133242029322476576759872812770932960291046675930901069250075813192682368630672900789854206257863569127198243906560429026556949402329459836300800233071106644330836568950534418276555326897 / 2^2048, 158175468879173850673066622729758770228192948292748322174831835707300203520417492780701019378899913955049662087022354249399947468088227814407773850253965506709636972253738001880927916548363612538550039254040322909337107732827801648511800422290736603967501969115465526720194324297936018342455193700862834112049862592883759571167144570068985547803256292995149533807791959306000386069548065397781240736646779485918670454205999133240293566621014661238288379936406385466480145523337965450534625037906596341184315336450394927103128931784563599121953280214513278474701164729918150400116535553322165418284475267209138277663449 / 2^2047], [-60422265724246461517236887797073286481576773353202326845473869531524731903761834720007749773175385223963733217605047676711910573611725064497450009854508530513032112156822537039391131259241652737311055742585527866164996777795154226135147219872274809628094470904488710841334549721699988135852820573525388418289559249771644507459869291847801330630104219398041704179774490936573054771165219647471499342181350227580455862825214523143686828259936346664442122849037487986726659134795549556590533040699308639824159720317730767083879201950048696234289728412105042863231819379189389179033873724416510322544497108053171818068471 / 2^2047, -120844531448492923034473775594146572963153546706404653690947739063049463807523669440015499546350770447927466435210095353423821147223450128994900019709017061026064224313645074078782262518483305474622111485171055732329993555590308452270294439744549619256188941808977421682669099443399976271705641147050776836579118499543289014919738583695602661260208438796083408359548981873146109542330439294942998684362700455160911725650429046287373656519872693328884245698074975973453318269591099113181066081398617279648319440635461534167758403900097392468579456824210085726463638758378778358067747448833020645088994216106343636136941 / 2^2048], [-950676485396675830575370391248163467571871698584967059590674364990615667241525832234894259617136635046587558324856597754335327538186450738823012198411423302767997140776049965434321021611831071201910848891854534993159051582596015106910946231571260739895530500309713519238455677390332069078064402574120024154486633589951252352809413488890424749740384143681233735190419572693974739927397252784561257860066499525769020808435203685973076908579228430982859461217868880797964510277554997726684054773492987155118162089480117655495618467519576106018685170127464541734344419301047792745787185671612094073772686486182048173721222356459 / 2^2070, -475338242698337915287685195624081733785935849292483529795337182495307833620762916117447129808568317523293779162428298877167663769093225369411506099205711651383998570388024982717160510805915535600955424445927267496579525791298007553455473115785630369947765250154856759619227838695166034539032201287060012077243316794975626176404706744445212374870192071840616867595209786346987369963698626392280628930033249762884510404217601842986538454289614215491429730608934440398982255138777498863342027386746493577559081044740058827747809233759788053009342585063732270867172209650523896372893592835806047036886343243091024086860611178229 / 2^2069]], [[2410312426921032588580116606028314112912093247945688951359675039065257391591803200669085024107346049663448766280888004787862416978794958324969612987890774651455213339381625224770782077917681499676845543137387820057597345857904599109461387122099507964997815641342300677629473355281617428411794163967785870370368969109221591943054232011562758450080579587850900993714892283476646631181515063804873375182260506246992837898705971012525843324401232986857004760339316735 / 2^2048, 2410312426921032588580116606028314112912093247945688951359675039065257391591803200669085024107346049663448766280888004787862416978794958324969612987890774651455213339381625224770782077917681499676845543137387820057597345857904599109461387122099507964997815641342300677629473355281617428411794163967785870370368969109221591943054232011562758450080579587850900993714892283476646631181515063804873375182260506246992837898705971012525843324401232986857004760339316737 / 2^2048], [-41583310638648933490716436075470039636586400676924452434433295668879220706941811453553400991243883140300306661605063493589630628172176096147282405642467611642715103495484758407566272103804920317665928445718399563024637867248157264290418658273183286110483553726956130268220944626812778623659358410131718818478242347538383716390935798457512709727836688442571047619648506869495757791655463121515092694485979702910264400471909074231620726317124901401905956568364548579740044863535209166106142092889252745203322058198668853354173571072253759593161847104502628254564659445681479814708531253652540822360793973316470423419513 / 2^2047, -83166621277297866981432872150940079273172801353848904868866591337758441413883622907106801982487766280600613323210126987179261256344352192294564811284935223285430206990969516815132544207609840635331856891436799126049275734496314528580837316546366572220967107453912260536441889253625557247318716820263437636956484695076767432781871596915025419455673376885142095239297013738991515583310926243030185388971959405820528800943818148463241452634249802803811913136729097159480089727070418332212284185778505490406644116397337706708347142144507519186323694209005256509129318891362959629417062507305081644721587946632940846839019 / 2^2048], [-877357889150386949727066127060835683097030372399109408875179682440003290709142404282226804809686859204870236160021070212881512905597080255422586793547824142732661811163217762616684244713754630218521738150589469479381030383003214732630885133963667678544284271974601659270294926006981108620302095746988515342133588490021778833072072772447469390969077220813741873962612495932349428479894588908139637952396127859052866739023144520326963572466185704995075267654601546925176370364306938281739455842448788785828092952179410461879767081726078120876413699250637846194068482079002217247075977398118670308190771238498589363991 / 2^2041, -112301809811249529565064464263786967436419887667086004336022999352320421210770227748125031015639917978223390228482696987248833651916426272694091109574121490269780711828891873614935583323360592667970782483275452093360771889024411485776753297147349462853668386812749012386597750528893581903398668255614529963793099326722787690633225314873276082044041884264158959867214399479340726845426507380241873657906704365958766942594962498601851337275671770239369634259788998006422575406631288100062650347833444964585995897878964539120610186460937999472180953504081644312840765706112283807625725106959189799448418718527819438590839 / 2^2048], [-6255933507478059456813612221418198226972882207708639115150078003228060287858842146658227671586518300872736712363303230057072250837659341671682349742666502431869556519195665963790114218963206696955540527542193079285449328842880038680372874414865061069391465742969719552383380309725279825360572851687729853168806017705677346151132426840513325898200213910697590402007550015209178478554093777448605385599308422351570768699069579662014314511471081483569192950149896986587305950804562159157648096880877294884884759520031103187036300246655356692106876913325805612808661785505522258146266941965502067285911480598988614255918427 / 2^2053, -12511867014956118913627224442836396453945764415417278230300156006456120575717684293316455343173036601745473424726606460114144501675318683343364699485333004863739113038391331927580228437926413393911081055084386158570898657685760077360745748829730122138782931485939439104766760619450559650721145703375459706337612035411354692302264853681026651796400427821395180804015100030418356957108187554897210771198616844703141537398139159324028629022942162967138385900299793973174611901609124318315296193761754589769769519040062206374072600493310713384213753826651611225617323571011044516292533883931004134571822961197977228511836853 / 2^2054]], [[2410312426921032588580116606028314112912093247945688951359675039065257391591803200669085024107346049663448766280888004787862416978794958324969612987890774651455213339381625224770782077917681499676845543137387820057597345857904599109461387122099507964997815641342300677629473355281617428411794163967785870370368969109221591943054232011562758450080579587850900993714892283476646631181515063804873375182260506246992837898705971012525843324401232986857004760339316735 / 2^2048, 2410312426921032588580116606028314112912093247945688951359675039065257391591803200669085024107346049663448766280888004787862416978794958324969612987890774651455213339381625224770782077917681499676845543137387820057597345857904599109461387122099507964997815641342300677629473355281617428411794163967785870370368969109221591943054232011562758450080579587850900993714892283476646631181515063804873375182260506246992837898705971012525843324401232986857004760339316737 / 2^2048], [-89104614558577110864434737009494084459453735852655043759185311828084251419551209153092099214970571892340655223730541095998346010474342618702240276793086660006605574773453742120400024321566637706990522143496113700096760545347973011643183908608318869707010075331337300338171657941479310439770504193181658170915345955393611246925753022259321643989396342815255673508378785815514651256187156124288533083856606882386001519147803884599915832212261063292052284919252212331364192829140269476711415387286161094712593004683003459548804397011206762894200774653812264215023505309361270904444042936180675498211538059622451763911523 / 2^2047, -178209229117154221728869474018988168918907471705310087518370623656168502839102418306184198429941143784681310447461082191996692020948685237404480553586173320013211149546907484240800048643133275413981044286992227400193521090695946023286367817216637739414020150662674600676343315882958620879541008386363316341830691910787222493851506044518643287978792685630511347016757571631029302512374312248577066167713213764772003038295607769199831664424522126584104569838504424662728385658280538953422830774572322189425186009366006919097608794022413525788401549307624528430047010618722541808888085872361350996423076119244903527823007 / 2^2048], [2337759392464213159991129810325108149721211392392786974537672461437455898378545035291589402641195987458370973453874463016165153519197717122193735976245518366589084028546095215028523767598397990944393818747324934544892825077500408193319786063869844522068670415968872793584148969026815465416160881531935516551294340750286605856208348841335173947460595370618104918022258672396762591470737018741872427958886459018427166541925667861056542337820393628245341589233090272560684648460594224353855158281688180984024575612091695024302553972815533976851240625791141929884052166728425813211271857596284466424886882163648496158863 / 2^2048, 2337759392464213159991129810325108149721211392392786974537672461437455898378545035291589402641195987458370973453874463016165153519197717122193735976245518366589084028546095215028523767598397990944393818747324934544892825077500408193319786063869844522068670415968872793584148969026815465416160881531935516551294340750286605856208348841335173947460595370618104918022258672396762591470737018741872427958886459018427166541925667861056542337820393628245341589233090272560684648460594224353855158281688180984024575612091695024302553972815533976851240625791141929884052166728425813211271857596284466424886882163648496158873 / 2^2048], [-7759826094031607667810577767992269121542452974644502561552480736165463649363024998194745303719745211694857290266638275196341571241226530466527186027878417142214230931460743042745669932780439070174800345429918072907714766021346210925916197145698561835478839030894547397876834138449107686764059998547144501419723835082597055146187357752895283483557608352646162991493926125684120359421177004404145778850168507301489425985839607728833614500340988938098713972376488146020086744188358804995104548694845990291701208892695531754180453404143347526070868013878514407108511141560612131097117597242945018826936816618044108928658387 / 2^2054, -3879913047015803833905288883996134560771226487322251280776240368082731824681512499097372651859872605847428645133319137598170785620613265233263593013939208571107115465730371521372834966390219535087400172714959036453857383010673105462958098572849280917739419515447273698938417069224553843382029999273572250709861917541298527573093678876447641741778804176323081495746963062842060179710588502202072889425084253650744712992919803864416807250170494469049356986188244073010043372094179402497552274347422995145850604446347765877090226702071673763035434006939257203554255570780306065548558798621472509413468408309022054464329193 / 2^2053]], [[2410312426921032588580116606028314112912093247945688951359675039065257391591803200669085024107346049663448766280888004787862416978794958324969612987890774651455213339381625224770782077917681499676845543137387820057597345857904599109461387122099507964997815641342300677629473355281617428411794163967785870370368969109221591943054232011562758450080579587850900993714892283476646631181515063804873375182260506246992837898705971012525843324401232986857004760339316735 / 2^2048, 2410312426921032588580116606028314112912093247945688951359675039065257391591803200669085024107346049663448766280888004787862416978794958324969612987890774651455213339381625224770782077917681499676845543137387820057597345857904599109461387122099507964997815641342300677629473355281617428411794163967785870370368969109221591943054232011562758450080579587850900993714892283476646631181515063804873375182260506246992837898705971012525843324401232986857004760339316737 / 2^2048], [-79886257712650007334701286934135689351338903053057536659529493481960321339893071790162488167177653442801751615680391982631005587328360957612438624815917695604538632337555001492426617497086102216298922426398919667932345728227736351726573843991645009140835832145138161906402124964686001027610326852802888904437262183310667722910105176784469790221265191157462380016726527035144243910981162075339066771151434503743242096589546020613878488332147497157150224955513075714991447481355939116480465124732586616075596733633915249407511460015038390946751716220652789317168416119376170617301383631595804972518308239847041975298823 / 2^2047, -159772515425300014669402573868271378702677806106115073319058986963920642679786143580324976334355306885603503231360783965262011174656721915224877249631835391209077264675110002984853234994172204432597844852797839335864691456455472703453147687983290018281671664290276323812804249929372002055220653705605777808874524366621335445820210353568939580442530382314924760033453054070288487821962324150678133542302869007486484193179092041227756976664294994314300449911026151429982894962711878232960930249465173232151193467267830498815022920030076781893503432441305578634336832238752341234602767263191609945036616479694083950597645 / 2^2048], [181376190284647691300747440635869835977468966019599426250341886908972603325894668907012343524405193169701504137199219269963864064039260335109479122312650273630680891570602713346671638735675194851708558555502809179490476760259803869316815032243125586777212890250491494246397607630017218494675716461392873909708741300630991356538606042899354348660980224807396025810508692704927111804163744986903005775600716544650659985219965748772267727512148654916660208191308831998178466489817191147207135010007429080743365737781322635546529524147155778636960812990216653396491326133903053996971271423677786628081875539672371470408289 / 2^2048, 90688095142323845650373720317934917988734483009799713125170943454486301662947334453506171762202596584850752068599609634981932032019630167554739561156325136815340445785301356673335819367837597425854279277751404589745238380129901934658407516121562793388606445125245747123198803815008609247337858230696436954854370650315495678269303021449677174330490112403698012905254346352463555902081872493451502887800358272325329992609982874386133863756074327458330104095654415999089233244908595573603567505003714540371682868890661317773264762073577889318480406495108326698245663066951526998485635711838893314040937769836185735204145 / 2^2047], [-6097439020130823771909119927254684172416305600503933599671355716600010774923179620966183354972249855453457062229524906313270926542165793444104639235825091448008634735352124930054926392480660914326858299218353554964838597611247598024490229926283571433503665767641153098431336761268625508366370070089878146733262145732498550039052779310056294842106530451714390363457648477080989481170163479813599888965755482507934398787208635026488164485015258177484140386092117292543647531765678438003434691592618174461976780487200779232109440522377542875298139257666245585632628140015226590698515786454073489292737280364124558792340274346163096183888496642448086237599789773929340451622651927845532781907840393889231302715605710174897674003629789758832941586913407859040098947757432821824154354669502213325927332340974696410808526441563520105865520595543504899584877377697621921219660916358172125717336941806053134222670185827463690088749715 / 2^3071, -12194878040261647543818239854509368344832611201007867199342711433200021549846359241932366709944499710906914124459049812626541853084331586888209278471650182896017269470704249860109852784961321828653716598436707109929677195222495196048980459852567142867007331535282306196862673522537251016732740140179756293466524291464997100078105558620112589684213060903428780726915296954161978962340326959627199777931510965015868797574417270052976328970030516354968280772184234585087295063531356876006869383185236348923953560974401558464218881044755085750596278515332491171265256280030453181397031572908146978585474560728249117584680548692326192367776993284896172475199579547858680903245303855691065563815680787778462605431211420349795348007259579517665883173826815718080197895514865643648308709339004426651854664681949392821617052883127040211731041191087009799169754755395243842439321832716344251434673883612106268445340371654927380177499429 / 2^3072]], [[2410312426921032588580116606028314112912093247945688951359675039065257391591803200669085024107346049663448766280888004787862416978794958324969612987890774651455213339381625224770782077917681499676845543137387820057597345857904599109461387122099507964997815641342300677629473355281617428411794163967785870370368969109221591943054232011562758450080579587850900993714892283476646631181515063804873375182260506246992837898705971012525843324401232986857004760339316735 / 2^2048, 2410312426921032588580116606028314112912093247945688951359675039065257391591803200669085024107346049663448766280888004787862416978794958324969612987890774651455213339381625224770782077917681499676845543137387820057597345857904599109461387122099507964997815641342300677629473355281617428411794163967785870370368969109221591943054232011562758450080579587850900993714892283476646631181515063804873375182260506246992837898705971012525843324401232986857004760339316737 / 2^2048], [-6135996125493583980861438765179910649373339837482805095946560304807057107468849893843714441061138638071655417524425860528084612380019359521820952247570390881287885013622394542477762454872691456519007868357088027732228184801695499122342194445879098280942436886140139341797740141529420469771905278892397572861452429905775761078045429825854307286868520308690015331155989923131193348832135291393448424191030975298444357869428149455765780279650817395667070096518072273934407984821770317552243995127876783876616313372071851320835971479735554494439485434603732221520011194658309946756249121203754605118412053705015609160595 / 2^2042, -196351876015794687387566040485757140779946874799449763070289929753825827439003196602998862113956436418292973360781627536898707596160619504698270471922252508201212320435916625359288398555926126608608251787426816887431301913654255971914950222268131144990157980356484458937527684528941455032700968924556722331566477756984824354497453754427337833179792649878080490596991677540198187162628329324590349574112991209550219451821700782584504968948826156661346243088578312765901055514296650161671807844092057084051722027906299242266751087351537743822063533907319431088640358229065918296199971878520147363789185718560499493139039 / 2^2047], [320727257243796395466426619293905183430148116314228615964748038608515126072741017054761488359871241926904613772020911601489162698452638160332729143370991087993381710396845020109585172454276260657716123907061546613572732921379358674175966722120958815249360440209006419772132033390117347845815216727005035317262793081409080031844297181459960035177115269589010445278057558498364011053970058946327274913883710720232245294602092434265918596260610742484183256617447269035353938788450667336279060919770792288257571521696682516847469747335967116583820219547953838289465400987515495421855124507274686720553822937145341229477275 / 2^2048, 80181814310949098866606654823476295857537029078557153991187009652128781518185254263690372089967810481726153443005227900372290674613159540083182285842747771998345427599211255027396293113569065164429030976765386653393183230344839668543991680530239703812340110052251604943033008347529336961453804181751258829315698270352270007961074295364990008794278817397252611319514389624591002763492514736581818728470927680058061323650523108566479649065152685621045814154361817258838484697112666834069765229942698072064392880424170629211867436833991779145955054886988459572366350246878873855463781126818671680138455734286335307369319 / 2^2046], [7879903182231050871195727390511945815789870165994879705553333959139886388253567121617483773840190217721743079176985103202614407897941760253784705878968242700301857810790432092605579411201959717209304619269640503431306719056447550035003260094562395718641307959911655067031683517278126093650075035777623469452706886594378010643695188603219309311779010424922784497562937276994350869017430700094113439069582318627482612369084167379397869841091571576196804060283656133439886492555674233297185599719664464625903570969137627055564511065830677556576629926480000796030832737520204603403370909009341203968868244310332499862488093 / 2^2053, 31519612728924203484782909562047783263159480663979518822213335836559545553014268486469935095360760870886972316707940412810457631591767041015138823515872970801207431243161728370422317644807838868837218477078562013725226876225790200140013040378249582874565231839646620268126734069112504374600300143110493877810827546377512042574780754412877237247116041699691137990251749107977403476069722800376453756278329274509930449476336669517591479364366286304787216241134624533759545970222696933188742398878657858503614283876550508222258044263322710226306519705920003184123330950080818413613483636037364815875472977241329999449952373 / 2^2055]]] +]]: diff --git a/output_files/realroot1.p128.res b/output_files/realroot1.p128.res new file mode 100644 index 00000000..e70356fb --- /dev/null +++ b/output_files/realroot1.p128.res @@ -0,0 +1,3 @@ +[0, [1, +[[[3351951982485649274893506249551461531869841455148098344430890360930441007518386743826873921110469881468742445858189974082835461967640050758932280147505953 / 2^1022, 3351951982485649274893506249551461531869841455148098344430890360930441007518386744574063227972981832376273483235053051344041479438333234214284544355536095 / 2^1022], [1133487920706302220754844119459477942517142683955105676004395488934583434495897 / 2^256, 566743960353151110377422059729738971258571341977552838002197744467291717247949 / 2^255], [-432986915262163296488672656971016926676698899978692891301922203344823302741149 / 2^256, -108246728815540824122168164242754231669174724994673222825480550836205825685287 / 2^254], [-3406281392216984996767606108227347130501692605328853362369390598310060505085474386643 / 2^278, -1703140696108492498383803054113673565250846302664426681184695299155030252542737193321 / 2^277]], [[6703903964971298549787012499102923063739682910296196688861780721860882015036677445574631664465499104533063337392497090514689289637171432004803178047503773 / 2^1023, 1675975991242824637446753124775730765934920727574049172215445180465220503759217382806810658425351080789242130198497240084766148293693784485407617739645081 / 2^1021], [-297986664088165384580450941044217465673802383853678943248455290873840987266045 / 2^256, -148993332044082692290225470522108732836901191926839471624227645436920493633019 / 2^255], [-402378275836638975973134516736872145626753749127962158244176271693818674354321 / 2^256, -50297284479579871996641814592109018203344218640995269780522033961727334294289 / 2^253], [-44830118814977816938535905645064381280221215513638443460206698766948213691606597 / 2^262, -11207529703744454234633976411266095320055303878409610865051674691737053422901649 / 2^260]], [[13407807929942597099574024998205846127479365820592393377723561443721764030072964492396886652192771423347270192964684484495515737032112977648521549950588767 / 2^1024, 6703903964971298549787012499102923063739682910296196688861780721860882015037064730603430972070517716016396761704143808605996014295890081122172874030789725 / 2^1023], [-638525082283704824270622524797012039848725365066661270254342023017320538552979 / 2^256, -638525082283704824270622524797012039848725365066661270254342023017320538552941 / 2^256], [4188105228409374608115984102217844833217210580304831829801532012050559747041 / 2^255, 2094052614204687304057992051108922416608605290152415914900766006025279873523 / 2^254], [-3475439810093584242852299248532514534926250626633541388912237744559493377780545 / 2^259, -27803518480748673942818393988260116279410005013068331111297901956475947022244359 / 2^262]], [[6703903964971298549787012499102923063739682910296196688861780721860882015036773488400937149083451713845015929093200722151932417498588844863721063001066533 / 2^1023, 6703903964971298549787012499102923063739682910296196688861780721860882015036773488400937149083451713845015929093285328701821465313357725082712586005017563 / 2^1023], [-143116547700718910444012634357589314212005034720512043074114343931771984810269 / 2^254, -572466190802875641776050537430357256848020138882048172296457375727087939241075 / 2^256], [162468082320352617176198792492807650793171949556762510600892578626574932908173 / 2^254, 649872329281410468704795169971230603172687798227050042403570314506299731632693 / 2^256], [-82708304227448008864751727050211745259747178918970416403197364825532878654722996558530034714830816945112093314974407 / 2^384, -41354152113724004432375863525105872629873589459485208201598682412766439327361498279265017357415408472556046657487203 / 2^383]], [[3351951982485649274893506249551461531869841455148098344430890360930441007518385948466867288609802885085541794402326243790114398083380030632332186105110201 / 2^1022, 3351951982485649274893506249551461531869841455148098344430890360930441007518387539934069860473648828759474134690916781636762543322593254340884638397931847 / 2^1022], [-175882582527647266591363483253945070147815313166911466979730357097877427897217 / 2^253, -1407060660221178132730907866031560561182522505335291735837842856783019423177735 / 2^256], [574584154077654807608862786833290447103510413230330832217204253718108577789903 / 2^255, 1149168308155309615217725573666580894207020826460661664434408507436217155579807 / 2^256], [112935022563034725423443496126943426397536914129365255452220362773879940388002573 / 2^263, 56467511281517362711721748063471713198768457064682627726110181386939970194001287 / 2^262]]] +]]: diff --git a/output_files/realroot1.p256.res b/output_files/realroot1.p256.res deleted file mode 100644 index b8aca53f..00000000 --- a/output_files/realroot1.p256.res +++ /dev/null @@ -1,3 +0,0 @@ -[0, [1, -[[[13407807929942597099574024998205846127479365820592393377723561443721764030073546976801874298166903427690031858186486050853753882811946569946433649006084095 / 2^1024, 13407807929942597099574024998205846127479365820592393377723561443721764030073546976801874298166903427690031858186486050853753882811946569946433649006084097 / 2^1024], [65624467231922065253568254040093051011219173809650545574622495262169651789058181066111381676960325221556729001699448370359731517525322763810111654247126559 / 2^511, 131248934463844130507136508080186102022438347619301091149244990524339303578116362132222763353920650443113458003398896740719463035050645527620223308494253119 / 2^512], [-12534114882656669539438621743167727273295042028174985113836470589471354376965882981606504556036620834316850001957925417051445881487100743810023829461209039 / 2^510, -50136459530626678157754486972670909093180168112699940455345882357885417507863531926426018224146483337267400007831701668205783525948402975240095317844836155 / 2^512], [-394420438934998774600418817123893319701184916891740463356700591939987212376342463344133255432368496180860854258027839533810017580881177551500944637658390363413005 / 2^534, -98605109733749693650104704280973329925296229222935115839175147984996803094085615836033313858092124045215213564506959883452504395220294387875236159414597590853251 / 2^532]], [[6703903964971298549787012499102923063739682910296196688861780721860882015036773488400937149083451713845015929093243025426876941405973284973216824503042047 / 2^1023, 6703903964971298549787012499102923063739682910296196688861780721860882015036773488400937149083451713845015929093243025426876941405973284973216824503042049 / 2^1023], [-17252249199813505733211930726073644951092550053525911912922211848509415055424287662395434404896841768593479861865640376159851109867202148815179126304171493 / 2^511, -34504498399627011466423861452147289902185100107051823825844423697018830110848575324790868809793683537186959723731280752319702219734404297630358252608342979 / 2^512], [-23296110611416765654698709789915645164075318681108666205329697301832951351802498907942346073056339625067843188301831168322895228279321784598504085673945695 / 2^511, -23296110611416765654698709789915645164075318681108666205329697301832951351802498907942346073056339625067843188301831168322895228279321784598504085673945691 / 2^511], [-5190973118343399149529839225925453861616018708281702408078518743173866846890130617343571070076014822205267636561358312567272895259927800473560638989371216649 / 2^518, -648871639792924893691229903240681732702002338535212801009814842896733355861266327167946383759501852775658454570169789070909111907490975059195079873671402081 / 2^515]], [[6703903964971298549787012499102923063739682910296196688861780721860882015036773488400937149083451713845015929093243025426876941405973284973216824503042045 / 2^1023, 6703903964971298549787012499102923063739682910296196688861780721860882015036773488400937149083451713845015929093243025426876941405973284973216824503042051 / 2^1023], [-73936153308059415471764720931410461860797150363459732869658524248118143631789658079455704742759893771285295382858181855054883018299401855194839701722809039 / 2^512, -73936153308059415471764720931410461860797150363459732869658524248118143631789658079455704742759893771285295382858181855054883018299401855194839701722809001 / 2^512], [242474727171624415948492347365844955216401334866549618643383843551938044451935851789951590591720266628686408507950657605706398118178785747384076331335473 / 2^510, 484949454343248831896984694731689910432802669733099237286767687103876088903871703579903181183440533257372817015901315211412796236357571494768152662670951 / 2^511], [-804856873258555116264757037132240735660353002171003513578417323115929691989118996138739503812931826797314076950349440834924820468897779648391917991893224587 / 2^516, -3219427493034220465059028148528962942641412008684014054313669292463718767956475984554958015251727307189256307801397763339699281875591118593567671967572898347 / 2^518]], [[13407807929942597099574024998205846127479365820592393377723561443721764030073546976801874298166903427690031858186486050853753882811946569946433649006084095 / 2^1024, 13407807929942597099574024998205846127479365820592393377723561443721764030073546976801874298166903427690031858186486050853753882811946569946433649006084097 / 2^1024], [-66287056250793056178427072585654624391816001386471113344993062726732809368337643529200709642000234545610999704461023914105851072687648352918215290616821491 / 2^512, -33143528125396528089213536292827312195908000693235556672496531363366404684168821764600354821000117272805499852230511957052925536343824176459107645308410745 / 2^511], [75250074745015615733915836357884834765834841903481282000065236397139328547685853543342659360732516051729173096819932189873063527747131416433355026743638921 / 2^512, 37625037372507807866957918178942417382917420951740641000032618198569664273842926771671329680366258025864586548409966094936531763873565708216677513371819461 / 2^511], [-1629436557831593072628694684018207917559578144543269085321633017408310146873426345763183158206043807605862579077642911376560833328242852727916520913888113604595241791341936006228328568996870622243946188329354122786469343830465775009 / 2^767, -3258873115663186145257389368036415835119156289086538170643266034816620293746852691526366316412087615211725158155285822753121666656485705455833041827776227209190483582683872012456657137993741244487892376658708245572938687660931550017 / 2^768]], [[13407807929942597099574024998205846127479365820592393377723561443721764030073546976801874298166903427690031858186486050853753882811946569946433649006084095 / 2^1024, 13407807929942597099574024998205846127479365820592393377723561443721764030073546976801874298166903427690031858186486050853753882811946569946433649006084097 / 2^1024], [-162926493530647700643899019368089703872770501251574701821831325569173527759259523188879873037162897178376013509706958488328014968273565191131441138380125951 / 2^512, -81463246765323850321949509684044851936385250625787350910915662784586763879629761594439936518581448589188006754853479244164007484136782595565720569190062975 / 2^511], [133064599286615287580606533160073415991358623304076476454106570822949899982568100164606368349908020095307132908653026840730479010071396981767901139479273271 / 2^512, 16633074910826910947575816645009176998919827913009559556763321352868737497821012520575796043738502511913391613581628355091309876258924622720987642434909159 / 2^509], [3269245552659308730264119857341643782994777680933943287703180286322948146595104712861827494897629024582472567543158825634657816269669005154009215097904229405 / 2^517, 13076982210637234921056479429366575131979110723735773150812721145291792586380418851447309979590516098329890270172635302538631265078676020616036860391616917621 / 2^519]]] -]]: diff --git a/output_files/realroot1.res b/output_files/realroot1.res deleted file mode 100644 index 83e0a6d0..00000000 --- a/output_files/realroot1.res +++ /dev/null @@ -1,3 +0,0 @@ -[0, [1, -[[[13407807929942597099574024998205846127479365312081701623341610371089426530917628571235009820073288923415308210485454055651618979966920299626849113173350229 / 2^1024, 3351951982485649274893506249551461531869841582275771283026378129088525382307366345592189515567737881915518883842800064713301772842031483769783033293710027 / 2^1022], [3331021618788898068800055232841681007971 / 2^128, 832755404697224517200013808210420251993 / 2^126], [-159054272772075454791813843974719060419 / 2^125, -1272434182176603638334510751797752483351 / 2^128], [-5005080667327678093976840349995031334612085417 / 2^149, -10010161334655356187953680699990062669224170833 / 2^150]], [[6703903964971298549787012499102923063707001230035189811403807969852662368560520573945053647857757386158722605114329178747973967864935522188587218085924507 / 2^1023, 6703903964971298549787012499102923063772364590557203566319753473869101661513185726771701232789163210338790795070503845157527685297713575956936270780076469 / 2^1023], [-437852050320021278576089641308992277253 / 2^127, -875704100640042557152179282617984554499 / 2^128], [-1182483475348953172361680291533996441395 / 2^128, -591241737674476586180840145766998220693 / 2^127], [-131743878534245914672234329431702004798991 / 2^134, -65871939267122957336117164715851002399495 / 2^133]], [[1675975991242824637446753124775730765910144581071082838994355938717875779113389624235074940076659307395728079296350118700830060737022984535589055287969235 / 2^1021, 13407807929942597099574024998205846127677574992616124043492275377700521827242907108788500510411142991897137022729562796782574367524732323534002904604501025 / 2^1024], [-1876456567707078291711149331740128854239 / 2^128, -1876456567707078291711149331740128854201 / 2^128], [24615470183222529751266921176376867327 / 2^128, 24615470183222529751266921176376867337 / 2^128], [-1276674957308716246643468125582223208451 / 2^128, -81707197267757839785181960037262285340863 / 2^134]], [[13407807929942597099574024998205846127479365820592393377192477522588142209153242496273334101918897725174063653409802998512265937612157542259380722079760773 / 2^1024, 13407807929942597099574024998205846127479365820592393378254645364855385850993851457330414494414909130206000062984205363019398675440329845776597083085063811 / 2^1024], [-841163466656917597615029034157611572619 / 2^127, -1682326933313835195230058068315223145237 / 2^128], [119362695597815541271248082166885526263 / 2^124, 1909803129565048660339969314670168420209 / 2^128], [-13176193044822943031961513278500639186668490962664071572429 / 2^192, -3294048261205735757990378319625159796667122740666017893107 / 2^190]], [[13407807929942597099574024998205846127478282724139256980774128523129783660231445751083399030220746936878006439976993171945366873101767115731435484185443249 / 2^1024, 3351951982485649274893506249551461531870112229261382443668248591078436099978912072503497514313073212130832527422872977915161511593218199799101398505222675 / 2^1022], [-4134979643385682623057124934752951502209 / 2^128, -32304528463950645492633788552757433611 / 2^121], [1688551067975715149423486339417510791901 / 2^127, 844275533987857574711743169708755395951 / 2^126], [41485775322760905267128138954116311575617 / 2^132, 331886202582087242137025111632930492604937 / 2^135]]] -]]: diff --git a/output_files/reals_dim0-chgvar.p1024.res b/output_files/reals_dim0-chgvar.p1024.res new file mode 100644 index 00000000..4865de83 --- /dev/null +++ b/output_files/reals_dim0-chgvar.p1024.res @@ -0,0 +1,3 @@ +[0, [1, +[[[457566008174563752616868194829800408536251922230391600017415631124979660554946796137982512995104674286062201101207419569485748565916334340458167091482279135504387509549740113170553146976483119754205497308829931258565493850028602959707765528060478345913400761522776268596139602678175920043252833005762459006223837055716261801890635768221489126969612645550663072058085837241843515156185749150288523595229876931396710153655247177237655519166725223706359408291633388255986288427673605063044433405480983897210104060413185595793381073311284424007291337457129471505928101151565236924800028730981027986721502495872996610511 / 2^2040, 117136898092688320669918257876428904585280492090980249604458401567994793102066379811323523326746796617231923481909099409788351632874581591157290775419463458689123202444733468971661605625979678657076607311060462402192766425607322357685187975183482456553830594949830724760611738285613035531072725249475189505593302286263363021284002756664701216504220837260969746446869974333911939879983551782473862040378848494437557799335743277372839812906681657268828008522658147393532489837484442896139374951803131877685786639465775512523105554767688812545866582389025144705517593894800700652748807355131143164600704638943487132290817 / 2^2048], [436740146806477601413925691678243151271632068461594636904481744857162487633592672438492614441931606467099673517898109944138160009346444764792334050122361053704484987373487247406513478966928665607282906107265580570524634442934473146370945956111269857100928017018206307297912212923670425760218607598618062617567793428325151573500179389544437798386871822570916359843107751324787590007107902021722035165884691116021609660072559576566918050100188148241242227088804307436106574203220293130031836767481055708597665942846220818932622500987779428552653494666033357061184853933139203392157941104227751468053583069503961873419 / 2^2045, 3493921174451820811311405533425945210173056547692757095235853958857299901068741379507940915535452851736797388143184879553105280074771558118338672400978888429635879898987897979252107831735429324858263248858124644564197075543475785170967567648890158856807424136145650458383297703389363406081748860788944500940542347426601212588001435116355502387094974580567330878744862010598300720056863216173776281327077528928172877280580476612535344400801505185929937816710434459488852593625762345040254694139848445668781327542769766551460980007902235428421227957328266856489478831465113627137263528833822011744428664556031694987353 / 2^2048], [129603291718592805362028988737304644336695936696582695440081807239933021862954879899760053234583710476218073186632825882765786980013286057247558206102862150975992960528703299033382835149587193723245786052300827106724188016883649944789802738307603310280235491114100262482820879475446639330902327894863405113763058172397726090291784607779185348454920516412011621565501059818703245553273034965823402629744383806349166184305985086756048214452355477589217979400366806808950029907272247925744308202971674632953319683570388819648890937426128622925037862138693000434900651192757736836029070782271469939283588826188379742911895 / 2^2047, 259206583437185610724057977474609288673391873393165390880163614479866043725909759799520106469167420952436146373265651765531573960026572114495116412205724301951985921057406598066765670299174387446491572104601654213448376033767299889579605476615206620560470982228200524965641758950893278661804655789726810227526116344795452180583569215558370696909841032824023243131002119637406491106546069931646805259488767612698332368611970173512096428904710955178435958800733613617900059814544495851488616405943349265906639367140777639297781874852257245850075724277386000869801302385515473672058141564542939878567177652376759485823791 / 2^2048], [-2557780274959349713509956625484063653803669206189309088758735471661067283645350234390862857377043177988358067127081279710859771355170014181319178313381262558184387764744071483381826976901213777393628497503047207131927367522192518517397969131061031427733542615184079954301607549232904308535454336223258694745516252583629124765581978626814293293992679988249632588394909500022851131663998574411247598196413483885676820848261213249337618176382740151847110830020439620124477629756013754115886189869819721497866521977944037427141514322377888100543147572431225004997632431216814121258328087356747486384115422380674586676564355625522489 / 2^2080, -319722534369918714188744578185507956725458650773663636094841933957633410455668779298857857172130397248544758390885159963857471419396251772664897289172657819773048470593008935422728372112651722174203562187880900891490920940274064814674746141382628928466692826898009994287700943654113038566931792027907336843189531572953640595697747328351786661749084998531204073549363687502856391457999821801405949774551685485709602606032651656167202272047842518980888853752554952515559703719501719264485773733727465187233315247243004678392689290297236012567893446553903125624704053902101765157291010919593435798014427797584323334570544453190311 / 2^2077]], [[23015698808035084796638195276392319058917061591959539471613704480005643303805960936616589166379302824794415426988591117490994265917424909403705487257717033451177495510359423262583580216975901383956115682649431225122538231723258650856022568122289104757272879370742338470108175409943979078707525615118618316318995587173033118069662932001792205590383445942124322599995895003678175216482862640481379387768522433135774486098187968136915107165002653017713200136864689890654115913755051363256631262880856039039872668060082852960624091529165822138402601005175615610842688756020631950432749422529421154410104917317581225672173 / 2^2048, 23015698808035084796638195276392319058917061591959539471613704480005643303805960936616589166379302824794415426988591117490994265917424909403705487257717033451177495510359423262583580216975901383956115682649431225122538231723258650856022568122289104757272879370742338470108175409943979078707525615118618316318995587173033118069662932001792205590383445942124322599995895003678175216482862640481379387768522433135774486098187968136915107165002653017713200136864689890654115913755051363256631262880856039039872668060082852960624091529165822138402601005175615610842688756020631950432749422529421154410104917317581230099271 / 2^2048], [33308000314549255098465789501199889336055247283853292848980733927375243656249991685236671569175356505618218079530562177657699547442946852177299897394187271926548916763381853904357688191504088415850108601120105988143159985414383588967817526181324157293478657074916190458695354675558969723462747847439557798755281803180764656208731353680190541315162766665107394840278173639551096259897331004482022171607883203235784889395112307287770012598415855951808691221779975224034471750277908165787915214717316648497696300514074297954261618391050557306308891963338909911850136971652460713354824479503476720719861955652803670964623 / 2^2048, 520437504914832110913527960956248270875863238810207700765323967615238182128906120081822993268364945400284657492665034025901555428796044565270310896784176123852326824427841467255588877992251381497657946892501656064736874772099743577622148846583189957710604016795565475917114916805608901929105435116243090605551278174699447753261427401252977208049418229142303044379346463117985879060895796945031596431373175050559138896798629801371406446850247749247010800340312112875538621098092315090436175229958072632776504695532410905535337787360164957911076436927170467372658390182069698646169132492241823761247843057075057379441 / 2^2042], [11178636482318979046911726777706048098019999801824857429067039028971387735353987527280872226691927564989003999679879317352293483600218032175333617169684205518705329386489251209569068197970328195675010246058427498650893508203594021401442245312184591407600813580221895950803298494058182242963166132655986730335059257886105693091236713808459264408149864098279300061986408956174524200336757296669134307470370805839595210886123660502593132356063042452742691372059551209255458719892092622171635134488564627473072905250438643524627072872295528284914765801795475166141478334292271234415582794411800637515139741256682897371743 / 2^2048, 11178636482318979046911726777706048098019999801824857429067039028971387735353987527280872226691927564989003999679879317352293483600218032175333617169684205518705329386489251209569068197970328195675010246058427498650893508203594021401442245312184591407600813580221895950803298494058182242963166132655986730335059257886105693091236713808459264408149864098279300061986408956174524200336757296669134307470370805839595210886123660502593132356063042452742691372059551209255458719892092622171635134488564627473072905250438643524627072872295528284914765801795475166141478334292271234415582794411800637515139741256682897938921 / 2^2048], [-47059010615838807994438054366166089727587161848171725668553843571082435097880907469093168477131964827155724278853651627229049981359209539552723156693205442949086243112503069603866622362388330227025915173322827805607173410731885607955738724353622821244939115800161382873814764662222789375623079635660391187752815422996616694158199189818044408318829393175729936130556253970812846717270183274266036738953652295496443580268406529956916764344290842479152017878589958056029542054816572351994768487597587356556940264932825628891307068086402995797134587903692418616024145475342323567169230973647300062832125027433427977069366123 / 2^2059, -23529505307919403997219027183083044863793580924085862834276921785541217548940453734546584238565982413577862139426825813614524990679604769776361578346602721474543121556251534801933311181194165113512957586661413902803586705365942803977869362176811410622469557900080691436907382331111394687811539817830195593876407711498308347079099594909022204159414696587864968065278126985406423358635091637133018369476826147748221790134203264978458382172145421239576008939294979028014771027408286175997384243798793678278470132466412814445653534043201497898567293951846209308012072737671161783584615486823650031416062513716713988534683061 / 2^2058]], [[2795314755518686759324500655151304009006303032523328138074702051239338975813069753274416183458068588489404816111326389568478311936495846140889568720876803287235394303543408993386121500894556885154472062829898882179346957961910927503729582249515767802606589968580728722384145351129890700118432726033637112615373492223687804660441141771184157842602695354656922472101400131652417186353260876035800205641564021988581446875073164052331282594138333869444694117138817635924628399492084802030369065849797598136601993897681115534800431853757955763580790687314704419978535913079672668102599177716711105711751897909705030448473881 / 2^2048, 349414344439835844915562581893913001125787879065416017259337756404917371976633719159302022932258573561175602013915798696059788992061980767611196090109600410904424287942926124173265187611819610644309007853737360272418369745238865937966197781189470975325823746072591090298018168891236337514804090754204639076921686527960975582555142721398019730325336919332115309012675016456552148294157609504475025705195502748572680859384145506541410324267291733680586764642352204490578549936510600253796133231224699767075249237210139441850053981719744470447598835914338052497316989134959083512824897214588888213968987238713129080058711 / 2^2045], [5583032063412871018928097021096000620574280863214710448858106190798887663788626699440768570870880295751296806160958623564360643232107548038624006129882949152465687341900908873044599702657462078642507122760993734722428996778015612261893857881580474814522891499046929390421268349177943369983959230943028411784129066544588907951026142304924941065752198900261608017183341010599655845585652173347862964492751887596012594597590430890747993260343739132607842240088973176497334274389485964843876110227668606428021401337815888937938563513838411636151557051728056750084559333706474568010384342647788345540459116785429692373043 / 2^2048, 5583032063412871018928097021096000620574280863214710448858106190798887663788626699440768570870880295751296806160958623564360643232107548038624006129882949152465687341900908873044599702657462078642507122760993734722428996778015612261893857881580474814522891499046929390421268349177943369983959230943028411784129066544588907951026142304924941065752198900261608017183341010599655845585652173347862964492751887596012594597590430890747993260343739132607842240088973176497334274389485964843876110227668606428021401337815888937938563513838411636151557051728056750084559333706474568010384342647788345540459116785429711541819 / 2^2048], [88966971650170368329067303468497831579946392544980587704052062063897838838628039449502811485711696706703148045234260492748104809752246006851435730043325052519662633573055482636294457364421627201647026564386232142156090699640235015192094215799674829633966753785159405752122526724861178418713299879708244685137652612108835634584545103666314700109339849705310940421868404843315539325356192280757713334328747188839906030711731164101219338963260777935843893139732968658582658761688280899590306544955773130746740277477993864580789414202599594111748556227803778826482298720513613737382872282242207188161529912651825528261803 / 2^2048, 44483485825085184164533651734248915789973196272490293852026031031948919419314019724751405742855848353351574022617130246374052404876123003425717865021662526259831316786527741318147228682210813600823513282193116071078045349820117507596047107899837414816983376892579702876061263362430589209356649939854122342568826306054417817292272551833157350054669924852655470210934202421657769662678096140378856667164373594419953015355865582050609669481630388967921946569866484329291329380844140449795153272477886565373370138738996932290394707101299797055874278113901889413241149360256806868691436141121103594080764956325912801964283 / 2^2047], [-17644553836247660625868183425616484494065875533110814002734369694563107157397548115168514110636244340966689544481423114946335724483878431242284399416683315044751149397142809275445889098967534124094401388004173762667894707657945833776076263195564181595109074049292894608334018619151757333584507625063505326358257426075756753211559136966322060670951959193902623597882319840776340175482143063372160641976568796376031366707112122840954958461838003113782176776609194868730291995121500968575577014267934574946410020284880670028085820995246459497685357073376175493304768213095009784590853863867575378316887378940891358930997007 / 2^2058, -35289107672495321251736366851232968988131751066221628005468739389126214314795096230337028221272488681933379088962846229892671448967756862484568798833366630089502298794285618550891778197935068248188802776008347525335789415315891667552152526391128363190218148098585789216668037238303514667169015250127010652716514852151513506423118273932644121341903918387805247195764639681552680350964286126744321283953137592752062733414224245681909916923676006227564353553218389737460583990243001937151154028535869149892820040569761340056171641990492918995370714146752350986609536426190019569181707727735150756633774757881782717861994013 / 2^2059]], [[1418141893946311814311906586905500553725640585514678156273060625346280199076182942570628214453972827474451311581987566579902394346427248611892915189985292533353455606047805680933919506995026104921451860422908695723936889379237138466751344896488476697946591440300199129615388930139272432520380409793286989865323025830328030336270069702218349053825706973897689007731155422125011147368578800385015949141364065820457334765626281669456951553857012164570624025692080956412799113960736812750856678245722179928950269756799488042691295522978576037535853265148011541344694629719443762435413220493223879260512029205964345857755757 / 2^2047, 709070946973155907155953293452750276862820292757339078136530312673140099538091471285314107226986413737225655790993783289951197173213624305946457594992646266676727803023902840466959753497513052460725930211454347861968444689618569233375672448244238348973295720150099564807694465069636216260190204896643494932661512915164015168135034851109174526912853486948844503865577711062505573684289400192507974570682032910228667382813140834728475776928506082285312012846040478206399556980368406375428339122861089964475134878399744021345647761489288018767926632574005770672347314859721881217706610246611939630256014602982181266445301 / 2^2046], [-325385990684608347981416336380707286932703887170505739078088023259521918982545795937995311534870804901468700821773153460548049394620510972770452678625149135486102752686667301298850621160617859876098226935967502823297527404958728813179559391468313243037264435281610352238635539949605402955750904448135813793711413616940742671613824283127035108024543083521746461834684430083038453702660146585338920448541995505219117880673125887685261483055762566638392608235492188072997553646180094206363709674890567076877588126776511215029642462983656514485900664592430771152566374375827174935796660148312741921098939788544837482427 / 2^2044, -650771981369216695962832672761414573865407774341011478156176046519043837965091591875990623069741609802937401643546306921096098789241021945540905357250298270972205505373334602597701242321235719752196453871935005646595054809917457626359118782936626486074528870563220704477271079899210805911501808896271627587422827233881485343227648566254070216049086167043492923669368860166076907405320293170677840897083991010438235761346251775370522966111525133276785216470984376145995107292360188412727419349781134153755176253553022430059284925967313028971801329184861542305132748751654349871593320296625483842197879577089638526177 / 2^2045], [88966413393687929847381611546434374355402127062331562501709387532313760602040958906174606879971607529849614035882879997107474930891499168078515470969232543488145591416988565796241664011859423405515623285052382735219907938181392152813851667256685885530775920810604359250077714852796563751407609338270761949994153266599254449595868666685960871681190870583945740700400306037108673675653359887620956579898052534302718059944216588620466484711462803486350776980349276844271652655592792767744331062432149739837259214416838690058834688319315229178483735973201187006918417089054987375058398914064711696438083770624969833585033 / 2^2048, 5560400837105495615461350721652148397212632941395722656356836720769610037627559931635912929998225470615600877242679999819217183180718698004907216935577033968009099463561785362265104000741213962844726455315773920951244246136337009550865729203542867845673495050662772453129857178299785234462975583641922621874634579162453403099741791667872554480074429411496608793775019127319292104728334992976309786243628283393919878746513536788779155294466425217896923561271829802766978290974549547984020691402009358739828700901052418128677168019957201823655233498325074187932401068065936710941149932129044481027380235664060685654155 / 2^2044], [-2176977632704144139467613446539881353029292519232035242673297724918894450674389300354721373107414249148309703330271999859231764519517752787965013286575724069237452681170207027611204765198329046519475542837968681773112031944424862027460949122217405471632402059530525696244474139922293653557269386350207768128328075418919717146069443290956953168370052758360322291851268175219470588045847081559994952713913099979179302900875844133809808959854565058627244434042512313457612216819438373286672490104938165611865744421853831825414708187671867818212332207647992944503449009938055277330266280942847579618676922606489316316644627 / 2^2055, -1088488816352072069733806723269940676514646259616017621336648862459447225337194650177360686553707124574154851665135999929615882259758876393982506643287862034618726340585103513805602382599164523259737771418984340886556015972212431013730474561108702735816201029765262848122237069961146826778634693175103884064164037709459858573034721645478476584185026379180161145925634087609735294022923540779997476356956549989589651450437922066904904479927282529313622217021256156728806108409719186643336245052469082805932872210926915912707354093835933909106166103823996472251724504969027638665133140471423789809338461303244658158322313 / 2^2054]], [[12234929384526733719668169729017348682937314922426489468956030283424244500695803448370541114212154427389574382181592017756507012476559662911918998031189483853307244955863127232992271631305355106183633875117963044668937148384114171415426776106093961190880636927202041032716407744711222757855642047640741291510957120353561020909641080872903257936481416325105068058106083182211896163283818389414060416230215144858736289901946768975167324867111759733383787662477332692532904966813290353942394320900054972652141506782737867220319702674452200481063651395601108248579829829144703625153486283158548503469539054219813901118969 / 2^2048, 6117464692263366859834084864508674341468657461213244734478015141712122250347901724185270557106077213694787191090796008878253506238279831455959499015594741926653622477931563616496135815652677553091816937558981522334468574192057085707713388053046980595440318463601020516358203872355611378927821023820370645755478560176780510454820540436451628968240708162552534029053041591105948081641909194707030208115107572429368144950973384487583662433555879866691893831238666346266452483406645176971197160450027486326070753391368933610159851337226100240531825697800554124289914914572351812576743141579274251734769527109906950621159 / 2^2047], [53969075655052255633364351621841638904011854273630455680950915589907081540619295921603150378967622892411211437916382544004868689147582635177375650409824428665969622965602485255007639375934716608869279828405950770117109309377184482654401018442581037144297235909142374734682352216680176649849575910463382826100908670480551841675449961288627269182449724837225464368060963015139373091054376842368748691685302172535220782861904169019228316746836522071938823579294908311547663743538839058679741133989723170189909522449726096941175253007102684542025764748983344451606897455704505306335394872055589227930856698106880203931783 / 2^2048, 13492268913763063908341087905460409726002963568407613920237728897476770385154823980400787594741905723102802859479095636001217172286895658794343912602456107166492405741400621313751909843983679152217319957101487692529277327344296120663600254610645259286074308977285593683670588054170044162462393977615845706525227167620137960418862490322156817295612431209306366092015240753784843272763594210592187172921325543133805195715476042254807079186709130517984705894823727077886915935884709764669935283497430792547477380612431524235293813251775671135506441187245836112901724363926126326583848718013897306982714174526720050994253 / 2^2046], [24034088931235628497301116346142290762579123926631704102002879130930882401224308312077260226895220165107346103144973664032459391461450003537782102998055596321480862512846900807669501721294668606824554714244355085631396847846756710819177142860506927681718213151264881570557272181293557120580623553340515831792468199906841156530255889459397270526555850498108720783019261115088613783110874973498474858578052184321592575980842876053559141179279876619560398453688631005791446172716869045499870457601352157047321638774604763341685936559235286383154062579641903540339690582925895624547402977807375437577260206916669726885435 / 2^2048, 24034088931235628497301116346142290762579123926631704102002879130930882401224308312077260226895220165107346103144973664032459391461450003537782102998055596321480862512846900807669501721294668606824554714244355085631396847846756710819177142860506927681718213151264881570557272181293557120580623553340515831792468199906841156530255889459397270526555850498108720783019261115088613783110874973498474858578052184321592575980842876053559141179279876619560398453688631005791446172716869045499870457601352157047321638774604763341685936559235286383154062579641903540339690582925895624547402977807375437577260206916669726904869 / 2^2048], [-7273908015023491060084873183879659056294889607798244610019791358243828122075308185954633161066870468974171301594795538790742926968966887167164946557529126450001687810427488023280229856322018874026035397694076729257568618191139883177038015103804906865741425283830723240042207292063381378981663452286098154214809240973555712563498283793588305936315861884414180330670645644823565113168228936413895399854392234649848424702095796187295505613580146266248090552706483930836831803221453241668341126549674337445514093133757888601651779540506009589682894525231900792457163305586137902149035023809100907889749972761206004093910155 / 2^2058, -3636954007511745530042436591939829528147444803899122305009895679121914061037654092977316580533435234487085650797397769395371463484483443583582473278764563225000843905213744011640114928161009437013017698847038364628784309095569941588519007551902453432870712641915361620021103646031690689490831726143049077107404620486777856281749141896794152968157930942207090165335322822411782556584114468206947699927196117324924212351047898093647752806790073133124045276353241965418415901610726620834170563274837168722757046566878944300825889770253004794841447262615950396228581652793068951074517511904550453944874986380603002046955077 / 2^2057]], [[2713672058756712600591918799962722985887216426445604280007320586849653445880380677475555736783133997478284333420830605906985136976902658527589232559515767132806677372277250687561141789970203299510091302717441477026588835500210093920061322423856931106403810567505212365401422173746907492965530463453184734805397224378173170626916374493757036152731541611256814434275611277473014908845160838789390483470969453354608441278372031846609142493268182172900103522063440600429760430775490289176449881812609058209348728502579407056319239086752669081037448287186716509031734997536721664381680917648482856997160087367394532571695 / 2^2047, 5427344117513425201183837599925445971774432852891208560014641173699306891760761354951111473566267994956568666841661211813970273953805317055178465119031534265613354744554501375122283579940406599020182605434882954053177671000420187840122644847713862212807621135010424730802844347493814985931060926906369469610794448756346341253832748987514072305463083222513628868551222554946029817690321677578780966941938906709216882556744063693218284986536364345800207044126881200859520861550980578352899763625218116418697457005158814112638478173505338162074896574373433018063469995073443328763361835296965713994320174734789065143391 / 2^2048], [-5191321277197348573291759094246159636386770448528710568076074130366220380420689516242967446965411033332234836543313493872939089038109155346647053803502976908637174616253637926090916406014724028624448900522443262177607160747852991392250678517534593723080111346034706407216458135859414767128771724292698530526030841358904639198881040976201440368325226088810342667365661417251984218642345546765762762355101500323921294830832981484895176034585092776840525220501582252864767797640304778008731478236035245270217979966694290023112547784245399542816288099455348764748306263621251492150489378406506055422067074411442003553089 / 2^2044, -83061140435157577172668145507938554182188327176459369089217186085859526086731032259887479151446576533315757384693015901967025424609746485546352860856047630538194793860058206817454662496235584457991182408359092194841714571965647862276010856280553499569281781536555302515463330173750636274060347588683176488416493461742474227182096655619223045893203617420965482677850582676031747498277528748252204197681624005182740717293327703758322816553361484429448403528025316045836284762244876448139703651776563924323487679467108640369800764547926392685060609591285580235972900217940023874407830054504096886753073190583072056849423 / 2^2048], [448186214939533846228400748435561465810891687261372109300625847692251198082893094997991681601467847573129968424751690925233053118529862858109967710364264195102926478628478302227161724522509658159274869851192189819588963978673664767581427510300324426297781305076611535698173002590018325746978622871047277247137768326865709598429166738481799701667889121080882941821971545930836836314745272021102268413290114432464686532621497090985562436396192969366794333799483673267059153600961102332044695924576537756358300698970001455050536530759452412697146392827899525022694334469321294116244833765380639818212937363721690593263 / 2^2042, 28683917756130166158617647899875933811897067984727814995240054252304076677305158079871467622493942244680317979184108219214915399585911222919037933463312908486587294632222611342538350369440618122193591670476300148453693694635114545125211360659220763283058003524903138284683072165761172847806631863747025743816817172919405414299466671262835180906744903749176508276606178939573557524143697409350545178450567323677739938087775813823075995929356350039474837363166955089091785830461510549250860539172898416406931244734080093123234337968604954412617369140985569601452437406036562823439669360984360948365627991278188197968833 / 2^2048], [3353173285221042141970044654274600038056005980477661876244882997181451543478759544501405253942668354225000936427932547171413995703840851941666962229655972772777003792860906699842401199877294792985843313829059805537919742304291215103188387845464435372295715947565614282785182650100106739013925254874687610415358649655588090841100835787453096044403219391482773416963060873204186511850402800479417619760953409958106114854534893886711003022661640653105576701456218420762812188573298765278101988892323952725754105976175456012202046165606684935063002047406112771411071745810897961945608038687188448073787791784762995000148553 / 2^2057, 53650772563536674271520714468393600608896095687642590019918127954903224695660152712022484063082693667600014982846920754742623931261453631066671395674495564364432060685774507197478419198036716687773493021264956888606715876868659441651014205527430965956731455161049828524562922401601707824222804077995001766645738394489409453457613372599249536710451510263724374671408973971266984189606444807670681916175254559329697837672558302187376048362586250449689227223299494732204995017172780244449631822277183243612065695618807296195232738649706958961008032758497804342577147932974367391129728618995015169180604668556207920002376849 / 2^2061]], [[25736039449325191326038382453705815098748926992675241705084615110713937638738064449630169703366467139887249184346282589790859640309785218246232397063270585357600967487781691754287037261452934985223969896691729133685429748661547455036166821341684195231985231207419028029081535691682727461370475187771823377948038692550352241797750732041889472181679397564674577760130870737521642188667697593493550639582221179008379559924540335973039747998983532774294130723686176683047236190925661406993089701308982422504922455815800864660268202116684002751607508793886813925891440931265944569099122236088660427839043363180982100159213 / 2^2048, 25736039449325191326038382453705815098748926992675241705084615110713937638738064449630169703366467139887249184346282589790859640309785218246232397063270585357600967487781691754287037261452934985223969896691729133685429748661547455036166821341684195231985231207419028029081535691682727461370475187771823377948038692550352241797750732041889472181679397564674577760130870737521642188667697593493550639582221179008379559924540335973039747998983532774294130723686176683047236190925661406993089701308982422504922455815800864660268202116684002751607508793886813925891440931265944569099122236088660427839043363180982100159221 / 2^2048], [-47116486740448166776815864260313663571323157403656581513803893250245419101175243467438813033404557323540144727482747054785727360278084279469718625830146751439780313694536321938227367955980667668113690985486480846567001480705450906719992510673156097076872216071488520557363743528730935872223775972381058984933362701097477299941299784958382217996409033249108307410456674339832039509800595519102850270730765651804298571186018470233437126994436222584344441047211968290408201176104523814252844779676047321922086833331500156161887099929118530471358515395029419722391489535336081423974774151082786227717465922056930133322773 / 2^2048, -47116486740448166776815864260313663571323157403656581513803893250245419101175243467438813033404557323540144727482747054785727360278084279469718625830146751439780313694536321938227367955980667668113690985486480846567001480705450906719992510673156097076872216071488520557363743528730935872223775972381058984933362701097477299941299784958382217996409033249108307410456674339832039509800595519102850270730765651804298571186018470233437126994436222584344441047211968290408201176104523814252844779676047321922086833331500156161887099929118530471358515395029419722391489535336081423974774151082786227717465922056930133322769 / 2^2048], [2130903110405527937114009057835950324798481230907323309061783609797434863719445739380400173152270433805548670258487889407648806038581607056607571546794346406801055594178383017718631243151359787637348530330329191762488517446768582720281589799064281861066387846351740822616359182195242194719658702970546130279884011033449858607966747687353798156166615918773705548205673194811445089102399178889607175738417228770392140154322890779584750471774840913674064551470408545001256926196571661425310915346261501879749331234937271746928101280006090508326164918645544509064123421901409237167917514341490531270454965966228621031235 / 2^2044, 8523612441622111748456036231343801299193924923629293236247134439189739454877782957521600692609081735222194681033951557630595224154326428226430286187177385627204222376713532070874524972605439150549394121321316767049954069787074330881126359196257127444265551385406963290465436728780968778878634811882184521119536044133799434431866990749415192624666463675094822192822692779245780356409596715558428702953668915081568560617291563118339001887099363654696258205881634180005027704786286645701243661385046007518997324939749086987712405120024362033304659674582178036256493687605636948671670057365962125081819863864914484124941 / 2^2046], [566792429914773106634890225241278640571957274703811479429208605696266140820523763681056920740693235124772227980864446040851651915165288055783611140341588993067797074929837246121438534571410642332024759719639102920362888592253206285027017821226537635634682277612938021095083512278870514987444424614847780242688681544610904314565888685611139516655038917330268635738637153126342044590612766652339048282504472934634184278176728192098450951800939128148826867007912016804650411467543154710361985584130404206636961294186512163216179263575798595479005621724534312503170517124638007748163209951121729825161413019380452137501359 / 2^2053, 2267169719659092426539560900965114562287829098815245917716834422785064563282095054724227682962772940499088911923457784163406607660661152223134444561366355972271188299719348984485754138285642569328099038878556411681451554369012825140108071284906150542538729110451752084380334049115482059949777698459391120970754726178443617258263554742444558066620155669321074542954548612505368178362451066609356193130017891738536737112706912768393803807203756512595307468031648067218601645870172618841447942336521616826547845176746048652864717054303194381916022486898137250012682068498552030992652839804486919300645652077521808550005437 / 2^2055]], [[33899082183501846853829055915924118385036269817887727278776835083474603235740775418752200820449957683866785527778587177268643156979362866136224971767871267239641210888504360260020600381639648615604390301764440805776564652625596728543645009836963168415546392553380616203775404480788742732580619552525870852490724009294083513039681477247098458081824065138153693813474056706322871363964541639337096885963871284974555695473635886363962161443734644021361944937480992989920485602991198284989229423186623654122818832835485761341455688493458626492119261826144114314197050391217219180306803981105843285725921246129180280126523 / 2^2048, 8474770545875461713457263978981029596259067454471931819694208770868650808935193854688050205112489420966696381944646794317160789244840716534056242941967816809910302722126090065005150095409912153901097575441110201444141163156399182135911252459240792103886598138345154050943851120197185683145154888131467713122681002323520878259920369311774614520456016284538423453368514176580717840991135409834274221490967821243638923868408971590990540360933661005340486234370248247480121400747799571247307355796655913530704708208871440335363922123364656623029815456536028578549262597804304795076700995276460821431480311532295070031631 / 2^2046], [27053558327913541818779016051774170050610351858731676843333221107114473359732059870988931579772657919848086675459490335469844677799435620589182454627331708401655664627841102748393355595450684189004628656416978658830658039261179578950190584607512007193609297506448642292403929556915603944245440101198191311851688656727980800091091674424176357384154380140479744153836297563433272594841277388446120695435264400263176315430140247880273212288765276740808131968282376738552193597371054328981537217811278318908303935054759561439376621074208036982795352116801323369144246506498947327817084050331986225050665029066205602538731 / 2^2048, 6763389581978385454694754012943542512652587964682919210833305276778618339933014967747232894943164479962021668864872583867461169449858905147295613656832927100413916156960275687098338898862671047251157164104244664707664509815294894737547646151878001798402324376612160573100982389228900986061360025299547827962922164181995200022772918606044089346038595035119936038459074390858318148710319347111530173858816100065794078857535061970068303072191319185202032992070594184638048399342763582245384304452819579727075983763689890359844155268552009245698838029200330842286061626624736831954271012582996556262666257266551400634683 / 2^2046], [12883001011674410113410317408377399588660956043953393255345711438667100015039361094243720410028943627193115209240329926215545140737071429979315242177721637188354411837621011721663325894514500386693867072924466683517972077617401519023828181365250567024525323743736774129983259292910866563411945566445642088663378380518803192549626149931539774973509839899712962605697718912159391526467011773504118167362986177351845490695695892388394939906333382329294204993544533726359113713713466667652951183021901758073235456042891324121706127325468114839534680604794882521015922998600947530833836657930049926303993771338097244169355 / 2^2048, 3220750252918602528352579352094349897165239010988348313836427859666775003759840273560930102507235906798278802310082481553886285184267857494828810544430409297088602959405252930415831473628625096673466768231116670879493019404350379755957045341312641756131330935934193532495814823227716640852986391611410522165844595129700798137406537482884943743377459974928240651424429728039847881616752943376029541840746544337961372673923973097098734976583345582323551248386133431589778428428366666913237795755475439518308864010722831030426531831367028709883670151198720630253980749650236882708459164482512481575998442834524311042339 / 2^2046], [1165921066973910793924564967898409389456262389103479183179030997728572056835005191579712018973424036797089063673472239950975881613776888604076753939498115495747622698872911865250557748745448636744691812692635715437838091770402113579060139338582432884126865835803202598193293247612895412312509967979941725735643446379294858298252470065888558981227983489829660393805531494707991645203415772418881974275032582207302440073940853323686140915518304924304340613995539430794444947097339985050123692355849487257938315769155303859291737147336486355872800904474004246990287622699309565529516231404480535407855360581324618336452008627547 / 2^2073, 2331842133947821587849129935796818778912524778206958366358061995457144113670010383159424037946848073594178127346944479901951763227553777208153507878996230991495245397745823730501115497490897273489383625385271430875676183540804227158120278677164865768253731671606405196386586495225790824625019935959883451471286892758589716596504940131777117962455966979659320787611062989415983290406831544837763948550065164414604880147881706647372281831036609848608681227991078861588889894194679970100247384711698974515876631538310607718583474294672972711745601808948008493980575245398619131059032462808961070815710721162649236672904017255095 / 2^2074]], [[58464022488862821574314064316420165320277893760325171198614539513345726848878284335186200651742920991988893556244075455661849321625695196879567698208628746984452526342514132878781194242821359883504398345077048985194341953452799873997344976400510376806459880100121962494466004065673971612910720032317702979157787639219047463907277417021258265248340400346200519564546951070433775529321313130972787582465172047951062253572194140929285204969226967299564096965669577653368637766223422990234254334608491311241358772189670804146895290627341644289086391618631408430368334727430807995289749978390681833215445308734071033093779 / 2^2046, 233856089955451286297256257265680661281111575041300684794458158053382907395513137340744802606971683967955574224976301822647397286502780787518270792834514987937810105370056531515124776971285439534017593380308195940777367813811199495989379905602041507225839520400487849977864016262695886451642880129270811916631150556876189855629109668085033060993361601384802078258187804281735102117285252523891150329860688191804249014288776563717140819876907869198256387862678310613474551064893691960937017338433965244965435088758683216587581162509366577156345566474525633721473338909723231981158999913562727332861781234936284132375117 / 2^2048], [734721989303015008592378078163503908564369516462291859997997734789567368935242913250921881114835800846426878939146039739761895872829857187523385545226492987214498854798504188035829517258250100627842965521251230949860001193646471294691404417611438493073984178674551723213855037835159638810203691251468570953236012265545632307688003390604121006872468422668253890021713024630372110634222785992273191808082551075557055998597537270889322579887496097796847395851267673777701190583092024832327502890725813040883144612502384155382309527274689213894000676804091556928279662275709843960609703646627498963609840855104494320427 / 2^2045, 5877775914424120068739024625308031268514956131698334879983981878316538951481943306007375048918686406771415031513168317918095166982638857500187084361811943897715990838388033504286636138066000805022743724170009847598880009549171770357531235340891507944591873429396413785710840302681277110481629530011748567625888098124365058461504027124832968054979747381346031120173704197042976885073782287938185534464660408604456447988780298167114580639099968782374779166810141390221609524664736198658620023125806504327065156900019073243058476218197513711152005414432732455426237298205678751684877629173019991708878726840835954563417 / 2^2048], [1005039468249513630900257529708774839502619686808716414999847054149710647835873532839013685056326786376570670894478273401803276270646634579545396324912383111168749565978037389390940562954514682989885796734146637080314708429129153159209326904037392039857228041103506116902827078058432660978009843607250438358401367368064584920447687978409213012212806268516234825455768590102166223770271466669369459708902891336612551750560455137286141682838669676933352693850021697745265398025398381317049246603983034391401314073597672693029958449183875529590552112470937108080931485558441616261433442790211307083903788780469432938923591 / 2^2048, 125629933531189203862532191213596854937827460851089551874980881768713830979484191604876710632040848297071333861809784175225409533830829322443174540614047888896093695747254673673867570369314335373735724591768329635039338553641144144901165863004674004982153505137938264612853384757304082622251230450906304794800170921008073115055960997301151626526600783564529353181971073762770777971283933333671182463612861417076568968820056892160767710354833709616669086731252712218158174753174797664631155825497879298925164259199709086628744806147984441198819014058867138510116435694805202032679180348776413385487973597558679117365449 / 2^2045], [29699067644116942920769657731370890055393826043136771545232634138137575647638678166170066947548282949327221107568474618006586847662351028542675444684431511863412072447563106783603744057576462035045081592900242848273178929094484608898177424153946445588817222588036870938432617408712018828124843055270815266976428395892266066537389151133734897542939546473362416375564379246902735782980676743525695696530333905031966390985613519041208411358892719679223867376001382252384364936986412194988216603486611583110302058837672570283089456890476019311539743438116817522322511537378233205361712619137443439727602258580844650742373941648153792224421083 / 2^2111, 59398135288233885841539315462741780110787652086273543090465268276275151295277356332340133895096565898654442215136949236013173695324702057085350889368863023726824144895126213567207488115152924070090163185800485696546357858188969217796354848307892891177634445176073741876865234817424037656249686110541630533952856791784532133074778302267469795085879092946724832751128758493805471565961353487051391393060667810063932781971227038082416822717785439358447734752002764504768729873972824389976433206973223166220604117675345140566178913780952038623079486876233635044645023074756466410723425238274886879455204517161689301484747883296307584448842167 / 2^2112]], [[727459997171007467931037967804045121106747275178803353335756557557016169761727337700111052162555202778442403220623212265532405596632370137501888768705066382033987977547479531391277824446238251659491621240657922928740455705078821972877928269155704745744234239899773606185124762895490442727455387132494624656176953065844832184220438094842580558545730274714983951284706331318865633974229439088081667769847241862221429984155767704677606452696570610368640246243409148222800927158549102430914868738272606387472560032533265631488835326555781384190607229885739913483427886917081706125650242683401366118875406389758564742580389 / 2^2047, 1454919994342014935862075935608090242213494550357606706671513115114032339523454675400222104325110405556884806441246424531064811193264740275003777537410132764067975955094959062782555648892476503318983242481315845857480911410157643945755856538311409491488468479799547212370249525790980885454910774264989249312353906131689664368440876189685161117091460549429967902569412662637731267948458878176163335539694483724442859968311535409355212905393141220737280492486818296445601854317098204861829737476545212774945120065066531262977670653111562768381214459771479826966855773834163412251300485366802732237750812779517129485160779 / 2^2048], [5473969535061218042378973901023983777897549809624360194241124859506201463364706442037337098934237156140767377200446252251155486612911491711064262788153254388119166842855138645222237370290404567752940519985268705907941946144168661536626764902588770484468080246739055967855588315792390336882183850268380034949054711032451086376358138497128620237409869811145978502591771497328356528978764293886470171943322986088964517900994507698969027683345692610926190583052601162263353336519383309534032460474845358589931034625140348323978984527246868291873304829435180679280608092034579831698028234636571050143112132052356851481249 / 2^2048, 2736984767530609021189486950511991888948774904812180097120562429753100731682353221018668549467118578070383688600223126125577743306455745855532131394076627194059583421427569322611118685145202283876470259992634352953970973072084330768313382451294385242234040123369527983927794157896195168441091925134190017474527355516225543188179069248564310118704934905572989251295885748664178264489382146943235085971661493044482258950497253849484513841672846305463095291526300581131676668259691654767016230237422679294965517312570174161989492263623434145936652414717590339640304046017289915849014117318285525071556066026178425740625 / 2^2047], [9746189573650854023539404029005698913489269019229851448237469194355876503439738335660713223621296766177363930361759977081876958734078400413288171556396854010412100738252780887389878690870339861766841020174392799924755649838197064934362099469966672207635882122743966518560642552408140426711649827806732291772466746112446798148860910381477029732113411392454608415358924403082504808643003625071565455009526223643919263635740093703195983095017538365911765820906424938307443329019338668242479525090591833493036017139324394997853258127402199583214316227467565991428327939322076488812941502041272181866760126982033972059742379 / 2^2046, 38984758294603416094157616116022795653957076076919405792949876777423506013758953342642852894485187064709455721447039908327507834936313601653152686225587416041648402953011123549559514763481359447067364080697571199699022599352788259737448397879866688830543528490975866074242570209632561706846599311226929167089866984449787192595443641525908118928453645569818433661435697612330019234572014500286261820038104894575677054542960374812783932380070153463647063283625699753229773316077354672969918100362367333972144068557297579991413032509608798332857264909870263965713311757288305955251766008165088727467040507928135888238969517 / 2^2048], [424026681879007710912033348128605134620280171693111370033432790553906101694021956755638773329539275819677988419094156468383738365822802379629288935238996610207202737578094651722428180145187245962278243922447767924495777280278767826141280456063921068921932682301625565289594109878346729501968868116606303979482077639300233371045431821289395701077933222751835299465024918975167497927895872422108722313100843933582222559745427200800972010471982945880955120948902680446483678072537772031075955751894550233737025067559335613353355376765273849785602238722356210330875336302154122481434513232589426976436433793974352144798309713956615366388511749314196003335234994108456532483718097599025564382855134131828725506735205185597855649275533916667198035703521729859006720036466611252452159869503542492922002727403965330506442651260345351402078479841578300124840925658255893454636395573860738925916777567016388293503380864194478972406657361 / 2^3065, 212013340939503855456016674064302567310140085846555685016716395276953050847010978377819386664769637909838994209547078234191869182911401189814644467619498305103601368789047325861214090072593622981139121961223883962247888640139383913070640228031960534460966341150812782644797054939173364750984434058303151989741038819650116685522715910644697850538966611375917649732512459487583748963947936211054361156550421966791111279872713600400486005235991472940477560474451340223241839036268886015537977875947275116868512533779667806676677688382636924892801119361178105165437668151077061240717256616294713488218216896987176072399154856978307683194255874657098001667617497054228266241859048799512782191427567065914362753367602592798927824637766958333599017851760864929503360018233305626226079934751771246461001363701982665253221325630172675701039239920789150062420462829127946727318197786930369462958388783508194146751690432097239486203328681 / 2^3064]]] +]]: diff --git a/output_files/reals_dim0-chgvar.p128.res b/output_files/reals_dim0-chgvar.p128.res new file mode 100644 index 00000000..2fa296bd --- /dev/null +++ b/output_files/reals_dim0-chgvar.p128.res @@ -0,0 +1,3 @@ +[0, [1, +[[[26231402220168492386911311598601399294410445648821232414704636581092750994409 / 2^252, 419702435522695878190580985577622388710567130381139718635274185297484015910545 / 2^256], [1564843412194300122876779311439880265685356580691193184773212738789523467325 / 2^253, 12518747297554400983014234491519042125482852645529545478185701910316187738601 / 2^256], [928739245647604584091051520110282442878929134853892326251466481827114336836793 / 2^256, 464369622823802292045525760055141221439464567426946163125733240913557168418397 / 2^255], [-4582273512496904836800154058666942979542530702073088000124128252953058049033059239182107 / 2^287, -9164547024993809673600308117333885959085061404146176000248256505906116098066118478364213 / 2^288]], [[41232715746602540203817624218113892689855459900618804464626304685070453361201 / 2^255, 20616357873301270101908812109056946344927729950309402232313152342535227787375 / 2^254], [119342829475861280869275914443475296377668039041757427202202948761188490909625 / 2^256, 119342829475861280869275914443475296377668039041757427202202948761188492229227 / 2^256], [20026571617679676739282705509838504842599438017839570024125137506715234093769 / 2^255, 40053143235359353478565411019677009685198876035679140048250275013430468754717 / 2^256], [-168612808520228272548334115952195024861320414645858101050978502175254657363932405 / 2^267, -42153202130057068137083528988048756215330103661464525262744625543813664340983101 / 2^265]], [[10015634954029512011780879015449993977098131717341521963583111729144001419290199 / 2^256, 5007817477014756005890439507724996988549065858670760981791555864572001805643003 / 2^255], [20004048192923314314970509531509242921442935460876225159417181307156402758201 / 2^256, 20004048192923314314970509531509242921442935460876225159417181307156421926977 / 2^256], [318769365508628578837631543960989041187088752889447597990117906743980900339873 / 2^256, 79692341377157144709407885990247260296772188222361899497529476685995244001659 / 2^254], [-126441152862433849481915518962800324272664191259661207134393626625395480880731151 / 2^267, -63220576431216924740957759481400162136332095629830603567196813312697740440365575 / 2^266]], [[5081213661087957008899163023563018985577302626965683450466068119344897134825159 / 2^255, 1270303415271989252224790755890754746394325656741420862616517029836228452490001 / 2^253], [-4663442348191043845884644094901274625191801682462980462763272830960619671585 / 2^254, -4663442348191043845884644094901274625191801682462980462763272830960546794231 / 2^254], [318767365271221401082102119632835565032310456912161776733140143087932332029867 / 2^256, 159383682635610700541051059816417782516155228456080888366570071543966734455657 / 2^255], [-7800128135554531993482971988420822227403515616971460827929047398733167912006417 / 2^263, -487508008472158249592685749276301389212719726060716301745565462420822994500401 / 2^259]], [[21918924543617383526364102328511833212523191079322356303485761525785825405279 / 2^255, 21918924543617383526364102328511833212523191079322356303485761525785825466953 / 2^255], [193371626397437755439175008765956219525704826797616427666483412962251096441707 / 2^256, 24171453299679719429896876095744527440713103349702053458310426620281387060867 / 2^253], [43057165693541190144944336349291738236752315989797494710923032556340044964643 / 2^255, 5382145711692648768118042043661467279594039498724686838865379069542505621795 / 2^252], [-26062470147175409472231336913800276876580096458385437935864060254716692033053629 / 2^266, -6515617536793852368057834228450069219145024114596359483966015063679173008263407 / 2^264]], [[151923570680849581417123093323648851839134618154471048158504414897770003137 / 2^249, 9723108523574373210695877972713526517704615561886147082144282553457280200769 / 2^255], [-297608725393628381023755894633938691955674716176351098541685526870866823784333 / 2^256, -74402181348407095255938973658484672988918679044087774635421381717716705946083 / 2^254], [102774704970030175156208087945820579818905558748500936391709348663571912589411 / 2^256, 25693676242507543789052021986455144954726389687125234097927337165892978147353 / 2^254], [192231143894326023352927915223545262918233244815085846162106897951615818222486771 / 2^269, 48057785973581505838231978805886315729558311203771461540526724487903954555621693 / 2^267]], [[23053108400230446669622136141460107322058684092448464839151879977332701641585 / 2^254, 23053108400230446669622136141460107322058684092448464839151879977332701641587 / 2^254], [-84409372965431336348158551414398945607097915484030857663249320714756146556437 / 2^255, -84409372965431336348158551414398945607097915484030857663249320714756146556435 / 2^255], [122160684103812808013107567177114663923665961589029307121512147169676449036745 / 2^256, 30540171025953202003276891794278665980916490397257326780378036792419112259187 / 2^254], [507705443682706456751036838202447030962891205504064652603850225412332928077165 / 2^259, 8123287098923303308016589411239152495406259288065034441661603606597326849234641 / 2^263]], [[15182585062929707661393979330388319669181376067541795633095341036259546111859 / 2^253, 121460680503437661291151834643106557353451008540334365064762728290076368894873 / 2^256], [48466557099693974424515148166003664579636434734682311868506634269301784947969 / 2^255, 96933114199387948849030296332007329159272869469364623737013268538603569895939 / 2^256], [5769986858840394746332334572998358718103530615108197602782693211533265867559 / 2^253, 46159894870723157970658676583986869744828244920865580822261545692266126940473 / 2^256], [4177504436296108053794721818884887447355164049790392310189184493887412377498342997689 / 2^281, 8355008872592216107589443637769774894710328099580784620378368987774824754996685995379 / 2^282]], [[837908226308445135027231978356435432693356675435500258612522358364242803997861 / 2^256, 418954113154222567513615989178217716346678337717750129306261179182121401998931 / 2^255], [10530058875165095765087847695374322303480778358459663743777715109768996961097 / 2^255, 21060117750330191530175695390748644606961556716919327487555430219537993922195 / 2^256], [1800532195615165747687899534877132599905875437442226305503806099065397709884877 / 2^255, 3601064391230331495375799069754265199811750874884452611007612198130795419769755 / 2^256], [212823990150840864671179537228867410283218445559761981336296433983096274753847288040682465592365093 / 2^320, 106411995075420432335589768614433705141609222779880990668148216991548137376923644020341232796182547 / 2^319]], [[2606494943347515047138634809021796624166384390841758692672282559828202832506225 / 2^255, 5212989886695030094277269618043593248332768781683517385344565119656405665012451 / 2^256], [19613276288264956083908691349424102592877149849370739618118444337517838188983 / 2^256, 2451659536033119510488586418678012824109643731171342452264805542189729773623 / 2^253], [34920674592991439017236863052172999544704796936776352401783769005730613839267441 / 2^254, 139682698371965756068947452208691998178819187747105409607135076022922455357069765 / 2^256], [1437920399434016348306517063610282982176966733078359024428186931852145080236526870004132994406722683363678524431053035 / 2^376, 2875840798868032696613034127220565964353933466156718048856373863704290160473053740008265988813445366727357048862106071 / 2^377]]] +]]: diff --git a/output_files/reals_dim0-chgvar.p256.res b/output_files/reals_dim0-chgvar.p256.res deleted file mode 100644 index 419f4cc0..00000000 --- a/output_files/reals_dim0-chgvar.p256.res +++ /dev/null @@ -1,3 +0,0 @@ -[0, [1, -[[[48598221867162947855629708422977551444836381522140396449230478493398885677207633491901857597563986579780025838627537235390714022749296377259865838434789127 / 2^512, 6074777733395368481953713552872193930604547690267549556153809811674860709650954186487732199695498322472503229828442154423839252843662047157483229804348641 / 2^509], [90598244013614385068224568700125491860846958697590609757865251250931875432928685165831300758215451111351281205478128198133212085816989274774881233844835 / 2^508, 1449571904217830161091593099202007869773551339161449756125844020014910006926858962653300812131447217781620499287650051170131393373071828396398099741517361 / 2^512], [26885164402556289238881462394105658075594118919338434179351379142570065659254910675355286468828322530545508464256242030844686029354807777976173180354322875 / 2^510, 107540657610225156955525849576422632302376475677353736717405516570280262637019642701421145875313290122182033857024968123378744117419231111904692721417291501 / 2^512], [-16580969483400997920726950762153643145984936689373605422512523124319446489885444261878877173605635746972794869658776449703183055881300718964972496537258880244152087 / 2^538, -1061182046937663866926524848777833161343035948119910747040801479956444575352668432760248139110760687806258871658161692781003715576403246013758239778384568335625733567 / 2^544]], [[1193605575306873502717952381277149180110630229562586809685949340928834822152979388953847649906028504366590200536332298878247452222549587281837447720552333 / 2^509, 9548844602454988021743619050217193440885041836500694477487594727430678577223835111630781199248228034932721604290658391025979617780396698254699581768845761 / 2^512], [3454738890125684757091149352333141343732766562384532744328537429859789025090754928771831064637424037930552903506540432253183946179121059883298567099174109 / 2^510, 13818955560502739028364597409332565374931066249538130977314149719439156100363019715087324258549696151722211614026161729012735784716484239533194268398016037 / 2^512], [4637837135743737772343326223200404658064981925475000029188112429112141296365822372526122753956877945551929126456608233968310859370354515995482017186562661 / 2^512, 289864820983983610771457888950025291129061370342187501824257026819508831022863898282882672122304871596995570403538014623019428710647157249717626074195615 / 2^508], [-19524029370728780652936608318660866422014092302340874356118573716319391345400802236407196307718707039231371279897094265904608116086471572644054805015025207609 / 2^523, -2440503671341097581617076039832608302751761537792609294514821714539923918175100279550899538464838379903921409987136783238076014510808946580506850626878150951 / 2^520]], [[289932824091342136384079165690894123704876625240278203398142449729724826258679051354417477448768670620664882074450799659587845638827364800652575095053881723 / 2^510, 1159731296365368545536316662763576494819506500961112813592569798918899305034716205417669909795074682482659528297803198638351382555309459202610300382407522699 / 2^512], [2316310533462550191548360549303491021160495204694459531213043023299819021448875195609952630605392194653150635396382086446943245700302647832637221115680697 / 2^512, 36192352085352346742943133582867047205632737573350930175203797239059672210138674931405509853209253041455478678068470100733488214067228872384956580232023 / 2^506], [2306935676068611481800248526539173026334202923076626854796206210184281340161100854399388163736863638637052815855163757729679126453415785671423785885588209 / 2^508, 18455485408548891854401988212313384210673623384613014838369649681474250721288806835195105309894909109096422526841310061837433011627326285371390287122539053 / 2^511], [-14640885255516078398105528924047859316438057498451758167587729732116102118308781839480625675025222039463107966191831642636544744312858291061618822007280586291 / 2^523, -7320442627758039199052764462023929658219028749225879083793864866058051059154390919740312837512611019731553983095915821318272372156429145530809411003640293145 / 2^522]], [[1176728691357133697972587739984151873781417580180708489612178581524265700277514820134032882603351386968278308389809157645898179408711339780311661359256275493 / 2^512, 588364345678566848986293869992075936890708790090354244806089290762132850138757410067016441301675693484139154194904578822949089704355669890155830696303272591 / 2^511], [-1079979465069633467310879040616303901049015641868955982271050464584226867535911297240051671722693397092450181750606829633064091959282987054550795649671967 / 2^511, -1079979465069633467310879040616303901049015641868955982271050464584226867535911297240051671722693397092450181750606829633064091959282987054550795503917259 / 2^511], [36910739205429435964165477747542763206818000525907401908918296156843300261602577133501446544080113188028311730302228754163141972749528726809847805098133179 / 2^512, 18455369602714717982082738873771381603409000262953700954459148078421650130801288566750723272040056594014155865151114377081570986374764363404923903117507313 / 2^511], [-903193133134631165888881417737687958571292116877444327517789684985162423559488971133989893556960404854256585989205905351251391731545912285834977144412173975 / 2^519, -451596566567315582944440708868843979285646058438722163758894842492581211779744485566994946778480202427128292994602952675625695865772956142917488572206086987 / 2^518]], [[5076076133481088471398990873663361156306502998600403968305524941251254090881809218294107081665613362911004007398613634501239627306013527627933400918965743 / 2^512, 1269019033370272117849747718415840289076625749650100992076381235312813522720452304573526770416403340727751001849653408625309906826503381906983350229772273 / 2^510], [11195452309888540314640641418831828089995340822769928631112109821480267418978702681102413985552680539940266868718252365824006134974782846714024131787503893 / 2^511, 22390904619777080629281282837663656179990681645539857262224219642960534837957405362204827971105361079880533737436504731648012269949565693428048263575053015 / 2^512], [9971358344584861925085629800136678331647324593384116391740178802399664617031182058722281291313173567319436154279167384901252434053774854330222041377827235 / 2^512, 4985679172292430962542814900068339165823662296692058195870089401199832308515591029361140645656586783659718077139583692450626217026887427165111020688923335 / 2^511], [-3017827869026624370888118318027257521462346540490409452080720207664623361256450840944630235057948254581308180157828699847490374556495918066904187546740665879 / 2^522, -1508913934513312185444059159013628760731173270245204726040360103832311680628225420472315117528974127290654090078914349923745187278247959033452093773370332939 / 2^521]], [[2251718099651667086874555117397259498445649100517036974149600023165023676488063624547261493595108278659725681010757338817034739491126544840711497907838885 / 2^512, 1125859049825833543437277558698629749222824550258518487074800011582511838244031812273630746797554139329862840505378669408517369745563272420355748953919443 / 2^511], [-34460736088582947963702839256454888219558886038270322794986321366224545441376169064425795222300287963648893678804892083392328390875346346403179935186017261 / 2^512, -8615184022145736990925709814113722054889721509567580698746580341556136360344042266106448805575071990912223419701223020848082097718836586600794983796504315 / 2^510], [11900497809228578343640769043330091753014042055439681897976014463673990821730002177250619735026251316013691896352300885546678626993047876555254596020279723 / 2^512, 2975124452307144585910192260832522938253510513859920474494003615918497705432500544312654933756562829003422974088075221386669656748261969138813649005069931 / 2^510], [5564711442000792300505194122603424754226516754797664354973613263721432520706298492026016489501989935624075991381025500413034088210371020740467490986781685481 / 2^523, 22258845768003169202020776490413699016906067019190657419894453054885730082825193968104065958007959742496303965524102001652136352841484082961869963947126741925 / 2^525]], [[2669367585077007479508494543844880578203129359254760089137281989492038147621492741762226017356107220692085211340420255809933346526460237431775760164001101 / 2^510, 2669367585077007479508494543844880578203129359254760089137281989492038147621492741762226017356107220692085211340420255809933346526460237431775760164001103 / 2^510], [-9773937646879130472060302498330804210752053444628378683912510079699837418136615244029110845852211534061922040984167993995670542390628048120996833704336869 / 2^511, -9773937646879130472060302498330804210752053444628378683912510079699837418136615244029110845852211534061922040984167993995670542390628048120996833704336867 / 2^511], [14145240835040286686651226470269292008948175565251016092516561326212839468756152866956655726929598247764608546219586084082043611490700927365912758852493069 / 2^512, 884077552190017917915701654391830750559260972828188505782285082888302466797259554184790982933099890485288034138724130255127725718168807960369547428280817 / 2^508], [940612384658866529465706990471381933396667262740132752830635340866925334363005766498544825295289900250537767780008079090677495187644254071142809375846595659 / 2^519, 235153096164716632366426747617845483349166815685033188207658835216731333590751441624636206323822475062634441945002019772669373796911063517785702343961648915 / 2^517]], [[3516046488919801268202659606872360892381130441322934112321054008451922238865403822667469342379183694751989874912686923520335458613809522011242976875900505 / 2^510, 14064185955679205072810638427489443569524521765291736449284216033807688955461615290669877369516734779007959499650747694081341834455238088044971907503602021 / 2^512], [2806021952356622747752909411918262856776353270072285515580758787929180678929420929661447913771463815695526753538179900701247840482778566064203189617512331 / 2^510, 11224087809426490991011637647673051427105413080289142062323035151716722715717683718645791655085855262782107014152719602804991361931114264256812758470049325 / 2^512], [5344950666055910033971597753905550964067890630574599788347881125184975260100532468394126610317123003995589415824560249067885518053971720358818659037688161 / 2^512, 2672475333027955016985798876952775482033945315287299894173940562592487630050266234197063305158561501997794707912280124533942759026985860179409329518844081 / 2^511], [483721966476883233305497142178085474811803068430928349144264429475186028208616525586345882011053395751225206726606877087792947734400021048863602583433888079744961 / 2^537, 967443932953766466610994284356170949623606136861856698288528858950372056417233051172691764022106791502450413453213754175585895468800042097727205166867776159489923 / 2^538]], [[48511572056694406454161485618384524476330795738905851355009535100240345534507476357975519730663016736809798826284008882592832514326092002293738030467893337 / 2^511, 97023144113388812908322971236769048952661591477811702710019070200480691069014952715951039461326033473619597652568017765185665028652184004587476060935786675 / 2^512], [2438595033894620336729926173791292208639229927382002324133081375137155382004832523817660532133979136371207311112493820935643902989315806333337960227187089 / 2^512, 1219297516947310168364963086895646104319614963691001162066540687568577691002416261908830266066989568185603655556246910467821951494657903166668980113593545 / 2^511], [416974769338664264814137644675490403442377893424670754264739828644530995934472078535965396453599557512979866213882304125212568669008229353998282733391632891 / 2^512, 104243692334666066203534411168872600860594473356167688566184957161132748983618019633991349113399889378244966553470576031303142167252057338499570683347908223 / 2^510], [24643334459387868464303273905729041320148565335041643853232745558983698892390816067162132872502904941828509431328898161851244066187549238490836422113772252912178769207883724055 / 2^576, 3080416807423483558037909238216130165018570666880205481654093194872962361548852008395266609062863117728563678916112270231405508273443654811354552764221531614022346150985465507 / 2^573]], [[150905747538354441806562230705403730861814168234032645431771053430065022516793351073003787317288888620249202827946950218709907883158345641784044941743118299 / 2^510, 603622990153417767226248922821614923447256672936130581727084213720260090067173404292015149269155554480996811311787800874839631532633382567136179766972473197 / 2^512], [567765559551728389742855985737321717797605825634838140538972403370463839637024452900520930097327676476442392144611489657056880960081658726798200723613727 / 2^510, 2271062238206913558971423942949286871190423302539352562155889613481855358548097811602083720389310705905769568578445958628227523840326634907192802894454909 / 2^512], [4043537868698945118955249890284464884091586069088787863502158224837171022524602069764435909528345778395857771876432003900960485949539553630019223929043579417 / 2^510, 16174151474795780475820999561137859536366344276355151454008632899348684090098408279057743638113383113583431087505728015603841943798158214520076895716174317669 / 2^512], [56656948488421136755627372914883781663965322101077836397097830472437268500020814412564238302648594310147202863392598645339137690034512333892561508502007275514508224873072278663249649041644128545764709556795473858297830106926895786373 / 2^760, 113313896976842273511254745829767563327930644202155672794195660944874537000041628825128476605297188620294405726785197290678275380069024667785123017004014551029016449746144557326499298083288257091529419113590947716595660213853791572747 / 2^761]]] -]]: diff --git a/output_files/reals_dim0-chgvar.res b/output_files/reals_dim0-chgvar.res deleted file mode 100644 index 8c519ac6..00000000 --- a/output_files/reals_dim0-chgvar.res +++ /dev/null @@ -1,3 +0,0 @@ -[0, [1, -[[[15319600406759311279748950765904158043931 / 2^128, 3829900101689827819937237691476039510983 / 2^126], [14409559673732612038632808778700401347 / 2^126, 57638238694930448154531235114801605389 / 2^128], [410490557109648206507895885740587264340339 / 2^128, 102622639277412051626973971435146816085085 / 2^126], [3179039472210149283343515975030212067269047 / 2^128, 397379934026268660417939496878776508408631 / 2^125]], [[1231195483166375101033967204361512516913 / 2^127, 2462390966332750202067934408723025033827 / 2^128], [61890123607913306301466379005685955835 / 2^128, 15472530901978326575366594751421488959 / 2^126], [5291288561048193107176309412527934968339 / 2^127, 10582577122096386214352618825055869936679 / 2^128], [33904817720423727345775268306844647680281 / 2^128, 16952408860211863672887634153422323840141 / 2^127]], [[7466172442412408544795727821783540203721 / 2^126, 29864689769649634179182911287134160814885 / 2^128], [-54818501356839951484895562809996582675 / 2^128, -27409250678419975742447781404998291337 / 2^127], [936773092757063492454318865261432226131 / 2^128, 234193273189265873113579716315358056533 / 2^126], [-44770539839034835945583172309554218245 / 2^126, -179082159356139343782332689238216872979 / 2^128]], [[29433305770899831525447638201843798761827 / 2^128, 7358326442724957881361909550460949690457 / 2^126], [7348326763861920280739804349370071173 / 2^125, 58786614110895362245918434794960569385 / 2^128], [468389485463247297316288699630786806479 / 2^127, 936778970926494594632577399261573612959 / 2^128], [-181434156373594113533553379330236815789 / 2^128, -45358539093398528383388344832559203947 / 2^126]], [[44617607430881789597600420339898561167 / 2^125, 356940859447054316780803362719188489391 / 2^128], [284860820372480490611969457734241390165 / 2^128, 35607602546560061326496182216780173779 / 2^125], [135651739137714393825031374183553050081 / 2^128, 135651739137714393825031374183553050105 / 2^128], [182935329727870213116536279958726961765 / 2^127, 365870659455740426233072559917453923607 / 2^128]], [[32206964971402775921687490567204882675 / 2^126, 128827859885611103686749962268819530701 / 2^128], [284134068049382510972053292908280701939 / 2^127, 568268136098765021944106585816561403879 / 2^128], [126533637587942174964991773214392191429 / 2^127, 253067275175884349929983546428784382859 / 2^128], [-37397810579198249416961518632295913211 / 2^127, -74795621158396498833923037264591826421 / 2^128]], [[121172061072981161958231376188783554453 / 2^127, 242344122145962323916462752377567108957 / 2^128], [350717054650056287223101936779907750427 / 2^128, 175358527325028143611550968389953875263 / 2^127], [58852804507301049463781233828460034341 / 2^127, 117705609014602098927562467656920068719 / 2^128], [-120973757258183838635580510727502330427 / 2^127, -120973757258183838635580510727502330399 / 2^127]], [[270987986933647118154757782905255024781 / 2^128, 135493993466823559077378891452627512391 / 2^127], [-496113705386580270675790922564246201423 / 2^128, -248056852693290135337895461282123100711 / 2^127], [358997985141544934451307380895349584133 / 2^128, 358997985141544934451307380895349584135 / 2^128], [186501525290857648964805488976725925807 / 2^128, 186501525290857648964805488976725925809 / 2^128]], [[57147295709468540957619583419442219169 / 2^128, 28573647854734270478809791709721109585 / 2^127], [-874593438639079062616877477807025914033 / 2^128, -54662089914942441413554842362939119627 / 2^124], [75506928187311091411038255659557397835 / 2^126, 302027712749244365644153022638229591341 / 2^128], [34479770462018814968289149501513663753 / 2^127, 68959540924037629936578299003027327507 / 2^128]], [[616697302479105464219603864265542945103 / 2^127, 1233394604958210928439207728531085890207 / 2^128], [36789291819117441728410105257375194043 / 2^128, 9197322954779360432102526314343798511 / 2^126], [2729319341614279898723659905584030185729 / 2^128, 1364659670807139949361829952792015092865 / 2^127], [-6270637535330271692444200364014446781829 / 2^128, -1567659383832567923111050091003611695457 / 2^126]]] -]]: diff --git a/output_files/reals_dim0-extract.p1024.res b/output_files/reals_dim0-extract.p1024.res new file mode 100644 index 00000000..9818db63 --- /dev/null +++ b/output_files/reals_dim0-extract.p1024.res @@ -0,0 +1,3 @@ +[0, [1, +[[[37909401411753034103645597538590293219854697794365872045323835918310934950872522703450931418393443485938388173099478060612771730323085859914528857804209501685360345188904890227178583432529470156543407688267306985543258112021426791735811707063878657781732358886186159780183145523200167964411167106630180342599184112504058923909692224012102178217701702792015781033899776719043371538856945162842878548202793411379475500652857713388309523996233832662700043043094751218352789107647004452942017995127026963078611698014648529860923982197 / 2^2048, 37909401411753034103645597538590293219854697794365872045323835918310934950872522703450931418393443485938388173099478060612771730323085859914528857804209501685360345188904890227178583432529470156543407688267306985543258112021426791735811707063878657781732358886186159780183145523200167964411167106630180342599184112504058923909692224012102178217701702792015781033899776719043371538856945162842878548202793411379475500652857713388309523996233832662700043043094751218352789107647004452942017995127026963078611698014648529860923982199 / 2^2048], [145106330743487803038580614491124848928573619573915325414967629135669583675006381807946621882601893359618533063801920123321175837982816550452705073131892239248986926994727486408508370394049448377803164073534593175590103150952160430752683015588171912795941013520504866394835629140364214089195650702844620794680537800097138492581682911353535751558838768399865354530314357740643032044881894001499989847389359928512774462863622860019511352745838955071337760950509994476991677106876706316323581437131747527985859082045766048142025978434943584823805360756009121252003255018156653355968776260278992806058154762218212139131617087263020210676557 / 2^2048, 145106330743487803038580614491124848928573619573915325414967629135669583675006381807946621882601893359618533063801920123321175837982816550452705073131892239248986926994727486408508370394049448377803164073534593175590103150952160430752683015588171912795941013520504866394835629140364214089195650702844620794680537800097138492581682911353535751558838768399865354530314357740643032044881894001499989847389359928512774462863622860019511352745838955071337760950509994476991677106876706316323581437131747527985859082045766048142025978434943584823805360756009121252003255018156653355968776260278992806058154762218212139131617087263020210676561 / 2^2048], [-294115966585075735686535940596113068862597036706404117372124114516527263053009225286750141703534089411492027096456922518000083459038584149573706924949833806395887575968539251166629163333680231885215061031618748732849056727956862931228714969284794683438672199111895930876897307212720316722635447249448374097889431659290730348687581835051724456402104826528663363139657530856076912908975143668269542165660633738690487713847559872871548302422864832513688057097610530517931788026259119298049233121331578249973785873052132270517545943786298171552610478345399382731384800485931914223531275798168132998874327086614794371704958522881337501728669 / 2^2080, -1176463866340302942746143762384452275450388146825616469488496458066109052212036901147000566814136357645968108385827690072000333836154336598294827699799335225583550303874157004666516653334720927540860244126474994931396226911827451724914859877139178733754688796447583723507589228850881266890541788997793496391557726637162921394750327340206897825608419306114653452558630123424307651635900574673078168662642534954761950855390239491486193209691459330054752228390442122071727152105036477192196932485326312999895143492208529082070183775145192686210441913381597530925539201943727656894125103192672531995497308346459177486819834091525350006914675 / 2^2082]], [[209175097898246941620960920286454868227916470164935709914715320214479218891295256372174007263996956515882435651233720614579602799475621957825492752873327107214940362533023812081152416030691856825240234984439219242518707772587814514662310803744780410155382415450025288698689390022902066196041561810657581285606722421593164714492925305344087178867788714010219246967460206579991619471745762701354169075273351547088746175656079014318552481574144530292707695973446680743138767838861067647460433851231308585020493965825111905496744396881162560312866523677516125889425297789268109622697163451222678051858530644301541 / 2^2048, 104587548949123470810480460143227434113958235082467854957357660107239609445647628186087003631998478257941217825616860307289801399737810978912746376436663553607470181266511906040576208015345928412620117492219609621259353886293907257331155401872390205077691207725012644349344695011451033098020780905328790642803361210796582357246462652672043589433894357005109623483730103289995809735872881350677084537636675773544373087828039507159276240787072265146353847986723340371569383919430533823730216925615654292510246982912555952748372198440581280156433261838758062944712648894634054811348581725611339025929265322150771 / 2^2047], [72553165352813484950275195886658253872967805342659366917240093258598448376364431386120651692788599432887049427631802210011849556746708098586522046065739316842938045716544548507687912213962028067607417572332502755694902732089467902542617739872680411012496465217082601153419390970179873673121796128572642450676154851608474172388839811695780770319716336490946651629730459604859579716490611065826295049914353241962372142074315704252605116605118776612146956154690180218645300294071728107468958340578352117773994970132141965589806411534003613996283270213840724687692732617122483026299773805955467377994768755737052224670885518629467480548821 / 2^2047, 145106330705626969900550391773316507745935610685318733834480186517196896752728862772241303385577198865774098855263604420023699113493416197173044092131478633685876091433089097015375824427924056135214835144665005511389805464178935805085235479745360822024992930434165202306838781940359747346243592257145284901352309703216948344777679623391561540639432672981893303259460919209719159432981222131652590099828706483924744284148631408505210233210237553224293912309380360437290600588143456214937916681156704235547989940264283931179612823068007227992566540427681449375385465234244966052599547611910934755989537511474104449341771037258934961097643 / 2^2048], [-11995816011058468456886993003566252716966768787052763454225321914511032285424518938541581967329175808314061265400743852567092936746302954163562980143419853529521843618166642857144075159484731873234578575347650160205179468732128907535570274800511567755362870441946563889897359456605998859309575432786444082700029360839083380366558451536175456090769130270515744432090004820930419932651888774329248164889842634599959499835699807927751988168348970700268648900212365948504470223299628720299044228507286905393693800941405088214682720425073702928441994803124407276988606434160563554860209020103726266464842311312906272367027108000072727645988586465924200556234971 / 2^2147, -23991632022116936913773986007132505433933537574105526908450643829022064570849037877083163934658351616628122530801487705134185873492605908327125960286839707059043687236333285714288150318969463746469157150695300320410358937464257815071140549601023135510725740883893127779794718913211997718619150865572888165400058721678166760733116903072350912181538260541031488864180009641860839865303777548658496329779685269199918999671399615855503976336697941400537297800424731897008940446599257440598088457014573810787387601882810176429365440850147405856883989606248814553977212868321127109720418040207452532929684622625812544734054216000145455291977172931848401112469941 / 2^2148]], [[293510532475241695510527883901360216529301902943265797682552599765743524482248794107735749069518709999542279786305460762381354149544214779221115599717660067230696884077600872541580762172008450674091898222533932002061708841216515456833280549700374479963211476319739315624649594014710506534428178172476959191957710192992021974580697144157732004482696574069433938441194002139505915881925985615887067213287310528939579936043327741042904959588620748971874244340742481785848439627067887347234652880996276215317187142499083447259863763740235970224212184699961953236384317947078323708727849307070065988834998578317245113633996087147165994520287 / 2^2048, 9172204139851302984703996371917506766540684466977056177579768742679485140070274815866742158422459687485696243322045648824417317173256711850659862491176877100959277627425027266924398817875264083565371819454185375064428401288016108026040017178136702498850358634991853613270299812959703329200880567889904974748678443531000686705646785754929125140084267939669810576287312566859559871310187050496470850415228454029361873001353991907590779987144398405371070135648202555807763738345871479601082902531133631728662098203096357726870742616882374069506630771873811038637009935846197615897745290845939562151093705572413909801062377723348937328759 / 2^2043], [103412407980845573325523196899539202069525942925015284888423261006348380303680936794237215751478532127106946117202811011400272199633955482376278354851682272462559023952144275680315883596421138371860048794869031585215572778132391756874921636567162574432039873159480512850073147693382916486888263892439274577934490317991441361878719765051188279842305006922402650259027235876295671459432363974029073971360515017487302313460672993246145351491975315667479376931195588978810259891148257043242783784396510530159002278498793095252254340368084343635387651157958934020841716579119929325692051750920869077095172485502311 / 2^2048, 12926550997605696665690399612442400258690742865626910611052907625793547537960117099279651968934816515888368264650351376425034024954244435297034794356460284057819877994018034460039485449552642296482506099358628948151946597266548969609365204570895321804004984144935064106259143461672864560861032986554909322241811289748930170234839970631398534980288125865300331282378404484536958932429045496753634246420064377185912789182584124155768168936496914458434922116399448622351282486393532130405347973049563816269875284812349136906531792546010542954423456394744866752605214572389991165711506468865108634636896560687789 / 2^2045], [12818678077241272143970289736472335576579369702811966887666793203732764324299369487556842703229084772125394200561793735189705696682917896156747061406477464652514066258442585027042700628045037168935878499954864251933014150154344799180125889350877918367633895173128538746766653901923810751090721705569561677341291043533567103328919516015533368517388636847758555808810578801950543630927400749206740407546669783782241786804085531755225518191077184668338978788882971440476619295544367557651861785006857697246485967562395883731621743322784895917791266560218051379258977479552772429287447254135428531621914374674543647760012148260664449465934433262450546936639684407587660101225080535284012850724572302484179416561656489221539916678104980175238451497683408762353972067324881269084670457198839907254042576087711269026822927288646754662563502950540115471311099534832321629499098767698451957224698447093920173850170011326793592231517091 / 2^3043, 51274712308965088575881158945889342306317478811247867550667172814931057297197477950227370812916339088501576802247174940758822786731671584626988245625909858610056265033770340108170802512180148675743513999819457007732056600617379196720503557403511673470535580692514154987066615607695243004362886822278246709365164174134268413315678064062133474069554547391034223235242315207802174523709602996826961630186679135128967147216342127020902072764308738673355915155531885761906477182177470230607447140027430788985943870249583534926486973291139583671165066240872205517035909918211089717149789016541714126487657498698174591040048593042657797863737733049802187746558737630350640404900322141136051402898289209936717666246625956886159666712419920700953805990733635049415888269299525076338681828795359629016170304350845076107291709154587018650254011802160461885244398139329286517996395070793807828898793788375680695400680045307174368926068365 / 2^3045]], [[293510532320336913036797415478857296353967538565073364984580735365664485719525869775339333587843049278613759384570937230153682810822305113015803746197453222647985113536714746821174805806238511452461104782936404313431442219384275659155882222017371647878084498204236576954549099406951119791779017040767345086889983158187575367484235420791946163382711464867550056499830646439278104658460228530991677252071349172229235613328384997011352749661714647988087674074280716234301745695577816306127822124422832854847156338500755356811827404593044304307221163684197466232019568430716690340636149134879133682342110300374804642355529199247029536566315 / 2^2048, 73377633080084228259199353869714324088491884641268341246145183841416121429881467443834833396960762319653439846142734307538420702705576278253950936549363305661996278384178686705293701451559627863115276195734101078357860554846068914788970555504342911969521124551059144238637274851737779947944754260191836271722495789546893841871058855197986540845677866216887514124957661609819526164615057132747919313017837293057308903332096249252838187415428661997021918518570179058575436423894454076531955531105708213711789084625188839202956851148261076076805290921049366558004892107679172585159037283719783420585527575093701160588882299811757384141579 / 2^2046], [408402798775130418464237981269639434890022357370372769782926004546779963228411916963273580628923048300324173972888109319378823525903938948985665225932744609424591398333536577131144565563493101712424120781994687822808971572273024515198086271192219876062318281724940906906523424186999354701202173281059178184154259945499433055262474835152702963284825756768066184525719485810656670990820054752994907535277352610256653986629902027348799999256060297187262279513743534478713083745034637629857963256740004577192849244551493484590965398803797254363872162273771119593824244394171 / 2^2048, 102100699693782604616059495317409858722505589342593192445731501136694990807102979240818395157230762075081043493222027329844705881475984737246416306483186152356147849583384144282786141390873275428106030195498671955702242893068256128799521567798054969015579570431235226726630856046749838675300543320264794546038564986374858263815618708788175740821206439192016546131429871452664167747705013688248726883819338152564163496657475506837199999814015074296815569878435883619678270936258659407464490814185001144298212311137873371147741349700949313590968040568442779898456061098543 / 2^2046], [379954593470649272577072021329139414691379609638287770138491823545532309685217049448877049836653076142635086156896591651545208631220076177089286396223544080844669286944076803655386786971324941324771726375827553925301554351026836006973960287464476470676842759758054668344620892601656754075602440711338807086457248552385909040515896835817801528797362735461417626073166018247717187411049800483715918823603596238825296019902393032567960469865454248141756630208405645378458275082149437876106961345262656348106662175728923859254356758604076485702268055821506080251738779237462242574117786579688473759290639894877101407909506082624300303448024759609673036356381555250339766152665951602321023432203474648687732995697897020714653912250874888184224630790438791434126648841779688524812659019755901004919583511358156258249669690260362229317588461983044599116966730847492495061045565287876344474369842720028888583976365343819525638531700648627 / 2^3056, 759909186941298545154144042658278829382759219276575540276983647091064619370434098897754099673306152285270172313793183303090417262440152354178572792447088161689338573888153607310773573942649882649543452751655107850603108702053672013947920574928952941353685519516109336689241785203313508151204881422677614172914497104771818081031793671635603057594725470922835252146332036495434374822099600967431837647207192477650592039804786065135920939730908496283513260416811290756916550164298875752213922690525312696213324351457847718508713517208152971404536111643012160503477558474924485148235573159376947518581279789754202815819012165248600606896049519219346072712763110500679532305331903204642046864406949297375465991395794041429307824501749776368449261580877582868253297683559377049625318039511802009839167022716312516499339380520724458635176923966089198233933461694984990122091130575752688948739685440057777167952730687639051277063401297255 / 2^3057]]] +]]: diff --git a/output_files/reals_dim0-extract.p128.res b/output_files/reals_dim0-extract.p128.res new file mode 100644 index 00000000..a9af9a22 --- /dev/null +++ b/output_files/reals_dim0-extract.p128.res @@ -0,0 +1,3 @@ +[0, [1, +[[[7864001568497707828101807145806271935379024022991169361570626416305 / 2^511, 15728003136995415656203614291612543870758048045982338723141252832611 / 2^512], [519917134689817603033657631268209116893594431418786718786796295190793686947804546057601282380841 / 2^256, 259958567344908801516828815634104558446797215709393359393398147595396843473902273028800641190421 / 2^255], [-166090463860166043899588147582177709582717702224858618507419798343808883557211222633506525829042521155276902415348411449642698906756392341892292783342452267687819843633901608571808311751662162828351263467236948315 / 2^674, -83045231930083021949794073791088854791358851112429309253709899171904441778605611316753262914521260577638451207674205724821349453378196170946146391671226133843909921816950804285904155875831081414175631733618474157 / 2^673]], [[749476035886872383904544662017767671467427191089027448033555634132867 / 2^256, 187369008971718095976136165504441917866856797772256862008388908533217 / 2^254], [519917134554161937417721812572846597026223608545634965764942458401126178290809437888218377084849 / 2^256, 259958567277080968708860906286423298513111804272817482882471229200563089145404718944109188542425 / 2^255], [-85962207944750993414566336002595155482344034646997984576364826242311654576947922277730410795546236254228352295346243 / 2^356, -42981103972375496707283168001297577741172017323498992288182413121155827288473961138865205397773118127114176147673121 / 2^355]], [[1051650567304134495132708290699175638367991870765798866200766034397654338986800101000503755459645 / 2^256, 525825283652067247566354145349587819183995935382899433100383017198827169493400050500251877729823 / 2^255], [185263739263797092109533046819610805761405176019368245031748430221259 / 2^255, 370527478527594184219066093639221611522810352038736490063496860442519 / 2^256], [347756204762648707414567305047038029994399554264038970901878221905417860623209423740383115053643111302304038582305485 / 2^357, 173878102381324353707283652523519014997199777132019485450939110952708930311604711870191557526821555651152019291152743 / 2^356]], [[65728160421819339383003272522812853762247994498579925204331894259673696971453430155839717051395 / 2^252, 1051650566749109430128052360365005660195967911977278803269310308154779151543254882493435472822321 / 2^256], [1463310469298716819488079044283 / 2^256, 365827617324679204872019761071 / 2^254], [322116793682101292200402382950599120867720395557717230274102146413552549522902835480637885204881639775086134227913452653 / 2^365, 5153868698913620675206438127209585933883526328923475684385634342616840792366445367690206163278106236401378147646615242449 / 2^369]]] +]]: diff --git a/output_files/reals_dim0-extract.p256.res b/output_files/reals_dim0-extract.p256.res deleted file mode 100644 index 08c576c9..00000000 --- a/output_files/reals_dim0-extract.p256.res +++ /dev/null @@ -1,3 +0,0 @@ -[0, [1, -[[[8443907388097589743165112862434260378533883385786356126185759913065960281913 / 2^541, 16887814776195179486330225724868520757067766771572712252371519826131920563827 / 2^542], [60202291256013103624351786094766442664065547773592514442328257480645916137729884017487584950758125585346886248982494808142366423238526866451173099572367335984919203906888175 / 2^512, 15050572814003275906087946523691610666016386943398128610582064370161479034432471004371896237689531396336721562245623702035591605809631716612793274893091834642295240362600533 / 2^510], [-14205463375625439824271981231838781084270062179606120160407346728116770963458049677964294556903239326560634612253186970740482369893460558982539932575393722194960917 / 2^511, -28410926751250879648543962463677562168540124359212240320814693456233541926916099355928589113806478653121269224506373941480964739786921117965079865150787443390974197 / 2^512]], [[95419353031382213633139369956416081761773852352517227804961569506499790070221755509023819815281239483535961307535239558945050421916859268954955340354080024409 / 2^552, 381677412125528854532557479825664327047095409410068911219846278025999160280887022036095279261124957934143845230140958235780201687667437075819821361416320097637 / 2^554], [60202291240305250685803819506479138112374249550703569304625077733885920408452959870785898011580374846937471051702552692056312593898161651675895586274364380010323144562663479 / 2^512, 60202291240305250685803819506479138112374249550703569304625077733885920408452959870785898011580374846937471051702552692056312593898161651675895586274364380010954067843231443 / 2^512], [-7852119228739570493557187760144536345748688167522167456018986108760375603865727464751849999127149286782393726645891835617605942449530082125419230808710542448501567 / 2^512, -7852119228739570493557187760144536345748688167522167456018986108760375603865727464751849999127149286782393726645891835617605942449530082125419230808710542448365411 / 2^512]], [[410373579023502998314293277420588657902069275446626959750066548639249827351892618000101370463113556110212946668578778092472888207049914757538683701617361560973171905002797365923852458452499341291796733537421167579954107656491295834957453837 / 2^733, 3282988632188023986514346219364709263216554203573015678000532389113998618815140944000810963704908448881703573348630224739783105656399318060309469612938892487785375240022378927390819667619994730334373868299369340639632861251930366679659630697 / 2^736], [84719888221468029422706116986275030930990416734677334225028971420450265451891893641816400417073710100392615 / 2^511, 169439776442936058845412233972550061861980833469354668450057942840900530903783787283632800834147420200785231 / 2^512], [57467556320577598044741821525626165446870765950833579121464022633112742023304365148048342319044969108277304801951557975101010687186692946416721261434280863321420013 / 2^512, 28733778160288799022370910762813082723435382975416789560732011316556371011652182574024171159522484554138652400975778987550505343593346473208360630717140431660710007 / 2^511]], [[205186789620042042411354388868615168007114084371480742885354107226817010646012172401282522182534135496662854507160250538626948051742163543674918161178858655024172351786256182603729985808683712712564217180193295076159800786514980962087032421 / 2^732, 820747158480168169645417555474460672028456337485922971541416428907268042584048689605130088730136541986651418028641002154507792206968654174699672644715434620096689407145024730414919943234734850850256868720773180304639203146059923848348129685 / 2^734], [10726037714636236559758509991817855352159987403073603739534959978018171213229507880748813765338411507643253214747186134194516202711403597575886947 / 2^510, 42904150858544946239034039967271421408639949612294414958139839912072684852918031522995255061353646030573012858988744536778064810845614390303547789 / 2^512], [15882695707893494541303836658076955190055036342540031206230103611753861229372583658470628475590234746857973928190717632886492149076567859891283431557094147071232609 / 2^512, 7941347853946747270651918329038477595027518171270015603115051805876930614686291829235314237795117373428986964095358816443246074538283929945641715778547073535616305 / 2^511]]] -]]: diff --git a/output_files/reals_dim0-extract.res b/output_files/reals_dim0-extract.res deleted file mode 100644 index 780915f4..00000000 --- a/output_files/reals_dim0-extract.res +++ /dev/null @@ -1,3 +0,0 @@ -[0, [1, -[[[8443907388097589743165112862434260378533883385786356126185759913065960281913 / 2^541, 16887814776195179486330225724868520757067766771572712252371519826131920563827 / 2^542], [1527899136808977399827358662938377330417784663266649701617 / 2^128, 763949568404488699913679331469188665208892331633324850809 / 2^127], [-721052796389099865046191244931999226002881710863 / 2^128, -360526398194549932523095622465999613001440855431 / 2^127]], [[3539300511586173536951128098566473233666983583176403340069598239917259011586571265122622457 / 2^328, 1769650255793086768475564049283236616833491791588201670034799119958629505793285632561311229 / 2^327], [763949568205160614177967101393949794088603190461849574001 / 2^127, 1527899136410321228355934202787899588177206380923699148003 / 2^128], [-24910277377761055085770254935205059453912618881 / 2^125, -99641109511044220343081019740819945425034696229 / 2^127]], [[5207521375663539835938678208630711271841986476234925504910697495268353208204985847730528816840673516100831224373308526257089 / 2^348, 20830085502654159343754712834522845087367945904939702019642789981073412832819943390922115267362694064403324897493234105028357 / 2^350], [182913808662339602436009880535 / 2^253, 1463310469298716819488079044287 / 2^256], [1458493154742872595987662460429159098086852655653 / 2^128, 1458493154742872595987662460429159098125617999631 / 2^128]], [[41660171027295126712348929771650383530200072543754916943583157566655318244255300691790646983099247441418550204339803807932265 / 2^351, 83320342054590253424697859543300767060400145087509833887166315133310636488510601383581293966198494882837100408679607615864531 / 2^352], [272220598646008374746728946433 / 2^126, 1088882394584033498986915785733 / 2^128], [100773394816041478750500991846530653087655240659 / 2^126, 403093579264165915002003967386122612567093323805 / 2^128]]] -]]: diff --git a/output_files/reals_dim0-swapvar.p256.res b/output_files/reals_dim0-swapvar.p1024.res similarity index 100% rename from output_files/reals_dim0-swapvar.p256.res rename to output_files/reals_dim0-swapvar.p1024.res diff --git a/output_files/reals_dim0-swapvar.res b/output_files/reals_dim0-swapvar.p128.res similarity index 100% rename from output_files/reals_dim0-swapvar.res rename to output_files/reals_dim0-swapvar.p128.res diff --git a/output_files/reals_dim0.p1024.res b/output_files/reals_dim0.p1024.res new file mode 100644 index 00000000..90044408 --- /dev/null +++ b/output_files/reals_dim0.p1024.res @@ -0,0 +1,3 @@ +[0, [1, +[[[20379166642182100357713838861951358509499624962455868285912306176992504626032951839339349716362929175034734380500475668078255271255438141416025041178361180528920547098494835083183709209726714891381890755207367383378243459868618822577342896838472261296992526954120035953507871457959165487803919504579793401989240431768246631125039145723273114259879900219267952612181244794053698063830458260907813590633862804292974152472552614592340684761279185018596705191156558712994716298243800266196368803876015090557123268777017196220316130194444603414207546537477980108521579566150265277056354162058997752538765209288759153672475 / 2^2048, 20379166642182100357713838861951358509499624962455868285912306176992504626032951839339349716362929175034734380500475668078255271255438141416025041178361180528920547098494835083183709209726714891381890755207367383378243459868618822577342896838472261296992526954120035953507871457959165487803919504579793401989240431768246631125039145723273114259879900219267952612181244794053698063830458260907813590633862804292974152472552614592340684761279185018596705191156558712994716298243800266196368803876015090557123268777017196220316130194444603414207546537477980108521579566150265277056354162058997752538765209288759153672477 / 2^2048], [10189583321091050178856919430975679254749812481227934142956153088496252313016475919669674858181464587517367190250237834039127635627719070708012520589180590264460273549247417541591854604863357445690945377603683691689121729934309411288671448419236130648496263477060017976753935728979582743901959752289896700994620215884123315562519572861636557129939950109633976306090622397026849031915229130453906795316931402146487076236276307296170342380639592509298352595578279356497358149121900133098184401938007545278561634388508598110158065097222301707103773268738990054260789783075132638528177081029498876269382604644379576836237 / 2^2048, 10189583321091050178856919430975679254749812481227934142956153088496252313016475919669674858181464587517367190250237834039127635627719070708012520589180590264460273549247417541591854604863357445690945377603683691689121729934309411288671448419236130648496263477060017976753935728979582743901959752289896700994620215884123315562519572861636557129939950109633976306090622397026849031915229130453906795316931402146487076236276307296170342380639592509298352595578279356497358149121900133098184401938007545278561634388508598110158065097222301707103773268738990054260789783075132638528177081029498876269382604644379576836239 / 2^2048], [-67530617704425547317702408281862120468441178041570020317554135411682832905584102283851984169623559091046006400632426533299127866883082893895695439762192623497681734637509392596937765352510221407741790976245337587837557608756943111942781594707746816987227264449630134913025336195018121336002292880285251347652532241174599358635146533279853272199228995225676665330277471430210959479619649661322948707228387934880037609813146974616664146962053793062317702152638641558098455294214242581340644048200790861156543959787021556044690104964289665521596543268532183051996455974938407595739118764104346855071796519731669688914365 / 2^2052, -135061235408851094635404816563724240936882356083140040635108270823365665811168204567703968339247118182092012801264853066598255733766165787791390879524385246995363469275018785193875530705020442815483581952490675175675115217513886223885563189415493633974454528899260269826050672390036242672004585760570502695305064482349198717270293066559706544398457990451353330660554942860421918959239299322645897414456775869760075219626293949233328293924107586124635404305277283116196910588428485162681288096401581722313087919574043112089380209928579331043193086537064366103992911949876815191478237528208693710143593039463339377828729 / 2^2053]], [[1, 1], [0, 0], [0, 0]], [[1830281069021119332153299574941435792720258617182208078264140333078585658963452945850277159092749162746041682215287801443461802004102804880655486645362908393619336946940790391721972215508961014325111090851886918786180324741978099247486724577198256919447935229763484949384655540840437015607781352238751017828814392070010129880315565309159843469642062667038652287971361442771795382479912644948102015098143681082315805535817958642828761199459127867723044619332279014157133572162797121249155749401052939532793156215886421931002252580321634568922868758428241544771805566055268596017051133472026022192499237737322982202729 / 2^2046, 7321124276084477328613198299765743170881034468728832313056561332314342635853811783401108636370996650984166728861151205773847208016411219522621946581451633574477347787763161566887888862035844057300444363407547675144721298967912396989946898308793027677791740919053939797538622163361748062431125408955004071315257568280040519521262261236639373878568250668154609151885445771087181529919650579792408060392574724329263222143271834571315044797836511470892178477329116056628534288651188484996622997604211758131172624863545687724009010321286538275691475033712966179087222264221074384068204533888104088769996950949291928810971 / 2^2048], [3660562138042238664306599149882871585440517234364416156528280666157171317926905891700554318185498325492083364430575602886923604008205609761310973290725816787238673893881580783443944431017922028650222181703773837572360649483956198494973449154396513838895870459526969898769311081680874031215562704477502035657628784140020259760631130618319686939284125334077304575942722885543590764959825289896204030196287362164631611071635917285657522398918255735446089238664558028314267144325594242498311498802105879065586312431772843862004505160643269137845737516856483089543611132110537192034102266944052044384998475474645964405463 / 2^2048, 457570267255279833038324893735358948180064654295552019566035083269646414740863236462569289773187290686510420553821950360865450501025701220163871661340727098404834236735197597930493053877240253581277772712971729696545081185494524811871681144299564229861983807440871237346163885210109253901945338059687754457203598017502532470078891327289960867410515666759663071992840360692948845619978161237025503774535920270578951383954489660707190299864781966930761154833069753539283393040699280312288937350263234883198289053971605482750563145080408642230717189607060386192951391513817149004262783368006505548124809434330745550685 / 2^2045], [35349515038284105286976960178276931237364067464515638812034445525791939734320534652789968277561840323440769006399191215892850286235336964099688518447090031943352363583549345915948840052635927984390337823137944435974699241413589924363888595441780230229996328027856850895620663129635139367490603162427844485782798393659174606756320904626571643475439349398034207508613828234313326265738318309130884944158055336134834318863836376429936523113257245925238681317150110235940114214816886479463822213037015614414666585707130644974055953251559844173665150197927009954738315213982161673017818821657487941307123903424951477217537 / 2^2050, 17674757519142052643488480089138465618682033732257819406017222762895969867160267326394984138780920161720384503199595607946425143117668482049844259223545015971676181791774672957974420026317963992195168911568972217987349620706794962181944297720890115114998164013928425447810331564817569683745301581213922242891399196829587303378160452313285821737719674699017103754306914117156663132869159154565442472079027668067417159431918188214968261556628622962619340658575055117970057107408443239731911106518507807207333292853565322487027976625779922086832575098963504977369157606991080836508909410828743970653561951712475738608769 / 2^2049]], [[10772335357103669100238292229556650653481367556571828010710115142508218379622630297732400470507637821229572653640632673164706519716830307031696050795482761040210292455766998697250065916796550702265352546128022522758930739547539918720612698112825390156860548617345435014295858630513688602869184133041310128507304777796556114140228324928854856498285392011775440686025935219777008730902820104716752864288059038908647867906153952452532783717433881968134565871077762410409041894903606736575052367242310441156559514193552232645015332422784332879405175055463145778514534045144409868215106159534984049397851951203686532076877 / 2^2048, 10772335357103669100238292229556650653481367556571828010710115142508218379622630297732400470507637821229572653640632673164706519716830307031696050795482761040210292455766998697250065916796550702265352546128022522758930739547539918720612698112825390156860548617345435014295858630513688602869184133041310128507304777796556114140228324928854856498285392011775440686025935219777008730902820104716752864288059038908647867906153952452532783717433881968134565871077762410409041894903606736575052367242310441156559514193552232645015332422784332879405175055463145778514534045144409868215106159534984049397851951203686532076893 / 2^2048], [-32894095465441561002513356629539058245452033074531831961275530167301881123490531802004294293871536918397445067366931912699371694135321116114643297964777716747785000177431371021960022710218038751560272953355211631996020651118380823236156631737377530657556318099394096204367711175318584840904115834822571999549091375057340991392482920764896079664407179178814292094829195046104794517578254248331513210593894565238906882356291533381841178851449889581268049356326738788927610071937799142041677764257769382817351373698168424683886104362430730756755088115789248716535452173565965847585413451437183436554155065282685660449069 / 2^4096, 34625363647833222107908796452146377100475824288980875748711084386633559077358454528425572940917407282523626386702033592315128099089811701173308734699766017629247368607822495812589497589703198685852918898268643823153705948545664024459112243934081611218480334841467469688808117026651141937793806141918496841630622500060358938307876758699890610173060188609278202205083363206426099492187636050875277063783046910777796718269780561454569661948894620611861104585607093462029063233618735938991239751850283560860369867050703604930406425644663927112373776963988682859511002287964174576405698369933877301635952700297563853104283 / 2^4096], [172357365713658705603812675672906410455701880905149248171361842280131494073962084763718407528122205139673162458250122770635304315469284912507136812727724176643364679292271979156001054668744811236245640738048360364142891832760638699529803169805206242509768777877526960228733738088219017645906946128660962056116876444744897826243653198861677703972566272188407050976414963516432139694445121675468045828608944622538365886498463239240524539478942111490153053937244198566544670318457707785200837875876967058504952227096835722320245318764549326070482800887410332456232544722310557891441698552559744790365631219258984513230165 / 2^2052, 86178682856829352801906337836453205227850940452574624085680921140065747036981042381859203764061102569836581229125061385317652157734642456253568406363862088321682339646135989578000527334372405618122820369024180182071445916380319349764901584902603121254884388938763480114366869044109508822953473064330481028058438222372448913121826599430838851986283136094203525488207481758216069847222560837734022914304472311269182943249231619620262269739471055745076526968622099283272335159228853892600418937938483529252476113548417861160122659382274663035241400443705166228116272361155278945720849276279872395182815609629492256615083 / 2^2051]]] +]]: diff --git a/output_files/reals_dim0.p128.res b/output_files/reals_dim0.p128.res new file mode 100644 index 00000000..2b74cfe3 --- /dev/null +++ b/output_files/reals_dim0.p128.res @@ -0,0 +1,3 @@ +[0, [1, +[[[36509357909062631536129668436573070012487487067100583303001175658946635606055 / 2^255, 4563669738632828942016208554571633751560935883387572912875146957368329450757 / 2^252], [36509357909062631536129668436573070012487487067100583303001175658946635606055 / 2^256, 4563669738632828942016208554571633751560935883387572912875146957368329450757 / 2^253], [-60490684797868661441895377475208744393359927205523538345094237255746825568573 / 2^258, -483925478382949291535163019801669955146879417644188306760753898045974604548583 / 2^261]], [[1, 1], [0, 0], [0, 0]], [[26231646385288618719372935991443495277827869864919316856389863546032268479235 / 2^256, 26231646385288618719372935991443495277827869864919316856389863546032268479291 / 2^256], [13115823192644309359686467995721747638913934932459658428194931773016134239623 / 2^256, 1639477899080538669960808499465218454864241866557457303524366471627016779955 / 2^253], [63328796466738957984825113025800917297614244935801930326677856915848592681411 / 2^257, 126657592933477915969650226051601834595228489871603860653355713831697185362823 / 2^258]], [[38597363079105398474523661669562635951089994888546854679819194669304376546637 / 2^256, 38597363079105398474523661669562635951089994888546854679819194669304376546653 / 2^256], [-58929902558276992313781662013350095961039188624477787055795377575455789191757 / 2^511, 62031476377133676119770170540368522064251777499450302163995134289953462307113 / 2^511], [617557809265686375592378586713002175217439918216749674877107114708870024746325 / 2^260, 308778904632843187796189293356501087608719959108374837438553557354435012373163 / 2^259]]] +]]: diff --git a/output_files/reals_dim0.p256.res b/output_files/reals_dim0.p256.res deleted file mode 100644 index 671fab45..00000000 --- a/output_files/reals_dim0.p256.res +++ /dev/null @@ -1,3 +0,0 @@ -[0, [1, -[[[8454989658006592107483875415131693843229597278548548551536510143038085242453846082856647764473650249869137393683973959687056897558903190162882156928474507 / 2^512, 8454989658006592107483875415131693843229597278548548551536510143038085242453846082856647764473650249869137393683973959687056897558903190162882156928474509 / 2^512], [4227494829003296053741937707565846921614798639274274275768255071519042621226923041428323882236825124934568696841986979843528448779451595081441078464237253 / 2^512, 2113747414501648026870968853782923460807399319637137137884127535759521310613461520714161941118412562467284348420993489921764224389725797540720539232118627 / 2^511], [-28017371088564696923149806656460332471838629892037629802795670738835251638673161511291369846243176576385943433451694948162879298446878483034645318806919355 / 2^516, -56034742177129393846299613312920664943677259784075259605591341477670503277346323022582739692486353152771886866903389896325758596893756966069290637613838709 / 2^517]], [[1, 1], [0, 0], [0, 0]], [[759354284771765637323465074404043566509607641918375728770921345037999552973727117171953979917352457752008192618967806689754464784262753162086671269185101 / 2^510, 3037417139087062549293860297616174266038430567673502915083685380151998211894908468687815919669409831008032770475871226759017859137051012648346685076740459 / 2^512], [1518708569543531274646930148808087133019215283836751457541842690075999105947454234343907959834704915504016385237935613379508929568525506324173342538370207 / 2^512, 94919285596470704665433134300505445813700955239796966096365168129749944121715889646494247489669057219001024077370975836219308098032844145260833908648139 / 2^508], [229155426617764750030822012592921799856328271413918360861130958856805237696366563732070076838377617677311447413585737416741192641807642020304383714143851 / 2^508, 14665947303536944001972608805946995190805009370490775095112381366835535212567460078852484917656167531347932634469487194671436329075689089299480557705206465 / 2^514]], [[4469269309980865699858008332735282042493121940197464459241187147907254676691182325600624766055634475896677286062162016951251294270648856648811216335361357 / 2^512, 4469269309980865699858008332735282042493121940197464459241187147907254676691182325600624766055634475896677286062162016951251294270648856648811216335361373 / 2^512], [-13647233071548714904923561158888093379755783067388686116611482183788224102039146029959050624919883846041639569939816158904713773576445615838334249881192749 / 2^1024, 14365508496367068320972169640934835136585034807777564333275244403987604317935943189430579605178825101096462705199806483057593445869942753514036052506518683 / 2^1024], [71508308959693851197728133323764512679889951043159431347858994366516074827058917209609996256890151614346836576994592271220020708330381706380979461365781845 / 2^516, 35754154479846925598864066661882256339944975521579715673929497183258037413529458604804998128445075807173418288497296135610010354165190853190489730682890923 / 2^515]]] -]]: diff --git a/output_files/reals_dim0.res b/output_files/reals_dim0.res deleted file mode 100644 index d8a02636..00000000 --- a/output_files/reals_dim0.res +++ /dev/null @@ -1,3 +0,0 @@ -[0, [1, -[[[107291359935630315248585097660753910587 / 2^127, 26822839983907578812146274415188477647 / 2^125], [107291359935630315248585097660753910587 / 2^128, 26822839983907578812146274415188477647 / 2^126], [-355532291286331190123863132844989723573 / 2^131, -1422129165145324760495452531379958894291 / 2^133]], [[1, 1], [0, 0], [0, 0]], [[77087880346686623900008039620007788617 / 2^128, 77087880346686623900008039620007788673 / 2^128], [19271970086671655975002009905001947157 / 2^127, 38543940173343311950004019810003894331 / 2^128], [93053303113782607831679264095876317083 / 2^128, 372213212455130431326717056383505268333 / 2^130]], [[113427455640312821154458202477256070477 / 2^128, 113427455640312821154458202477256070493 / 2^128], [-346358837758812364596649153993049786669 / 2^256, 364588250272434067996472793676894512283 / 2^256], [1814839290245005138471331239636097127765 / 2^132, 907419645122502569235665619818048563883 / 2^131]]] -]]: diff --git a/output_files/test-lifting2.res b/output_files/test-lifting2.P2.d0.res similarity index 100% rename from output_files/test-lifting2.res rename to output_files/test-lifting2.P2.d0.res diff --git a/output_files/xy-qq.res b/output_files/xy-qq.P2.d0.res similarity index 100% rename from output_files/xy-qq.res rename to output_files/xy-qq.P2.d0.res diff --git a/test/diff/diff_bug_2nd_prime_bad.sh b/test/diff/diff_bug_2nd_prime_bad.sh index 39429863..b361699e 100755 --- a/test/diff/diff_bug_2nd_prime_bad.sh +++ b/test/diff/diff_bug_2nd_prime_bad.sh @@ -2,48 +2,6 @@ file=bug-2nd-prime-bad -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -g 2 -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 1 -fi +source test/diff/diff_source.sh -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 2 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -g 2 -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 21 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 22 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -g 2 -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 41 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 42 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -g 2 -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 61 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 62 -fi - -rm test/diff/$file.res +source test/diff/diff_source-gb-red.sh diff --git a/test/diff/diff_bug_68.sh b/test/diff/diff_bug_68.sh index 726b52a2..e6328dc1 100755 --- a/test/diff/diff_bug_68.sh +++ b/test/diff/diff_bug_68.sh @@ -2,48 +2,6 @@ file=bug_68 -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 1 -fi +source test/diff/diff_source.sh -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 2 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 21 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 22 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 41 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 42 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 61 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 62 -fi - -rm test/diff/$file.res +source test/diff/diff_source-noarg.sh diff --git a/test/diff/diff_bug_empty_tracer.sh b/test/diff/diff_bug_empty_tracer.sh index 57393422..9034b1d9 100755 --- a/test/diff/diff_bug_empty_tracer.sh +++ b/test/diff/diff_bug_empty_tracer.sh @@ -2,48 +2,6 @@ file=bug-empty-tracer -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -g 2 -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 1 -fi +source test/diff/diff_source.sh -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 2 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -g 2 -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 21 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 22 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -g 2 -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 41 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 42 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -g 2 -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 61 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 62 -fi - -rm test/diff/$file.res +source test/diff/diff_source-gb-red.sh diff --git a/test/diff/diff_cp_d_3_n_4_p_2.sh b/test/diff/diff_cp_d_3_n_4_p_2.sh index 71976991..3ccc60a3 100755 --- a/test/diff/diff_cp_d_3_n_4_p_2.sh +++ b/test/diff/diff_cp_d_3_n_4_p_2.sh @@ -3,3 +3,5 @@ file=cp_d_3_n_4_p_2 source test/diff/diff_source.sh + +source test/diff/diff_source-param-nonf-qq.sh diff --git a/test/diff/diff_cyclic5-16.sh b/test/diff/diff_cyclic5-16.sh index 8ba24c6f..5b34a90c 100755 --- a/test/diff/diff_cyclic5-16.sh +++ b/test/diff/diff_cyclic5-16.sh @@ -2,48 +2,6 @@ file=cyclic5-16 -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -d 4 -P 2 -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 1 -fi +source test/diff/diff_source.sh -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 2 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -d 4 -P 2 -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 21 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 22 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -d 4 -P 2 -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 41 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 42 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -d 4 -P 2 -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 61 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 62 -fi - -rm test/diff/$file.res +source test/diff/diff_source-param-fullnf.sh diff --git a/test/diff/diff_cyclic5-31.sh b/test/diff/diff_cyclic5-31.sh index 6306d328..3cd27ff7 100755 --- a/test/diff/diff_cyclic5-31.sh +++ b/test/diff/diff_cyclic5-31.sh @@ -2,48 +2,6 @@ file=cyclic5-31 -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -d 4 -P 2 -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 1 -fi +source test/diff/diff_source.sh -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 2 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -d 4 -P 2 -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 21 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 22 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -d 4 -P 2 -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 41 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 42 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -d 4 -P 2 -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 61 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 62 -fi - -rm test/diff/$file.res +source test/diff/diff_source-param-fullnf.sh diff --git a/test/diff/diff_cyclic5-qq.sh b/test/diff/diff_cyclic5-qq.sh index 3047ee8b..3589b45f 100755 --- a/test/diff/diff_cyclic5-qq.sh +++ b/test/diff/diff_cyclic5-qq.sh @@ -4,4 +4,8 @@ file=cyclic5-qq source test/diff/diff_source.sh -source test/diff/diff_source-groebner.sh +source test/diff/diff_source-param-fullnf-qq.sh + +source test/diff/diff_source-gb-red.sh + +source test/diff/diff_source-gb-elim-red.sh diff --git a/test/diff/diff_eco10-31.sh b/test/diff/diff_eco10-31.sh index 9291dbf4..07639787 100755 --- a/test/diff/diff_eco10-31.sh +++ b/test/diff/diff_eco10-31.sh @@ -3,3 +3,5 @@ file=eco10-31 source test/diff/diff_source.sh + +source test/diff/diff_source-param-nonf.sh diff --git a/test/diff/diff_eco6-16.sh b/test/diff/diff_eco6-16.sh index 26fcc7fd..dea94038 100755 --- a/test/diff/diff_eco6-16.sh +++ b/test/diff/diff_eco6-16.sh @@ -2,48 +2,6 @@ file=eco6-16 -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -d 4 -P 2 -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 1 -fi +source test/diff/diff_source.sh -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 2 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -d 4 -P 2 -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 21 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 22 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -d 4 -P 2 -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 41 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 42 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -d 4 -P 2 -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 61 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 62 -fi - -rm test/diff/$file.res +source test/diff/diff_source-param-fullnf.sh diff --git a/test/diff/diff_eco6-31.sh b/test/diff/diff_eco6-31.sh index 1c1397c4..e91bf00f 100755 --- a/test/diff/diff_eco6-31.sh +++ b/test/diff/diff_eco6-31.sh @@ -2,92 +2,6 @@ file=eco6-31 -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -d 4 -P 2 -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 1 -fi +source test/diff/diff_source.sh -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 2 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -L 1 -d 4 -P 2 -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 101 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 201 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -d 4 -P 2 -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 21 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 22 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -L 1 -d 4 -P 2 -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 211 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 221 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -d 4 -P 2 -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 41 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 42 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -L 1 -d 4 -P 2 -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 411 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 421 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -d 4 -P 2 -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 61 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 62 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -L 1 -d 4 -P 2 -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 611 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 621 -fi - -rm test/diff/$file.res +source test/diff/diff_source-param-fullnf.sh diff --git a/test/diff/diff_eco6-qq.sh b/test/diff/diff_eco6-qq.sh index cacf611c..369ced6c 100755 --- a/test/diff/diff_eco6-qq.sh +++ b/test/diff/diff_eco6-qq.sh @@ -2,92 +2,6 @@ file=eco6-qq -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -d 4 -P 2 -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 1 -fi +source test/diff/diff_source.sh -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 2 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -L 1 -d 4 -P 2 -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 101 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 201 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -d 4 -P 2 -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 21 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 22 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -L 1 -d 4 -P 2 -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 211 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 221 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -d 4 -P 2 -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 41 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 42 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -L 1 -d 4 -P 2 -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 411 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 421 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -d 4 -P 2 -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 61 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 62 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -L 1 -d 4 -P 2 -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 611 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 621 -fi - -rm test/diff/$file.res +source test/diff/diff_source-param-fullnf-qq.sh diff --git a/test/diff/diff_elim-31.sh b/test/diff/diff_elim-31.sh index b8330674..bfecf124 100755 --- a/test/diff/diff_elim-31.sh +++ b/test/diff/diff_elim-31.sh @@ -2,92 +2,6 @@ file=elim-31 -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -e 1 -g 2 -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 1 -fi +source test/diff/diff_source.sh -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 2 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -e 2 -g 2 -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 3 -fi - -diff test/diff/$file.res output_files/$file.e2.res -if [ $? -gt 0 ]; then - exit 4 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -e 1 -g 2 -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 21 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 22 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -e 2 -g 2 -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 23 -fi - -diff test/diff/$file.res output_files/$file.e2.res -if [ $? -gt 0 ]; then - exit 24 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -e 1 -g 2 -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 41 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 42 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -e 2 -g 2 -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 43 -fi - -diff test/diff/$file.res output_files/$file.e2.res -if [ $? -gt 0 ]; then - exit 44 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -e 1 -g 2 -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 61 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 62 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -e 2 -g 2 -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 63 -fi - -diff test/diff/$file.res output_files/$file.e2.res -if [ $? -gt 0 ]; then - exit 64 -fi - -rm test/diff/$file.res +source test/diff/diff_source-gb-elim-red.sh diff --git a/test/diff/diff_elim-qq.sh b/test/diff/diff_elim-qq.sh index 3397e073..3693dd23 100755 --- a/test/diff/diff_elim-qq.sh +++ b/test/diff/diff_elim-qq.sh @@ -2,92 +2,6 @@ file=elim-qq -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -e 1 -g 2 -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 1 -fi +source test/diff/diff_source.sh -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 2 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -e 2 -g 2 -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 3 -fi - -diff test/diff/$file.res output_files/$file.e2.res -if [ $? -gt 0 ]; then - exit 4 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -e 1 -g 2 -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 21 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 22 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -e 2 -g 2 -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 23 -fi - -diff test/diff/$file.res output_files/$file.e2.res -if [ $? -gt 0 ]; then - exit 24 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -e 1 -g 2 -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 41 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 42 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -e 2 -g 2 -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 43 -fi - -diff test/diff/$file.res output_files/$file.e2.res -if [ $? -gt 0 ]; then - exit 44 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -e 1 -g 2 -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 61 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 62 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -e 2 -g 2 -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 63 -fi - -diff test/diff/$file.res output_files/$file.e2.res -if [ $? -gt 0 ]; then - exit 64 -fi - -rm test/diff/$file.res +source test/diff/diff_source-gb-elim-red.sh diff --git a/test/diff/diff_F4SAT-31.sh b/test/diff/diff_f4sat-31.sh similarity index 98% rename from test/diff/diff_F4SAT-31.sh rename to test/diff/diff_f4sat-31.sh index 4081afc6..b9f275e2 100755 --- a/test/diff/diff_F4SAT-31.sh +++ b/test/diff/diff_f4sat-31.sh @@ -1,6 +1,6 @@ #!/bin/bash -file=F4SAT-31 +file=f4sat-31 $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ -S -g 2 -l 2 -t 1 diff --git a/test/diff/diff_F4SAT-byone-31.sh b/test/diff/diff_f4sat-byone-31.sh similarity index 97% rename from test/diff/diff_F4SAT-byone-31.sh rename to test/diff/diff_f4sat-byone-31.sh index 3383e296..4130ab8d 100755 --- a/test/diff/diff_F4SAT-byone-31.sh +++ b/test/diff/diff_f4sat-byone-31.sh @@ -1,6 +1,6 @@ #!/bin/bash -file=F4SAT-byone-31 +file=f4sat-byone-31 $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ -S -g 2 -l 2 -t 1 diff --git a/test/diff/diff_groebner-g2.sh b/test/diff/diff_groebner-g2.sh index 06b96db9..bd00e54c 100755 --- a/test/diff/diff_groebner-g2.sh +++ b/test/diff/diff_groebner-g2.sh @@ -2,48 +2,6 @@ file=groebner-g2 -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -g 2 -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 3 -fi +source test/diff/diff_source.sh -diff test/diff/$file.res output_files/$file.g2.res -if [ $? -gt 0 ]; then - exit 4 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -g 2 -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 23 -fi - -diff test/diff/$file.res output_files/$file.g2.res -if [ $? -gt 0 ]; then - exit 24 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -g 2 -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 43 -fi - -diff test/diff/$file.res output_files/$file.g2.res -if [ $? -gt 0 ]; then - exit 44 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -g 2 -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 63 -fi - -diff test/diff/$file.res output_files/$file.g2.res -if [ $? -gt 0 ]; then - exit 64 -fi - -rm test/diff/$file.res +source test/diff/diff_source-gb-red.sh diff --git a/test/diff/diff_henrion5-qq.sh b/test/diff/diff_henrion5-qq.sh index 418e88ac..f26cd888 100755 --- a/test/diff/diff_henrion5-qq.sh +++ b/test/diff/diff_henrion5-qq.sh @@ -2,7 +2,11 @@ file=henrion5-qq -#source test/diff/diff_source.sh +source test/diff/diff_source.sh -source test/diff/diff_source-groebner.sh +source test/diff/diff_source-param-nonf-qq.sh + +source test/diff/diff_source-gb-red.sh + +source test/diff/diff_source-gb-elim-red.sh diff --git a/test/diff/diff_input-overflow-16.sh b/test/diff/diff_input-overflow-16.sh index 29863654..7d9561b0 100755 --- a/test/diff/diff_input-overflow-16.sh +++ b/test/diff/diff_input-overflow-16.sh @@ -2,49 +2,6 @@ file=input-overflow-16 +source test/diff/diff_source.sh -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 1 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 2 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 21 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 22 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 41 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 42 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 61 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 62 -fi - -rm test/diff/$file.res +source test/diff/diff_source-param-nonf.sh diff --git a/test/diff/diff_issue_230.sh b/test/diff/diff_issue_230.sh index 812f2a88..60b488e6 100755 --- a/test/diff/diff_issue_230.sh +++ b/test/diff/diff_issue_230.sh @@ -2,48 +2,7 @@ file=issue_230 -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -P 1 -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 1 -fi +source test/diff/diff_source.sh -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 2 -fi +source test/diff/diff_source-real-param-nonf.sh -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -P 1 -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 21 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 22 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -P 1 -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 41 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 42 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -P 1 -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 61 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 62 -fi - -rm test/diff/$file.res diff --git a/test/diff/diff_issue_230_squared.sh b/test/diff/diff_issue_230_squared.sh index b596d712..5d0208cd 100755 --- a/test/diff/diff_issue_230_squared.sh +++ b/test/diff/diff_issue_230_squared.sh @@ -2,48 +2,6 @@ file=issue_230_squared -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -P 1 -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 1 -fi +source test/diff/diff_source.sh -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 2 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -P 1 -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 21 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 22 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -P 1 -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 41 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 42 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -P 1 -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 61 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 62 -fi - -rm test/diff/$file.res +source test/diff/diff_source-real-param-nonf.sh diff --git a/test/diff/diff_kat6-31.sh b/test/diff/diff_kat6-31.sh index 3af6d537..ad877952 100755 --- a/test/diff/diff_kat6-31.sh +++ b/test/diff/diff_kat6-31.sh @@ -3,3 +3,5 @@ file=kat6-31 source test/diff/diff_source.sh + +source test/diff/diff_source-param-nonf.sh diff --git a/test/diff/diff_kat7-qq.sh b/test/diff/diff_kat7-qq.sh index 724415f4..7f8be490 100755 --- a/test/diff/diff_kat7-qq.sh +++ b/test/diff/diff_kat7-qq.sh @@ -3,3 +3,7 @@ file=kat7-qq source test/diff/diff_source.sh + +source test/diff/diff_source-param-nonf.sh + +source test/diff/diff_source-param-nonf-qq.sh diff --git a/test/diff/diff_truncate_gb.sh b/test/diff/diff_kat8-qq-truncate.sh similarity index 100% rename from test/diff/diff_truncate_gb.sh rename to test/diff/diff_kat8-qq-truncate.sh diff --git a/test/diff/diff_linear-qq.sh b/test/diff/diff_linear-qq.sh index 3a0477e7..23bf282a 100755 --- a/test/diff/diff_linear-qq.sh +++ b/test/diff/diff_linear-qq.sh @@ -3,3 +3,5 @@ file=linear-qq source test/diff/diff_source.sh + +source test/diff/diff_source-param-nonf-qq.sh diff --git a/test/diff/diff_maxbitsize-bug.sh b/test/diff/diff_maxbitsize-bug.sh index 64f78a7d..a103f1ab 100755 --- a/test/diff/diff_maxbitsize-bug.sh +++ b/test/diff/diff_maxbitsize-bug.sh @@ -2,48 +2,6 @@ file=maxbitsize-bug -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 1 -fi +source test/diff/diff_source.sh -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 2 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 21 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 22 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 41 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 42 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 61 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 62 -fi - -rm test/diff/$file.res +source test/diff/diff_source-noarg.sh diff --git a/test/diff/diff_mq_2_1.sh b/test/diff/diff_mq_2_1.sh index 21441d09..0513a483 100755 --- a/test/diff/diff_mq_2_1.sh +++ b/test/diff/diff_mq_2_1.sh @@ -2,48 +2,6 @@ file=mq_2_1 -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 1 -fi +source test/diff/diff_source.sh -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 2 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 21 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 22 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 41 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 42 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 61 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 62 -fi - -rm test/diff/$file.res +source test/diff/diff_source-noarg.sh diff --git a/test/diff/diff_multy-16.sh b/test/diff/diff_multy-16.sh index 570a7435..b9754809 100755 --- a/test/diff/diff_multy-16.sh +++ b/test/diff/diff_multy-16.sh @@ -3,3 +3,5 @@ file=multy-16 source test/diff/diff_source.sh + +source test/diff/diff_source-param-nonf.sh diff --git a/test/diff/diff_multy-31.sh b/test/diff/diff_multy-31.sh index a87bdfc3..ae953ca8 100755 --- a/test/diff/diff_multy-31.sh +++ b/test/diff/diff_multy-31.sh @@ -3,3 +3,5 @@ file=multy-31 source test/diff/diff_source.sh + +source test/diff/diff_source-param-nonf.sh diff --git a/test/diff/diff_multy-qq.sh b/test/diff/diff_multy-qq.sh index 3f65bac0..0815239e 100755 --- a/test/diff/diff_multy-qq.sh +++ b/test/diff/diff_multy-qq.sh @@ -3,3 +3,7 @@ file=multy-qq source test/diff/diff_source.sh + +source test/diff/diff_source-param-nonf.sh + +source test/diff/diff_source-param-nonf-qq.sh diff --git a/test/diff/diff_nf_16.sh b/test/diff/diff_nf_16.sh index 79697906..c00c33e5 100755 --- a/test/diff/diff_nf_16.sh +++ b/test/diff/diff_nf_16.sh @@ -3,14 +3,14 @@ file=nf-16 $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -n2 + -n 2 if [ $? -gt 0 ]; then - exit 3 + exit 1 fi diff test/diff/$file.res output_files/$file.res if [ $? -gt 0 ]; then - exit 4 + exit 2 fi rm test/diff/$file.res diff --git a/test/diff/diff_nf_31.sh b/test/diff/diff_nf_31.sh index 582fd4ed..a74aff7f 100755 --- a/test/diff/diff_nf_31.sh +++ b/test/diff/diff_nf_31.sh @@ -3,7 +3,7 @@ file=nf-31 $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -n2 + -n 2 if [ $? -gt 0 ]; then exit 1 fi diff --git a/test/diff/diff_nf_8.sh b/test/diff/diff_nf_8.sh index 425b7a6d..abdf4b4d 100755 --- a/test/diff/diff_nf_8.sh +++ b/test/diff/diff_nf_8.sh @@ -3,14 +3,14 @@ file=nf-8 $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -n2 + -n 2 if [ $? -gt 0 ]; then - exit 5 + exit 1 fi diff test/diff/$file.res output_files/$file.res if [ $? -gt 0 ]; then - exit 6 + exit 2 fi rm test/diff/$file.res diff --git a/test/diff/diff_nf_lm_bug.sh b/test/diff/diff_nf_lm_bug.sh index dc7ec811..2c86dc45 100755 --- a/test/diff/diff_nf_lm_bug.sh +++ b/test/diff/diff_nf_lm_bug.sh @@ -3,14 +3,14 @@ file=nf-lm-bug $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -n3 + -n 3 if [ $? -gt 0 ]; then - exit 5 + exit 1 fi diff test/diff/$file.res output_files/$file.res if [ $? -gt 0 ]; then - exit 6 + exit 2 fi rm test/diff/$file.res diff --git a/test/diff/diff_nonradical_radicalshape-no-square-31.sh b/test/diff/diff_nonradical_radicalshape-no-square-31.sh index 0f679165..20c6478b 100755 --- a/test/diff/diff_nonradical_radicalshape-no-square-31.sh +++ b/test/diff/diff_nonradical_radicalshape-no-square-31.sh @@ -2,8 +2,6 @@ file=nonradical_radicalshape-no-square-31 -# source test/diff/diff_source.sh - $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ -P 2 -l 2 -t 1 -c 0 if [ $? -gt 0 ]; then diff --git a/test/diff/diff_nonradical_radicalshape-no-square-qq.sh b/test/diff/diff_nonradical_radicalshape-no-square-qq.sh index ef59a063..b9693f88 100755 --- a/test/diff/diff_nonradical_radicalshape-no-square-qq.sh +++ b/test/diff/diff_nonradical_radicalshape-no-square-qq.sh @@ -2,74 +2,6 @@ file=nonradical_radicalshape-no-square-qq -# source test/diff/diff_source.sh +source test/diff/diff_source.sh -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -p 3 -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 3 -fi - -#diff test/diff/$file.res output_files/$file.p3.res -if [ $? -gt 0 ]; then - exit 4 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -P 2 -l 2 -t 1 -c 0 -if [ $? -ne 1 ]; then - exit 5 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -p 3 -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 23 -fi - -#diff test/diff/$file.res output_files/$file.p3.res -if [ $? -gt 0 ]; then - exit 24 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -P 2 -l 2 -t 2 -c 0 -if [ $? -ne 1 ]; then - exit 25 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -p 3 -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 43 -fi - -#diff test/diff/$file.res output_files/$file.p3.res -if [ $? -gt 0 ]; then - exit 44 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -P 2 -l 44 -t 1 -c 0 -if [ $? -ne 1 ]; then - exit 45 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -p 3 -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 63 -fi - -#diff test/diff/$file.res output_files/$file.p3.res -if [ $? -gt 0 ]; then - exit 64 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -P 2 -l 44 -t 2 -c 0 -if [ $? -ne 1 ]; then - exit 65 -fi - -rm test/diff/$file.res +source test/diff/diff_source-real-param-nonf.sh diff --git a/test/diff/diff_nonradical_radicalshape-qq.sh b/test/diff/diff_nonradical_radicalshape-qq.sh index d9167927..af8e1fe3 100755 --- a/test/diff/diff_nonradical_radicalshape-qq.sh +++ b/test/diff/diff_nonradical_radicalshape-qq.sh @@ -4,48 +4,4 @@ file=nonradical_radicalshape-qq source test/diff/diff_source.sh -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -p 3 -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 3 -fi - -diff test/diff/$file.res output_files/$file.p3.res -if [ $? -gt 0 ]; then - exit 4 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -p 3 -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 23 -fi - -diff test/diff/$file.res output_files/$file.p3.res -if [ $? -gt 0 ]; then - exit 24 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -p 3 -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 43 -fi - -diff test/diff/$file.res output_files/$file.p3.res -if [ $? -gt 0 ]; then - exit 44 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -p 3 -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 63 -fi - -diff test/diff/$file.res output_files/$file.p3.res -if [ $? -gt 0 ]; then - exit 64 -fi - -rm test/diff/$file.res +source test/diff/diff_source-real-param-nonf.sh diff --git a/test/diff/diff_nonradical_shape-qq.sh b/test/diff/diff_nonradical_shape-qq.sh index 25a4f4cf..b2946933 100755 --- a/test/diff/diff_nonradical_shape-qq.sh +++ b/test/diff/diff_nonradical_shape-qq.sh @@ -4,48 +4,4 @@ file=nonradical_shape-qq source test/diff/diff_source.sh -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -p 1024 -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 3 -fi - -diff test/diff/$file.res output_files/$file.p1024.res -if [ $? -gt 0 ]; then - exit 4 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -p 1024 -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 23 -fi - -diff test/diff/$file.res output_files/$file.p1024.res -if [ $? -gt 0 ]; then - exit 24 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -p 1024 -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 43 -fi - -diff test/diff/$file.res output_files/$file.p1024.res -if [ $? -gt 0 ]; then - exit 44 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -p 1024 -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 63 -fi - -diff test/diff/$file.res output_files/$file.p1024.res -if [ $? -gt 0 ]; then - exit 64 -fi - -rm test/diff/$file.res +source test/diff/diff_source-real-param-nonf.sh diff --git a/test/diff/diff_one-16.sh b/test/diff/diff_one-16.sh index da4426a3..16f643df 100755 --- a/test/diff/diff_one-16.sh +++ b/test/diff/diff_one-16.sh @@ -4,4 +4,6 @@ file=one-16 source test/diff/diff_source.sh +source test/diff/diff_source-noarg.sh + diff --git a/test/diff/diff_one-31.sh b/test/diff/diff_one-31.sh index 95bdeddb..5759e6cd 100755 --- a/test/diff/diff_one-31.sh +++ b/test/diff/diff_one-31.sh @@ -4,49 +4,7 @@ file=one-31 source test/diff/diff_source.sh -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -g 1 -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 3 -fi +source test/diff/diff_source-noarg.sh -diff test/diff/$file.res output_files/$file.g1.res -if [ $? -gt 0 ]; then - exit 4 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -g 1 -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 23 -fi - -diff test/diff/$file.res output_files/$file.g1.res -if [ $? -gt 0 ]; then - exit 24 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -g 1 -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 43 -fi - -diff test/diff/$file.res output_files/$file.g1.res -if [ $? -gt 0 ]; then - exit 44 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -g 1 -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 63 -fi - -diff test/diff/$file.res output_files/$file.g1.res -if [ $? -gt 0 ]; then - exit 64 -fi - -rm test/diff/$file.res +source test/diff/diff_source-gb-lm.sh diff --git a/test/diff/diff_one-qq.sh b/test/diff/diff_one-qq.sh index fde00358..a595bf12 100755 --- a/test/diff/diff_one-qq.sh +++ b/test/diff/diff_one-qq.sh @@ -4,49 +4,7 @@ file=one-qq source test/diff/diff_source.sh -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -g 2 -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 3 -fi +source test/diff/diff_source-noarg.sh -diff test/diff/$file.res output_files/$file.g2.res -if [ $? -gt 0 ]; then - exit 4 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -g 2 -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 23 -fi - -diff test/diff/$file.res output_files/$file.g2.res -if [ $? -gt 0 ]; then - exit 24 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -g 2 -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 43 -fi - -diff test/diff/$file.res output_files/$file.g2.res -if [ $? -gt 0 ]; then - exit 44 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -g 2 -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 63 -fi - -diff test/diff/$file.res output_files/$file.g2.res -if [ $? -gt 0 ]; then - exit 64 -fi - -rm test/diff/$file.res +source test/diff/diff_source-gb-red.sh diff --git a/test/diff/diff_radical_shape-31.sh b/test/diff/diff_radical_shape-31.sh index 46d53b91..1066dc88 100755 --- a/test/diff/diff_radical_shape-31.sh +++ b/test/diff/diff_radical_shape-31.sh @@ -3,3 +3,5 @@ file=radical_shape-31 source test/diff/diff_source.sh + +source test/diff/diff_source-param-nonf.sh diff --git a/test/diff/diff_radical_shape-qq.sh b/test/diff/diff_radical_shape-qq.sh index dbfd30ac..1f0a84d6 100755 --- a/test/diff/diff_radical_shape-qq.sh +++ b/test/diff/diff_radical_shape-qq.sh @@ -3,3 +3,7 @@ file=radical_shape-qq source test/diff/diff_source.sh + +source test/diff/diff_source-param-nonf.sh + +source test/diff/diff_source-param-nonf-qq.sh diff --git a/test/diff/diff_realroot-extraction-exact-root.sh b/test/diff/diff_realroot-extraction-exact-root.sh index 110aeeca..27007746 100755 --- a/test/diff/diff_realroot-extraction-exact-root.sh +++ b/test/diff/diff_realroot-extraction-exact-root.sh @@ -2,92 +2,6 @@ file=realroot-extraction-exact-root -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 1 -fi +source test/diff/diff_source.sh -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 2 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -p 256 -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 3 -fi - -diff test/diff/$file.res output_files/$file.p256.res -if [ $? -gt 0 ]; then - exit 4 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 21 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 22 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -p 256 -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 23 -fi - -diff test/diff/$file.res output_files/$file.p256.res -if [ $? -gt 0 ]; then - exit 24 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 41 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 42 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -p 256 -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 43 -fi - -diff test/diff/$file.res output_files/$file.p256.res -if [ $? -gt 0 ]; then - exit 44 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 61 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 62 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -p 256 -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 63 -fi - -diff test/diff/$file.res output_files/$file.p256.res -if [ $? -gt 0 ]; then - exit 64 -fi - -rm test/diff/$file.res +source test/diff/diff_source-real.sh diff --git a/test/diff/diff_realroot1.sh b/test/diff/diff_realroot1.sh index 574329c9..0fd682f4 100755 --- a/test/diff/diff_realroot1.sh +++ b/test/diff/diff_realroot1.sh @@ -6,92 +6,6 @@ file=realroot1 -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 1 -fi +source test/diff/diff_source.sh -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 2 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -p 256 -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 3 -fi - -diff test/diff/$file.res output_files/$file.p256.res -if [ $? -gt 0 ]; then - exit 4 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 21 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 22 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -p 256 -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 23 -fi - -diff test/diff/$file.res output_files/$file.p256.res -if [ $? -gt 0 ]; then - exit 24 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 41 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 42 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -p 256 -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 43 -fi - -diff test/diff/$file.res output_files/$file.p256.res -if [ $? -gt 0 ]; then - exit 44 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 61 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 62 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -p 256 -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 63 -fi - -diff test/diff/$file.res output_files/$file.p256.res -if [ $? -gt 0 ]; then - exit 64 -fi - -rm test/diff/$file.res +source test/diff/diff_source-real.sh diff --git a/test/diff/diff_reals_dim0-chgvar.sh b/test/diff/diff_reals_dim0-chgvar.sh index f40f607e..4d596917 100755 --- a/test/diff/diff_reals_dim0-chgvar.sh +++ b/test/diff/diff_reals_dim0-chgvar.sh @@ -2,48 +2,7 @@ file=reals_dim0-chgvar -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -d 0 -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 1 -fi +source test/diff/diff_source.sh -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 2 -fi +source test/diff/diff_source-real.sh -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -d 0 -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 21 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 22 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -d 0 -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 41 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 42 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -d 0 -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 61 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 62 -fi - -rm test/diff/$file.res diff --git a/test/diff/diff_reals_dim0-extract.sh b/test/diff/diff_reals_dim0-extract.sh index 5979fd7a..12ab411e 100755 --- a/test/diff/diff_reals_dim0-extract.sh +++ b/test/diff/diff_reals_dim0-extract.sh @@ -2,92 +2,6 @@ file=reals_dim0-extract -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -d 0 -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 1 -fi +source test/diff/diff_source.sh -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 2 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -d 0 -p 256 -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 3 -fi - -diff test/diff/$file.res output_files/$file.p256.res -if [ $? -gt 0 ]; then - exit 4 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -d 0 -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 21 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 22 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -d 0 -p 256 -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 23 -fi - -diff test/diff/$file.res output_files/$file.p256.res -if [ $? -gt 0 ]; then - exit 24 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -d 0 -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 41 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 42 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -d 0 -p 256 -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 43 -fi - -diff test/diff/$file.res output_files/$file.p256.res -if [ $? -gt 0 ]; then - exit 44 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -d 0 -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 61 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 62 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -d 0 -p 256 -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 63 -fi - -diff test/diff/$file.res output_files/$file.p256.res -if [ $? -gt 0 ]; then - exit 64 -fi - -rm test/diff/$file.res +source test/diff/diff_source-real.sh diff --git a/test/diff/diff_reals_dim0-swapvar.sh b/test/diff/diff_reals_dim0-swapvar.sh index 0d781c36..aa95a476 100755 --- a/test/diff/diff_reals_dim0-swapvar.sh +++ b/test/diff/diff_reals_dim0-swapvar.sh @@ -2,92 +2,6 @@ file=reals_dim0-swapvar -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 1 -fi +source test/diff/diff_source.sh -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 2 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -p 256 -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 3 -fi - -diff test/diff/$file.res output_files/$file.p256.res -if [ $? -gt 0 ]; then - exit 4 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 21 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 22 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -p 256 -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 23 -fi - -diff test/diff/$file.res output_files/$file.p256.res -if [ $? -gt 0 ]; then - exit 24 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 41 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 42 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -p 256 -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 43 -fi - -diff test/diff/$file.res output_files/$file.p256.res -if [ $? -gt 0 ]; then - exit 44 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 61 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 62 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -p 256 -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 63 -fi - -diff test/diff/$file.res output_files/$file.p256.res -if [ $? -gt 0 ]; then - exit 64 -fi - -rm test/diff/$file.res +source test/diff/diff_source-real.sh diff --git a/test/diff/diff_reals_dim0.sh b/test/diff/diff_reals_dim0.sh index e177b03e..1dc0dc8d 100755 --- a/test/diff/diff_reals_dim0.sh +++ b/test/diff/diff_reals_dim0.sh @@ -2,92 +2,6 @@ file=reals_dim0 -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 1 -fi +source test/diff/diff_source.sh -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 2 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -p 256 -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 3 -fi - -diff test/diff/$file.res output_files/$file.p256.res -if [ $? -gt 0 ]; then - exit 4 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 21 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 22 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -p 256 -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 23 -fi - -diff test/diff/$file.res output_files/$file.p256.res -if [ $? -gt 0 ]; then - exit 24 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 41 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 42 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -p 256 -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 43 -fi - -diff test/diff/$file.res output_files/$file.p256.res -if [ $? -gt 0 ]; then - exit 44 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 61 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 62 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -p 256 -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 63 -fi - -diff test/diff/$file.res output_files/$file.p256.res -if [ $? -gt 0 ]; then - exit 64 -fi - -rm test/diff/$file.res +source test/diff/diff_source-real.sh diff --git a/test/diff/diff_source-groebner.sh b/test/diff/diff_source-gb-elim-red.sh similarity index 60% rename from test/diff/diff_source-groebner.sh rename to test/diff/diff_source-gb-elim-red.sh index 98083cfa..16b9c712 100644 --- a/test/diff/diff_source-groebner.sh +++ b/test/diff/diff_source-gb-elim-red.sh @@ -1,133 +1,98 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -g 2 -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 3 -fi - -diff test/diff/$file.res output_files/$file.g2.res -if [ $? -gt 0 ]; then - exit 4 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -g 2 -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 23 -fi - -diff test/diff/$file.res output_files/$file.g2.res -if [ $? -gt 0 ]; then - exit 24 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -g 2 -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 43 -fi - -diff test/diff/$file.res output_files/$file.g2.res -if [ $? -gt 0 ]; then - exit 44 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -g 2 -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 63 -fi - -diff test/diff/$file.res output_files/$file.g2.res -if [ $? -gt 0 ]; then - exit 64 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ -e 1 -g 2 -l 2 -t 1 if [ $? -gt 0 ]; then - exit 31 + exit 5 fi diff test/diff/$file.res output_files/$file.g2.e1.res if [ $? -gt 0 ]; then - exit 41 + exit 6 fi $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -e 1 -g 2 -l 2 -t 2 + --random-seed $seed \ + -e 2 -g 2 -l 2 -t 1 if [ $? -gt 0 ]; then - exit 231 + exit 7 fi -diff test/diff/$file.res output_files/$file.g2.e1.res +diff test/diff/$file.res output_files/$file.g2.e2.res if [ $? -gt 0 ]; then - exit 241 + exit 8 fi $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -e 1 -g 2 -l 44 -t 1 + --random-seed $seed \ + -e 1 -g 2 -l 2 -t 2 if [ $? -gt 0 ]; then - exit 431 + exit 25 fi diff test/diff/$file.res output_files/$file.g2.e1.res if [ $? -gt 0 ]; then - exit 441 + exit 26 fi $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -e 1 -g 2 -l 44 -t 2 + --random-seed $seed \ + -e 2 -g 2 -l 2 -t 2 if [ $? -gt 0 ]; then - exit 631 + exit 27 fi -diff test/diff/$file.res output_files/$file.g2.e1.res +diff test/diff/$file.res output_files/$file.g2.e2.res if [ $? -gt 0 ]; then - exit 641 + exit 28 fi $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -e 2 -g 2 -l 2 -t 1 + --random-seed $seed \ + -e 1 -g 2 -l 44 -t 1 if [ $? -gt 0 ]; then - exit 32 + exit 45 fi -diff test/diff/$file.res output_files/$file.g2.e2.res +diff test/diff/$file.res output_files/$file.g2.e1.res if [ $? -gt 0 ]; then - exit 42 + exit 46 fi $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -e 2 -g 2 -l 2 -t 2 + --random-seed $seed \ + -e 2 -g 2 -l 44 -t 1 if [ $? -gt 0 ]; then - exit 232 + exit 47 fi diff test/diff/$file.res output_files/$file.g2.e2.res if [ $? -gt 0 ]; then - exit 242 + exit 48 fi $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -e 2 -g 2 -l 44 -t 1 + --random-seed $seed \ + -e 1 -g 2 -l 44 -t 2 if [ $? -gt 0 ]; then - exit 432 + exit 65 fi -diff test/diff/$file.res output_files/$file.g2.e2.res +diff test/diff/$file.res output_files/$file.g2.e1.res if [ $? -gt 0 ]; then - exit 442 + exit 66 fi $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ -e 2 -g 2 -l 44 -t 2 if [ $? -gt 0 ]; then - exit 632 + exit 67 fi diff test/diff/$file.res output_files/$file.g2.e2.res if [ $? -gt 0 ]; then - exit 642 + exit 68 fi rm test/diff/$file.res + diff --git a/test/diff/diff_source-gb-lm.sh b/test/diff/diff_source-gb-lm.sh new file mode 100644 index 00000000..23f0b1c5 --- /dev/null +++ b/test/diff/diff_source-gb-lm.sh @@ -0,0 +1,49 @@ +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -g 1 -l 2 -t 1 +if [ $? -gt 0 ]; then + exit 3 +fi + +diff test/diff/$file.res output_files/$file.g1.res +if [ $? -gt 0 ]; then + exit 4 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -g 1 -l 2 -t 2 +if [ $? -gt 0 ]; then + exit 23 +fi + +diff test/diff/$file.res output_files/$file.g1.res +if [ $? -gt 0 ]; then + exit 24 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -g 1 -l 44 -t 1 +if [ $? -gt 0 ]; then + exit 43 +fi + +diff test/diff/$file.res output_files/$file.g1.res +if [ $? -gt 0 ]; then + exit 44 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -g 1 -l 44 -t 2 +if [ $? -gt 0 ]; then + exit 63 +fi + +diff test/diff/$file.res output_files/$file.g1.res +if [ $? -gt 0 ]; then + exit 64 +fi + +rm test/diff/$file.res diff --git a/test/diff/diff_source-gb-red.sh b/test/diff/diff_source-gb-red.sh new file mode 100644 index 00000000..a7ca36af --- /dev/null +++ b/test/diff/diff_source-gb-red.sh @@ -0,0 +1,49 @@ +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -g 2 -l 2 -t 1 +if [ $? -gt 0 ]; then + exit 3 +fi + +diff test/diff/$file.res output_files/$file.g2.res +if [ $? -gt 0 ]; then + exit 4 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -g 2 -l 2 -t 2 +if [ $? -gt 0 ]; then + exit 23 +fi + +diff test/diff/$file.res output_files/$file.g2.res +if [ $? -gt 0 ]; then + exit 24 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -g 2 -l 44 -t 1 +if [ $? -gt 0 ]; then + exit 43 +fi + +diff test/diff/$file.res output_files/$file.g2.res +if [ $? -gt 0 ]; then + exit 44 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -g 2 -l 44 -t 2 +if [ $? -gt 0 ]; then + exit 63 +fi + +diff test/diff/$file.res output_files/$file.g2.res +if [ $? -gt 0 ]; then + exit 64 +fi + +rm test/diff/$file.res diff --git a/test/diff/diff_source-noarg.sh b/test/diff/diff_source-noarg.sh new file mode 100644 index 00000000..21d9a2e2 --- /dev/null +++ b/test/diff/diff_source-noarg.sh @@ -0,0 +1,49 @@ +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -l 2 -t 1 +if [ $? -gt 0 ]; then + exit 1 +fi + +diff test/diff/$file.res output_files/$file.res +if [ $? -gt 0 ]; then + exit 2 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -l 2 -t 2 +if [ $? -gt 0 ]; then + exit 21 +fi + +diff test/diff/$file.res output_files/$file.res +if [ $? -gt 0 ]; then + exit 22 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -l 44 -t 1 +if [ $? -gt 0 ]; then + exit 41 +fi + +diff test/diff/$file.res output_files/$file.res +if [ $? -gt 0 ]; then + exit 42 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -l 44 -t 2 +if [ $? -gt 0 ]; then + exit 61 +fi + +diff test/diff/$file.res output_files/$file.res +if [ $? -gt 0 ]; then + exit 62 +fi + +rm test/diff/$file.res diff --git a/test/diff/diff_source-param-fullnf-qq.sh b/test/diff/diff_source-param-fullnf-qq.sh new file mode 100644 index 00000000..f5f8ec05 --- /dev/null +++ b/test/diff/diff_source-param-fullnf-qq.sh @@ -0,0 +1,51 @@ +source test/diff/diff_source-param-fullnf.sh + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -P 2 -d 4 -L 1 -l 2 -t 1 +if [ $? -gt 0 ]; then + exit 81 +fi + +diff test/diff/$file.res output_files/$file.P2.d4.res +if [ $? -gt 0 ]; then + exit 82 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -P 2 -d 4 -L 1 -l 2 -t 2 +if [ $? -gt 0 ]; then + exit 101 +fi + +diff test/diff/$file.res output_files/$file.P2.d4.res +if [ $? -gt 0 ]; then + exit 102 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -P 2 -d 4 -L 1 -l 44 -t 1 +if [ $? -gt 0 ]; then + exit 121 +fi + +diff test/diff/$file.res output_files/$file.P2.d4.res +if [ $? -gt 0 ]; then + exit 122 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -P 2 -d 4 -L 1 -l 44 -t 2 +if [ $? -gt 0 ]; then + exit 141 +fi + +diff test/diff/$file.res output_files/$file.P2.d4.res +if [ $? -gt 0 ]; then + exit 142 +fi + +rm test/diff/$file.res diff --git a/test/diff/diff_source-param-fullnf.sh b/test/diff/diff_source-param-fullnf.sh new file mode 100644 index 00000000..4daed97e --- /dev/null +++ b/test/diff/diff_source-param-fullnf.sh @@ -0,0 +1,49 @@ +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -P 2 -d 4 -L 0 -l 2 -t 1 +if [ $? -gt 0 ]; then + exit 1 +fi + +diff test/diff/$file.res output_files/$file.P2.d4.res +if [ $? -gt 0 ]; then + exit 2 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -P 2 -d 4 -L 0 -l 2 -t 2 +if [ $? -gt 0 ]; then + exit 21 +fi + +diff test/diff/$file.res output_files/$file.P2.d4.res +if [ $? -gt 0 ]; then + exit 22 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -P 2 -d 4 -L 0 -l 44 -t 1 +if [ $? -gt 0 ]; then + exit 41 +fi + +diff test/diff/$file.res output_files/$file.P2.d4.res +if [ $? -gt 0 ]; then + exit 42 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -P 2 -d 4 -L 0 -l 44 -t 2 +if [ $? -gt 0 ]; then + exit 61 +fi + +diff test/diff/$file.res output_files/$file.P2.d4.res +if [ $? -gt 0 ]; then + exit 62 +fi + +rm test/diff/$file.res diff --git a/test/diff/diff_source-param-nonf-qq.sh b/test/diff/diff_source-param-nonf-qq.sh new file mode 100644 index 00000000..889c00d4 --- /dev/null +++ b/test/diff/diff_source-param-nonf-qq.sh @@ -0,0 +1,51 @@ +source test/diff/diff_source-param-nonf.sh + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -P 2 -d 0 -L 1 -l 2 -t 1 +if [ $? -gt 0 ]; then + exit 81 +fi + +diff test/diff/$file.res output_files/$file.P2.d0.res +if [ $? -gt 0 ]; then + exit 82 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -P 2 -d 0 -L 1 -l 2 -t 2 +if [ $? -gt 0 ]; then + exit 101 +fi + +diff test/diff/$file.res output_files/$file.P2.d0.res +if [ $? -gt 0 ]; then + exit 102 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -P 2 -d 0 -L 1 -l 44 -t 1 +if [ $? -gt 0 ]; then + exit 121 +fi + +diff test/diff/$file.res output_files/$file.P2.d0.res +if [ $? -gt 0 ]; then + exit 122 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -P 2 -d 0 -L 1 -l 44 -t 2 +if [ $? -gt 0 ]; then + exit 141 +fi + +diff test/diff/$file.res output_files/$file.P2.d0.res +if [ $? -gt 0 ]; then + exit 142 +fi + +rm test/diff/$file.res diff --git a/test/diff/diff_source-param-nonf.sh b/test/diff/diff_source-param-nonf.sh new file mode 100644 index 00000000..c4d3caba --- /dev/null +++ b/test/diff/diff_source-param-nonf.sh @@ -0,0 +1,49 @@ +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -P 2 -d 0 -L 0 -l 2 -t 1 +if [ $? -gt 0 ]; then + exit 1 +fi + +diff test/diff/$file.res output_files/$file.P2.d0.res +if [ $? -gt 0 ]; then + exit 2 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -P 2 -d 0 -L 0 -l 2 -t 2 +if [ $? -gt 0 ]; then + exit 21 +fi + +diff test/diff/$file.res output_files/$file.P2.d0.res +if [ $? -gt 0 ]; then + exit 22 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -P 2 -d 0 -L 0 -l 44 -t 1 +if [ $? -gt 0 ]; then + exit 41 +fi + +diff test/diff/$file.res output_files/$file.P2.d0.res +if [ $? -gt 0 ]; then + exit 42 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -P 2 -d 0 -L 0 -l 44 -t 2 +if [ $? -gt 0 ]; then + exit 61 +fi + +diff test/diff/$file.res output_files/$file.P2.d0.res +if [ $? -gt 0 ]; then + exit 62 +fi + +rm test/diff/$file.res diff --git a/test/diff/diff_source-real-param-nonf.sh b/test/diff/diff_source-real-param-nonf.sh new file mode 100644 index 00000000..1a4f0ba5 --- /dev/null +++ b/test/diff/diff_source-real-param-nonf.sh @@ -0,0 +1,193 @@ +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -P 1 -d 0 -p 128 -L 0 -l 2 -t 1 +if [ $? -gt 0 ]; then + exit 1 +fi + +diff test/diff/$file.res output_files/$file.P1.d0.p128.res +if [ $? -gt 0 ]; then + exit 2 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -P 1 -d 0 -p 1024 -L 0 -l 2 -t 1 +if [ $? -gt 0 ]; then + exit 3 +fi + +diff test/diff/$file.res output_files/$file.P1.d0.p1024.res +if [ $? -gt 0 ]; then + exit 4 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -P 1 -d 0 -p 128 -L 0 -l 2 -t 2 +if [ $? -gt 0 ]; then + exit 21 +fi + +diff test/diff/$file.res output_files/$file.P1.d0.p128.res +if [ $? -gt 0 ]; then + exit 22 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -P 1 -d 0 -p 1024 -L 0 -l 2 -t 2 +if [ $? -gt 0 ]; then + exit 23 +fi + +diff test/diff/$file.res output_files/$file.P1.d0.p1024.res +if [ $? -gt 0 ]; then + exit 24 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -P 1 -d 0 -p 128 -L 0 -l 44 -t 1 +if [ $? -gt 0 ]; then + exit 41 +fi + +diff test/diff/$file.res output_files/$file.P1.d0.p128.res +if [ $? -gt 0 ]; then + exit 42 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -P 1 -d 0 -p 1024 -L 0 -l 44 -t 1 +if [ $? -gt 0 ]; then + exit 43 +fi + +diff test/diff/$file.res output_files/$file.P1.d0.p1024.res +if [ $? -gt 0 ]; then + exit 44 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -P 1 -d 0 -p 128 -L 0 -l 44 -t 2 +if [ $? -gt 0 ]; then + exit 61 +fi + +diff test/diff/$file.res output_files/$file.P1.d0.p128.res +if [ $? -gt 0 ]; then + exit 62 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -P 1 -d 0 -p 1024 -L 0 -l 44 -t 2 +if [ $? -gt 0 ]; then + exit 63 +fi + +diff test/diff/$file.res output_files/$file.P1.d0.p1024.res +if [ $? -gt 0 ]; then + exit 64 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -P 1 -d 0 -p 128 -L 1 -l 2 -t 1 +if [ $? -gt 0 ]; then + exit 81 +fi + +diff test/diff/$file.res output_files/$file.P1.d0.p128.res +if [ $? -gt 0 ]; then + exit 82 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -P 1 -d 0 -p 1024 -L 1 -l 2 -t 1 +if [ $? -gt 0 ]; then + exit 83 +fi + +diff test/diff/$file.res output_files/$file.P1.d0.p1024.res +if [ $? -gt 0 ]; then + exit 84 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -P 1 -d 0 -p 128 -L 1 -l 2 -t 2 +if [ $? -gt 0 ]; then + exit 101 +fi + +diff test/diff/$file.res output_files/$file.P1.d0.p128.res +if [ $? -gt 0 ]; then + exit 102 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -P 1 -d 0 -p 1024 -L 1 -l 2 -t 2 +if [ $? -gt 0 ]; then + exit 103 +fi + +diff test/diff/$file.res output_files/$file.P1.d0.p1024.res +if [ $? -gt 0 ]; then + exit 104 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -P 1 -d 0 -p 128 -L 1 -l 44 -t 1 +if [ $? -gt 0 ]; then + exit 121 +fi + +diff test/diff/$file.res output_files/$file.P1.d0.p128.res +if [ $? -gt 0 ]; then + exit 122 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -P 1 -d 0 -p 1024 -L 1 -l 44 -t 1 +if [ $? -gt 0 ]; then + exit 123 +fi + +diff test/diff/$file.res output_files/$file.P1.d0.p1024.res +if [ $? -gt 0 ]; then + exit 124 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -P 1 -d 0 -p 128 -L 1 -l 44 -t 2 +if [ $? -gt 0 ]; then + exit 141 +fi + +diff test/diff/$file.res output_files/$file.P1.d0.p128.res +if [ $? -gt 0 ]; then + exit 142 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -P 1 -d 0 -p 1024 -L 1 -l 44 -t 2 +if [ $? -gt 0 ]; then + exit 143 +fi + +diff test/diff/$file.res output_files/$file.P1.d0.p1024.res +if [ $? -gt 0 ]; then + exit 144 +fi + +rm test/diff/$file.res diff --git a/test/diff/diff_source-real.sh b/test/diff/diff_source-real.sh new file mode 100644 index 00000000..e417fb97 --- /dev/null +++ b/test/diff/diff_source-real.sh @@ -0,0 +1,193 @@ +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -p 128 -L 0 -l 2 -t 1 +if [ $? -gt 0 ]; then + exit 11 +fi + +diff test/diff/$file.res output_files/$file.p128.res +if [ $? -gt 0 ]; then + exit 12 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -p 1024 -L 0 -l 2 -t 1 +if [ $? -gt 0 ]; then + exit 13 +fi + +diff test/diff/$file.res output_files/$file.p1024.res +if [ $? -gt 0 ]; then + exit 14 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -p 128 -L 0 -l 2 -t 2 +if [ $? -gt 0 ]; then + exit 31 +fi + +diff test/diff/$file.res output_files/$file.p128.res +if [ $? -gt 0 ]; then + exit 32 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -p 1024 -L 0 -l 2 -t 2 +if [ $? -gt 0 ]; then + exit 33 +fi + +diff test/diff/$file.res output_files/$file.p1024.res +if [ $? -gt 0 ]; then + exit 34 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -p 128 -L 0 -l 44 -t 1 +if [ $? -gt 0 ]; then + exit 51 +fi + +diff test/diff/$file.res output_files/$file.p128.res +if [ $? -gt 0 ]; then + exit 52 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -p 1024 -L 0 -l 44 -t 1 +if [ $? -gt 0 ]; then + exit 53 +fi + +diff test/diff/$file.res output_files/$file.p1024.res +if [ $? -gt 0 ]; then + exit 54 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -p 128 -L 0 -l 44 -t 2 +if [ $? -gt 0 ]; then + exit 71 +fi + +diff test/diff/$file.res output_files/$file.p128.res +if [ $? -gt 0 ]; then + exit 72 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -p 1024 -L 0 -l 44 -t 2 +if [ $? -gt 0 ]; then + exit 73 +fi + +diff test/diff/$file.res output_files/$file.p1024.res +if [ $? -gt 0 ]; then + exit 74 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -p 128 -L 1 -l 2 -t 1 +if [ $? -gt 0 ]; then + exit 91 +fi + +diff test/diff/$file.res output_files/$file.p128.res +if [ $? -gt 0 ]; then + exit 92 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -p 1024 -L 1 -l 2 -t 1 +if [ $? -gt 0 ]; then + exit 93 +fi + +diff test/diff/$file.res output_files/$file.p1024.res +if [ $? -gt 0 ]; then + exit 94 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -p 128 -L 1 -l 2 -t 2 +if [ $? -gt 0 ]; then + exit 111 +fi + +diff test/diff/$file.res output_files/$file.p128.res +if [ $? -gt 0 ]; then + exit 112 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -p 1024 -L 1 -l 2 -t 2 +if [ $? -gt 0 ]; then + exit 113 +fi + +diff test/diff/$file.res output_files/$file.p1024.res +if [ $? -gt 0 ]; then + exit 114 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -p 128 -L 1 -l 44 -t 1 +if [ $? -gt 0 ]; then + exit 131 +fi + +diff test/diff/$file.res output_files/$file.p128.res +if [ $? -gt 0 ]; then + exit 132 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -p 1024 -L 1 -l 44 -t 1 +if [ $? -gt 0 ]; then + exit 133 +fi + +diff test/diff/$file.res output_files/$file.p1024.res +if [ $? -gt 0 ]; then + exit 134 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -p 128 -L 1 -l 44 -t 2 +if [ $? -gt 0 ]; then + exit 151 +fi + +diff test/diff/$file.res output_files/$file.p128.res +if [ $? -gt 0 ]; then + exit 152 +fi + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ + --random-seed $seed \ + -p 1024 -L 1 -l 44 -t 2 +if [ $? -gt 0 ]; then + exit 153 +fi + +diff test/diff/$file.res output_files/$file.p1024.res +if [ $? -gt 0 ]; then + exit 154 +fi + +rm test/diff/$file.res diff --git a/test/diff/diff_source.sh b/test/diff/diff_source.sh index 1eb3fda9..ef7a6e04 100755 --- a/test/diff/diff_source.sh +++ b/test/diff/diff_source.sh @@ -1,91 +1,17 @@ -#!/bin/bash - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -P 2 -d 0 -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 1 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 2 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -L 1 -P 2 -d 0 -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 101 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 201 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -P 2 -d 0 -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 21 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 22 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -L 1 -P 2 -d 0 -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 211 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 221 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -P 2 -d 0 -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 41 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 42 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -L 1 -P 2 -d 0 -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 411 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 421 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -P 2 -d 0 -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 61 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 62 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -L 1 -P 2 -d 0 -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 611 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 621 -fi - -rm test/diff/$file.res +seed=$EPOCHSECONDS && echo "Seed:" $seed + +# each diff_example.sh is built by running msolve on $file.ms +# with options -L 0 -l 2 -t 1 +# if the execution fails, exit 1 +# then compare the output with the expected one, if different, exit 2 +# repeat for other execution parameters with exit 3 and 4 and so on, until at most 19 and 20 + +# repeat all these tests changing -L 0 into -L 1, -l 2 into -l 44 and -t 1 into -t 2 +# increase all exit codes by +# 20 for -t 2 +# 40 for -l 44 +# thus 60 for -l 44 and -t 2 +# 80 for -L 1 +# thus 100 for -L 1 and -t 2 +# thus 120 for -L 1 and -l 44 +# thus 140 for -L 1, -l 44 and -t 2 diff --git a/test/diff/diff_test-lifting2.sh b/test/diff/diff_test-lifting2.sh index 93622850..69dfc90b 100755 --- a/test/diff/diff_test-lifting2.sh +++ b/test/diff/diff_test-lifting2.sh @@ -4,3 +4,7 @@ file=test-lifting2 source test/diff/diff_source.sh +source test/diff/diff_source-param-nonf.sh + +source test/diff/diff_source-param-nonf-qq.sh + diff --git a/test/diff/diff_xy-qq.sh b/test/diff/diff_xy-qq.sh index 4905cfba..47e76cb3 100755 --- a/test/diff/diff_xy-qq.sh +++ b/test/diff/diff_xy-qq.sh @@ -3,3 +3,7 @@ file=xy-qq source test/diff/diff_source.sh + +source test/diff/diff_source-param-nonf.sh + +source test/diff/diff_source-param-nonf-qq.sh From c8b12ef96b89767436fdd83c30b23e59af13cab0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Berthomieu?= Date: Thu, 15 Jan 2026 09:56:53 +0100 Subject: [PATCH 02/15] move some verbose messages from stderr to stdout --- src/msolve/hilbert.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/msolve/hilbert.c b/src/msolve/hilbert.c index b697ae67..f05bfdbe 100644 --- a/src/msolve/hilbert.c +++ b/src/msolve/hilbert.c @@ -1548,10 +1548,10 @@ static inline sp_matfglm_t * build_matrixn(int32_t *lmb, long dquot, int32_t bld } } else{ - fprintf(stderr, "\nStaircase is not generic\n"); - fprintf(stderr, "Multiplication by "); - display_monomial_full(stderr, nv, NULL, 0, exp); - fprintf(stderr, " gets outside the staircase\n"); + fprintf(stdout, "\nStaircase is not generic\n"); + fprintf(stdout, "Multiplication by "); + display_monomial_full(stdout, nv, NULL, 0, exp); + fprintf(stdout, " gets outside the staircase\n"); free(matrix->dense_mat); free(matrix->dense_idx); free(matrix->triv_idx); @@ -2607,10 +2607,10 @@ static inline sp_matfglm_t * build_matrixn_trace(int32_t **bdiv_xn, } } else{ - fprintf(stderr, "Staircase is not generic\n"); - fprintf(stderr, "Multiplication by "); + fprintf(stdout, "Staircase is not generic\n"); + fprintf(stdout, "Multiplication by "); display_monomial_full(stderr, nv, NULL, 0, exp); - fprintf(stderr, " gets outside the staircase\n"); + fprintf(stdout, " gets outside the staircase\n"); free(matrix->dense_mat); free(matrix->dense_idx); free(matrix->triv_idx); @@ -2997,10 +2997,10 @@ static inline void build_matrixn_from_bs_trace_application(sp_matfglm_t *matrix, } } else{ - fprintf(stderr, "Staircase is not generic\n"); - fprintf(stderr, "Multiplication by "); + fprintf(stdout, "Staircase is not generic\n"); + fprintf(stdout, "Multiplication by "); display_monomial_full(stderr, nv, NULL, 0, exp); - fprintf(stderr, " gets outside the staircase\n"); + fprintf(stdout, " gets outside the staircase\n"); free(matrix->dense_mat); free(matrix->dense_idx); free(matrix->triv_idx); @@ -3206,10 +3206,10 @@ static inline void build_matrixn_unstable_from_bs_trace_application(sp_matfglm_t } } else{ /* should not arrive here */ - fprintf(stderr, "Staircase is not generic\n"); - fprintf(stderr, "Multiplication by "); + fprintf(stdout, "Staircase is not generic\n"); + fprintf(stdout, "Multiplication by "); display_monomial_full(stderr, nv, NULL, 0, exp); - fprintf(stderr, " gets outside the staircase\n"); + fprintf(stdout, " gets outside the staircase\n"); free(matrix->dense_mat); free(matrix->dense_idx); free(matrix->triv_idx); From 6cd7bc80c1df30c85d5fbdb4d190de3bac47ead8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Berthomieu?= Date: Fri, 16 Jan 2026 15:23:37 +0100 Subject: [PATCH 03/15] some files in make check where not sourcing the template files --- src/msolve/main.c | 18 ++++++++++++++++++ test/diff/diff_f4sat-31.sh | 2 ++ test/diff/diff_f4sat-byone-31.sh | 2 ++ test/diff/diff_f4sat-field-char.sh | 2 ++ test/diff/diff_f4sat-is-saturated-check.sh | 2 ++ test/diff/diff_f4sat-zero-input.sh | 2 ++ test/diff/diff_kat8-qq-truncate.sh | 2 ++ test/diff/diff_nf_16.sh | 2 ++ test/diff/diff_nf_31.sh | 2 ++ test/diff/diff_nf_8.sh | 2 ++ test/diff/diff_nf_lm_bug.sh | 2 ++ 11 files changed, 38 insertions(+) diff --git a/src/msolve/main.c b/src/msolve/main.c index 21feaa89..24d36333 100644 --- a/src/msolve/main.c +++ b/src/msolve/main.c @@ -30,7 +30,11 @@ static inline void display_option_help(char short_opt, char *long_opt, char *arg_opt, char* str) { int long_opt_non_empty= strcmp (long_opt, ""); +<<<<<<< HEAD +======= + +>>>>>>> 7ec0ae3 (some files in make check where not sourcing the template files) if (short_opt == 0) { fprintf (stdout, " "); } else { @@ -163,10 +167,19 @@ static inline void display_help(char *str){ display_option_help_noopt("0 - no lifting (default). \n"); display_option_help_noopt("1 - matrices are lifted.\n"); display_option_help_noopt("Warning: when activated, this option may cause higher memory consumption.\n"); + /* display_option_help(0, "mul-mat", "MAT", "Compute multiplication matrices."); */ + /* display_option_help_noopt("MAT has to be a number between 1 and #variables,\n"); */ + /* display_option_help_noopt("and gives the number of multiplication matrices, starting\n"); */ + /* display_option_help_noopt("from the last one.\n"); */ + /* display_option_help_noopt("not yet implemented.\n"); */ display_option_help('q', "", "Q", "Uses signature-based algorithms.\n"); display_option_help_noopt("0 - no (default).\n"); display_option_help_noopt("1 - yes.\n"); +<<<<<<< HEAD display_option_help(0, "random-seed", "SEED", "Random seed to initialize the pseudo\n"); +======= + display_option_help(0, "random_seed", "SEED", "Random seed to initialize the pseudo\n"); +>>>>>>> 7ec0ae3 (some files in make check where not sourcing the template files) display_option_help_noopt("random generator\n"); display_option_help_noopt("-1 - time(0) will be used (default)\n"); display_option_help_noopt("SEED ≥ 0 - use at your own risks;\n"); @@ -235,9 +248,13 @@ static void getoptions( see https://cgit.git.savannah.gnu.org/cgit/coreutils.git/tree/src/ls.c */ enum { RANDOM_SEED_OPTION = CHAR_MAX + 1, +<<<<<<< HEAD /* Below is the template for the next long option with * no equivalent short option */ /* NEXT_OPTION */ +======= + /* MUL_MAT_OPION */ +>>>>>>> 7ec0ae3 (some files in make check where not sourcing the template files) }; struct option long_options[] = { {"elimination", required_argument, NULL, 'e'}, @@ -247,6 +264,7 @@ static void getoptions( {"isolate", required_argument, NULL, 'I'}, {"linear-algebra", required_argument, NULL, 'l'}, {"lifting-mulmat", required_argument, NULL, 'L'}, + /* {"mul-mat", required_argument, NULL, MUL_MAT_OPION}, */ {"normal-form", required_argument, NULL, 'n'}, {"output-file", required_argument, NULL, 'o'}, {"precision", required_argument, NULL, 'p'}, diff --git a/test/diff/diff_f4sat-31.sh b/test/diff/diff_f4sat-31.sh index b9f275e2..0fc7bf54 100755 --- a/test/diff/diff_f4sat-31.sh +++ b/test/diff/diff_f4sat-31.sh @@ -2,6 +2,8 @@ file=f4sat-31 +source test/diff/diff_source.sh + $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ -S -g 2 -l 2 -t 1 if [ $? -gt 0 ]; then diff --git a/test/diff/diff_f4sat-byone-31.sh b/test/diff/diff_f4sat-byone-31.sh index 4130ab8d..7b519d27 100755 --- a/test/diff/diff_f4sat-byone-31.sh +++ b/test/diff/diff_f4sat-byone-31.sh @@ -2,6 +2,8 @@ file=f4sat-byone-31 +source test/diff/diff_source.sh + $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ -S -g 2 -l 2 -t 1 if [ $? -gt 0 ]; then diff --git a/test/diff/diff_f4sat-field-char.sh b/test/diff/diff_f4sat-field-char.sh index 8e2bd2d3..756d552b 100755 --- a/test/diff/diff_f4sat-field-char.sh +++ b/test/diff/diff_f4sat-field-char.sh @@ -2,6 +2,8 @@ file=f4sat-field-char +source test/diff/diff_source.sh + $(pwd)/msolve -f input_files/$file.ms -S -g2 -o test/diff/$file.res \ -n2 if [ $? -gt 0 ]; then diff --git a/test/diff/diff_f4sat-is-saturated-check.sh b/test/diff/diff_f4sat-is-saturated-check.sh index d66b32da..9a0ac149 100755 --- a/test/diff/diff_f4sat-is-saturated-check.sh +++ b/test/diff/diff_f4sat-is-saturated-check.sh @@ -2,6 +2,8 @@ file=f4sat-is-saturated-check +source test/diff/diff_source.sh + $(pwd)/msolve -f input_files/$file.ms -S -o test/diff/$file.res \ -n2 # should return an error 1 status diff --git a/test/diff/diff_f4sat-zero-input.sh b/test/diff/diff_f4sat-zero-input.sh index 28d3111f..ab98f526 100755 --- a/test/diff/diff_f4sat-zero-input.sh +++ b/test/diff/diff_f4sat-zero-input.sh @@ -2,6 +2,8 @@ file=f4sat-zero-input +source test/diff/diff_source.sh + $(pwd)/msolve -f input_files/$file.ms -S -g2 -o test/diff/$file.res \ -n2 # should return an error 1 status diff --git a/test/diff/diff_kat8-qq-truncate.sh b/test/diff/diff_kat8-qq-truncate.sh index e3a0077b..1ebe0091 100755 --- a/test/diff/diff_kat8-qq-truncate.sh +++ b/test/diff/diff_kat8-qq-truncate.sh @@ -2,6 +2,8 @@ file=kat8-qq-truncate +source test/diff/diff_source.sh + $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ -N 5 -g 2 -l 2 -t 1 if [ $? -gt 0 ]; then diff --git a/test/diff/diff_nf_16.sh b/test/diff/diff_nf_16.sh index c00c33e5..646c4807 100755 --- a/test/diff/diff_nf_16.sh +++ b/test/diff/diff_nf_16.sh @@ -2,6 +2,8 @@ file=nf-16 +source test/diff/diff_source.sh + $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ -n 2 if [ $? -gt 0 ]; then diff --git a/test/diff/diff_nf_31.sh b/test/diff/diff_nf_31.sh index a74aff7f..4bf888e6 100755 --- a/test/diff/diff_nf_31.sh +++ b/test/diff/diff_nf_31.sh @@ -2,6 +2,8 @@ file=nf-31 +source test/diff/diff_source.sh + $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ -n 2 if [ $? -gt 0 ]; then diff --git a/test/diff/diff_nf_8.sh b/test/diff/diff_nf_8.sh index abdf4b4d..8b8fe90e 100755 --- a/test/diff/diff_nf_8.sh +++ b/test/diff/diff_nf_8.sh @@ -2,6 +2,8 @@ file=nf-8 +source test/diff/diff_source.sh + $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ -n 2 if [ $? -gt 0 ]; then diff --git a/test/diff/diff_nf_lm_bug.sh b/test/diff/diff_nf_lm_bug.sh index 2c86dc45..26d07a3a 100755 --- a/test/diff/diff_nf_lm_bug.sh +++ b/test/diff/diff_nf_lm_bug.sh @@ -2,6 +2,8 @@ file=nf-lm-bug +source test/diff/diff_source.sh + $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ -n 3 if [ $? -gt 0 ]; then From 65f00a030c0a4d21421e8dc51a6442bcf8b8f721 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Berthomieu?= Date: Sun, 25 Jan 2026 23:14:41 +0100 Subject: [PATCH 04/15] corrects names in configure.ac --- configure.ac | 16 ++++++++-------- .../diff_nonradical_radicalshape-no-square-31.sh | 2 ++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index abad38c2..1f5ce6e1 100644 --- a/configure.ac +++ b/configure.ac @@ -125,31 +125,31 @@ AC_CONFIG_LINKS([ output_files/choice-linear-form-qq-real-roots.res:output_files/choice-linear-form-qq-real-roots.res test/diff/diff_choice-linear-form-qq-real-roots.sh:test/diff/diff_choice-linear-form-qq-real-roots.sh input_files/cp_d_3_n_4_p_2.ms:input_files/cp_d_3_n_4_p_2.ms - output_files/cp_d_3_n_4_p_2.res:output_files/cp_d_3_n_4_p_2.P2.d0.res + output_files/cp_d_3_n_4_p_2.P2.d0.res:output_files/cp_d_3_n_4_p_2.P2.d0.res test/diff/diff_cp_d_3_n_4_p_2.sh:test/diff/diff_cp_d_3_n_4_p_2.sh input_files/cyclic5-16.ms:input_files/cyclic5-16.ms - output_files/cyclic5-16.res:output_files/cyclic5-16.P2.d4.res + output_files/cyclic5-16.P2.d4.res:output_files/cyclic5-16.P2.d4.res test/diff/diff_cyclic5-16.sh:test/diff/diff_cyclic5-16.sh input_files/cyclic5-31.ms:input_files/cyclic5-31.ms - output_files/cyclic5-31.res:output_files/cyclic5-31.P2.d4.res + output_files/cyclic5-31.P2.d4.res:output_files/cyclic5-31.P2.d4.res test/diff/diff_cyclic5-31.sh:test/diff/diff_cyclic5-31.sh input_files/cyclic5-qq.ms:input_files/cyclic5-qq.ms - output_files/cyclic5-qq.res:output_files/cyclic5-qq.P2.d4.res + output_files/cyclic5-qq.P2.d4.res:output_files/cyclic5-qq.P2.d4.res output_files/cyclic5-qq.g2.res:output_files/cyclic5-qq.g2.res output_files/cyclic5-qq.g2.e1.res:output_files/cyclic5-qq.g2.e1.res output_files/cyclic5-qq.g2.e2.res:output_files/cyclic5-qq.g2.e2.res test/diff/diff_cyclic5-qq.sh:test/diff/diff_cyclic5-qq.sh input_files/eco10-31.ms:input_files/eco10-31.ms - output_files/eco10-31.res:output_files/eco10-31.P2.d0.res + output_files/eco10-31.P2.d0.res:output_files/eco10-31.P2.d0.res test/diff/diff_eco10-31.sh:test/diff/diff_eco10-31.sh input_files/eco6-16.ms:input_files/eco6-16.ms - output_files/eco6-16.res:output_files/eco6-16.P2.d4.res + output_files/eco6-16.P2.d4.res:output_files/eco6-16.P2.d4.res test/diff/diff_eco6-16.sh:test/diff/diff_eco6-16.sh input_files/eco6-31.ms:input_files/eco6-31.ms - output_files/eco6-31.res:output_files/eco6-31.P2.d4.res + output_files/eco6-31.P2.d4.res:output_files/eco6-31.P2.d4.res test/diff/diff_eco6-31.sh:test/diff/diff_eco6-31.sh input_files/eco6-qq.ms:input_files/eco6-qq.ms - output_files/eco6-qq.res:output_files/eco6-qq.P2.d4.res + output_files/eco6-qq.P2.d4.res:output_files/eco6-qq.P2.d4.res test/diff/diff_eco6-qq.sh:test/diff/diff_eco6-qq.sh input_files/elim-31.ms:input_files/elim-31.ms output_files/elim-31.g2.e1.res:output_files/elim-31.g2.e1.res diff --git a/test/diff/diff_nonradical_radicalshape-no-square-31.sh b/test/diff/diff_nonradical_radicalshape-no-square-31.sh index 20c6478b..7a493913 100755 --- a/test/diff/diff_nonradical_radicalshape-no-square-31.sh +++ b/test/diff/diff_nonradical_radicalshape-no-square-31.sh @@ -2,6 +2,8 @@ file=nonradical_radicalshape-no-square-31 +source test/diff/diff_source.sh + $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ -P 2 -l 2 -t 1 -c 0 if [ $? -gt 0 ]; then From ab317b710373a5b5f454d15f2365f391e8850817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Berthomieu?= Date: Mon, 26 Jan 2026 14:44:48 +0100 Subject: [PATCH 05/15] change names of output files in make check --- test/diff/diff_f4sat-31.sh | 24 +++-- test/diff/diff_f4sat-byone-31.sh | 24 +++-- test/diff/diff_f4sat-field-char.sh | 8 +- test/diff/diff_f4sat-is-saturated-check.sh | 8 +- test/diff/diff_kat8-qq-truncate.sh | 24 +++-- test/diff/diff_nf_16.sh | 6 +- test/diff/diff_nf_31.sh | 6 +- test/diff/diff_nf_8.sh | 6 +- test/diff/diff_nf_lm_bug.sh | 6 +- ...ff_nonradical_radicalshape-no-square-31.sh | 24 +++-- test/diff/diff_source-gb-elim-red.sh | 49 ++++++---- test/diff/diff_source-gb-lm.sh | 24 +++-- test/diff/diff_source-gb-red.sh | 24 +++-- test/diff/diff_source-noarg.sh | 24 +++-- test/diff/diff_source-param-fullnf-qq.sh | 24 +++-- test/diff/diff_source-param-fullnf.sh | 22 +++-- test/diff/diff_source-param-nonf-qq.sh | 24 +++-- test/diff/diff_source-param-nonf.sh | 24 +++-- test/diff/diff_source-real-param-nonf.sh | 96 ++++++++++++------- test/diff/diff_source-real.sh | 96 ++++++++++++------- test/diff/diff_source.sh | 14 ++- 21 files changed, 354 insertions(+), 203 deletions(-) diff --git a/test/diff/diff_f4sat-31.sh b/test/diff/diff_f4sat-31.sh index 0fc7bf54..ca9eda01 100755 --- a/test/diff/diff_f4sat-31.sh +++ b/test/diff/diff_f4sat-31.sh @@ -4,48 +4,54 @@ file=f4sat-31 source test/diff/diff_source.sh -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.1.res \ -S -g 2 -l 2 -t 1 if [ $? -gt 0 ]; then exit 1 fi -diff test/diff/$file.res output_files/$file.res +diff test/diff/$file.1.res output_files/$file.res if [ $? -gt 0 ]; then exit 2 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.1.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.21.res \ -S -g 2 -l 2 -t 2 if [ $? -gt 0 ]; then exit 21 fi -diff test/diff/$file.res output_files/$file.res +diff test/diff/$file.21.res output_files/$file.res if [ $? -gt 0 ]; then exit 22 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.21.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.41.res \ -S -g 2 -l 44 -t 1 if [ $? -gt 0 ]; then exit 41 fi -diff test/diff/$file.res output_files/$file.res +diff test/diff/$file.41.res output_files/$file.res if [ $? -gt 0 ]; then exit 42 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.41.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.61.res \ -S -g 2 -l 44 -t 2 if [ $? -gt 0 ]; then exit 61 fi -diff test/diff/$file.res output_files/$file.res +diff test/diff/$file.61.res output_files/$file.res if [ $? -gt 0 ]; then exit 62 fi -rm test/diff/$file.res +rm test/diff/$file.61.res diff --git a/test/diff/diff_f4sat-byone-31.sh b/test/diff/diff_f4sat-byone-31.sh index 7b519d27..68cfa1ee 100755 --- a/test/diff/diff_f4sat-byone-31.sh +++ b/test/diff/diff_f4sat-byone-31.sh @@ -4,48 +4,54 @@ file=f4sat-byone-31 source test/diff/diff_source.sh -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.1.res \ -S -g 2 -l 2 -t 1 if [ $? -gt 0 ]; then exit 1 fi -diff test/diff/$file.res output_files/$file.res +diff test/diff/$file.1.res output_files/$file.res if [ $? -gt 0 ]; then exit 2 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.1.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.21.res \ -S -g 2 -l 2 -t 2 if [ $? -gt 0 ]; then exit 21 fi -diff test/diff/$file.res output_files/$file.res +diff test/diff/$file.21.res output_files/$file.res if [ $? -gt 0 ]; then exit 22 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.21.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.41.res \ -S -g 2 -l 44 -t 1 if [ $? -gt 0 ]; then exit 41 fi -diff test/diff/$file.res output_files/$file.res +diff test/diff/$file.41.res output_files/$file.res if [ $? -gt 0 ]; then exit 42 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.41.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.61.res \ -S -g 2 -l 44 -t 2 if [ $? -gt 0 ]; then exit 61 fi -diff test/diff/$file.res output_files/$file.res +diff test/diff/$file.61.res output_files/$file.res if [ $? -gt 0 ]; then exit 62 fi -rm test/diff/$file.res +rm test/diff/$file.61.res diff --git a/test/diff/diff_f4sat-field-char.sh b/test/diff/diff_f4sat-field-char.sh index 756d552b..a05b3e84 100755 --- a/test/diff/diff_f4sat-field-char.sh +++ b/test/diff/diff_f4sat-field-char.sh @@ -4,15 +4,15 @@ file=f4sat-field-char source test/diff/diff_source.sh -$(pwd)/msolve -f input_files/$file.ms -S -g2 -o test/diff/$file.res \ - -n2 +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.1.res \ + -S -g 2 -n 2 if [ $? -gt 0 ]; then exit 1 fi -diff test/diff/$file.res output_files/$file.res +diff test/diff/$file.1.res output_files/$file.res if [ $? -gt 0 ]; then exit 2 fi -rm test/diff/$file.res +rm test/diff/$file.1.res diff --git a/test/diff/diff_f4sat-is-saturated-check.sh b/test/diff/diff_f4sat-is-saturated-check.sh index 9a0ac149..246032a3 100755 --- a/test/diff/diff_f4sat-is-saturated-check.sh +++ b/test/diff/diff_f4sat-is-saturated-check.sh @@ -4,17 +4,17 @@ file=f4sat-is-saturated-check source test/diff/diff_source.sh -$(pwd)/msolve -f input_files/$file.ms -S -o test/diff/$file.res \ - -n2 +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.1.res \ + -S -n 2 # should return an error 1 status if [ $? -gt 1 ]; then exit 1 fi -diff test/diff/$file.res output_files/$file.res +diff test/diff/$file.1.res output_files/$file.res # should return an error 1 status if [ $? -gt 1 ]; then exit 2 fi -rm test/diff/$file.res +rm test/diff/$file.1.res diff --git a/test/diff/diff_kat8-qq-truncate.sh b/test/diff/diff_kat8-qq-truncate.sh index 1ebe0091..164aceed 100755 --- a/test/diff/diff_kat8-qq-truncate.sh +++ b/test/diff/diff_kat8-qq-truncate.sh @@ -4,48 +4,54 @@ file=kat8-qq-truncate source test/diff/diff_source.sh -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.1.res \ -N 5 -g 2 -l 2 -t 1 if [ $? -gt 0 ]; then exit 1 fi -diff test/diff/$file.res output_files/$file.res +diff test/diff/$file.1.res output_files/$file.res if [ $? -gt 0 ]; then exit 2 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.1.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.21.res \ -N 5 -g 2 -l 2 -t 2 if [ $? -gt 0 ]; then exit 21 fi -diff test/diff/$file.res output_files/$file.res +diff test/diff/$file.21.res output_files/$file.res if [ $? -gt 0 ]; then exit 22 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.21.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.41.res \ -N 5 -g 2 -l 44 -t 1 if [ $? -gt 0 ]; then exit 41 fi -diff test/diff/$file.res output_files/$file.res +diff test/diff/$file.41.res output_files/$file.res if [ $? -gt 0 ]; then exit 42 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.41.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.61.res \ -N 5 -g 2 -l 44 -t 2 if [ $? -gt 0 ]; then exit 61 fi -diff test/diff/$file.res output_files/$file.res +diff test/diff/$file.61.res output_files/$file.res if [ $? -gt 0 ]; then exit 62 fi -rm test/diff/$file.res +rm test/diff/$file.61.res diff --git a/test/diff/diff_nf_16.sh b/test/diff/diff_nf_16.sh index 646c4807..81462a88 100755 --- a/test/diff/diff_nf_16.sh +++ b/test/diff/diff_nf_16.sh @@ -4,15 +4,15 @@ file=nf-16 source test/diff/diff_source.sh -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.1.res \ -n 2 if [ $? -gt 0 ]; then exit 1 fi -diff test/diff/$file.res output_files/$file.res +diff test/diff/$file.1.res output_files/$file.res if [ $? -gt 0 ]; then exit 2 fi -rm test/diff/$file.res +rm test/diff/$file.1.res diff --git a/test/diff/diff_nf_31.sh b/test/diff/diff_nf_31.sh index 4bf888e6..aa71d9ec 100755 --- a/test/diff/diff_nf_31.sh +++ b/test/diff/diff_nf_31.sh @@ -4,15 +4,15 @@ file=nf-31 source test/diff/diff_source.sh -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.1.res \ -n 2 if [ $? -gt 0 ]; then exit 1 fi -diff test/diff/$file.res output_files/$file.res +diff test/diff/$file.1.res output_files/$file.res if [ $? -gt 0 ]; then exit 2 fi -rm test/diff/$file.res +rm test/diff/$file.1.res diff --git a/test/diff/diff_nf_8.sh b/test/diff/diff_nf_8.sh index 8b8fe90e..5d2df509 100755 --- a/test/diff/diff_nf_8.sh +++ b/test/diff/diff_nf_8.sh @@ -4,15 +4,15 @@ file=nf-8 source test/diff/diff_source.sh -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.1.res \ -n 2 if [ $? -gt 0 ]; then exit 1 fi -diff test/diff/$file.res output_files/$file.res +diff test/diff/$file.1.res output_files/$file.res if [ $? -gt 0 ]; then exit 2 fi -rm test/diff/$file.res +rm test/diff/$file.1.res diff --git a/test/diff/diff_nf_lm_bug.sh b/test/diff/diff_nf_lm_bug.sh index 26d07a3a..4d78843f 100755 --- a/test/diff/diff_nf_lm_bug.sh +++ b/test/diff/diff_nf_lm_bug.sh @@ -4,15 +4,15 @@ file=nf-lm-bug source test/diff/diff_source.sh -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.1.res \ -n 3 if [ $? -gt 0 ]; then exit 1 fi -diff test/diff/$file.res output_files/$file.res +diff test/diff/$file.1.res output_files/$file.res if [ $? -gt 0 ]; then exit 2 fi -rm test/diff/$file.res +rm test/diff/$file.1.res diff --git a/test/diff/diff_nonradical_radicalshape-no-square-31.sh b/test/diff/diff_nonradical_radicalshape-no-square-31.sh index 7a493913..1680bba5 100755 --- a/test/diff/diff_nonradical_radicalshape-no-square-31.sh +++ b/test/diff/diff_nonradical_radicalshape-no-square-31.sh @@ -4,48 +4,54 @@ file=nonradical_radicalshape-no-square-31 source test/diff/diff_source.sh -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.3.res \ -P 2 -l 2 -t 1 -c 0 if [ $? -gt 0 ]; then exit 3 fi -diff test/diff/$file.res output_files/$file.c0.res +diff test/diff/$file.3.res output_files/$file.c0.res if [ $? -gt 0 ]; then exit 4 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.3.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.23.res \ -P 2 -l 2 -t 2 -c 0 if [ $? -gt 0 ]; then exit 23 fi -diff test/diff/$file.res output_files/$file.c0.res +diff test/diff/$file.23.res output_files/$file.c0.res if [ $? -gt 0 ]; then exit 24 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.23.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.43.res \ -P 2 -l 44 -t 1 -c 0 if [ $? -gt 0 ]; then exit 43 fi -diff test/diff/$file.res output_files/$file.c0.res +diff test/diff/$file.43.res output_files/$file.c0.res if [ $? -gt 0 ]; then exit 44 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.43.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.63.res \ -P 2 -l 44 -t 2 -c 0 if [ $? -gt 0 ]; then exit 63 fi -diff test/diff/$file.res output_files/$file.c0.res +diff test/diff/$file.63.res output_files/$file.c0.res if [ $? -gt 0 ]; then exit 64 fi -rm test/diff/$file.res +rm test/diff/$file.63.res diff --git a/test/diff/diff_source-gb-elim-red.sh b/test/diff/diff_source-gb-elim-red.sh index 16b9c712..cfc895da 100644 --- a/test/diff/diff_source-gb-elim-red.sh +++ b/test/diff/diff_source-gb-elim-red.sh @@ -1,98 +1,113 @@ -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.5.res \ --random-seed $seed \ -e 1 -g 2 -l 2 -t 1 if [ $? -gt 0 ]; then exit 5 fi -diff test/diff/$file.res output_files/$file.g2.e1.res +diff test/diff/$file.5.res output_files/$file.g2.e1.res if [ $? -gt 0 ]; then exit 6 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.5.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.7.res \ --random-seed $seed \ -e 2 -g 2 -l 2 -t 1 if [ $? -gt 0 ]; then exit 7 fi -diff test/diff/$file.res output_files/$file.g2.e2.res +diff test/diff/$file.7.res output_files/$file.g2.e2.res if [ $? -gt 0 ]; then exit 8 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.7.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.25.res \ --random-seed $seed \ -e 1 -g 2 -l 2 -t 2 if [ $? -gt 0 ]; then exit 25 fi -diff test/diff/$file.res output_files/$file.g2.e1.res +diff test/diff/$file.25.res output_files/$file.g2.e1.res if [ $? -gt 0 ]; then exit 26 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.25.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.27.res \ --random-seed $seed \ -e 2 -g 2 -l 2 -t 2 if [ $? -gt 0 ]; then exit 27 fi -diff test/diff/$file.res output_files/$file.g2.e2.res +diff test/diff/$file.27.res output_files/$file.g2.e2.res if [ $? -gt 0 ]; then exit 28 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.27.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.45.res \ --random-seed $seed \ -e 1 -g 2 -l 44 -t 1 if [ $? -gt 0 ]; then exit 45 fi -diff test/diff/$file.res output_files/$file.g2.e1.res +diff test/diff/$file.45.res output_files/$file.g2.e1.res if [ $? -gt 0 ]; then exit 46 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.45.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.47.res \ --random-seed $seed \ -e 2 -g 2 -l 44 -t 1 if [ $? -gt 0 ]; then exit 47 fi -diff test/diff/$file.res output_files/$file.g2.e2.res +diff test/diff/$file.47.res output_files/$file.g2.e2.res if [ $? -gt 0 ]; then exit 48 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.47.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.65.res \ --random-seed $seed \ -e 1 -g 2 -l 44 -t 2 if [ $? -gt 0 ]; then exit 65 fi -diff test/diff/$file.res output_files/$file.g2.e1.res +diff test/diff/$file.65.res output_files/$file.g2.e1.res if [ $? -gt 0 ]; then exit 66 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.65.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.67.res \ --random-seed $seed \ -e 2 -g 2 -l 44 -t 2 if [ $? -gt 0 ]; then exit 67 fi -diff test/diff/$file.res output_files/$file.g2.e2.res +diff test/diff/$file.67.res output_files/$file.g2.e2.res if [ $? -gt 0 ]; then exit 68 fi -rm test/diff/$file.res +rm test/diff/$file.67.res + diff --git a/test/diff/diff_source-gb-lm.sh b/test/diff/diff_source-gb-lm.sh index 23f0b1c5..3f4dd14b 100644 --- a/test/diff/diff_source-gb-lm.sh +++ b/test/diff/diff_source-gb-lm.sh @@ -1,49 +1,55 @@ -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.3.res \ --random-seed $seed \ -g 1 -l 2 -t 1 if [ $? -gt 0 ]; then exit 3 fi -diff test/diff/$file.res output_files/$file.g1.res +diff test/diff/$file.3.res output_files/$file.g1.res if [ $? -gt 0 ]; then exit 4 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.3.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.23.res \ --random-seed $seed \ -g 1 -l 2 -t 2 if [ $? -gt 0 ]; then exit 23 fi -diff test/diff/$file.res output_files/$file.g1.res +diff test/diff/$file.23.res output_files/$file.g1.res if [ $? -gt 0 ]; then exit 24 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.23.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.43.res \ --random-seed $seed \ -g 1 -l 44 -t 1 if [ $? -gt 0 ]; then exit 43 fi -diff test/diff/$file.res output_files/$file.g1.res +diff test/diff/$file.43.res output_files/$file.g1.res if [ $? -gt 0 ]; then exit 44 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.43.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.63.res \ --random-seed $seed \ -g 1 -l 44 -t 2 if [ $? -gt 0 ]; then exit 63 fi -diff test/diff/$file.res output_files/$file.g1.res +diff test/diff/$file.63.res output_files/$file.g1.res if [ $? -gt 0 ]; then exit 64 fi -rm test/diff/$file.res +rm test/diff/$file.63.res diff --git a/test/diff/diff_source-gb-red.sh b/test/diff/diff_source-gb-red.sh index a7ca36af..ffb3023e 100644 --- a/test/diff/diff_source-gb-red.sh +++ b/test/diff/diff_source-gb-red.sh @@ -1,49 +1,55 @@ -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.3.res \ --random-seed $seed \ -g 2 -l 2 -t 1 if [ $? -gt 0 ]; then exit 3 fi -diff test/diff/$file.res output_files/$file.g2.res +diff test/diff/$file.3.res output_files/$file.g2.res if [ $? -gt 0 ]; then exit 4 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.3.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.23.res \ --random-seed $seed \ -g 2 -l 2 -t 2 if [ $? -gt 0 ]; then exit 23 fi -diff test/diff/$file.res output_files/$file.g2.res +diff test/diff/$file.23.res output_files/$file.g2.res if [ $? -gt 0 ]; then exit 24 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.23.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.43.res \ --random-seed $seed \ -g 2 -l 44 -t 1 if [ $? -gt 0 ]; then exit 43 fi -diff test/diff/$file.res output_files/$file.g2.res +diff test/diff/$file.43.res output_files/$file.g2.res if [ $? -gt 0 ]; then exit 44 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.43.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.63.res \ --random-seed $seed \ -g 2 -l 44 -t 2 if [ $? -gt 0 ]; then exit 63 fi -diff test/diff/$file.res output_files/$file.g2.res +diff test/diff/$file.63.res output_files/$file.g2.res if [ $? -gt 0 ]; then exit 64 fi -rm test/diff/$file.res +rm test/diff/$file.63.res diff --git a/test/diff/diff_source-noarg.sh b/test/diff/diff_source-noarg.sh index 21d9a2e2..6df99bc1 100644 --- a/test/diff/diff_source-noarg.sh +++ b/test/diff/diff_source-noarg.sh @@ -1,49 +1,55 @@ -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.1.res \ --random-seed $seed \ -l 2 -t 1 if [ $? -gt 0 ]; then exit 1 fi -diff test/diff/$file.res output_files/$file.res +diff test/diff/$file.1.res output_files/$file.res if [ $? -gt 0 ]; then exit 2 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.1.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.21.res \ --random-seed $seed \ -l 2 -t 2 if [ $? -gt 0 ]; then exit 21 fi -diff test/diff/$file.res output_files/$file.res +diff test/diff/$file.21.res output_files/$file.res if [ $? -gt 0 ]; then exit 22 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.21.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.41.res \ --random-seed $seed \ -l 44 -t 1 if [ $? -gt 0 ]; then exit 41 fi -diff test/diff/$file.res output_files/$file.res +diff test/diff/$file.41.res output_files/$file.res if [ $? -gt 0 ]; then exit 42 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.41.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.61.res \ --random-seed $seed \ -l 44 -t 2 if [ $? -gt 0 ]; then exit 61 fi -diff test/diff/$file.res output_files/$file.res +diff test/diff/$file.61.res output_files/$file.res if [ $? -gt 0 ]; then exit 62 fi -rm test/diff/$file.res +rm test/diff/$file.61.res diff --git a/test/diff/diff_source-param-fullnf-qq.sh b/test/diff/diff_source-param-fullnf-qq.sh index f5f8ec05..0f1edf1a 100644 --- a/test/diff/diff_source-param-fullnf-qq.sh +++ b/test/diff/diff_source-param-fullnf-qq.sh @@ -1,51 +1,57 @@ source test/diff/diff_source-param-fullnf.sh -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.81.res \ --random-seed $seed \ -P 2 -d 4 -L 1 -l 2 -t 1 if [ $? -gt 0 ]; then exit 81 fi -diff test/diff/$file.res output_files/$file.P2.d4.res +diff test/diff/$file.81.res output_files/$file.P2.d4.res if [ $? -gt 0 ]; then exit 82 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.81.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.101.res \ --random-seed $seed \ -P 2 -d 4 -L 1 -l 2 -t 2 if [ $? -gt 0 ]; then exit 101 fi -diff test/diff/$file.res output_files/$file.P2.d4.res +diff test/diff/$file.101.res output_files/$file.P2.d4.res if [ $? -gt 0 ]; then exit 102 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.101.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.121.res \ --random-seed $seed \ -P 2 -d 4 -L 1 -l 44 -t 1 if [ $? -gt 0 ]; then exit 121 fi -diff test/diff/$file.res output_files/$file.P2.d4.res +diff test/diff/$file.121.res output_files/$file.P2.d4.res if [ $? -gt 0 ]; then exit 122 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.121.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.141.res \ --random-seed $seed \ -P 2 -d 4 -L 1 -l 44 -t 2 if [ $? -gt 0 ]; then exit 141 fi -diff test/diff/$file.res output_files/$file.P2.d4.res +diff test/diff/$file.141.res output_files/$file.P2.d4.res if [ $? -gt 0 ]; then exit 142 fi -rm test/diff/$file.res +rm test/diff/$file.141.res diff --git a/test/diff/diff_source-param-fullnf.sh b/test/diff/diff_source-param-fullnf.sh index 4daed97e..2c97e85f 100644 --- a/test/diff/diff_source-param-fullnf.sh +++ b/test/diff/diff_source-param-fullnf.sh @@ -1,49 +1,53 @@ -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.1.res \ --random-seed $seed \ -P 2 -d 4 -L 0 -l 2 -t 1 if [ $? -gt 0 ]; then exit 1 fi -diff test/diff/$file.res output_files/$file.P2.d4.res +diff test/diff/$file.1.res output_files/$file.P2.d4.res if [ $? -gt 0 ]; then exit 2 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.1.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.21.res \ --random-seed $seed \ -P 2 -d 4 -L 0 -l 2 -t 2 if [ $? -gt 0 ]; then exit 21 fi -diff test/diff/$file.res output_files/$file.P2.d4.res +diff test/diff/$file.21.res output_files/$file.P2.d4.res if [ $? -gt 0 ]; then exit 22 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.41.res \ --random-seed $seed \ -P 2 -d 4 -L 0 -l 44 -t 1 if [ $? -gt 0 ]; then exit 41 fi -diff test/diff/$file.res output_files/$file.P2.d4.res +diff test/diff/$file.41.res output_files/$file.P2.d4.res if [ $? -gt 0 ]; then exit 42 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.41.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.61.res \ --random-seed $seed \ -P 2 -d 4 -L 0 -l 44 -t 2 if [ $? -gt 0 ]; then exit 61 fi -diff test/diff/$file.res output_files/$file.P2.d4.res +diff test/diff/$file.61.res output_files/$file.P2.d4.res if [ $? -gt 0 ]; then exit 62 fi -rm test/diff/$file.res +rm test/diff/$file.61.res diff --git a/test/diff/diff_source-param-nonf-qq.sh b/test/diff/diff_source-param-nonf-qq.sh index 889c00d4..101440ca 100644 --- a/test/diff/diff_source-param-nonf-qq.sh +++ b/test/diff/diff_source-param-nonf-qq.sh @@ -1,51 +1,57 @@ source test/diff/diff_source-param-nonf.sh -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.81.res \ --random-seed $seed \ -P 2 -d 0 -L 1 -l 2 -t 1 if [ $? -gt 0 ]; then exit 81 fi -diff test/diff/$file.res output_files/$file.P2.d0.res +diff test/diff/$file.81.res output_files/$file.P2.d0.res if [ $? -gt 0 ]; then exit 82 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.81.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.101.res \ --random-seed $seed \ -P 2 -d 0 -L 1 -l 2 -t 2 if [ $? -gt 0 ]; then exit 101 fi -diff test/diff/$file.res output_files/$file.P2.d0.res +diff test/diff/$file.101.res output_files/$file.P2.d0.res if [ $? -gt 0 ]; then exit 102 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.101.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.121.res \ --random-seed $seed \ -P 2 -d 0 -L 1 -l 44 -t 1 if [ $? -gt 0 ]; then exit 121 fi -diff test/diff/$file.res output_files/$file.P2.d0.res +diff test/diff/$file.121.res output_files/$file.P2.d0.res if [ $? -gt 0 ]; then exit 122 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.121.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.141.res \ --random-seed $seed \ -P 2 -d 0 -L 1 -l 44 -t 2 if [ $? -gt 0 ]; then exit 141 fi -diff test/diff/$file.res output_files/$file.P2.d0.res +diff test/diff/$file.141.res output_files/$file.P2.d0.res if [ $? -gt 0 ]; then exit 142 fi -rm test/diff/$file.res +rm test/diff/$file.141.res diff --git a/test/diff/diff_source-param-nonf.sh b/test/diff/diff_source-param-nonf.sh index c4d3caba..b1672e6d 100644 --- a/test/diff/diff_source-param-nonf.sh +++ b/test/diff/diff_source-param-nonf.sh @@ -1,49 +1,55 @@ -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.1.res \ --random-seed $seed \ -P 2 -d 0 -L 0 -l 2 -t 1 if [ $? -gt 0 ]; then exit 1 fi -diff test/diff/$file.res output_files/$file.P2.d0.res +diff test/diff/$file.1.res output_files/$file.P2.d0.res if [ $? -gt 0 ]; then exit 2 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.1.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.21.res \ --random-seed $seed \ -P 2 -d 0 -L 0 -l 2 -t 2 if [ $? -gt 0 ]; then exit 21 fi -diff test/diff/$file.res output_files/$file.P2.d0.res +diff test/diff/$file.21.res output_files/$file.P2.d0.res if [ $? -gt 0 ]; then exit 22 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.21.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.41.res \ --random-seed $seed \ -P 2 -d 0 -L 0 -l 44 -t 1 if [ $? -gt 0 ]; then exit 41 fi -diff test/diff/$file.res output_files/$file.P2.d0.res +diff test/diff/$file.41.res output_files/$file.P2.d0.res if [ $? -gt 0 ]; then exit 42 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.41.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.61.res \ --random-seed $seed \ -P 2 -d 0 -L 0 -l 44 -t 2 if [ $? -gt 0 ]; then exit 61 fi -diff test/diff/$file.res output_files/$file.P2.d0.res +diff test/diff/$file.61.res output_files/$file.P2.d0.res if [ $? -gt 0 ]; then exit 62 fi -rm test/diff/$file.res +rm test/diff/$file.61.res diff --git a/test/diff/diff_source-real-param-nonf.sh b/test/diff/diff_source-real-param-nonf.sh index 1a4f0ba5..c8f0a47d 100644 --- a/test/diff/diff_source-real-param-nonf.sh +++ b/test/diff/diff_source-real-param-nonf.sh @@ -1,193 +1,223 @@ -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.1.res \ --random-seed $seed \ -P 1 -d 0 -p 128 -L 0 -l 2 -t 1 if [ $? -gt 0 ]; then exit 1 fi -diff test/diff/$file.res output_files/$file.P1.d0.p128.res +diff test/diff/$file.1.res output_files/$file.P1.d0.p128.res if [ $? -gt 0 ]; then exit 2 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.1.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.3.res \ --random-seed $seed \ -P 1 -d 0 -p 1024 -L 0 -l 2 -t 1 if [ $? -gt 0 ]; then exit 3 fi -diff test/diff/$file.res output_files/$file.P1.d0.p1024.res +diff test/diff/$file.3.res output_files/$file.P1.d0.p1024.res if [ $? -gt 0 ]; then exit 4 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.3.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.21.res \ --random-seed $seed \ -P 1 -d 0 -p 128 -L 0 -l 2 -t 2 if [ $? -gt 0 ]; then exit 21 fi -diff test/diff/$file.res output_files/$file.P1.d0.p128.res +diff test/diff/$file.21.res output_files/$file.P1.d0.p128.res if [ $? -gt 0 ]; then exit 22 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.21.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.23.res \ --random-seed $seed \ -P 1 -d 0 -p 1024 -L 0 -l 2 -t 2 if [ $? -gt 0 ]; then exit 23 fi -diff test/diff/$file.res output_files/$file.P1.d0.p1024.res +diff test/diff/$file.23.res output_files/$file.P1.d0.p1024.res if [ $? -gt 0 ]; then exit 24 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.23.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.41.res \ --random-seed $seed \ -P 1 -d 0 -p 128 -L 0 -l 44 -t 1 if [ $? -gt 0 ]; then exit 41 fi -diff test/diff/$file.res output_files/$file.P1.d0.p128.res +diff test/diff/$file.41.res output_files/$file.P1.d0.p128.res if [ $? -gt 0 ]; then exit 42 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.41.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.43.res \ --random-seed $seed \ -P 1 -d 0 -p 1024 -L 0 -l 44 -t 1 if [ $? -gt 0 ]; then exit 43 fi -diff test/diff/$file.res output_files/$file.P1.d0.p1024.res +diff test/diff/$file.43.res output_files/$file.P1.d0.p1024.res if [ $? -gt 0 ]; then exit 44 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.43.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.61.res \ --random-seed $seed \ -P 1 -d 0 -p 128 -L 0 -l 44 -t 2 if [ $? -gt 0 ]; then exit 61 fi -diff test/diff/$file.res output_files/$file.P1.d0.p128.res +diff test/diff/$file.61.res output_files/$file.P1.d0.p128.res if [ $? -gt 0 ]; then exit 62 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.61.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.63.res \ --random-seed $seed \ -P 1 -d 0 -p 1024 -L 0 -l 44 -t 2 if [ $? -gt 0 ]; then exit 63 fi -diff test/diff/$file.res output_files/$file.P1.d0.p1024.res +diff test/diff/$file.63.res output_files/$file.P1.d0.p1024.res if [ $? -gt 0 ]; then exit 64 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.63.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.81.res \ --random-seed $seed \ -P 1 -d 0 -p 128 -L 1 -l 2 -t 1 if [ $? -gt 0 ]; then exit 81 fi -diff test/diff/$file.res output_files/$file.P1.d0.p128.res +diff test/diff/$file.81.res output_files/$file.P1.d0.p128.res if [ $? -gt 0 ]; then exit 82 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.81.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.83.res \ --random-seed $seed \ -P 1 -d 0 -p 1024 -L 1 -l 2 -t 1 if [ $? -gt 0 ]; then exit 83 fi -diff test/diff/$file.res output_files/$file.P1.d0.p1024.res +diff test/diff/$file.83.res output_files/$file.P1.d0.p1024.res if [ $? -gt 0 ]; then exit 84 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.83.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.101.res \ --random-seed $seed \ -P 1 -d 0 -p 128 -L 1 -l 2 -t 2 if [ $? -gt 0 ]; then exit 101 fi -diff test/diff/$file.res output_files/$file.P1.d0.p128.res +diff test/diff/$file.101.res output_files/$file.P1.d0.p128.res if [ $? -gt 0 ]; then exit 102 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.101.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.103.res \ --random-seed $seed \ -P 1 -d 0 -p 1024 -L 1 -l 2 -t 2 if [ $? -gt 0 ]; then exit 103 fi -diff test/diff/$file.res output_files/$file.P1.d0.p1024.res +diff test/diff/$file.103.res output_files/$file.P1.d0.p1024.res if [ $? -gt 0 ]; then exit 104 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.103.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.121.res \ --random-seed $seed \ -P 1 -d 0 -p 128 -L 1 -l 44 -t 1 if [ $? -gt 0 ]; then exit 121 fi -diff test/diff/$file.res output_files/$file.P1.d0.p128.res +diff test/diff/$file.121.res output_files/$file.P1.d0.p128.res if [ $? -gt 0 ]; then exit 122 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.121.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.123.res \ --random-seed $seed \ -P 1 -d 0 -p 1024 -L 1 -l 44 -t 1 if [ $? -gt 0 ]; then exit 123 fi -diff test/diff/$file.res output_files/$file.P1.d0.p1024.res +diff test/diff/$file.123.res output_files/$file.P1.d0.p1024.res if [ $? -gt 0 ]; then exit 124 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.123.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.141.res \ --random-seed $seed \ -P 1 -d 0 -p 128 -L 1 -l 44 -t 2 if [ $? -gt 0 ]; then exit 141 fi -diff test/diff/$file.res output_files/$file.P1.d0.p128.res +diff test/diff/$file.141.res output_files/$file.P1.d0.p128.res if [ $? -gt 0 ]; then exit 142 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.141.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.143.res \ --random-seed $seed \ -P 1 -d 0 -p 1024 -L 1 -l 44 -t 2 if [ $? -gt 0 ]; then exit 143 fi -diff test/diff/$file.res output_files/$file.P1.d0.p1024.res +diff test/diff/$file.143.res output_files/$file.P1.d0.p1024.res if [ $? -gt 0 ]; then exit 144 fi -rm test/diff/$file.res +rm test/diff/$file.143.res diff --git a/test/diff/diff_source-real.sh b/test/diff/diff_source-real.sh index e417fb97..4346b359 100644 --- a/test/diff/diff_source-real.sh +++ b/test/diff/diff_source-real.sh @@ -1,193 +1,223 @@ -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.11.res \ --random-seed $seed \ -p 128 -L 0 -l 2 -t 1 if [ $? -gt 0 ]; then exit 11 fi -diff test/diff/$file.res output_files/$file.p128.res +diff test/diff/$file.11.res output_files/$file.p128.res if [ $? -gt 0 ]; then exit 12 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.11.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.13.res \ --random-seed $seed \ -p 1024 -L 0 -l 2 -t 1 if [ $? -gt 0 ]; then exit 13 fi -diff test/diff/$file.res output_files/$file.p1024.res +diff test/diff/$file.13.res output_files/$file.p1024.res if [ $? -gt 0 ]; then exit 14 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.13.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.31.res \ --random-seed $seed \ -p 128 -L 0 -l 2 -t 2 if [ $? -gt 0 ]; then exit 31 fi -diff test/diff/$file.res output_files/$file.p128.res +diff test/diff/$file.31.res output_files/$file.p128.res if [ $? -gt 0 ]; then exit 32 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.31.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.33.res \ --random-seed $seed \ -p 1024 -L 0 -l 2 -t 2 if [ $? -gt 0 ]; then exit 33 fi -diff test/diff/$file.res output_files/$file.p1024.res +diff test/diff/$file.33.res output_files/$file.p1024.res if [ $? -gt 0 ]; then exit 34 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.33.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.51.res \ --random-seed $seed \ -p 128 -L 0 -l 44 -t 1 if [ $? -gt 0 ]; then exit 51 fi -diff test/diff/$file.res output_files/$file.p128.res +diff test/diff/$file.51.res output_files/$file.p128.res if [ $? -gt 0 ]; then exit 52 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.51.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.53.res \ --random-seed $seed \ -p 1024 -L 0 -l 44 -t 1 if [ $? -gt 0 ]; then exit 53 fi -diff test/diff/$file.res output_files/$file.p1024.res +diff test/diff/$file.53.res output_files/$file.p1024.res if [ $? -gt 0 ]; then exit 54 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.53..res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.71.res \ --random-seed $seed \ -p 128 -L 0 -l 44 -t 2 if [ $? -gt 0 ]; then exit 71 fi -diff test/diff/$file.res output_files/$file.p128.res +diff test/diff/$file.71.res output_files/$file.p128.res if [ $? -gt 0 ]; then exit 72 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.71.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.73.res \ --random-seed $seed \ -p 1024 -L 0 -l 44 -t 2 if [ $? -gt 0 ]; then exit 73 fi -diff test/diff/$file.res output_files/$file.p1024.res +diff test/diff/$file.73.res output_files/$file.p1024.res if [ $? -gt 0 ]; then exit 74 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.73.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.91.res \ --random-seed $seed \ -p 128 -L 1 -l 2 -t 1 if [ $? -gt 0 ]; then exit 91 fi -diff test/diff/$file.res output_files/$file.p128.res +diff test/diff/$file.91.res output_files/$file.p128.res if [ $? -gt 0 ]; then exit 92 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.91.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.93.res \ --random-seed $seed \ -p 1024 -L 1 -l 2 -t 1 if [ $? -gt 0 ]; then exit 93 fi -diff test/diff/$file.res output_files/$file.p1024.res +diff test/diff/$file.93.res output_files/$file.p1024.res if [ $? -gt 0 ]; then exit 94 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.93.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.111.res \ --random-seed $seed \ -p 128 -L 1 -l 2 -t 2 if [ $? -gt 0 ]; then exit 111 fi -diff test/diff/$file.res output_files/$file.p128.res +diff test/diff/$file.111.res output_files/$file.p128.res if [ $? -gt 0 ]; then exit 112 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.111.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.113.res \ --random-seed $seed \ -p 1024 -L 1 -l 2 -t 2 if [ $? -gt 0 ]; then exit 113 fi -diff test/diff/$file.res output_files/$file.p1024.res +diff test/diff/$file.113.res output_files/$file.p1024.res if [ $? -gt 0 ]; then exit 114 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.113.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.131.res \ --random-seed $seed \ -p 128 -L 1 -l 44 -t 1 if [ $? -gt 0 ]; then exit 131 fi -diff test/diff/$file.res output_files/$file.p128.res +diff test/diff/$file.131.res output_files/$file.p128.res if [ $? -gt 0 ]; then exit 132 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.131.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.133.res \ --random-seed $seed \ -p 1024 -L 1 -l 44 -t 1 if [ $? -gt 0 ]; then exit 133 fi -diff test/diff/$file.res output_files/$file.p1024.res +diff test/diff/$file.133.res output_files/$file.p1024.res if [ $? -gt 0 ]; then exit 134 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.133.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.151.res \ --random-seed $seed \ -p 128 -L 1 -l 44 -t 2 if [ $? -gt 0 ]; then exit 151 fi -diff test/diff/$file.res output_files/$file.p128.res +diff test/diff/$file.151.res output_files/$file.p128.res if [ $? -gt 0 ]; then exit 152 fi -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ +rm test/diff/$file.151.res + +$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.153.res \ --random-seed $seed \ -p 1024 -L 1 -l 44 -t 2 if [ $? -gt 0 ]; then exit 153 fi -diff test/diff/$file.res output_files/$file.p1024.res +diff test/diff/$file.153.res output_files/$file.p1024.res if [ $? -gt 0 ]; then exit 154 fi -rm test/diff/$file.res +rm test/diff/$file.153.res diff --git a/test/diff/diff_source.sh b/test/diff/diff_source.sh index ef7a6e04..4763c0f2 100755 --- a/test/diff/diff_source.sh +++ b/test/diff/diff_source.sh @@ -1,4 +1,16 @@ -seed=$EPOCHSECONDS && echo "Seed:" $seed +# seed=$EPOCHSECONDS +seed=${SEED:-$EPOCHSECONDS} + +if [ -t 2 ]; then + col='\033[0;96m' # High Intensity Light blue. + std='\033[0m' +else + col= + std= +fi + +echo -e "${col}SEED${std}: $seed" >&2 +echo -e "${col}SEED${std}: $seed" # each diff_example.sh is built by running msolve on $file.ms # with options -L 0 -l 2 -t 1 From 00fccbf1dfeab30ffe65266a90e7e1a3c7e623cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Berthomieu?= Date: Mon, 26 Jan 2026 15:51:36 +0100 Subject: [PATCH 06/15] SEED default variable defined in Makefile.am --- Makefile.am | 1 + test/diff/diff_source-param-fullnf.sh | 2 ++ test/diff/diff_source-real.sh | 2 +- test/diff/diff_source.sh | 10 +++++----- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index 6356a570..2992d79f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -77,6 +77,7 @@ fglm_build_matrixn_nonradical_radicalshape_31_SOURCES = test/fglm/build_matrixn_ line_endings_support_SOURCES = test/msolve/line_endings_support.c TESTS = $(check_PROGRAMS) $(checkdiff) +TESTS_ENVIRONMENT = SEED=$${SEED:-$${EPOCHSECONDS}} pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = msolve.pc diff --git a/test/diff/diff_source-param-fullnf.sh b/test/diff/diff_source-param-fullnf.sh index 2c97e85f..4894615a 100644 --- a/test/diff/diff_source-param-fullnf.sh +++ b/test/diff/diff_source-param-fullnf.sh @@ -24,6 +24,8 @@ if [ $? -gt 0 ]; then exit 22 fi +rm test/diff/$file.21.res + $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.41.res \ --random-seed $seed \ -P 2 -d 4 -L 0 -l 44 -t 1 diff --git a/test/diff/diff_source-real.sh b/test/diff/diff_source-real.sh index 4346b359..701d5967 100644 --- a/test/diff/diff_source-real.sh +++ b/test/diff/diff_source-real.sh @@ -80,7 +80,7 @@ if [ $? -gt 0 ]; then exit 54 fi -rm test/diff/$file.53..res +rm test/diff/$file.53.res $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.71.res \ --random-seed $seed \ diff --git a/test/diff/diff_source.sh b/test/diff/diff_source.sh index 4763c0f2..455cc2e4 100755 --- a/test/diff/diff_source.sh +++ b/test/diff/diff_source.sh @@ -1,16 +1,16 @@ -# seed=$EPOCHSECONDS seed=${SEED:-$EPOCHSECONDS} if [ -t 2 ]; then - col='\033[0;96m' # High Intensity Light blue. + colseed='\033[0;96m' # High Intensity Light blue. + colexit='\033[0;93m' # High Intensity Yellow. std='\033[0m' else - col= + colseed= + colexit= std= fi -echo -e "${col}SEED${std}: $seed" >&2 -echo -e "${col}SEED${std}: $seed" +echo -e "${colseed}SEED${std}: $seed" # each diff_example.sh is built by running msolve on $file.ms # with options -L 0 -l 2 -t 1 From 9aa46cae257de23b97e3afc04d76f3f5ba50e54b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Berthomieu?= Date: Mon, 26 Jan 2026 15:57:09 +0100 Subject: [PATCH 07/15] function for color printing the exit code --- test/diff/diff_source.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/diff/diff_source.sh b/test/diff/diff_source.sh index 455cc2e4..a14a6a86 100755 --- a/test/diff/diff_source.sh +++ b/test/diff/diff_source.sh @@ -10,6 +10,13 @@ else std= fi +# print in color the exit code +print_exit() { + local excode=$1 + echo -e "${colexit}EXIT${std}: $excode" + exit "$excode" +} + echo -e "${colseed}SEED${std}: $seed" # each diff_example.sh is built by running msolve on $file.ms From 850bece1c66e202a36a1ef2cf915a10f9cdc9fd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Berthomieu?= Date: Mon, 26 Jan 2026 16:13:51 +0100 Subject: [PATCH 08/15] call the color printed function for exit codes in test/diff/diff_*.sh files --- test/diff/diff_f4sat-31.sh | 16 ++--- test/diff/diff_f4sat-byone-31.sh | 16 ++--- test/diff/diff_f4sat-field-char.sh | 4 +- test/diff/diff_f4sat-is-saturated-check.sh | 4 +- test/diff/diff_f4sat-zero-input.sh | 4 +- test/diff/diff_kat8-qq-truncate.sh | 16 ++--- test/diff/diff_nf_16.sh | 4 +- test/diff/diff_nf_31.sh | 4 +- test/diff/diff_nf_8.sh | 4 +- test/diff/diff_nf_lm_bug.sh | 4 +- ...ff_nonradical_radicalshape-no-square-31.sh | 16 ++--- test/diff/diff_source-gb-elim-red.sh | 32 +++++----- test/diff/diff_source-gb-lm.sh | 16 ++--- test/diff/diff_source-gb-red.sh | 16 ++--- test/diff/diff_source-noarg.sh | 16 ++--- test/diff/diff_source-param-fullnf-qq.sh | 16 ++--- test/diff/diff_source-param-fullnf.sh | 16 ++--- test/diff/diff_source-param-nonf-qq.sh | 16 ++--- test/diff/diff_source-param-nonf.sh | 16 ++--- test/diff/diff_source-real-param-nonf.sh | 64 +++++++++---------- test/diff/diff_source-real.sh | 64 +++++++++---------- test/diff/diff_source.sh | 4 +- 22 files changed, 184 insertions(+), 184 deletions(-) diff --git a/test/diff/diff_f4sat-31.sh b/test/diff/diff_f4sat-31.sh index ca9eda01..7576b6d3 100755 --- a/test/diff/diff_f4sat-31.sh +++ b/test/diff/diff_f4sat-31.sh @@ -7,12 +7,12 @@ source test/diff/diff_source.sh $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.1.res \ -S -g 2 -l 2 -t 1 if [ $? -gt 0 ]; then - exit 1 + print_exit 1 fi diff test/diff/$file.1.res output_files/$file.res if [ $? -gt 0 ]; then - exit 2 + print_exit 2 fi rm test/diff/$file.1.res @@ -20,12 +20,12 @@ rm test/diff/$file.1.res $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.21.res \ -S -g 2 -l 2 -t 2 if [ $? -gt 0 ]; then - exit 21 + print_exit 21 fi diff test/diff/$file.21.res output_files/$file.res if [ $? -gt 0 ]; then - exit 22 + print_exit 22 fi rm test/diff/$file.21.res @@ -33,12 +33,12 @@ rm test/diff/$file.21.res $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.41.res \ -S -g 2 -l 44 -t 1 if [ $? -gt 0 ]; then - exit 41 + print_exit 41 fi diff test/diff/$file.41.res output_files/$file.res if [ $? -gt 0 ]; then - exit 42 + print_exit 42 fi rm test/diff/$file.41.res @@ -46,12 +46,12 @@ rm test/diff/$file.41.res $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.61.res \ -S -g 2 -l 44 -t 2 if [ $? -gt 0 ]; then - exit 61 + print_exit 61 fi diff test/diff/$file.61.res output_files/$file.res if [ $? -gt 0 ]; then - exit 62 + print_exit 62 fi rm test/diff/$file.61.res diff --git a/test/diff/diff_f4sat-byone-31.sh b/test/diff/diff_f4sat-byone-31.sh index 68cfa1ee..46b25b03 100755 --- a/test/diff/diff_f4sat-byone-31.sh +++ b/test/diff/diff_f4sat-byone-31.sh @@ -7,12 +7,12 @@ source test/diff/diff_source.sh $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.1.res \ -S -g 2 -l 2 -t 1 if [ $? -gt 0 ]; then - exit 1 + print_exit 1 fi diff test/diff/$file.1.res output_files/$file.res if [ $? -gt 0 ]; then - exit 2 + print_exit 2 fi rm test/diff/$file.1.res @@ -20,12 +20,12 @@ rm test/diff/$file.1.res $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.21.res \ -S -g 2 -l 2 -t 2 if [ $? -gt 0 ]; then - exit 21 + print_exit 21 fi diff test/diff/$file.21.res output_files/$file.res if [ $? -gt 0 ]; then - exit 22 + print_exit 22 fi rm test/diff/$file.21.res @@ -33,12 +33,12 @@ rm test/diff/$file.21.res $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.41.res \ -S -g 2 -l 44 -t 1 if [ $? -gt 0 ]; then - exit 41 + print_exit 41 fi diff test/diff/$file.41.res output_files/$file.res if [ $? -gt 0 ]; then - exit 42 + print_exit 42 fi rm test/diff/$file.41.res @@ -46,12 +46,12 @@ rm test/diff/$file.41.res $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.61.res \ -S -g 2 -l 44 -t 2 if [ $? -gt 0 ]; then - exit 61 + print_exit 61 fi diff test/diff/$file.61.res output_files/$file.res if [ $? -gt 0 ]; then - exit 62 + print_exit 62 fi rm test/diff/$file.61.res diff --git a/test/diff/diff_f4sat-field-char.sh b/test/diff/diff_f4sat-field-char.sh index a05b3e84..e6944f61 100755 --- a/test/diff/diff_f4sat-field-char.sh +++ b/test/diff/diff_f4sat-field-char.sh @@ -7,12 +7,12 @@ source test/diff/diff_source.sh $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.1.res \ -S -g 2 -n 2 if [ $? -gt 0 ]; then - exit 1 + print_exit 1 fi diff test/diff/$file.1.res output_files/$file.res if [ $? -gt 0 ]; then - exit 2 + print_exit 2 fi rm test/diff/$file.1.res diff --git a/test/diff/diff_f4sat-is-saturated-check.sh b/test/diff/diff_f4sat-is-saturated-check.sh index 246032a3..893744a1 100755 --- a/test/diff/diff_f4sat-is-saturated-check.sh +++ b/test/diff/diff_f4sat-is-saturated-check.sh @@ -8,13 +8,13 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.1.res \ -S -n 2 # should return an error 1 status if [ $? -gt 1 ]; then - exit 1 + print_exit 1 fi diff test/diff/$file.1.res output_files/$file.res # should return an error 1 status if [ $? -gt 1 ]; then - exit 2 + print_exit 2 fi rm test/diff/$file.1.res diff --git a/test/diff/diff_f4sat-zero-input.sh b/test/diff/diff_f4sat-zero-input.sh index ab98f526..8105b81f 100755 --- a/test/diff/diff_f4sat-zero-input.sh +++ b/test/diff/diff_f4sat-zero-input.sh @@ -8,13 +8,13 @@ $(pwd)/msolve -f input_files/$file.ms -S -g2 -o test/diff/$file.res \ -n2 # should return an error 1 status if [ $? -gt 1 ]; then - exit 1 + print_exit 1 fi diff test/diff/$file.res output_files/$file.res # should return an error 1 status if [ $? -gt 1 ]; then - exit 2 + print_exit 2 fi rm test/diff/$file.res diff --git a/test/diff/diff_kat8-qq-truncate.sh b/test/diff/diff_kat8-qq-truncate.sh index 164aceed..743cd43c 100755 --- a/test/diff/diff_kat8-qq-truncate.sh +++ b/test/diff/diff_kat8-qq-truncate.sh @@ -7,12 +7,12 @@ source test/diff/diff_source.sh $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.1.res \ -N 5 -g 2 -l 2 -t 1 if [ $? -gt 0 ]; then - exit 1 + print_exit 1 fi diff test/diff/$file.1.res output_files/$file.res if [ $? -gt 0 ]; then - exit 2 + print_exit 2 fi rm test/diff/$file.1.res @@ -20,12 +20,12 @@ rm test/diff/$file.1.res $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.21.res \ -N 5 -g 2 -l 2 -t 2 if [ $? -gt 0 ]; then - exit 21 + print_exit 21 fi diff test/diff/$file.21.res output_files/$file.res if [ $? -gt 0 ]; then - exit 22 + print_exit 22 fi rm test/diff/$file.21.res @@ -33,12 +33,12 @@ rm test/diff/$file.21.res $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.41.res \ -N 5 -g 2 -l 44 -t 1 if [ $? -gt 0 ]; then - exit 41 + print_exit 41 fi diff test/diff/$file.41.res output_files/$file.res if [ $? -gt 0 ]; then - exit 42 + print_exit 42 fi rm test/diff/$file.41.res @@ -46,12 +46,12 @@ rm test/diff/$file.41.res $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.61.res \ -N 5 -g 2 -l 44 -t 2 if [ $? -gt 0 ]; then - exit 61 + print_exit 61 fi diff test/diff/$file.61.res output_files/$file.res if [ $? -gt 0 ]; then - exit 62 + print_exit 62 fi rm test/diff/$file.61.res diff --git a/test/diff/diff_nf_16.sh b/test/diff/diff_nf_16.sh index 81462a88..056dac2a 100755 --- a/test/diff/diff_nf_16.sh +++ b/test/diff/diff_nf_16.sh @@ -7,12 +7,12 @@ source test/diff/diff_source.sh $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.1.res \ -n 2 if [ $? -gt 0 ]; then - exit 1 + print_exit 1 fi diff test/diff/$file.1.res output_files/$file.res if [ $? -gt 0 ]; then - exit 2 + print_exit 2 fi rm test/diff/$file.1.res diff --git a/test/diff/diff_nf_31.sh b/test/diff/diff_nf_31.sh index aa71d9ec..b4819828 100755 --- a/test/diff/diff_nf_31.sh +++ b/test/diff/diff_nf_31.sh @@ -7,12 +7,12 @@ source test/diff/diff_source.sh $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.1.res \ -n 2 if [ $? -gt 0 ]; then - exit 1 + print_exit 1 fi diff test/diff/$file.1.res output_files/$file.res if [ $? -gt 0 ]; then - exit 2 + print_exit 2 fi rm test/diff/$file.1.res diff --git a/test/diff/diff_nf_8.sh b/test/diff/diff_nf_8.sh index 5d2df509..7fbf948b 100755 --- a/test/diff/diff_nf_8.sh +++ b/test/diff/diff_nf_8.sh @@ -7,12 +7,12 @@ source test/diff/diff_source.sh $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.1.res \ -n 2 if [ $? -gt 0 ]; then - exit 1 + print_exit 1 fi diff test/diff/$file.1.res output_files/$file.res if [ $? -gt 0 ]; then - exit 2 + print_exit 2 fi rm test/diff/$file.1.res diff --git a/test/diff/diff_nf_lm_bug.sh b/test/diff/diff_nf_lm_bug.sh index 4d78843f..a9b2a213 100755 --- a/test/diff/diff_nf_lm_bug.sh +++ b/test/diff/diff_nf_lm_bug.sh @@ -7,12 +7,12 @@ source test/diff/diff_source.sh $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.1.res \ -n 3 if [ $? -gt 0 ]; then - exit 1 + print_exit 1 fi diff test/diff/$file.1.res output_files/$file.res if [ $? -gt 0 ]; then - exit 2 + print_exit 2 fi rm test/diff/$file.1.res diff --git a/test/diff/diff_nonradical_radicalshape-no-square-31.sh b/test/diff/diff_nonradical_radicalshape-no-square-31.sh index 1680bba5..67bae5d8 100755 --- a/test/diff/diff_nonradical_radicalshape-no-square-31.sh +++ b/test/diff/diff_nonradical_radicalshape-no-square-31.sh @@ -7,12 +7,12 @@ source test/diff/diff_source.sh $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.3.res \ -P 2 -l 2 -t 1 -c 0 if [ $? -gt 0 ]; then - exit 3 + print_exit 3 fi diff test/diff/$file.3.res output_files/$file.c0.res if [ $? -gt 0 ]; then - exit 4 + print_exit 4 fi rm test/diff/$file.3.res @@ -20,12 +20,12 @@ rm test/diff/$file.3.res $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.23.res \ -P 2 -l 2 -t 2 -c 0 if [ $? -gt 0 ]; then - exit 23 + print_exit 23 fi diff test/diff/$file.23.res output_files/$file.c0.res if [ $? -gt 0 ]; then - exit 24 + print_exit 24 fi rm test/diff/$file.23.res @@ -33,12 +33,12 @@ rm test/diff/$file.23.res $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.43.res \ -P 2 -l 44 -t 1 -c 0 if [ $? -gt 0 ]; then - exit 43 + print_exit 43 fi diff test/diff/$file.43.res output_files/$file.c0.res if [ $? -gt 0 ]; then - exit 44 + print_exit 44 fi rm test/diff/$file.43.res @@ -46,12 +46,12 @@ rm test/diff/$file.43.res $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.63.res \ -P 2 -l 44 -t 2 -c 0 if [ $? -gt 0 ]; then - exit 63 + print_exit 63 fi diff test/diff/$file.63.res output_files/$file.c0.res if [ $? -gt 0 ]; then - exit 64 + print_exit 64 fi rm test/diff/$file.63.res diff --git a/test/diff/diff_source-gb-elim-red.sh b/test/diff/diff_source-gb-elim-red.sh index cfc895da..38edc056 100644 --- a/test/diff/diff_source-gb-elim-red.sh +++ b/test/diff/diff_source-gb-elim-red.sh @@ -2,12 +2,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.5.res \ --random-seed $seed \ -e 1 -g 2 -l 2 -t 1 if [ $? -gt 0 ]; then - exit 5 + print_exit 5 fi diff test/diff/$file.5.res output_files/$file.g2.e1.res if [ $? -gt 0 ]; then - exit 6 + print_exit 6 fi rm test/diff/$file.5.res @@ -16,12 +16,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.7.res \ --random-seed $seed \ -e 2 -g 2 -l 2 -t 1 if [ $? -gt 0 ]; then - exit 7 + print_exit 7 fi diff test/diff/$file.7.res output_files/$file.g2.e2.res if [ $? -gt 0 ]; then - exit 8 + print_exit 8 fi rm test/diff/$file.7.res @@ -30,12 +30,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.25.res \ --random-seed $seed \ -e 1 -g 2 -l 2 -t 2 if [ $? -gt 0 ]; then - exit 25 + print_exit 25 fi diff test/diff/$file.25.res output_files/$file.g2.e1.res if [ $? -gt 0 ]; then - exit 26 + print_exit 26 fi rm test/diff/$file.25.res @@ -44,12 +44,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.27.res \ --random-seed $seed \ -e 2 -g 2 -l 2 -t 2 if [ $? -gt 0 ]; then - exit 27 + print_exit 27 fi diff test/diff/$file.27.res output_files/$file.g2.e2.res if [ $? -gt 0 ]; then - exit 28 + print_exit 28 fi rm test/diff/$file.27.res @@ -58,12 +58,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.45.res \ --random-seed $seed \ -e 1 -g 2 -l 44 -t 1 if [ $? -gt 0 ]; then - exit 45 + print_exit 45 fi diff test/diff/$file.45.res output_files/$file.g2.e1.res if [ $? -gt 0 ]; then - exit 46 + print_exit 46 fi rm test/diff/$file.45.res @@ -72,12 +72,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.47.res \ --random-seed $seed \ -e 2 -g 2 -l 44 -t 1 if [ $? -gt 0 ]; then - exit 47 + print_exit 47 fi diff test/diff/$file.47.res output_files/$file.g2.e2.res if [ $? -gt 0 ]; then - exit 48 + print_exit 48 fi rm test/diff/$file.47.res @@ -86,12 +86,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.65.res \ --random-seed $seed \ -e 1 -g 2 -l 44 -t 2 if [ $? -gt 0 ]; then - exit 65 + print_exit 65 fi diff test/diff/$file.65.res output_files/$file.g2.e1.res if [ $? -gt 0 ]; then - exit 66 + print_exit 66 fi rm test/diff/$file.65.res @@ -100,12 +100,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.67.res \ --random-seed $seed \ -e 2 -g 2 -l 44 -t 2 if [ $? -gt 0 ]; then - exit 67 + print_exit 67 fi diff test/diff/$file.67.res output_files/$file.g2.e2.res if [ $? -gt 0 ]; then - exit 68 + print_exit 68 fi rm test/diff/$file.67.res diff --git a/test/diff/diff_source-gb-lm.sh b/test/diff/diff_source-gb-lm.sh index 3f4dd14b..ce369dc0 100644 --- a/test/diff/diff_source-gb-lm.sh +++ b/test/diff/diff_source-gb-lm.sh @@ -2,12 +2,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.3.res \ --random-seed $seed \ -g 1 -l 2 -t 1 if [ $? -gt 0 ]; then - exit 3 + print_exit 3 fi diff test/diff/$file.3.res output_files/$file.g1.res if [ $? -gt 0 ]; then - exit 4 + print_exit 4 fi rm test/diff/$file.3.res @@ -16,12 +16,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.23.res \ --random-seed $seed \ -g 1 -l 2 -t 2 if [ $? -gt 0 ]; then - exit 23 + print_exit 23 fi diff test/diff/$file.23.res output_files/$file.g1.res if [ $? -gt 0 ]; then - exit 24 + print_exit 24 fi rm test/diff/$file.23.res @@ -30,12 +30,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.43.res \ --random-seed $seed \ -g 1 -l 44 -t 1 if [ $? -gt 0 ]; then - exit 43 + print_exit 43 fi diff test/diff/$file.43.res output_files/$file.g1.res if [ $? -gt 0 ]; then - exit 44 + print_exit 44 fi rm test/diff/$file.43.res @@ -44,12 +44,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.63.res \ --random-seed $seed \ -g 1 -l 44 -t 2 if [ $? -gt 0 ]; then - exit 63 + print_exit 63 fi diff test/diff/$file.63.res output_files/$file.g1.res if [ $? -gt 0 ]; then - exit 64 + print_exit 64 fi rm test/diff/$file.63.res diff --git a/test/diff/diff_source-gb-red.sh b/test/diff/diff_source-gb-red.sh index ffb3023e..d155a902 100644 --- a/test/diff/diff_source-gb-red.sh +++ b/test/diff/diff_source-gb-red.sh @@ -2,12 +2,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.3.res \ --random-seed $seed \ -g 2 -l 2 -t 1 if [ $? -gt 0 ]; then - exit 3 + print_exit 3 fi diff test/diff/$file.3.res output_files/$file.g2.res if [ $? -gt 0 ]; then - exit 4 + print_exit 4 fi rm test/diff/$file.3.res @@ -16,12 +16,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.23.res \ --random-seed $seed \ -g 2 -l 2 -t 2 if [ $? -gt 0 ]; then - exit 23 + print_exit 23 fi diff test/diff/$file.23.res output_files/$file.g2.res if [ $? -gt 0 ]; then - exit 24 + print_exit 24 fi rm test/diff/$file.23.res @@ -30,12 +30,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.43.res \ --random-seed $seed \ -g 2 -l 44 -t 1 if [ $? -gt 0 ]; then - exit 43 + print_exit 43 fi diff test/diff/$file.43.res output_files/$file.g2.res if [ $? -gt 0 ]; then - exit 44 + print_exit 44 fi rm test/diff/$file.43.res @@ -44,12 +44,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.63.res \ --random-seed $seed \ -g 2 -l 44 -t 2 if [ $? -gt 0 ]; then - exit 63 + print_exit 63 fi diff test/diff/$file.63.res output_files/$file.g2.res if [ $? -gt 0 ]; then - exit 64 + print_exit 64 fi rm test/diff/$file.63.res diff --git a/test/diff/diff_source-noarg.sh b/test/diff/diff_source-noarg.sh index 6df99bc1..4db8e782 100644 --- a/test/diff/diff_source-noarg.sh +++ b/test/diff/diff_source-noarg.sh @@ -2,12 +2,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.1.res \ --random-seed $seed \ -l 2 -t 1 if [ $? -gt 0 ]; then - exit 1 + print_exit 1 fi diff test/diff/$file.1.res output_files/$file.res if [ $? -gt 0 ]; then - exit 2 + print_exit 2 fi rm test/diff/$file.1.res @@ -16,12 +16,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.21.res \ --random-seed $seed \ -l 2 -t 2 if [ $? -gt 0 ]; then - exit 21 + print_exit 21 fi diff test/diff/$file.21.res output_files/$file.res if [ $? -gt 0 ]; then - exit 22 + print_exit 22 fi rm test/diff/$file.21.res @@ -30,12 +30,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.41.res \ --random-seed $seed \ -l 44 -t 1 if [ $? -gt 0 ]; then - exit 41 + print_exit 41 fi diff test/diff/$file.41.res output_files/$file.res if [ $? -gt 0 ]; then - exit 42 + print_exit 42 fi rm test/diff/$file.41.res @@ -44,12 +44,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.61.res \ --random-seed $seed \ -l 44 -t 2 if [ $? -gt 0 ]; then - exit 61 + print_exit 61 fi diff test/diff/$file.61.res output_files/$file.res if [ $? -gt 0 ]; then - exit 62 + print_exit 62 fi rm test/diff/$file.61.res diff --git a/test/diff/diff_source-param-fullnf-qq.sh b/test/diff/diff_source-param-fullnf-qq.sh index 0f1edf1a..4a918854 100644 --- a/test/diff/diff_source-param-fullnf-qq.sh +++ b/test/diff/diff_source-param-fullnf-qq.sh @@ -4,12 +4,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.81.res \ --random-seed $seed \ -P 2 -d 4 -L 1 -l 2 -t 1 if [ $? -gt 0 ]; then - exit 81 + print_exit 81 fi diff test/diff/$file.81.res output_files/$file.P2.d4.res if [ $? -gt 0 ]; then - exit 82 + print_exit 82 fi rm test/diff/$file.81.res @@ -18,12 +18,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.101.res \ --random-seed $seed \ -P 2 -d 4 -L 1 -l 2 -t 2 if [ $? -gt 0 ]; then - exit 101 + print_exit 101 fi diff test/diff/$file.101.res output_files/$file.P2.d4.res if [ $? -gt 0 ]; then - exit 102 + print_exit 102 fi rm test/diff/$file.101.res @@ -32,12 +32,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.121.res \ --random-seed $seed \ -P 2 -d 4 -L 1 -l 44 -t 1 if [ $? -gt 0 ]; then - exit 121 + print_exit 121 fi diff test/diff/$file.121.res output_files/$file.P2.d4.res if [ $? -gt 0 ]; then - exit 122 + print_exit 122 fi rm test/diff/$file.121.res @@ -46,12 +46,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.141.res \ --random-seed $seed \ -P 2 -d 4 -L 1 -l 44 -t 2 if [ $? -gt 0 ]; then - exit 141 + print_exit 141 fi diff test/diff/$file.141.res output_files/$file.P2.d4.res if [ $? -gt 0 ]; then - exit 142 + print_exit 142 fi rm test/diff/$file.141.res diff --git a/test/diff/diff_source-param-fullnf.sh b/test/diff/diff_source-param-fullnf.sh index 4894615a..7d6d0a4a 100644 --- a/test/diff/diff_source-param-fullnf.sh +++ b/test/diff/diff_source-param-fullnf.sh @@ -2,12 +2,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.1.res \ --random-seed $seed \ -P 2 -d 4 -L 0 -l 2 -t 1 if [ $? -gt 0 ]; then - exit 1 + print_exit 1 fi diff test/diff/$file.1.res output_files/$file.P2.d4.res if [ $? -gt 0 ]; then - exit 2 + print_exit 2 fi rm test/diff/$file.1.res @@ -16,12 +16,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.21.res \ --random-seed $seed \ -P 2 -d 4 -L 0 -l 2 -t 2 if [ $? -gt 0 ]; then - exit 21 + print_exit 21 fi diff test/diff/$file.21.res output_files/$file.P2.d4.res if [ $? -gt 0 ]; then - exit 22 + print_exit 22 fi rm test/diff/$file.21.res @@ -30,12 +30,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.41.res \ --random-seed $seed \ -P 2 -d 4 -L 0 -l 44 -t 1 if [ $? -gt 0 ]; then - exit 41 + print_exit 41 fi diff test/diff/$file.41.res output_files/$file.P2.d4.res if [ $? -gt 0 ]; then - exit 42 + print_exit 42 fi rm test/diff/$file.41.res @@ -44,12 +44,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.61.res \ --random-seed $seed \ -P 2 -d 4 -L 0 -l 44 -t 2 if [ $? -gt 0 ]; then - exit 61 + print_exit 61 fi diff test/diff/$file.61.res output_files/$file.P2.d4.res if [ $? -gt 0 ]; then - exit 62 + print_exit 62 fi rm test/diff/$file.61.res diff --git a/test/diff/diff_source-param-nonf-qq.sh b/test/diff/diff_source-param-nonf-qq.sh index 101440ca..c65e03d4 100644 --- a/test/diff/diff_source-param-nonf-qq.sh +++ b/test/diff/diff_source-param-nonf-qq.sh @@ -4,12 +4,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.81.res \ --random-seed $seed \ -P 2 -d 0 -L 1 -l 2 -t 1 if [ $? -gt 0 ]; then - exit 81 + print_exit 81 fi diff test/diff/$file.81.res output_files/$file.P2.d0.res if [ $? -gt 0 ]; then - exit 82 + print_exit 82 fi rm test/diff/$file.81.res @@ -18,12 +18,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.101.res \ --random-seed $seed \ -P 2 -d 0 -L 1 -l 2 -t 2 if [ $? -gt 0 ]; then - exit 101 + print_exit 101 fi diff test/diff/$file.101.res output_files/$file.P2.d0.res if [ $? -gt 0 ]; then - exit 102 + print_exit 102 fi rm test/diff/$file.101.res @@ -32,12 +32,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.121.res \ --random-seed $seed \ -P 2 -d 0 -L 1 -l 44 -t 1 if [ $? -gt 0 ]; then - exit 121 + print_exit 121 fi diff test/diff/$file.121.res output_files/$file.P2.d0.res if [ $? -gt 0 ]; then - exit 122 + print_exit 122 fi rm test/diff/$file.121.res @@ -46,12 +46,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.141.res \ --random-seed $seed \ -P 2 -d 0 -L 1 -l 44 -t 2 if [ $? -gt 0 ]; then - exit 141 + print_exit 141 fi diff test/diff/$file.141.res output_files/$file.P2.d0.res if [ $? -gt 0 ]; then - exit 142 + print_exit 142 fi rm test/diff/$file.141.res diff --git a/test/diff/diff_source-param-nonf.sh b/test/diff/diff_source-param-nonf.sh index b1672e6d..517f7e1a 100644 --- a/test/diff/diff_source-param-nonf.sh +++ b/test/diff/diff_source-param-nonf.sh @@ -2,12 +2,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.1.res \ --random-seed $seed \ -P 2 -d 0 -L 0 -l 2 -t 1 if [ $? -gt 0 ]; then - exit 1 + print_exit 1 fi diff test/diff/$file.1.res output_files/$file.P2.d0.res if [ $? -gt 0 ]; then - exit 2 + print_exit 2 fi rm test/diff/$file.1.res @@ -16,12 +16,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.21.res \ --random-seed $seed \ -P 2 -d 0 -L 0 -l 2 -t 2 if [ $? -gt 0 ]; then - exit 21 + print_exit 21 fi diff test/diff/$file.21.res output_files/$file.P2.d0.res if [ $? -gt 0 ]; then - exit 22 + print_exit 22 fi rm test/diff/$file.21.res @@ -30,12 +30,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.41.res \ --random-seed $seed \ -P 2 -d 0 -L 0 -l 44 -t 1 if [ $? -gt 0 ]; then - exit 41 + print_exit 41 fi diff test/diff/$file.41.res output_files/$file.P2.d0.res if [ $? -gt 0 ]; then - exit 42 + print_exit 42 fi rm test/diff/$file.41.res @@ -44,12 +44,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.61.res \ --random-seed $seed \ -P 2 -d 0 -L 0 -l 44 -t 2 if [ $? -gt 0 ]; then - exit 61 + print_exit 61 fi diff test/diff/$file.61.res output_files/$file.P2.d0.res if [ $? -gt 0 ]; then - exit 62 + print_exit 62 fi rm test/diff/$file.61.res diff --git a/test/diff/diff_source-real-param-nonf.sh b/test/diff/diff_source-real-param-nonf.sh index c8f0a47d..faca9935 100644 --- a/test/diff/diff_source-real-param-nonf.sh +++ b/test/diff/diff_source-real-param-nonf.sh @@ -2,12 +2,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.1.res \ --random-seed $seed \ -P 1 -d 0 -p 128 -L 0 -l 2 -t 1 if [ $? -gt 0 ]; then - exit 1 + print_exit 1 fi diff test/diff/$file.1.res output_files/$file.P1.d0.p128.res if [ $? -gt 0 ]; then - exit 2 + print_exit 2 fi rm test/diff/$file.1.res @@ -16,12 +16,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.3.res \ --random-seed $seed \ -P 1 -d 0 -p 1024 -L 0 -l 2 -t 1 if [ $? -gt 0 ]; then - exit 3 + print_exit 3 fi diff test/diff/$file.3.res output_files/$file.P1.d0.p1024.res if [ $? -gt 0 ]; then - exit 4 + print_exit 4 fi rm test/diff/$file.3.res @@ -30,12 +30,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.21.res \ --random-seed $seed \ -P 1 -d 0 -p 128 -L 0 -l 2 -t 2 if [ $? -gt 0 ]; then - exit 21 + print_exit 21 fi diff test/diff/$file.21.res output_files/$file.P1.d0.p128.res if [ $? -gt 0 ]; then - exit 22 + print_exit 22 fi rm test/diff/$file.21.res @@ -44,12 +44,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.23.res \ --random-seed $seed \ -P 1 -d 0 -p 1024 -L 0 -l 2 -t 2 if [ $? -gt 0 ]; then - exit 23 + print_exit 23 fi diff test/diff/$file.23.res output_files/$file.P1.d0.p1024.res if [ $? -gt 0 ]; then - exit 24 + print_exit 24 fi rm test/diff/$file.23.res @@ -58,12 +58,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.41.res \ --random-seed $seed \ -P 1 -d 0 -p 128 -L 0 -l 44 -t 1 if [ $? -gt 0 ]; then - exit 41 + print_exit 41 fi diff test/diff/$file.41.res output_files/$file.P1.d0.p128.res if [ $? -gt 0 ]; then - exit 42 + print_exit 42 fi rm test/diff/$file.41.res @@ -72,12 +72,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.43.res \ --random-seed $seed \ -P 1 -d 0 -p 1024 -L 0 -l 44 -t 1 if [ $? -gt 0 ]; then - exit 43 + print_exit 43 fi diff test/diff/$file.43.res output_files/$file.P1.d0.p1024.res if [ $? -gt 0 ]; then - exit 44 + print_exit 44 fi rm test/diff/$file.43.res @@ -86,12 +86,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.61.res \ --random-seed $seed \ -P 1 -d 0 -p 128 -L 0 -l 44 -t 2 if [ $? -gt 0 ]; then - exit 61 + print_exit 61 fi diff test/diff/$file.61.res output_files/$file.P1.d0.p128.res if [ $? -gt 0 ]; then - exit 62 + print_exit 62 fi rm test/diff/$file.61.res @@ -100,12 +100,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.63.res \ --random-seed $seed \ -P 1 -d 0 -p 1024 -L 0 -l 44 -t 2 if [ $? -gt 0 ]; then - exit 63 + print_exit 63 fi diff test/diff/$file.63.res output_files/$file.P1.d0.p1024.res if [ $? -gt 0 ]; then - exit 64 + print_exit 64 fi rm test/diff/$file.63.res @@ -114,12 +114,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.81.res \ --random-seed $seed \ -P 1 -d 0 -p 128 -L 1 -l 2 -t 1 if [ $? -gt 0 ]; then - exit 81 + print_exit 81 fi diff test/diff/$file.81.res output_files/$file.P1.d0.p128.res if [ $? -gt 0 ]; then - exit 82 + print_exit 82 fi rm test/diff/$file.81.res @@ -128,12 +128,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.83.res \ --random-seed $seed \ -P 1 -d 0 -p 1024 -L 1 -l 2 -t 1 if [ $? -gt 0 ]; then - exit 83 + print_exit 83 fi diff test/diff/$file.83.res output_files/$file.P1.d0.p1024.res if [ $? -gt 0 ]; then - exit 84 + print_exit 84 fi rm test/diff/$file.83.res @@ -142,12 +142,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.101.res \ --random-seed $seed \ -P 1 -d 0 -p 128 -L 1 -l 2 -t 2 if [ $? -gt 0 ]; then - exit 101 + print_exit 101 fi diff test/diff/$file.101.res output_files/$file.P1.d0.p128.res if [ $? -gt 0 ]; then - exit 102 + print_exit 102 fi rm test/diff/$file.101.res @@ -156,12 +156,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.103.res \ --random-seed $seed \ -P 1 -d 0 -p 1024 -L 1 -l 2 -t 2 if [ $? -gt 0 ]; then - exit 103 + print_exit 103 fi diff test/diff/$file.103.res output_files/$file.P1.d0.p1024.res if [ $? -gt 0 ]; then - exit 104 + print_exit 104 fi rm test/diff/$file.103.res @@ -170,12 +170,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.121.res \ --random-seed $seed \ -P 1 -d 0 -p 128 -L 1 -l 44 -t 1 if [ $? -gt 0 ]; then - exit 121 + print_exit 121 fi diff test/diff/$file.121.res output_files/$file.P1.d0.p128.res if [ $? -gt 0 ]; then - exit 122 + print_exit 122 fi rm test/diff/$file.121.res @@ -184,12 +184,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.123.res \ --random-seed $seed \ -P 1 -d 0 -p 1024 -L 1 -l 44 -t 1 if [ $? -gt 0 ]; then - exit 123 + print_exit 123 fi diff test/diff/$file.123.res output_files/$file.P1.d0.p1024.res if [ $? -gt 0 ]; then - exit 124 + print_exit 124 fi rm test/diff/$file.123.res @@ -198,12 +198,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.141.res \ --random-seed $seed \ -P 1 -d 0 -p 128 -L 1 -l 44 -t 2 if [ $? -gt 0 ]; then - exit 141 + print_exit 141 fi diff test/diff/$file.141.res output_files/$file.P1.d0.p128.res if [ $? -gt 0 ]; then - exit 142 + print_exit 142 fi rm test/diff/$file.141.res @@ -212,12 +212,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.143.res \ --random-seed $seed \ -P 1 -d 0 -p 1024 -L 1 -l 44 -t 2 if [ $? -gt 0 ]; then - exit 143 + print_exit 143 fi diff test/diff/$file.143.res output_files/$file.P1.d0.p1024.res if [ $? -gt 0 ]; then - exit 144 + print_exit 144 fi rm test/diff/$file.143.res diff --git a/test/diff/diff_source-real.sh b/test/diff/diff_source-real.sh index 701d5967..6a61148c 100644 --- a/test/diff/diff_source-real.sh +++ b/test/diff/diff_source-real.sh @@ -2,12 +2,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.11.res \ --random-seed $seed \ -p 128 -L 0 -l 2 -t 1 if [ $? -gt 0 ]; then - exit 11 + print_exit 11 fi diff test/diff/$file.11.res output_files/$file.p128.res if [ $? -gt 0 ]; then - exit 12 + print_exit 12 fi rm test/diff/$file.11.res @@ -16,12 +16,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.13.res \ --random-seed $seed \ -p 1024 -L 0 -l 2 -t 1 if [ $? -gt 0 ]; then - exit 13 + print_exit 13 fi diff test/diff/$file.13.res output_files/$file.p1024.res if [ $? -gt 0 ]; then - exit 14 + print_exit 14 fi rm test/diff/$file.13.res @@ -30,12 +30,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.31.res \ --random-seed $seed \ -p 128 -L 0 -l 2 -t 2 if [ $? -gt 0 ]; then - exit 31 + print_exit 31 fi diff test/diff/$file.31.res output_files/$file.p128.res if [ $? -gt 0 ]; then - exit 32 + print_exit 32 fi rm test/diff/$file.31.res @@ -44,12 +44,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.33.res \ --random-seed $seed \ -p 1024 -L 0 -l 2 -t 2 if [ $? -gt 0 ]; then - exit 33 + print_exit 33 fi diff test/diff/$file.33.res output_files/$file.p1024.res if [ $? -gt 0 ]; then - exit 34 + print_exit 34 fi rm test/diff/$file.33.res @@ -58,12 +58,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.51.res \ --random-seed $seed \ -p 128 -L 0 -l 44 -t 1 if [ $? -gt 0 ]; then - exit 51 + print_exit 51 fi diff test/diff/$file.51.res output_files/$file.p128.res if [ $? -gt 0 ]; then - exit 52 + print_exit 52 fi rm test/diff/$file.51.res @@ -72,12 +72,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.53.res \ --random-seed $seed \ -p 1024 -L 0 -l 44 -t 1 if [ $? -gt 0 ]; then - exit 53 + print_exit 53 fi diff test/diff/$file.53.res output_files/$file.p1024.res if [ $? -gt 0 ]; then - exit 54 + print_exit 54 fi rm test/diff/$file.53.res @@ -86,12 +86,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.71.res \ --random-seed $seed \ -p 128 -L 0 -l 44 -t 2 if [ $? -gt 0 ]; then - exit 71 + print_exit 71 fi diff test/diff/$file.71.res output_files/$file.p128.res if [ $? -gt 0 ]; then - exit 72 + print_exit 72 fi rm test/diff/$file.71.res @@ -100,12 +100,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.73.res \ --random-seed $seed \ -p 1024 -L 0 -l 44 -t 2 if [ $? -gt 0 ]; then - exit 73 + print_exit 73 fi diff test/diff/$file.73.res output_files/$file.p1024.res if [ $? -gt 0 ]; then - exit 74 + print_exit 74 fi rm test/diff/$file.73.res @@ -114,12 +114,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.91.res \ --random-seed $seed \ -p 128 -L 1 -l 2 -t 1 if [ $? -gt 0 ]; then - exit 91 + print_exit 91 fi diff test/diff/$file.91.res output_files/$file.p128.res if [ $? -gt 0 ]; then - exit 92 + print_exit 92 fi rm test/diff/$file.91.res @@ -128,12 +128,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.93.res \ --random-seed $seed \ -p 1024 -L 1 -l 2 -t 1 if [ $? -gt 0 ]; then - exit 93 + print_exit 93 fi diff test/diff/$file.93.res output_files/$file.p1024.res if [ $? -gt 0 ]; then - exit 94 + print_exit 94 fi rm test/diff/$file.93.res @@ -142,12 +142,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.111.res \ --random-seed $seed \ -p 128 -L 1 -l 2 -t 2 if [ $? -gt 0 ]; then - exit 111 + print_exit 111 fi diff test/diff/$file.111.res output_files/$file.p128.res if [ $? -gt 0 ]; then - exit 112 + print_exit 112 fi rm test/diff/$file.111.res @@ -156,12 +156,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.113.res \ --random-seed $seed \ -p 1024 -L 1 -l 2 -t 2 if [ $? -gt 0 ]; then - exit 113 + print_exit 113 fi diff test/diff/$file.113.res output_files/$file.p1024.res if [ $? -gt 0 ]; then - exit 114 + print_exit 114 fi rm test/diff/$file.113.res @@ -170,12 +170,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.131.res \ --random-seed $seed \ -p 128 -L 1 -l 44 -t 1 if [ $? -gt 0 ]; then - exit 131 + print_exit 131 fi diff test/diff/$file.131.res output_files/$file.p128.res if [ $? -gt 0 ]; then - exit 132 + print_exit 132 fi rm test/diff/$file.131.res @@ -184,12 +184,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.133.res \ --random-seed $seed \ -p 1024 -L 1 -l 44 -t 1 if [ $? -gt 0 ]; then - exit 133 + print_exit 133 fi diff test/diff/$file.133.res output_files/$file.p1024.res if [ $? -gt 0 ]; then - exit 134 + print_exit 134 fi rm test/diff/$file.133.res @@ -198,12 +198,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.151.res \ --random-seed $seed \ -p 128 -L 1 -l 44 -t 2 if [ $? -gt 0 ]; then - exit 151 + print_exit 151 fi diff test/diff/$file.151.res output_files/$file.p128.res if [ $? -gt 0 ]; then - exit 152 + print_exit 152 fi rm test/diff/$file.151.res @@ -212,12 +212,12 @@ $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.153.res \ --random-seed $seed \ -p 1024 -L 1 -l 44 -t 2 if [ $? -gt 0 ]; then - exit 153 + print_exit 153 fi diff test/diff/$file.153.res output_files/$file.p1024.res if [ $? -gt 0 ]; then - exit 154 + print_exit 154 fi rm test/diff/$file.153.res diff --git a/test/diff/diff_source.sh b/test/diff/diff_source.sh index a14a6a86..c424ffc0 100755 --- a/test/diff/diff_source.sh +++ b/test/diff/diff_source.sh @@ -21,8 +21,8 @@ echo -e "${colseed}SEED${std}: $seed" # each diff_example.sh is built by running msolve on $file.ms # with options -L 0 -l 2 -t 1 -# if the execution fails, exit 1 -# then compare the output with the expected one, if different, exit 2 +# if the execution fails, print_exit 1 +# then compare the output with the expected one, if different, print_exit 2 # repeat for other execution parameters with exit 3 and 4 and so on, until at most 19 and 20 # repeat all these tests changing -L 0 into -L 1, -l 2 into -l 44 and -t 1 into -t 2 From d6b6e72fae6013a4985c9119821b962f281703ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Berthomieu?= Date: Mon, 26 Jan 2026 17:32:15 +0100 Subject: [PATCH 09/15] more renaming of test files --- Makefile.am | 54 ++++---- configure.ac | 130 +++++++++--------- input_files/{bug_68.ms => bug-68.ms} | 0 .../{cp_d_3_n_4_p_2.ms => cp-d3-n4-p2.ms} | 0 ...ue_230_squared.ms => issue-230-squared.ms} | 0 input_files/{issue_230.ms => issue-230.ms} | 0 input_files/{mq_2_1.ms => mq-2-1.ms} | 0 ...pe-31.ms => nonradical-radicalshape-31.ms} | 0 ...> nonradical-radicalshape-no-square-31.ms} | 0 ...> nonradical-radicalshape-no-square-qq.ms} | 0 ...pe-qq.ms => nonradical-radicalshape-qq.ms} | 0 ...cal_shape-31.ms => nonradical-shape-31.ms} | 0 ...cal_shape-qq.ms => nonradical-shape-qq.ms} | 0 ...adical_shape-31.ms => radical-shape-31.ms} | 0 ...adical_shape-qq.ms => radical-shape-qq.ms} | 0 ...ls_dim0-chgvar.ms => reals-dim0-chgvar.ms} | 0 ..._dim0-extract.ms => reals-dim0-extract.ms} | 0 ..._dim0-swapvar.ms => reals-dim0-swapvar.ms} | 0 input_files/{reals_dim0.ms => reals-dim0.ms} | 0 output_files/{bug_68.res => bug-68.res} | 0 ..._4_p_2.P2.d0.res => cp-d3-n4-p2.P2.d0.res} | 0 ....res => issue-230-squared.P1.d0.p1024.res} | 0 ...8.res => issue-230-squared.P1.d0.p128.res} | 0 ...d0.p1024.res => issue-230.P1.d0.p1024.res} | 0 ...1.d0.p128.res => issue-230.P1.d0.p128.res} | 0 output_files/{mq_2_1.res => mq-2-1.res} | 0 ...-31.res => nonradical-radicalshape-31.res} | 0 ...nradical-radicalshape-no-square-31.c0.res} | 0 ...radicalshape-no-square-qq.P1.d0.p1024.res} | 0 ...-radicalshape-no-square-qq.P1.d0.p128.res} | 0 ...onradical-radicalshape-qq.P1.d0.p1024.res} | 0 ...nonradical-radicalshape-qq.P1.d0.p128.res} | 0 ...l_shape-31.res => nonradical-shape-31.res} | 0 ...es => nonradical-shape-qq.P1.d0.p1024.res} | 0 ...res => nonradical-shape-qq.P1.d0.p128.res} | 0 ...1.P2.d0.res => radical-shape-31.P2.d0.res} | 0 ...q.P2.d0.res => radical-shape-qq.P2.d0.res} | 0 ....p1024.res => reals-dim0-chgvar.p1024.res} | 0 ...ar.p128.res => reals-dim0-chgvar.p128.res} | 0 ...p1024.res => reals-dim0-extract.p1024.res} | 0 ...t.p128.res => reals-dim0-extract.p128.res} | 0 ...p1024.res => reals-dim0-swapvar.p1024.res} | 0 ...r.p128.res => reals-dim0-swapvar.p128.res} | 0 ...ls_dim0.p1024.res => reals-dim0.p1024.res} | 0 ...eals_dim0.p128.res => reals-dim0.p128.res} | 0 ...prime_bad.sh => diff_bug-2nd-prime-bad.sh} | 0 test/diff/{diff_bug_68.sh => diff_bug-68.sh} | 2 +- ...pty_tracer.sh => diff_bug-empty-tracer.sh} | 0 ..._cp_d_3_n_4_p_2.sh => diff_cp-d3-n4-p2.sh} | 2 +- ...0_squared.sh => diff_issue-230-squared.sh} | 2 +- .../{diff_issue_230.sh => diff_issue-230.sh} | 2 +- test/diff/{diff_mq_2_1.sh => diff_mq-2-1.sh} | 2 +- test/diff/{diff_nf_16.sh => diff_nf-16.sh} | 0 test/diff/{diff_nf_31.sh => diff_nf-31.sh} | 0 test/diff/{diff_nf_8.sh => diff_nf-8.sh} | 0 .../{diff_nf_lm_bug.sh => diff_nf-lm-bug.sh} | 0 ...f_nonradical-radicalshape-no-square-31.sh} | 2 +- ...f_nonradical-radicalshape-no-square-qq.sh} | 2 +- ....sh => diff_nonradical-radicalshape-qq.sh} | 2 +- ...hape-31.sh => diff_nonradical-shape-31.sh} | 2 +- ...hape-qq.sh => diff_nonradical-shape-qq.sh} | 2 +- test/diff/diff_nonradical_radicalshape-31.sh | 2 +- ...l_shape-31.sh => diff_radical-shape-31.sh} | 2 +- ...l_shape-qq.sh => diff_radical-shape-qq.sh} | 2 +- ...m0-chgvar.sh => diff_reals-dim0-chgvar.sh} | 2 +- ...-swapvar.sh => diff_reals-dim0-extract.sh} | 2 +- ...-extract.sh => diff_reals-dim0-swapvar.sh} | 2 +- ...{diff_reals_dim0.sh => diff_reals-dim0.sh} | 2 +- ...uild_matrixn_nonradical-radicalshape-31.c} | 2 +- ....c => build_matrixn_nonradical-shape-31.c} | 2 +- ...-31.c => build_matrixn_radical-shape-31.c} | 2 +- 71 files changed, 112 insertions(+), 112 deletions(-) rename input_files/{bug_68.ms => bug-68.ms} (100%) rename input_files/{cp_d_3_n_4_p_2.ms => cp-d3-n4-p2.ms} (100%) rename input_files/{issue_230_squared.ms => issue-230-squared.ms} (100%) rename input_files/{issue_230.ms => issue-230.ms} (100%) rename input_files/{mq_2_1.ms => mq-2-1.ms} (100%) rename input_files/{nonradical_radicalshape-31.ms => nonradical-radicalshape-31.ms} (100%) rename input_files/{nonradical_radicalshape-no-square-31.ms => nonradical-radicalshape-no-square-31.ms} (100%) rename input_files/{nonradical_radicalshape-no-square-qq.ms => nonradical-radicalshape-no-square-qq.ms} (100%) rename input_files/{nonradical_radicalshape-qq.ms => nonradical-radicalshape-qq.ms} (100%) rename input_files/{nonradical_shape-31.ms => nonradical-shape-31.ms} (100%) rename input_files/{nonradical_shape-qq.ms => nonradical-shape-qq.ms} (100%) rename input_files/{radical_shape-31.ms => radical-shape-31.ms} (100%) rename input_files/{radical_shape-qq.ms => radical-shape-qq.ms} (100%) rename input_files/{reals_dim0-chgvar.ms => reals-dim0-chgvar.ms} (100%) rename input_files/{reals_dim0-extract.ms => reals-dim0-extract.ms} (100%) rename input_files/{reals_dim0-swapvar.ms => reals-dim0-swapvar.ms} (100%) rename input_files/{reals_dim0.ms => reals-dim0.ms} (100%) rename output_files/{bug_68.res => bug-68.res} (100%) rename output_files/{cp_d_3_n_4_p_2.P2.d0.res => cp-d3-n4-p2.P2.d0.res} (100%) rename output_files/{issue_230_squared.P1.d0.p1024.res => issue-230-squared.P1.d0.p1024.res} (100%) rename output_files/{issue_230_squared.P1.d0.p128.res => issue-230-squared.P1.d0.p128.res} (100%) rename output_files/{issue_230.P1.d0.p1024.res => issue-230.P1.d0.p1024.res} (100%) rename output_files/{issue_230.P1.d0.p128.res => issue-230.P1.d0.p128.res} (100%) rename output_files/{mq_2_1.res => mq-2-1.res} (100%) rename output_files/{nonradical_radicalshape-31.res => nonradical-radicalshape-31.res} (100%) rename output_files/{nonradical_radicalshape-no-square-31.c0.res => nonradical-radicalshape-no-square-31.c0.res} (100%) rename output_files/{nonradical_radicalshape-no-square-qq.P1.d0.p1024.res => nonradical-radicalshape-no-square-qq.P1.d0.p1024.res} (100%) rename output_files/{nonradical_radicalshape-no-square-qq.P1.d0.p128.res => nonradical-radicalshape-no-square-qq.P1.d0.p128.res} (100%) rename output_files/{nonradical_radicalshape-qq.P1.d0.p1024.res => nonradical-radicalshape-qq.P1.d0.p1024.res} (100%) rename output_files/{nonradical_radicalshape-qq.P1.d0.p128.res => nonradical-radicalshape-qq.P1.d0.p128.res} (100%) rename output_files/{nonradical_shape-31.res => nonradical-shape-31.res} (100%) rename output_files/{nonradical_shape-qq.P1.d0.p1024.res => nonradical-shape-qq.P1.d0.p1024.res} (100%) rename output_files/{nonradical_shape-qq.P1.d0.p128.res => nonradical-shape-qq.P1.d0.p128.res} (100%) rename output_files/{radical_shape-31.P2.d0.res => radical-shape-31.P2.d0.res} (100%) rename output_files/{radical_shape-qq.P2.d0.res => radical-shape-qq.P2.d0.res} (100%) rename output_files/{reals_dim0-chgvar.p1024.res => reals-dim0-chgvar.p1024.res} (100%) rename output_files/{reals_dim0-chgvar.p128.res => reals-dim0-chgvar.p128.res} (100%) rename output_files/{reals_dim0-extract.p1024.res => reals-dim0-extract.p1024.res} (100%) rename output_files/{reals_dim0-extract.p128.res => reals-dim0-extract.p128.res} (100%) rename output_files/{reals_dim0-swapvar.p1024.res => reals-dim0-swapvar.p1024.res} (100%) rename output_files/{reals_dim0-swapvar.p128.res => reals-dim0-swapvar.p128.res} (100%) rename output_files/{reals_dim0.p1024.res => reals-dim0.p1024.res} (100%) rename output_files/{reals_dim0.p128.res => reals-dim0.p128.res} (100%) rename test/diff/{diff_bug_2nd_prime_bad.sh => diff_bug-2nd-prime-bad.sh} (100%) rename test/diff/{diff_bug_68.sh => diff_bug-68.sh} (87%) rename test/diff/{diff_bug_empty_tracer.sh => diff_bug-empty-tracer.sh} (100%) rename test/diff/{diff_cp_d_3_n_4_p_2.sh => diff_cp-d3-n4-p2.sh} (82%) rename test/diff/{diff_issue_230_squared.sh => diff_issue-230-squared.sh} (80%) rename test/diff/{diff_issue_230.sh => diff_issue-230.sh} (86%) rename test/diff/{diff_mq_2_1.sh => diff_mq-2-1.sh} (87%) rename test/diff/{diff_nf_16.sh => diff_nf-16.sh} (100%) rename test/diff/{diff_nf_31.sh => diff_nf-31.sh} (100%) rename test/diff/{diff_nf_8.sh => diff_nf-8.sh} (100%) rename test/diff/{diff_nf_lm_bug.sh => diff_nf-lm-bug.sh} (100%) rename test/diff/{diff_nonradical_radicalshape-no-square-31.sh => diff_nonradical-radicalshape-no-square-31.sh} (96%) rename test/diff/{diff_nonradical_radicalshape-no-square-qq.sh => diff_nonradical-radicalshape-no-square-qq.sh} (69%) rename test/diff/{diff_nonradical_radicalshape-qq.sh => diff_nonradical-radicalshape-qq.sh} (74%) rename test/diff/{diff_nonradical_shape-31.sh => diff_nonradical-shape-31.sh} (64%) rename test/diff/{diff_nonradical_shape-qq.sh => diff_nonradical-shape-qq.sh} (79%) rename test/diff/{diff_radical_shape-31.sh => diff_radical-shape-31.sh} (80%) rename test/diff/{diff_radical_shape-qq.sh => diff_radical-shape-qq.sh} (86%) rename test/diff/{diff_reals_dim0-chgvar.sh => diff_reals-dim0-chgvar.sh} (78%) rename test/diff/{diff_reals_dim0-swapvar.sh => diff_reals-dim0-extract.sh} (77%) rename test/diff/{diff_reals_dim0-extract.sh => diff_reals-dim0-swapvar.sh} (77%) rename test/diff/{diff_reals_dim0.sh => diff_reals-dim0.sh} (84%) rename test/fglm/{build_matrixn_nonradical_radicalshape-31.c => build_matrixn_nonradical-radicalshape-31.c} (98%) rename test/fglm/{build_matrixn_nonradical_shape-31.c => build_matrixn_nonradical-shape-31.c} (99%) rename test/fglm/{build_matrixn_radical_shape-31.c => build_matrixn_radical-shape-31.c} (98%) diff --git a/Makefile.am b/Makefile.am index 2992d79f..78331223 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,17 +8,17 @@ bin_PROGRAMS = msolve msolve_SOURCES = src/msolve/main.c check_PROGRAMS = neogb_io \ - fglm_build_matrixn_radical_shape-31 \ - fglm_build_matrixn_nonradical_shape-31 \ - fglm_build_matrixn_nonradical_radicalshape-31 \ + fglm_build_matrixn_radical-shape-31 \ + fglm_build_matrixn_nonradical-shape-31 \ + fglm_build_matrixn_nonradical-radicalshape-31 \ line_endings_support -checkdiff = test/diff/diff_bug_2nd_prime_bad.sh \ - test/diff/diff_bug_68.sh \ - test/diff/diff_bug_empty_tracer.sh \ +checkdiff = test/diff/diff_bug-2nd-prime-bad.sh \ + test/diff/diff_bug-68.sh \ + test/diff/diff_bug-empty-tracer.sh \ test/diff/diff_choice-linear-form-qq.sh \ test/diff/diff_choice-linear-form-qq-real-roots.sh \ - test/diff/diff_cp_d_3_n_4_p_2.sh \ + test/diff/diff_cp-d3-n4-p2.sh \ test/diff/diff_cyclic5-16.sh \ test/diff/diff_cyclic5-31.sh \ test/diff/diff_cyclic5-qq.sh \ @@ -36,44 +36,44 @@ checkdiff = test/diff/diff_bug_2nd_prime_bad.sh \ test/diff/diff_groebner-g2.sh \ test/diff/diff_henrion5-qq.sh \ test/diff/diff_input-overflow-16.sh \ - test/diff/diff_issue_230.sh \ - test/diff/diff_issue_230_squared.sh \ + test/diff/diff_issue-230.sh \ + test/diff/diff_issue-230-squared.sh \ test/diff/diff_kat6-31.sh \ test/diff/diff_kat7-qq.sh \ test/diff/diff_kat8-qq-truncate.sh \ test/diff/diff_linear-qq.sh \ test/diff/diff_maxbitsize-bug.sh \ - test/diff/diff_mq_2_1.sh \ + test/diff/diff_mq-2-1.sh \ test/diff/diff_multy-16.sh \ test/diff/diff_multy-31.sh \ test/diff/diff_multy-qq.sh \ - test/diff/diff_nf_16.sh \ - test/diff/diff_nf_31.sh \ - test/diff/diff_nf_8.sh \ - test/diff/diff_nf_lm_bug.sh \ - test/diff/diff_nonradical_radicalshape-no-square-31.sh \ - test/diff/diff_nonradical_radicalshape-no-square-qq.sh \ - test/diff/diff_nonradical_radicalshape-qq.sh \ - test/diff/diff_nonradical_shape-qq.sh \ + test/diff/diff_nf-16.sh \ + test/diff/diff_nf-31.sh \ + test/diff/diff_nf-8.sh \ + test/diff/diff_nf-lm-bug.sh \ + test/diff/diff_nonradical-radicalshape-no-square-31.sh \ + test/diff/diff_nonradical-radicalshape-no-square-qq.sh \ + test/diff/diff_nonradical-radicalshape-qq.sh \ + test/diff/diff_nonradical-shape-qq.sh \ test/diff/diff_one-16.sh \ test/diff/diff_one-31.sh \ test/diff/diff_one-qq.sh \ - test/diff/diff_radical_shape-31.sh \ - test/diff/diff_radical_shape-qq.sh \ + test/diff/diff_radical-shape-31.sh \ + test/diff/diff_radical-shape-qq.sh \ test/diff/diff_realroot1.sh \ test/diff/diff_realroot-extraction-exact-root.sh \ - test/diff/diff_reals_dim0-chgvar.sh \ - test/diff/diff_reals_dim0-extract.sh \ - test/diff/diff_reals_dim0.sh \ - test/diff/diff_reals_dim0-swapvar.sh \ + test/diff/diff_reals-dim0-chgvar.sh \ + test/diff/diff_reals-dim0-extract.sh \ + test/diff/diff_reals-dim0.sh \ + test/diff/diff_reals-dim0-swapvar.sh \ test/diff/diff_test-lifting2.sh \ test/diff/diff_xy-qq.sh # dist_check_DATA = test/input_files neogb_io_SOURCES = test/neogb/io/validate_input_data.c -fglm_build_matrixn_radical_shape_31_SOURCES = test/fglm/build_matrixn_radical_shape-31.c -fglm_build_matrixn_nonradical_shape_31_SOURCES = test/fglm/build_matrixn_nonradical_shape-31.c -fglm_build_matrixn_nonradical_radicalshape_31_SOURCES = test/fglm/build_matrixn_nonradical_radicalshape-31.c +fglm_build_matrixn_radical_shape_31_SOURCES = test/fglm/build_matrixn_radical-shape-31.c +fglm_build_matrixn_nonradical_shape_31_SOURCES = test/fglm/build_matrixn_nonradical-shape-31.c +fglm_build_matrixn_nonradical_radicalshape_31_SOURCES = test/fglm/build_matrixn_nonradical-radicalshape-31.c line_endings_support_SOURCES = test/msolve/line_endings_support.c TESTS = $(check_PROGRAMS) $(checkdiff) diff --git a/configure.ac b/configure.ac index 1f5ce6e1..f9ae60f0 100644 --- a/configure.ac +++ b/configure.ac @@ -111,22 +111,22 @@ AC_CONFIG_LINKS([ test/diff/diff_source-real.sh:test/diff/diff_source-real.sh input_files/bug-2nd-prime-bad.ms:input_files/bug-2nd-prime-bad.ms output_files/bug-2nd-prime-bad.g2.res:output_files/bug-2nd-prime-bad.g2.res - test/diff/diff_bug_2nd_prime_bad.sh:test/diff/diff_bug_2nd_prime_bad.sh - input_files/bug_68.ms:input_files/bug_68.ms - output_files/bug_68.res:output_files/bug_68.res - test/diff/diff_bug_68.sh:test/diff/diff_bug_68.sh + test/diff/diff_bug-2nd-prime_bad.sh:test/diff/diff_bug-2nd-prime-bad.sh + input_files/bug-68.ms:input_files/bug-68.ms + output_files/bug-68.res:output_files/bug-68.res + test/diff/diff_bug-68.sh:test/diff/diff_bug-68.sh input_files/bug-empty-tracer.ms:input_files/bug-empty-tracer.ms output_files/bug-empty-tracer.g2.res:output_files/bug-empty-tracer.g2.res - test/diff/diff_bug_empty_tracer.sh:test/diff/diff_bug_empty_tracer.sh + test/diff/diff_bug-empty-tracer.sh:test/diff/diff_bug-empty-tracer.sh input_files/choice-linear-form-qq.ms:input_files/choice-linear-form-qq.ms output_files/choice-linear-form-qq.res:output_files/choice-linear-form-qq.res test/diff/diff_choice-linear-form-qq.sh:test/diff/diff_choice-linear-form-qq.sh input_files/choice-linear-form-qq-real-roots.ms:input_files/choice-linear-form-qq-real-roots.ms output_files/choice-linear-form-qq-real-roots.res:output_files/choice-linear-form-qq-real-roots.res test/diff/diff_choice-linear-form-qq-real-roots.sh:test/diff/diff_choice-linear-form-qq-real-roots.sh - input_files/cp_d_3_n_4_p_2.ms:input_files/cp_d_3_n_4_p_2.ms - output_files/cp_d_3_n_4_p_2.P2.d0.res:output_files/cp_d_3_n_4_p_2.P2.d0.res - test/diff/diff_cp_d_3_n_4_p_2.sh:test/diff/diff_cp_d_3_n_4_p_2.sh + input_files/cp-d3-n4-p2.ms:input_files/cp-d3-n4-p2.ms + output_files/cp-d3-n4-p2.P2.d0.res:output_files/cp-d3-n4-p2.P2.d0.res + test/diff/diff_cp-d3-n4-p2.sh:test/diff/diff_cp-d3-n4-p2.sh input_files/cyclic5-16.ms:input_files/cyclic5-16.ms output_files/cyclic5-16.P2.d4.res:output_files/cyclic5-16.P2.d4.res test/diff/diff_cyclic5-16.sh:test/diff/diff_cyclic5-16.sh @@ -186,32 +186,32 @@ AC_CONFIG_LINKS([ input_files/input-overflow-16.ms:input_files/input-overflow-16.ms output_files/input-overflow-16.P2.d0.res:output_files/input-overflow-16.P2.d0.res test/diff/diff_input-overflow-16.sh:test/diff/diff_input-overflow-16.sh - input_files/issue_230.ms:input_files/issue_230.ms - output_files/issue_230.P1.d0.p128.res:output_files/issue_230.P1.d0.p128.res - output_files/issue_230.P1.d0.p1024.res:output_files/issue_230.P1.d0.p1024.res - test/diff/diff_issue_230.sh:test/diff/diff_issue_230.sh - input_files/issue_230_squared.ms:input_files/issue_230_squared.ms - output_files/issue_230_squared.P1.d0.p128.res:output_files/issue_230_squared.P1.d0.p128.res - output_files/issue_230_squared.P1.d0.p1024.res:output_files/issue_230_squared.P1.d0.p1024.res - test/diff/diff_issue_230_squared.sh:test/diff/diff_issue_230_squared.sh + input_files/issue-230.ms:input_files/issue-230.ms + output_files/issue-230.P1.d0.p128.res:output_files/issue-230.P1.d0.p128.res + output_files/issue-230.P1.d0.p1024.res:output_files/issue-230.P1.d0.p1024.res + test/diff/diff_issue-230.sh:test/diff/diff_issue-230.sh + input_files/issue-230-squared.ms:input_files/issue-230-squared.ms + output_files/issue-230-squared.P1.d0.p128.res:output_files/issue-230-squared.P1.d0.p128.res + output_files/issue-230-squared.P1.d0.p1024.res:output_files/issue-230-squared.P1.d0.p1024.res + test/diff/diff_issue-230-squared.sh:test/diff/diff_issue-230-squared.sh input_files/kat6-31.ms:input_files/kat6-31.ms output_files/kat6-31.P2.d0.res:output_files/kat6-31.P2.d0.res test/diff/diff_kat6-31.sh:test/diff/diff_kat6-31.sh input_files/kat7-qq.ms:input_files/kat7-qq.ms output_files/kat7-qq.P2.d0.res:output_files/kat7-qq.P2.d0.res test/diff/diff_kat7-qq.sh:test/diff/diff_kat7-qq.sh - test/diff/diff_kat8-qq-truncate.sh:test/diff/diff_kat8-qq-truncate.sh input_files/kat8-qq-truncate.ms:input_files/kat8-qq-truncate.ms output_files/kat8-qq-truncate.res:output_files/kat8-qq-truncate.res + test/diff/diff_kat8-qq-truncate.sh:test/diff/diff_kat8-qq-truncate.sh input_files/linear-qq.ms:input_files/linear-qq.ms output_files/linear-qq.P2.d0.res:output_files/linear-qq.P2.d0.res test/diff/diff_linear-qq.sh:test/diff/diff_linear-qq.sh input_files/maxbitsize-bug.ms:input_files/maxbitsize-bug.ms output_files/maxbitsize-bug.res:output_files/maxbitsize-bug.res test/diff/diff_maxbitsize-bug.sh:test/diff/diff_maxbitsize-bug.sh - input_files/mq_2_1.ms:input_files/mq_2_1.ms - output_files/mq_2_1.res:output_files/mq_2_1.res - test/diff/diff_mq_2_1.sh:test/diff/diff_mq_2_1.sh + input_files/mq-2-1.ms:input_files/mq-2-1.ms + output_files/mq-2-1.res:output_files/mq-2-1.res + test/diff/diff_mq-2-1.sh:test/diff/diff_mq-2-1.sh input_files/multy-16.ms:input_files/multy-16.ms output_files/multy-16.P2.d0.res:output_files/multy-16.P2.d0.res test/diff/diff_multy-16.sh:test/diff/diff_multy-16.sh @@ -223,35 +223,35 @@ AC_CONFIG_LINKS([ test/diff/diff_multy-qq.sh:test/diff/diff_multy-qq.sh input_files/nf-8.ms:input_files/nf-8.ms output_files/nf-8.res:output_files/nf-8.res - test/diff/diff_nf_8.sh:test/diff/diff_nf_8.sh + test/diff/diff_nf-8.sh:test/diff/diff_nf-8.sh input_files/nf-16.ms:input_files/nf-16.ms output_files/nf-16.res:output_files/nf-16.res - test/diff/diff_nf_16.sh:test/diff/diff_nf_16.sh + test/diff/diff_nf-16.sh:test/diff/diff_nf-16.sh input_files/nf-31.ms:input_files/nf-31.ms output_files/nf-31.res:output_files/nf-31.res - test/diff/diff_nf_31.sh:test/diff/diff_nf_31.sh + test/diff/diff_nf-31.sh:test/diff/diff_nf-31.sh input_files/nf-lm-bug.ms:input_files/nf-lm-bug.ms output_files/nf-lm-bug.res:output_files/nf-lm-bug.res - test/diff/diff_nf_lm_bug.sh:test/diff/diff_nf_lm_bug.sh - input_files/nonradical_shape-31.ms:input_files/nonradical_shape-31.ms - output_files/nonradical_shape-31.res:output_files/nonradical_shape-31.res - input_files/nonradical_shape-qq.ms:input_files/nonradical_shape-qq.ms - output_files/nonradical_shape-qq.P1.d0.p128.res:output_files/nonradical_shape-qq.P1.d0.p128.res - output_files/nonradical_shape-qq.P1.d0.p1024.res:output_files/nonradical_shape-qq.P1.d0.p1024.res - test/diff/diff_nonradical_shape-qq.sh:test/diff/diff_nonradical_shape-qq.sh - input_files/nonradical_radicalshape-31.ms:input_files/nonradical_radicalshape-31.ms - output_files/nonradical_radicalshape-31.res:output_files/nonradical_radicalshape-31.res - input_files/nonradical_radicalshape-qq.ms:input_files/nonradical_radicalshape-qq.ms - output_files/nonradical_radicalshape-qq.P1.d0.p128.res:output_files/nonradical_radicalshape-qq.P1.d0.p128.res - output_files/nonradical_radicalshape-qq.P1.d0.p1024.res:output_files/nonradical_radicalshape-qq.P1.d0.p1024.res - test/diff/diff_nonradical_radicalshape-qq.sh:test/diff/diff_nonradical_radicalshape-qq.sh - input_files/nonradical_radicalshape-no-square-31.ms:input_files/nonradical_radicalshape-no-square-31.ms - output_files/nonradical_radicalshape-no-square-31.c0.res:output_files/nonradical_radicalshape-no-square-31.c0.res - test/diff/diff_nonradical_radicalshape-no-square-31.sh:test/diff/diff_nonradical_radicalshape-no-square-31.sh - input_files/nonradical_radicalshape-no-square-qq.ms:input_files/nonradical_radicalshape-no-square-qq.ms - output_files/nonradical_radicalshape-no-square-qq.P1.d0.p128.res:output_files/nonradical_radicalshape-no-square-qq.P1.d0.p128.res - output_files/nonradical_radicalshape-no-square-qq.P1.d0.p1024.res:output_files/nonradical_radicalshape-no-square-qq.P1.d0.p1024.res - test/diff/diff_nonradical_radicalshape-no-square-qq.sh:test/diff/diff_nonradical_radicalshape-no-square-qq.sh + test/diff/diff_nf-lm-bug.sh:test/diff/diff_nf-lm-bug.sh + input_files/nonradical-radicalshape-no-square-31.ms:input_files/nonradical-radicalshape-no-square-31.ms + output_files/nonradical-radicalshape-no-square-31.c0.res:output_files/nonradical-radicalshape-no-square-31.c0.res + test/diff/diff_nonradical-radicalshape-no-square-31.sh:test/diff/diff_nonradical-radicalshape-no-square-31.sh + input_files/nonradical-radicalshape-no-square-qq.ms:input_files/nonradical-radicalshape-no-square-qq.ms + output_files/nonradical-radicalshape-no-square-qq.P1.d0.p128.res:output_files/nonradical-radicalshape-no-square-qq.P1.d0.p128.res + output_files/nonradical-radicalshape-no-square-qq.P1.d0.p1024.res:output_files/nonradical-radicalshape-no-square-qq.P1.d0.p1024.res + test/diff/diff_nonradical-radicalshape-no-square-qq.sh:test/diff/diff_nonradical-radicalshape-no-square-qq.sh + input_files/nonradical-radicalshape-31.ms:input_files/nonradical-radicalshape-31.ms + output_files/nonradical-radicalshape-31.res:output_files/nonradical-radicalshape-31.res + input_files/nonradical-radicalshape-qq.ms:input_files/nonradical-radicalshape-qq.ms + output_files/nonradical-radicalshape-qq.P1.d0.p128.res:output_files/nonradical-radicalshape-qq.P1.d0.p128.res + output_files/nonradical-radicalshape-qq.P1.d0.p1024.res:output_files/nonradical-radicalshape-qq.P1.d0.p1024.res + test/diff/diff_nonradical-radicalshape-qq.sh:test/diff/diff_nonradical-radicalshape-qq.sh + input_files/nonradical-shape-31.ms:input_files/nonradical-shape-31.ms + output_files/nonradical-shape-31.res:output_files/nonradical-shape-31.res + input_files/nonradical-shape-qq.ms:input_files/nonradical-shape-qq.ms + output_files/nonradical-shape-qq.P1.d0.p128.res:output_files/nonradical-shape-qq.P1.d0.p128.res + output_files/nonradical-shape-qq.P1.d0.p1024.res:output_files/nonradical-shape-qq.P1.d0.p1024.res + test/diff/diff_nonradical-shape-qq.sh:test/diff/diff_nonradical-shape-qq.sh input_files/one-16.ms:input_files/one-16.ms output_files/one-16.res:output_files/one-16.res test/diff/diff_one-16.sh:test/diff/diff_one-16.sh @@ -263,12 +263,12 @@ AC_CONFIG_LINKS([ output_files/one-qq.res:output_files/one-qq.res output_files/one-qq.g2.res:output_files/one-qq.g2.res test/diff/diff_one-qq.sh:test/diff/diff_one-qq.sh - input_files/radical_shape-31.ms:input_files/radical_shape-31.ms - output_files/radical_shape-31.P2.d0.res:output_files/radical_shape-31.P2.d0.res - test/diff/diff_radical_shape-31.sh:test/diff/diff_radical_shape-31.sh - input_files/radical_shape-qq.ms:input_files/radical_shape-qq.ms - output_files/radical_shape-qq.P2.d0.res:output_files/radical_shape-qq.P2.d0.res - test/diff/diff_radical_shape-qq.sh:test/diff/diff_radical_shape-qq.sh + input_files/radical-shape-31.ms:input_files/radical-shape-31.ms + output_files/radical-shape-31.P2.d0.res:output_files/radical-shape-31.P2.d0.res + test/diff/diff_radical-shape-31.sh:test/diff/diff_radical-shape-31.sh + input_files/radical-shape-qq.ms:input_files/radical-shape-qq.ms + output_files/radical-shape-qq.P2.d0.res:output_files/radical-shape-qq.P2.d0.res + test/diff/diff_radical-shape-qq.sh:test/diff/diff_radical-shape-qq.sh input_files/realroot1.ms:input_files/realroot1.ms output_files/realroot1.p128.res:output_files/realroot1.p128.res output_files/realroot1.p1024.res:output_files/realroot1.p1024.res @@ -277,22 +277,22 @@ AC_CONFIG_LINKS([ output_files/realroot-extraction-exact-root.p128.res:output_files/realroot-extraction-exact-root.p128.res output_files/realroot-extraction-exact-root.p1024.res:output_files/realroot-extraction-exact-root.p1024.res test/diff/diff_realroot-extraction-exact-root.sh:test/diff/diff_realroot-extraction-exact-root.sh - input_files/reals_dim0-chgvar.ms:input_files/reals_dim0-chgvar.ms - output_files/reals_dim0-chgvar.p128.res:output_files/reals_dim0-chgvar.p128.res - output_files/reals_dim0-chgvar.p1024.res:output_files/reals_dim0-chgvar.p1024.res - test/diff/diff_reals_dim0-chgvar.sh:test/diff/diff_reals_dim0-chgvar.sh - input_files/reals_dim0-extract.ms:input_files/reals_dim0-extract.ms - output_files/reals_dim0-extract.p128.res:output_files/reals_dim0-extract.p128.res - output_files/reals_dim0-extract.p1024.res:output_files/reals_dim0-extract.p1024.res - test/diff/diff_reals_dim0-extract.sh:test/diff/diff_reals_dim0-extract.sh - input_files/reals_dim0.ms:input_files/reals_dim0.ms - output_files/reals_dim0.p128.res:output_files/reals_dim0.p128.res - output_files/reals_dim0.p1024.res:output_files/reals_dim0.p1024.res - test/diff/diff_reals_dim0.sh:test/diff/diff_reals_dim0.sh - input_files/reals_dim0-swapvar.ms:input_files/reals_dim0-swapvar.ms - output_files/reals_dim0-swapvar.p128.res:output_files/reals_dim0-swapvar.p128.res - output_files/reals_dim0-swapvar.p1024.res:output_files/reals_dim0-swapvar.p1024.res - test/diff/diff_reals_dim0-swapvar.sh:test/diff/diff_reals_dim0-swapvar.sh + input_files/reals-dim0-chgvar.ms:input_files/reals-dim0-chgvar.ms + output_files/reals-dim0-chgvar.p128.res:output_files/reals-dim0-chgvar.p128.res + output_files/reals-dim0-chgvar.p1024.res:output_files/reals-dim0-chgvar.p1024.res + test/diff/diff_reals-dim0-chgvar.sh:test/diff/diff_reals-dim0-chgvar.sh + input_files/reals-dim0-extract.ms:input_files/reals-dim0-extract.ms + output_files/reals-dim0-extract.p128.res:output_files/reals-dim0-extract.p128.res + output_files/reals-dim0-extract.p1024.res:output_files/reals-dim0-extract.p1024.res + test/diff/diff_reals-dim0-extract.sh:test/diff/diff_reals-dim0-extract.sh + input_files/reals-dim0.ms:input_files/reals-dim0.ms + output_files/reals-dim0.p128.res:output_files/reals-dim0.p128.res + output_files/reals-dim0.p1024.res:output_files/reals-dim0.p1024.res + test/diff/diff_reals-dim0.sh:test/diff/diff_reals-dim0.sh + input_files/reals-dim0-swapvar.ms:input_files/reals-dim0-swapvar.ms + output_files/reals-dim0-swapvar.p128.res:output_files/reals-dim0-swapvar.p128.res + output_files/reals-dim0-swapvar.p1024.res:output_files/reals-dim0-swapvar.p1024.res + test/diff/diff_reals-dim0-swapvar.sh:test/diff/diff_reals-dim0-swapvar.sh input_files/test-lifting2.ms:input_files/test-lifting2.ms output_files/test-lifting2.P2.d0.res:output_files/test-lifting2.P2.d0.res test/diff/diff_test-lifting2.sh:test/diff/diff_test-lifting2.sh diff --git a/input_files/bug_68.ms b/input_files/bug-68.ms similarity index 100% rename from input_files/bug_68.ms rename to input_files/bug-68.ms diff --git a/input_files/cp_d_3_n_4_p_2.ms b/input_files/cp-d3-n4-p2.ms similarity index 100% rename from input_files/cp_d_3_n_4_p_2.ms rename to input_files/cp-d3-n4-p2.ms diff --git a/input_files/issue_230_squared.ms b/input_files/issue-230-squared.ms similarity index 100% rename from input_files/issue_230_squared.ms rename to input_files/issue-230-squared.ms diff --git a/input_files/issue_230.ms b/input_files/issue-230.ms similarity index 100% rename from input_files/issue_230.ms rename to input_files/issue-230.ms diff --git a/input_files/mq_2_1.ms b/input_files/mq-2-1.ms similarity index 100% rename from input_files/mq_2_1.ms rename to input_files/mq-2-1.ms diff --git a/input_files/nonradical_radicalshape-31.ms b/input_files/nonradical-radicalshape-31.ms similarity index 100% rename from input_files/nonradical_radicalshape-31.ms rename to input_files/nonradical-radicalshape-31.ms diff --git a/input_files/nonradical_radicalshape-no-square-31.ms b/input_files/nonradical-radicalshape-no-square-31.ms similarity index 100% rename from input_files/nonradical_radicalshape-no-square-31.ms rename to input_files/nonradical-radicalshape-no-square-31.ms diff --git a/input_files/nonradical_radicalshape-no-square-qq.ms b/input_files/nonradical-radicalshape-no-square-qq.ms similarity index 100% rename from input_files/nonradical_radicalshape-no-square-qq.ms rename to input_files/nonradical-radicalshape-no-square-qq.ms diff --git a/input_files/nonradical_radicalshape-qq.ms b/input_files/nonradical-radicalshape-qq.ms similarity index 100% rename from input_files/nonradical_radicalshape-qq.ms rename to input_files/nonradical-radicalshape-qq.ms diff --git a/input_files/nonradical_shape-31.ms b/input_files/nonradical-shape-31.ms similarity index 100% rename from input_files/nonradical_shape-31.ms rename to input_files/nonradical-shape-31.ms diff --git a/input_files/nonradical_shape-qq.ms b/input_files/nonradical-shape-qq.ms similarity index 100% rename from input_files/nonradical_shape-qq.ms rename to input_files/nonradical-shape-qq.ms diff --git a/input_files/radical_shape-31.ms b/input_files/radical-shape-31.ms similarity index 100% rename from input_files/radical_shape-31.ms rename to input_files/radical-shape-31.ms diff --git a/input_files/radical_shape-qq.ms b/input_files/radical-shape-qq.ms similarity index 100% rename from input_files/radical_shape-qq.ms rename to input_files/radical-shape-qq.ms diff --git a/input_files/reals_dim0-chgvar.ms b/input_files/reals-dim0-chgvar.ms similarity index 100% rename from input_files/reals_dim0-chgvar.ms rename to input_files/reals-dim0-chgvar.ms diff --git a/input_files/reals_dim0-extract.ms b/input_files/reals-dim0-extract.ms similarity index 100% rename from input_files/reals_dim0-extract.ms rename to input_files/reals-dim0-extract.ms diff --git a/input_files/reals_dim0-swapvar.ms b/input_files/reals-dim0-swapvar.ms similarity index 100% rename from input_files/reals_dim0-swapvar.ms rename to input_files/reals-dim0-swapvar.ms diff --git a/input_files/reals_dim0.ms b/input_files/reals-dim0.ms similarity index 100% rename from input_files/reals_dim0.ms rename to input_files/reals-dim0.ms diff --git a/output_files/bug_68.res b/output_files/bug-68.res similarity index 100% rename from output_files/bug_68.res rename to output_files/bug-68.res diff --git a/output_files/cp_d_3_n_4_p_2.P2.d0.res b/output_files/cp-d3-n4-p2.P2.d0.res similarity index 100% rename from output_files/cp_d_3_n_4_p_2.P2.d0.res rename to output_files/cp-d3-n4-p2.P2.d0.res diff --git a/output_files/issue_230_squared.P1.d0.p1024.res b/output_files/issue-230-squared.P1.d0.p1024.res similarity index 100% rename from output_files/issue_230_squared.P1.d0.p1024.res rename to output_files/issue-230-squared.P1.d0.p1024.res diff --git a/output_files/issue_230_squared.P1.d0.p128.res b/output_files/issue-230-squared.P1.d0.p128.res similarity index 100% rename from output_files/issue_230_squared.P1.d0.p128.res rename to output_files/issue-230-squared.P1.d0.p128.res diff --git a/output_files/issue_230.P1.d0.p1024.res b/output_files/issue-230.P1.d0.p1024.res similarity index 100% rename from output_files/issue_230.P1.d0.p1024.res rename to output_files/issue-230.P1.d0.p1024.res diff --git a/output_files/issue_230.P1.d0.p128.res b/output_files/issue-230.P1.d0.p128.res similarity index 100% rename from output_files/issue_230.P1.d0.p128.res rename to output_files/issue-230.P1.d0.p128.res diff --git a/output_files/mq_2_1.res b/output_files/mq-2-1.res similarity index 100% rename from output_files/mq_2_1.res rename to output_files/mq-2-1.res diff --git a/output_files/nonradical_radicalshape-31.res b/output_files/nonradical-radicalshape-31.res similarity index 100% rename from output_files/nonradical_radicalshape-31.res rename to output_files/nonradical-radicalshape-31.res diff --git a/output_files/nonradical_radicalshape-no-square-31.c0.res b/output_files/nonradical-radicalshape-no-square-31.c0.res similarity index 100% rename from output_files/nonradical_radicalshape-no-square-31.c0.res rename to output_files/nonradical-radicalshape-no-square-31.c0.res diff --git a/output_files/nonradical_radicalshape-no-square-qq.P1.d0.p1024.res b/output_files/nonradical-radicalshape-no-square-qq.P1.d0.p1024.res similarity index 100% rename from output_files/nonradical_radicalshape-no-square-qq.P1.d0.p1024.res rename to output_files/nonradical-radicalshape-no-square-qq.P1.d0.p1024.res diff --git a/output_files/nonradical_radicalshape-no-square-qq.P1.d0.p128.res b/output_files/nonradical-radicalshape-no-square-qq.P1.d0.p128.res similarity index 100% rename from output_files/nonradical_radicalshape-no-square-qq.P1.d0.p128.res rename to output_files/nonradical-radicalshape-no-square-qq.P1.d0.p128.res diff --git a/output_files/nonradical_radicalshape-qq.P1.d0.p1024.res b/output_files/nonradical-radicalshape-qq.P1.d0.p1024.res similarity index 100% rename from output_files/nonradical_radicalshape-qq.P1.d0.p1024.res rename to output_files/nonradical-radicalshape-qq.P1.d0.p1024.res diff --git a/output_files/nonradical_radicalshape-qq.P1.d0.p128.res b/output_files/nonradical-radicalshape-qq.P1.d0.p128.res similarity index 100% rename from output_files/nonradical_radicalshape-qq.P1.d0.p128.res rename to output_files/nonradical-radicalshape-qq.P1.d0.p128.res diff --git a/output_files/nonradical_shape-31.res b/output_files/nonradical-shape-31.res similarity index 100% rename from output_files/nonradical_shape-31.res rename to output_files/nonradical-shape-31.res diff --git a/output_files/nonradical_shape-qq.P1.d0.p1024.res b/output_files/nonradical-shape-qq.P1.d0.p1024.res similarity index 100% rename from output_files/nonradical_shape-qq.P1.d0.p1024.res rename to output_files/nonradical-shape-qq.P1.d0.p1024.res diff --git a/output_files/nonradical_shape-qq.P1.d0.p128.res b/output_files/nonradical-shape-qq.P1.d0.p128.res similarity index 100% rename from output_files/nonradical_shape-qq.P1.d0.p128.res rename to output_files/nonradical-shape-qq.P1.d0.p128.res diff --git a/output_files/radical_shape-31.P2.d0.res b/output_files/radical-shape-31.P2.d0.res similarity index 100% rename from output_files/radical_shape-31.P2.d0.res rename to output_files/radical-shape-31.P2.d0.res diff --git a/output_files/radical_shape-qq.P2.d0.res b/output_files/radical-shape-qq.P2.d0.res similarity index 100% rename from output_files/radical_shape-qq.P2.d0.res rename to output_files/radical-shape-qq.P2.d0.res diff --git a/output_files/reals_dim0-chgvar.p1024.res b/output_files/reals-dim0-chgvar.p1024.res similarity index 100% rename from output_files/reals_dim0-chgvar.p1024.res rename to output_files/reals-dim0-chgvar.p1024.res diff --git a/output_files/reals_dim0-chgvar.p128.res b/output_files/reals-dim0-chgvar.p128.res similarity index 100% rename from output_files/reals_dim0-chgvar.p128.res rename to output_files/reals-dim0-chgvar.p128.res diff --git a/output_files/reals_dim0-extract.p1024.res b/output_files/reals-dim0-extract.p1024.res similarity index 100% rename from output_files/reals_dim0-extract.p1024.res rename to output_files/reals-dim0-extract.p1024.res diff --git a/output_files/reals_dim0-extract.p128.res b/output_files/reals-dim0-extract.p128.res similarity index 100% rename from output_files/reals_dim0-extract.p128.res rename to output_files/reals-dim0-extract.p128.res diff --git a/output_files/reals_dim0-swapvar.p1024.res b/output_files/reals-dim0-swapvar.p1024.res similarity index 100% rename from output_files/reals_dim0-swapvar.p1024.res rename to output_files/reals-dim0-swapvar.p1024.res diff --git a/output_files/reals_dim0-swapvar.p128.res b/output_files/reals-dim0-swapvar.p128.res similarity index 100% rename from output_files/reals_dim0-swapvar.p128.res rename to output_files/reals-dim0-swapvar.p128.res diff --git a/output_files/reals_dim0.p1024.res b/output_files/reals-dim0.p1024.res similarity index 100% rename from output_files/reals_dim0.p1024.res rename to output_files/reals-dim0.p1024.res diff --git a/output_files/reals_dim0.p128.res b/output_files/reals-dim0.p128.res similarity index 100% rename from output_files/reals_dim0.p128.res rename to output_files/reals-dim0.p128.res diff --git a/test/diff/diff_bug_2nd_prime_bad.sh b/test/diff/diff_bug-2nd-prime-bad.sh similarity index 100% rename from test/diff/diff_bug_2nd_prime_bad.sh rename to test/diff/diff_bug-2nd-prime-bad.sh diff --git a/test/diff/diff_bug_68.sh b/test/diff/diff_bug-68.sh similarity index 87% rename from test/diff/diff_bug_68.sh rename to test/diff/diff_bug-68.sh index e6328dc1..657e35aa 100755 --- a/test/diff/diff_bug_68.sh +++ b/test/diff/diff_bug-68.sh @@ -1,6 +1,6 @@ #!/bin/bash -file=bug_68 +file=bug-68 source test/diff/diff_source.sh diff --git a/test/diff/diff_bug_empty_tracer.sh b/test/diff/diff_bug-empty-tracer.sh similarity index 100% rename from test/diff/diff_bug_empty_tracer.sh rename to test/diff/diff_bug-empty-tracer.sh diff --git a/test/diff/diff_cp_d_3_n_4_p_2.sh b/test/diff/diff_cp-d3-n4-p2.sh similarity index 82% rename from test/diff/diff_cp_d_3_n_4_p_2.sh rename to test/diff/diff_cp-d3-n4-p2.sh index 3ccc60a3..351f78e8 100755 --- a/test/diff/diff_cp_d_3_n_4_p_2.sh +++ b/test/diff/diff_cp-d3-n4-p2.sh @@ -1,6 +1,6 @@ #!/bin/bash -file=cp_d_3_n_4_p_2 +file=cp-d3-n4-p2 source test/diff/diff_source.sh diff --git a/test/diff/diff_issue_230_squared.sh b/test/diff/diff_issue-230-squared.sh similarity index 80% rename from test/diff/diff_issue_230_squared.sh rename to test/diff/diff_issue-230-squared.sh index 5d0208cd..f6552240 100755 --- a/test/diff/diff_issue_230_squared.sh +++ b/test/diff/diff_issue-230-squared.sh @@ -1,6 +1,6 @@ #!/bin/bash -file=issue_230_squared +file=issue-230-squared source test/diff/diff_source.sh diff --git a/test/diff/diff_issue_230.sh b/test/diff/diff_issue-230.sh similarity index 86% rename from test/diff/diff_issue_230.sh rename to test/diff/diff_issue-230.sh index 60b488e6..a05e4895 100755 --- a/test/diff/diff_issue_230.sh +++ b/test/diff/diff_issue-230.sh @@ -1,6 +1,6 @@ #!/bin/bash -file=issue_230 +file=issue-230 source test/diff/diff_source.sh diff --git a/test/diff/diff_mq_2_1.sh b/test/diff/diff_mq-2-1.sh similarity index 87% rename from test/diff/diff_mq_2_1.sh rename to test/diff/diff_mq-2-1.sh index 0513a483..6ef7db51 100755 --- a/test/diff/diff_mq_2_1.sh +++ b/test/diff/diff_mq-2-1.sh @@ -1,6 +1,6 @@ #!/bin/bash -file=mq_2_1 +file=mq-2-1 source test/diff/diff_source.sh diff --git a/test/diff/diff_nf_16.sh b/test/diff/diff_nf-16.sh similarity index 100% rename from test/diff/diff_nf_16.sh rename to test/diff/diff_nf-16.sh diff --git a/test/diff/diff_nf_31.sh b/test/diff/diff_nf-31.sh similarity index 100% rename from test/diff/diff_nf_31.sh rename to test/diff/diff_nf-31.sh diff --git a/test/diff/diff_nf_8.sh b/test/diff/diff_nf-8.sh similarity index 100% rename from test/diff/diff_nf_8.sh rename to test/diff/diff_nf-8.sh diff --git a/test/diff/diff_nf_lm_bug.sh b/test/diff/diff_nf-lm-bug.sh similarity index 100% rename from test/diff/diff_nf_lm_bug.sh rename to test/diff/diff_nf-lm-bug.sh diff --git a/test/diff/diff_nonradical_radicalshape-no-square-31.sh b/test/diff/diff_nonradical-radicalshape-no-square-31.sh similarity index 96% rename from test/diff/diff_nonradical_radicalshape-no-square-31.sh rename to test/diff/diff_nonradical-radicalshape-no-square-31.sh index 67bae5d8..243368a2 100755 --- a/test/diff/diff_nonradical_radicalshape-no-square-31.sh +++ b/test/diff/diff_nonradical-radicalshape-no-square-31.sh @@ -1,6 +1,6 @@ #!/bin/bash -file=nonradical_radicalshape-no-square-31 +file=nonradical-radicalshape-no-square-31 source test/diff/diff_source.sh diff --git a/test/diff/diff_nonradical_radicalshape-no-square-qq.sh b/test/diff/diff_nonradical-radicalshape-no-square-qq.sh similarity index 69% rename from test/diff/diff_nonradical_radicalshape-no-square-qq.sh rename to test/diff/diff_nonradical-radicalshape-no-square-qq.sh index b9693f88..659c35ba 100755 --- a/test/diff/diff_nonradical_radicalshape-no-square-qq.sh +++ b/test/diff/diff_nonradical-radicalshape-no-square-qq.sh @@ -1,6 +1,6 @@ #!/bin/bash -file=nonradical_radicalshape-no-square-qq +file=nonradical-radicalshape-no-square-qq source test/diff/diff_source.sh diff --git a/test/diff/diff_nonradical_radicalshape-qq.sh b/test/diff/diff_nonradical-radicalshape-qq.sh similarity index 74% rename from test/diff/diff_nonradical_radicalshape-qq.sh rename to test/diff/diff_nonradical-radicalshape-qq.sh index af8e1fe3..372c8ef1 100755 --- a/test/diff/diff_nonradical_radicalshape-qq.sh +++ b/test/diff/diff_nonradical-radicalshape-qq.sh @@ -1,6 +1,6 @@ #!/bin/bash -file=nonradical_radicalshape-qq +file=nonradical-radicalshape-qq source test/diff/diff_source.sh diff --git a/test/diff/diff_nonradical_shape-31.sh b/test/diff/diff_nonradical-shape-31.sh similarity index 64% rename from test/diff/diff_nonradical_shape-31.sh rename to test/diff/diff_nonradical-shape-31.sh index d2fa4967..d81c47ce 100755 --- a/test/diff/diff_nonradical_shape-31.sh +++ b/test/diff/diff_nonradical-shape-31.sh @@ -1,5 +1,5 @@ #!/bin/bash -file=nonradical_shape-31 +file=nonradical-shape-31 source test/diff/diff_source.sh diff --git a/test/diff/diff_nonradical_shape-qq.sh b/test/diff/diff_nonradical-shape-qq.sh similarity index 79% rename from test/diff/diff_nonradical_shape-qq.sh rename to test/diff/diff_nonradical-shape-qq.sh index b2946933..c823c9f0 100755 --- a/test/diff/diff_nonradical_shape-qq.sh +++ b/test/diff/diff_nonradical-shape-qq.sh @@ -1,6 +1,6 @@ #!/bin/bash -file=nonradical_shape-qq +file=nonradical-shape-qq source test/diff/diff_source.sh diff --git a/test/diff/diff_nonradical_radicalshape-31.sh b/test/diff/diff_nonradical_radicalshape-31.sh index bd65ab41..5a5cf6e0 100755 --- a/test/diff/diff_nonradical_radicalshape-31.sh +++ b/test/diff/diff_nonradical_radicalshape-31.sh @@ -1,5 +1,5 @@ #!/bin/bash -file=nonradical_radicalshape-31 +file=nonradical-radicalshape-31 source test/diff/diff_source.sh diff --git a/test/diff/diff_radical_shape-31.sh b/test/diff/diff_radical-shape-31.sh similarity index 80% rename from test/diff/diff_radical_shape-31.sh rename to test/diff/diff_radical-shape-31.sh index 1066dc88..f0c69969 100755 --- a/test/diff/diff_radical_shape-31.sh +++ b/test/diff/diff_radical-shape-31.sh @@ -1,6 +1,6 @@ #!/bin/bash -file=radical_shape-31 +file=radical-shape-31 source test/diff/diff_source.sh diff --git a/test/diff/diff_radical_shape-qq.sh b/test/diff/diff_radical-shape-qq.sh similarity index 86% rename from test/diff/diff_radical_shape-qq.sh rename to test/diff/diff_radical-shape-qq.sh index 1f0a84d6..d51308be 100755 --- a/test/diff/diff_radical_shape-qq.sh +++ b/test/diff/diff_radical-shape-qq.sh @@ -1,6 +1,6 @@ #!/bin/bash -file=radical_shape-qq +file=radical-shape-qq source test/diff/diff_source.sh diff --git a/test/diff/diff_reals_dim0-chgvar.sh b/test/diff/diff_reals-dim0-chgvar.sh similarity index 78% rename from test/diff/diff_reals_dim0-chgvar.sh rename to test/diff/diff_reals-dim0-chgvar.sh index 4d596917..68844184 100755 --- a/test/diff/diff_reals_dim0-chgvar.sh +++ b/test/diff/diff_reals-dim0-chgvar.sh @@ -1,6 +1,6 @@ #!/bin/bash -file=reals_dim0-chgvar +file=reals-dim0-chgvar source test/diff/diff_source.sh diff --git a/test/diff/diff_reals_dim0-swapvar.sh b/test/diff/diff_reals-dim0-extract.sh similarity index 77% rename from test/diff/diff_reals_dim0-swapvar.sh rename to test/diff/diff_reals-dim0-extract.sh index aa95a476..e3ff1a76 100755 --- a/test/diff/diff_reals_dim0-swapvar.sh +++ b/test/diff/diff_reals-dim0-extract.sh @@ -1,6 +1,6 @@ #!/bin/bash -file=reals_dim0-swapvar +file=reals-dim0-extract source test/diff/diff_source.sh diff --git a/test/diff/diff_reals_dim0-extract.sh b/test/diff/diff_reals-dim0-swapvar.sh similarity index 77% rename from test/diff/diff_reals_dim0-extract.sh rename to test/diff/diff_reals-dim0-swapvar.sh index 12ab411e..de69024e 100755 --- a/test/diff/diff_reals_dim0-extract.sh +++ b/test/diff/diff_reals-dim0-swapvar.sh @@ -1,6 +1,6 @@ #!/bin/bash -file=reals_dim0-extract +file=reals-dim0-swapvar source test/diff/diff_source.sh diff --git a/test/diff/diff_reals_dim0.sh b/test/diff/diff_reals-dim0.sh similarity index 84% rename from test/diff/diff_reals_dim0.sh rename to test/diff/diff_reals-dim0.sh index 1dc0dc8d..596f7122 100755 --- a/test/diff/diff_reals_dim0.sh +++ b/test/diff/diff_reals-dim0.sh @@ -1,6 +1,6 @@ #!/bin/bash -file=reals_dim0 +file=reals-dim0 source test/diff/diff_source.sh diff --git a/test/fglm/build_matrixn_nonradical_radicalshape-31.c b/test/fglm/build_matrixn_nonradical-radicalshape-31.c similarity index 98% rename from test/fglm/build_matrixn_nonradical_radicalshape-31.c rename to test/fglm/build_matrixn_nonradical-radicalshape-31.c index 7529f0e6..8c4f6e41 100644 --- a/test/fglm/build_matrixn_nonradical_radicalshape-31.c +++ b/test/fglm/build_matrixn_nonradical-radicalshape-31.c @@ -24,7 +24,7 @@ int main(void) int32_t refine = 0; /* not used at the moment */ int32_t isolate = 0; /* not used at the moment */ files_gb *files = malloc(sizeof(files_gb)); - files->in_file = "input_files/nonradical_radicalshape-31.ms"; + files->in_file = "input_files/nonradical-radicalshape-31.ms"; files->out_file = NULL; FILE *fh = fopen(files->in_file, "r"); diff --git a/test/fglm/build_matrixn_nonradical_shape-31.c b/test/fglm/build_matrixn_nonradical-shape-31.c similarity index 99% rename from test/fglm/build_matrixn_nonradical_shape-31.c rename to test/fglm/build_matrixn_nonradical-shape-31.c index e967679d..db80411d 100644 --- a/test/fglm/build_matrixn_nonradical_shape-31.c +++ b/test/fglm/build_matrixn_nonradical-shape-31.c @@ -24,7 +24,7 @@ int main(void) int32_t refine = 0; /* not used at the moment */ int32_t isolate = 0; /* not used at the moment */ files_gb *files = malloc(sizeof(files_gb)); - files->in_file = "input_files/nonradical_shape-31.ms"; + files->in_file = "input_files/nonradical-shape-31.ms"; files->out_file = NULL; FILE *fh = fopen(files->in_file, "r"); diff --git a/test/fglm/build_matrixn_radical_shape-31.c b/test/fglm/build_matrixn_radical-shape-31.c similarity index 98% rename from test/fglm/build_matrixn_radical_shape-31.c rename to test/fglm/build_matrixn_radical-shape-31.c index 026125e2..daf86944 100644 --- a/test/fglm/build_matrixn_radical_shape-31.c +++ b/test/fglm/build_matrixn_radical-shape-31.c @@ -24,7 +24,7 @@ int main(void) int32_t refine = 0; /* not used at the moment */ int32_t isolate = 0; /* not used at the moment */ files_gb *files = malloc(sizeof(files_gb)); - files->in_file = "input_files/radical_shape-31.ms"; + files->in_file = "input_files/radical-shape-31.ms"; files->out_file = NULL; FILE *fh = fopen(files->in_file, "r"); From 6090be3c26108ea3f3bc78e8b44f8e2ca63b2591 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Berthomieu?= Date: Mon, 26 Jan 2026 17:47:33 +0100 Subject: [PATCH 10/15] updates some test files --- Makefile.am | 1 - configure.ac | 7 ++- .../choice-linear-form-qq-real-roots.ms | 11 ---- ...qq.res => choice-linear-form-qq.P2.d0.res} | 0 ...ts.res => choice-linear-form-qq.p1024.res} | 0 output_files/choice-linear-form-qq.p128.res | 3 ++ .../diff_choice-linear-form-qq-real-roots.sh | 50 ------------------- test/diff/diff_choice-linear-form-qq.sh | 6 +++ test/diff/diff_cp-d3-n4-p2.sh | 2 + test/diff/diff_cyclic5-qq.sh | 2 + test/diff/diff_eco6-qq.sh | 2 + test/diff/diff_henrion5-qq.sh | 2 + test/diff/diff_linear-qq.sh | 2 + test/diff/diff_source-param-fullnf-qq.sh | 2 - test/diff/diff_source-param-nonf-qq.sh | 2 - 15 files changed, 22 insertions(+), 70 deletions(-) delete mode 100644 input_files/choice-linear-form-qq-real-roots.ms rename output_files/{choice-linear-form-qq.res => choice-linear-form-qq.P2.d0.res} (100%) rename output_files/{choice-linear-form-qq-real-roots.res => choice-linear-form-qq.p1024.res} (100%) create mode 100644 output_files/choice-linear-form-qq.p128.res delete mode 100755 test/diff/diff_choice-linear-form-qq-real-roots.sh diff --git a/Makefile.am b/Makefile.am index 78331223..5549a84d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,7 +17,6 @@ checkdiff = test/diff/diff_bug-2nd-prime-bad.sh \ test/diff/diff_bug-68.sh \ test/diff/diff_bug-empty-tracer.sh \ test/diff/diff_choice-linear-form-qq.sh \ - test/diff/diff_choice-linear-form-qq-real-roots.sh \ test/diff/diff_cp-d3-n4-p2.sh \ test/diff/diff_cyclic5-16.sh \ test/diff/diff_cyclic5-31.sh \ diff --git a/configure.ac b/configure.ac index f9ae60f0..67eeff63 100644 --- a/configure.ac +++ b/configure.ac @@ -119,11 +119,10 @@ AC_CONFIG_LINKS([ output_files/bug-empty-tracer.g2.res:output_files/bug-empty-tracer.g2.res test/diff/diff_bug-empty-tracer.sh:test/diff/diff_bug-empty-tracer.sh input_files/choice-linear-form-qq.ms:input_files/choice-linear-form-qq.ms - output_files/choice-linear-form-qq.res:output_files/choice-linear-form-qq.res + output_files/choice-linear-form-qq.P2.d0.res:output_files/choice-linear-form-qq.P2.d0.res + output_files/choice-linear-form-qq.p128.res:output_files/choice-linear-form-qq.p128.res + output_files/choice-linear-form-qq.p1024.res:output_files/choice-linear-form-qq.p1024.res test/diff/diff_choice-linear-form-qq.sh:test/diff/diff_choice-linear-form-qq.sh - input_files/choice-linear-form-qq-real-roots.ms:input_files/choice-linear-form-qq-real-roots.ms - output_files/choice-linear-form-qq-real-roots.res:output_files/choice-linear-form-qq-real-roots.res - test/diff/diff_choice-linear-form-qq-real-roots.sh:test/diff/diff_choice-linear-form-qq-real-roots.sh input_files/cp-d3-n4-p2.ms:input_files/cp-d3-n4-p2.ms output_files/cp-d3-n4-p2.P2.d0.res:output_files/cp-d3-n4-p2.P2.d0.res test/diff/diff_cp-d3-n4-p2.sh:test/diff/diff_cp-d3-n4-p2.sh diff --git a/input_files/choice-linear-form-qq-real-roots.ms b/input_files/choice-linear-form-qq-real-roots.ms deleted file mode 100644 index 21a609ae..00000000 --- a/input_files/choice-linear-form-qq-real-roots.ms +++ /dev/null @@ -1,11 +0,0 @@ -_xx[1], _xx[2], _xx[3], _xx[4], _xx[5], _xx[6], _xx[7], _xx[8] -0 --_xx[1]+_xx[2], --_xx[1]+_xx[4], --_xx[1]+_xx[5], -_xx[1]+_xx[6], --_xx[1]+_xx[7], --_xx[3]*_xx[6]+_xx[2]*_xx[7]+_xx[1], --_xx[4]*_xx[7]-_xx[1]+_xx[3], --_xx[5]*_xx[6]+_xx[2]*_xx[8]-_xx[1]+_xx[6]-_xx[8], --_xx[4]*_xx[6]+_xx[5]*_xx[6]-_xx[2]*_xx[8]+_xx[4]*_xx[8]+_xx[2]-_xx[5] diff --git a/output_files/choice-linear-form-qq.res b/output_files/choice-linear-form-qq.P2.d0.res similarity index 100% rename from output_files/choice-linear-form-qq.res rename to output_files/choice-linear-form-qq.P2.d0.res diff --git a/output_files/choice-linear-form-qq-real-roots.res b/output_files/choice-linear-form-qq.p1024.res similarity index 100% rename from output_files/choice-linear-form-qq-real-roots.res rename to output_files/choice-linear-form-qq.p1024.res diff --git a/output_files/choice-linear-form-qq.p128.res b/output_files/choice-linear-form-qq.p128.res new file mode 100644 index 00000000..bea02a67 --- /dev/null +++ b/output_files/choice-linear-form-qq.p128.res @@ -0,0 +1,3 @@ +[0, [1, +[[[-1, -1], [-1, -1], [0, 0], [-1, -1], [-1, -1], [1, 1], [-1, -1], [3 / 2, 3 / 2]], [[0, 0], [0, 0], [0, 0], [0, 0], [0, 0], [0, 0], [0, 0], [0, 0]]] +]]: diff --git a/test/diff/diff_choice-linear-form-qq-real-roots.sh b/test/diff/diff_choice-linear-form-qq-real-roots.sh deleted file mode 100755 index ce544eee..00000000 --- a/test/diff/diff_choice-linear-form-qq-real-roots.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -file=choice-linear-form-qq-real-roots - - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -d 0 -l 2 -t 1 -if [ $? -gt 0 ]; then - exit 1 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 2 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -d 0 -l 2 -t 2 -if [ $? -gt 0 ]; then - exit 21 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 22 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -d 0 -l 44 -t 1 -if [ $? -gt 0 ]; then - exit 41 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 42 -fi - -$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \ - -d 0 -l 44 -t 2 -if [ $? -gt 0 ]; then - exit 61 -fi - -diff test/diff/$file.res output_files/$file.res -if [ $? -gt 0 ]; then - exit 62 -fi - -rm test/diff/$file.res diff --git a/test/diff/diff_choice-linear-form-qq.sh b/test/diff/diff_choice-linear-form-qq.sh index 6850588a..35dfa1a6 100755 --- a/test/diff/diff_choice-linear-form-qq.sh +++ b/test/diff/diff_choice-linear-form-qq.sh @@ -3,3 +3,9 @@ file=choice-linear-form-qq source test/diff/diff_source.sh + +source test/diff/diff_source-param-nonf.sh + +source test/diff/diff_source-param-nonf-qq.sh + +source test/diff/diff_source-real.sh diff --git a/test/diff/diff_cp-d3-n4-p2.sh b/test/diff/diff_cp-d3-n4-p2.sh index 351f78e8..4ad41304 100755 --- a/test/diff/diff_cp-d3-n4-p2.sh +++ b/test/diff/diff_cp-d3-n4-p2.sh @@ -4,4 +4,6 @@ file=cp-d3-n4-p2 source test/diff/diff_source.sh +source test/diff/diff_source-param-nonf.sh + source test/diff/diff_source-param-nonf-qq.sh diff --git a/test/diff/diff_cyclic5-qq.sh b/test/diff/diff_cyclic5-qq.sh index 3589b45f..3f924c8b 100755 --- a/test/diff/diff_cyclic5-qq.sh +++ b/test/diff/diff_cyclic5-qq.sh @@ -4,6 +4,8 @@ file=cyclic5-qq source test/diff/diff_source.sh +source test/diff/diff_source-param-fullnf.sh + source test/diff/diff_source-param-fullnf-qq.sh source test/diff/diff_source-gb-red.sh diff --git a/test/diff/diff_eco6-qq.sh b/test/diff/diff_eco6-qq.sh index 369ced6c..77d4c23a 100755 --- a/test/diff/diff_eco6-qq.sh +++ b/test/diff/diff_eco6-qq.sh @@ -4,4 +4,6 @@ file=eco6-qq source test/diff/diff_source.sh +source test/diff/diff_source-param-fullnf.sh + source test/diff/diff_source-param-fullnf-qq.sh diff --git a/test/diff/diff_henrion5-qq.sh b/test/diff/diff_henrion5-qq.sh index f26cd888..155c3a2f 100755 --- a/test/diff/diff_henrion5-qq.sh +++ b/test/diff/diff_henrion5-qq.sh @@ -4,6 +4,8 @@ file=henrion5-qq source test/diff/diff_source.sh +source test/diff/diff_source-param-nonf.sh + source test/diff/diff_source-param-nonf-qq.sh source test/diff/diff_source-gb-red.sh diff --git a/test/diff/diff_linear-qq.sh b/test/diff/diff_linear-qq.sh index 23bf282a..33cef66b 100755 --- a/test/diff/diff_linear-qq.sh +++ b/test/diff/diff_linear-qq.sh @@ -4,4 +4,6 @@ file=linear-qq source test/diff/diff_source.sh +source test/diff/diff_source-param-nonf.sh + source test/diff/diff_source-param-nonf-qq.sh diff --git a/test/diff/diff_source-param-fullnf-qq.sh b/test/diff/diff_source-param-fullnf-qq.sh index 4a918854..dbb03ec5 100644 --- a/test/diff/diff_source-param-fullnf-qq.sh +++ b/test/diff/diff_source-param-fullnf-qq.sh @@ -1,5 +1,3 @@ -source test/diff/diff_source-param-fullnf.sh - $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.81.res \ --random-seed $seed \ -P 2 -d 4 -L 1 -l 2 -t 1 diff --git a/test/diff/diff_source-param-nonf-qq.sh b/test/diff/diff_source-param-nonf-qq.sh index c65e03d4..35ab0cce 100644 --- a/test/diff/diff_source-param-nonf-qq.sh +++ b/test/diff/diff_source-param-nonf-qq.sh @@ -1,5 +1,3 @@ -source test/diff/diff_source-param-nonf.sh - $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.81.res \ --random-seed $seed \ -P 2 -d 0 -L 1 -l 2 -t 1 From 32b009cc019d2c9bd5c39e1289abb7e26bcce572 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Berthomieu?= Date: Mon, 9 Feb 2026 12:45:27 +0100 Subject: [PATCH 11/15] bad linking --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 67eeff63..707f9216 100644 --- a/configure.ac +++ b/configure.ac @@ -111,7 +111,7 @@ AC_CONFIG_LINKS([ test/diff/diff_source-real.sh:test/diff/diff_source-real.sh input_files/bug-2nd-prime-bad.ms:input_files/bug-2nd-prime-bad.ms output_files/bug-2nd-prime-bad.g2.res:output_files/bug-2nd-prime-bad.g2.res - test/diff/diff_bug-2nd-prime_bad.sh:test/diff/diff_bug-2nd-prime-bad.sh + test/diff/diff_bug-2nd-prime-bad.sh:test/diff/diff_bug-2nd-prime-bad.sh input_files/bug-68.ms:input_files/bug-68.ms output_files/bug-68.res:output_files/bug-68.res test/diff/diff_bug-68.sh:test/diff/diff_bug-68.sh From 22413791c0518ab2533f4a0b68cfe71456c8c02f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Berthomieu?= Date: Wed, 11 Feb 2026 15:19:41 +0100 Subject: [PATCH 12/15] printf and tput for portability --- test/diff/diff_source.sh | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/test/diff/diff_source.sh b/test/diff/diff_source.sh index c424ffc0..cd5139cb 100755 --- a/test/diff/diff_source.sh +++ b/test/diff/diff_source.sh @@ -1,24 +1,43 @@ seed=${SEED:-$EPOCHSECONDS} +isatty=false -if [ -t 2 ]; then - colseed='\033[0;96m' # High Intensity Light blue. - colexit='\033[0;93m' # High Intensity Yellow. - std='\033[0m' +[ -t 1 ] && isatty=true +[ -t 2 ] && isatty=true + + +if $isatty; then + # colseed='\033[0;96m' # High Intensity Light blue. + colseed=$(tput setaf 14) # High Intensity Light blue. + # colexit='\033[0;93m' # High Intensity Yellow. + colexit=$(tput setaf 11) # High Intensity Yellow. + # std='\033[0m' + std=$(tput sgr0) else colseed= colexit= std= fi -# print in color the exit code +# print the seed in color +# carriage return if tty to prevent too many lines +# when the test is successful +print_seed() { + if $isatty; then + # interactive terminal -> overwrite line + printf "\r" + fi + printf "${colseed}SEED${std}: %-10d " $seed >&2 +} + +print_seed + +# print the exit code in color print_exit() { local excode=$1 - echo -e "${colexit}EXIT${std}: $excode" + printf "${colexit}EXIT${std}: $excode\n" >&2 exit "$excode" } -echo -e "${colseed}SEED${std}: $seed" - # each diff_example.sh is built by running msolve on $file.ms # with options -L 0 -l 2 -t 1 # if the execution fails, print_exit 1 From 7f551ec726068b16eefa1a1a7389fb7669be0351 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Berthomieu?= Date: Wed, 11 Feb 2026 23:35:02 +0100 Subject: [PATCH 13/15] reworked printing of seed and exit, add normal_exit for shell tests --- test/diff/diff_bug-2nd-prime-bad.sh | 2 + test/diff/diff_bug-68.sh | 2 + test/diff/diff_bug-empty-tracer.sh | 2 + test/diff/diff_choice-linear-form-qq.sh | 2 + test/diff/diff_cp-d3-n4-p2.sh | 2 + test/diff/diff_cyclic5-16.sh | 2 + test/diff/diff_cyclic5-31.sh | 2 + test/diff/diff_cyclic5-qq.sh | 2 + test/diff/diff_eco10-31.sh | 2 + test/diff/diff_eco6-16.sh | 2 + test/diff/diff_eco6-31.sh | 2 + test/diff/diff_eco6-qq.sh | 2 + test/diff/diff_elim-31.sh | 2 + test/diff/diff_elim-qq.sh | 2 + test/diff/diff_f4sat-31.sh | 2 + test/diff/diff_f4sat-byone-31.sh | 2 + test/diff/diff_f4sat-field-char.sh | 2 + test/diff/diff_f4sat-is-saturated-check.sh | 2 + test/diff/diff_f4sat-zero-input.sh | 2 + test/diff/diff_groebner-g2.sh | 2 + test/diff/diff_henrion5-qq.sh | 1 + test/diff/diff_input-overflow-16.sh | 2 + test/diff/diff_issue-230-squared.sh | 2 + test/diff/diff_issue-230.sh | 1 + test/diff/diff_kat6-31.sh | 2 + test/diff/diff_kat7-qq.sh | 2 + test/diff/diff_kat8-qq-truncate.sh | 2 + test/diff/diff_linear-qq.sh | 2 + test/diff/diff_maxbitsize-bug.sh | 2 + test/diff/diff_mq-2-1.sh | 2 + test/diff/diff_multy-16.sh | 2 + test/diff/diff_multy-31.sh | 2 + test/diff/diff_multy-qq.sh | 2 + test/diff/diff_nf-16.sh | 2 + test/diff/diff_nf-31.sh | 2 + test/diff/diff_nf-8.sh | 2 + test/diff/diff_nf-lm-bug.sh | 2 + ...ff_nonradical-radicalshape-no-square-31.sh | 2 + ...ff_nonradical-radicalshape-no-square-qq.sh | 2 + test/diff/diff_nonradical-radicalshape-qq.sh | 2 + test/diff/diff_nonradical-shape-31.sh | 2 + test/diff/diff_nonradical-shape-qq.sh | 2 + test/diff/diff_nonradical_radicalshape-31.sh | 2 + test/diff/diff_one-16.sh | 2 +- test/diff/diff_one-31.sh | 1 + test/diff/diff_one-qq.sh | 1 + test/diff/diff_radical-shape-31.sh | 2 + test/diff/diff_radical-shape-qq.sh | 2 + .../diff_realroot-extraction-exact-root.sh | 2 + test/diff/diff_realroot1.sh | 2 + test/diff/diff_reals-dim0-chgvar.sh | 1 + test/diff/diff_reals-dim0-extract.sh | 2 + test/diff/diff_reals-dim0-swapvar.sh | 2 + test/diff/diff_reals-dim0.sh | 2 + test/diff/diff_source-gb-elim-red.sh | 2 - test/diff/diff_source.sh | 67 +++++++++++++------ test/diff/diff_test-lifting2.sh | 2 + test/diff/diff_xy-qq.sh | 2 + 58 files changed, 151 insertions(+), 25 deletions(-) diff --git a/test/diff/diff_bug-2nd-prime-bad.sh b/test/diff/diff_bug-2nd-prime-bad.sh index b361699e..524f5e5d 100755 --- a/test/diff/diff_bug-2nd-prime-bad.sh +++ b/test/diff/diff_bug-2nd-prime-bad.sh @@ -5,3 +5,5 @@ file=bug-2nd-prime-bad source test/diff/diff_source.sh source test/diff/diff_source-gb-red.sh + +normal_exit diff --git a/test/diff/diff_bug-68.sh b/test/diff/diff_bug-68.sh index 657e35aa..c09cd7f9 100755 --- a/test/diff/diff_bug-68.sh +++ b/test/diff/diff_bug-68.sh @@ -5,3 +5,5 @@ file=bug-68 source test/diff/diff_source.sh source test/diff/diff_source-noarg.sh + +normal_exit diff --git a/test/diff/diff_bug-empty-tracer.sh b/test/diff/diff_bug-empty-tracer.sh index 9034b1d9..05f7a181 100755 --- a/test/diff/diff_bug-empty-tracer.sh +++ b/test/diff/diff_bug-empty-tracer.sh @@ -5,3 +5,5 @@ file=bug-empty-tracer source test/diff/diff_source.sh source test/diff/diff_source-gb-red.sh + +normal_exit diff --git a/test/diff/diff_choice-linear-form-qq.sh b/test/diff/diff_choice-linear-form-qq.sh index 35dfa1a6..9c0a4b94 100755 --- a/test/diff/diff_choice-linear-form-qq.sh +++ b/test/diff/diff_choice-linear-form-qq.sh @@ -9,3 +9,5 @@ source test/diff/diff_source-param-nonf.sh source test/diff/diff_source-param-nonf-qq.sh source test/diff/diff_source-real.sh + +normal_exit diff --git a/test/diff/diff_cp-d3-n4-p2.sh b/test/diff/diff_cp-d3-n4-p2.sh index 4ad41304..97b6419a 100755 --- a/test/diff/diff_cp-d3-n4-p2.sh +++ b/test/diff/diff_cp-d3-n4-p2.sh @@ -7,3 +7,5 @@ source test/diff/diff_source.sh source test/diff/diff_source-param-nonf.sh source test/diff/diff_source-param-nonf-qq.sh + +normal_exit diff --git a/test/diff/diff_cyclic5-16.sh b/test/diff/diff_cyclic5-16.sh index 5b34a90c..a528b61f 100755 --- a/test/diff/diff_cyclic5-16.sh +++ b/test/diff/diff_cyclic5-16.sh @@ -5,3 +5,5 @@ file=cyclic5-16 source test/diff/diff_source.sh source test/diff/diff_source-param-fullnf.sh + +normal_exit diff --git a/test/diff/diff_cyclic5-31.sh b/test/diff/diff_cyclic5-31.sh index 3cd27ff7..60c2ed89 100755 --- a/test/diff/diff_cyclic5-31.sh +++ b/test/diff/diff_cyclic5-31.sh @@ -5,3 +5,5 @@ file=cyclic5-31 source test/diff/diff_source.sh source test/diff/diff_source-param-fullnf.sh + +normal_exit diff --git a/test/diff/diff_cyclic5-qq.sh b/test/diff/diff_cyclic5-qq.sh index 3f924c8b..85441f53 100755 --- a/test/diff/diff_cyclic5-qq.sh +++ b/test/diff/diff_cyclic5-qq.sh @@ -11,3 +11,5 @@ source test/diff/diff_source-param-fullnf-qq.sh source test/diff/diff_source-gb-red.sh source test/diff/diff_source-gb-elim-red.sh + +normal_exit diff --git a/test/diff/diff_eco10-31.sh b/test/diff/diff_eco10-31.sh index 07639787..c6ae35f2 100755 --- a/test/diff/diff_eco10-31.sh +++ b/test/diff/diff_eco10-31.sh @@ -5,3 +5,5 @@ file=eco10-31 source test/diff/diff_source.sh source test/diff/diff_source-param-nonf.sh + +normal_exit diff --git a/test/diff/diff_eco6-16.sh b/test/diff/diff_eco6-16.sh index dea94038..663be6f3 100755 --- a/test/diff/diff_eco6-16.sh +++ b/test/diff/diff_eco6-16.sh @@ -5,3 +5,5 @@ file=eco6-16 source test/diff/diff_source.sh source test/diff/diff_source-param-fullnf.sh + +normal_exit diff --git a/test/diff/diff_eco6-31.sh b/test/diff/diff_eco6-31.sh index e91bf00f..5ba38185 100755 --- a/test/diff/diff_eco6-31.sh +++ b/test/diff/diff_eco6-31.sh @@ -5,3 +5,5 @@ file=eco6-31 source test/diff/diff_source.sh source test/diff/diff_source-param-fullnf.sh + +normal_exit diff --git a/test/diff/diff_eco6-qq.sh b/test/diff/diff_eco6-qq.sh index 77d4c23a..bb153bc6 100755 --- a/test/diff/diff_eco6-qq.sh +++ b/test/diff/diff_eco6-qq.sh @@ -7,3 +7,5 @@ source test/diff/diff_source.sh source test/diff/diff_source-param-fullnf.sh source test/diff/diff_source-param-fullnf-qq.sh + +normal_exit diff --git a/test/diff/diff_elim-31.sh b/test/diff/diff_elim-31.sh index bfecf124..e82e4dc8 100755 --- a/test/diff/diff_elim-31.sh +++ b/test/diff/diff_elim-31.sh @@ -5,3 +5,5 @@ file=elim-31 source test/diff/diff_source.sh source test/diff/diff_source-gb-elim-red.sh + +normal_exit diff --git a/test/diff/diff_elim-qq.sh b/test/diff/diff_elim-qq.sh index 3693dd23..33301bf7 100755 --- a/test/diff/diff_elim-qq.sh +++ b/test/diff/diff_elim-qq.sh @@ -5,3 +5,5 @@ file=elim-qq source test/diff/diff_source.sh source test/diff/diff_source-gb-elim-red.sh + +normal_exit diff --git a/test/diff/diff_f4sat-31.sh b/test/diff/diff_f4sat-31.sh index 7576b6d3..ffe54680 100755 --- a/test/diff/diff_f4sat-31.sh +++ b/test/diff/diff_f4sat-31.sh @@ -55,3 +55,5 @@ if [ $? -gt 0 ]; then fi rm test/diff/$file.61.res + +normal_exit diff --git a/test/diff/diff_f4sat-byone-31.sh b/test/diff/diff_f4sat-byone-31.sh index 46b25b03..b5aef9c8 100755 --- a/test/diff/diff_f4sat-byone-31.sh +++ b/test/diff/diff_f4sat-byone-31.sh @@ -55,3 +55,5 @@ if [ $? -gt 0 ]; then fi rm test/diff/$file.61.res + +normal_exit diff --git a/test/diff/diff_f4sat-field-char.sh b/test/diff/diff_f4sat-field-char.sh index e6944f61..3e547985 100755 --- a/test/diff/diff_f4sat-field-char.sh +++ b/test/diff/diff_f4sat-field-char.sh @@ -16,3 +16,5 @@ if [ $? -gt 0 ]; then fi rm test/diff/$file.1.res + +normal_exit diff --git a/test/diff/diff_f4sat-is-saturated-check.sh b/test/diff/diff_f4sat-is-saturated-check.sh index 893744a1..c13de562 100755 --- a/test/diff/diff_f4sat-is-saturated-check.sh +++ b/test/diff/diff_f4sat-is-saturated-check.sh @@ -18,3 +18,5 @@ if [ $? -gt 1 ]; then fi rm test/diff/$file.1.res + +normal_exit diff --git a/test/diff/diff_f4sat-zero-input.sh b/test/diff/diff_f4sat-zero-input.sh index 8105b81f..68ee1620 100755 --- a/test/diff/diff_f4sat-zero-input.sh +++ b/test/diff/diff_f4sat-zero-input.sh @@ -18,3 +18,5 @@ if [ $? -gt 1 ]; then fi rm test/diff/$file.res + +normal_exit diff --git a/test/diff/diff_groebner-g2.sh b/test/diff/diff_groebner-g2.sh index bd00e54c..ff830886 100755 --- a/test/diff/diff_groebner-g2.sh +++ b/test/diff/diff_groebner-g2.sh @@ -5,3 +5,5 @@ file=groebner-g2 source test/diff/diff_source.sh source test/diff/diff_source-gb-red.sh + +normal_exit diff --git a/test/diff/diff_henrion5-qq.sh b/test/diff/diff_henrion5-qq.sh index 155c3a2f..84ba64b3 100755 --- a/test/diff/diff_henrion5-qq.sh +++ b/test/diff/diff_henrion5-qq.sh @@ -12,3 +12,4 @@ source test/diff/diff_source-gb-red.sh source test/diff/diff_source-gb-elim-red.sh +normal_exit diff --git a/test/diff/diff_input-overflow-16.sh b/test/diff/diff_input-overflow-16.sh index 7d9561b0..8736b6f2 100755 --- a/test/diff/diff_input-overflow-16.sh +++ b/test/diff/diff_input-overflow-16.sh @@ -5,3 +5,5 @@ file=input-overflow-16 source test/diff/diff_source.sh source test/diff/diff_source-param-nonf.sh + +normal_exit diff --git a/test/diff/diff_issue-230-squared.sh b/test/diff/diff_issue-230-squared.sh index f6552240..950b37d8 100755 --- a/test/diff/diff_issue-230-squared.sh +++ b/test/diff/diff_issue-230-squared.sh @@ -5,3 +5,5 @@ file=issue-230-squared source test/diff/diff_source.sh source test/diff/diff_source-real-param-nonf.sh + +normal_exit diff --git a/test/diff/diff_issue-230.sh b/test/diff/diff_issue-230.sh index a05e4895..0d94414f 100755 --- a/test/diff/diff_issue-230.sh +++ b/test/diff/diff_issue-230.sh @@ -6,3 +6,4 @@ source test/diff/diff_source.sh source test/diff/diff_source-real-param-nonf.sh +normal_exit diff --git a/test/diff/diff_kat6-31.sh b/test/diff/diff_kat6-31.sh index ad877952..d41cc23a 100755 --- a/test/diff/diff_kat6-31.sh +++ b/test/diff/diff_kat6-31.sh @@ -5,3 +5,5 @@ file=kat6-31 source test/diff/diff_source.sh source test/diff/diff_source-param-nonf.sh + +normal_exit diff --git a/test/diff/diff_kat7-qq.sh b/test/diff/diff_kat7-qq.sh index 7f8be490..acbe2247 100755 --- a/test/diff/diff_kat7-qq.sh +++ b/test/diff/diff_kat7-qq.sh @@ -7,3 +7,5 @@ source test/diff/diff_source.sh source test/diff/diff_source-param-nonf.sh source test/diff/diff_source-param-nonf-qq.sh + +normal_exit diff --git a/test/diff/diff_kat8-qq-truncate.sh b/test/diff/diff_kat8-qq-truncate.sh index 743cd43c..9a0e3a00 100755 --- a/test/diff/diff_kat8-qq-truncate.sh +++ b/test/diff/diff_kat8-qq-truncate.sh @@ -55,3 +55,5 @@ if [ $? -gt 0 ]; then fi rm test/diff/$file.61.res + +normal_exit diff --git a/test/diff/diff_linear-qq.sh b/test/diff/diff_linear-qq.sh index 33cef66b..e9f73225 100755 --- a/test/diff/diff_linear-qq.sh +++ b/test/diff/diff_linear-qq.sh @@ -7,3 +7,5 @@ source test/diff/diff_source.sh source test/diff/diff_source-param-nonf.sh source test/diff/diff_source-param-nonf-qq.sh + +normal_exit diff --git a/test/diff/diff_maxbitsize-bug.sh b/test/diff/diff_maxbitsize-bug.sh index a103f1ab..18799b95 100755 --- a/test/diff/diff_maxbitsize-bug.sh +++ b/test/diff/diff_maxbitsize-bug.sh @@ -5,3 +5,5 @@ file=maxbitsize-bug source test/diff/diff_source.sh source test/diff/diff_source-noarg.sh + +normal_exit diff --git a/test/diff/diff_mq-2-1.sh b/test/diff/diff_mq-2-1.sh index 6ef7db51..24e7c2ae 100755 --- a/test/diff/diff_mq-2-1.sh +++ b/test/diff/diff_mq-2-1.sh @@ -5,3 +5,5 @@ file=mq-2-1 source test/diff/diff_source.sh source test/diff/diff_source-noarg.sh + +normal_exit diff --git a/test/diff/diff_multy-16.sh b/test/diff/diff_multy-16.sh index b9754809..e2d82990 100755 --- a/test/diff/diff_multy-16.sh +++ b/test/diff/diff_multy-16.sh @@ -5,3 +5,5 @@ file=multy-16 source test/diff/diff_source.sh source test/diff/diff_source-param-nonf.sh + +normal_exit diff --git a/test/diff/diff_multy-31.sh b/test/diff/diff_multy-31.sh index ae953ca8..cb2d9e17 100755 --- a/test/diff/diff_multy-31.sh +++ b/test/diff/diff_multy-31.sh @@ -5,3 +5,5 @@ file=multy-31 source test/diff/diff_source.sh source test/diff/diff_source-param-nonf.sh + +normal_exit diff --git a/test/diff/diff_multy-qq.sh b/test/diff/diff_multy-qq.sh index 0815239e..808ca8d0 100755 --- a/test/diff/diff_multy-qq.sh +++ b/test/diff/diff_multy-qq.sh @@ -7,3 +7,5 @@ source test/diff/diff_source.sh source test/diff/diff_source-param-nonf.sh source test/diff/diff_source-param-nonf-qq.sh + +normal_exit diff --git a/test/diff/diff_nf-16.sh b/test/diff/diff_nf-16.sh index 056dac2a..59e3d842 100755 --- a/test/diff/diff_nf-16.sh +++ b/test/diff/diff_nf-16.sh @@ -16,3 +16,5 @@ if [ $? -gt 0 ]; then fi rm test/diff/$file.1.res + +normal_exit diff --git a/test/diff/diff_nf-31.sh b/test/diff/diff_nf-31.sh index b4819828..cb3a22a8 100755 --- a/test/diff/diff_nf-31.sh +++ b/test/diff/diff_nf-31.sh @@ -16,3 +16,5 @@ if [ $? -gt 0 ]; then fi rm test/diff/$file.1.res + +normal_exit diff --git a/test/diff/diff_nf-8.sh b/test/diff/diff_nf-8.sh index 7fbf948b..e90813d5 100755 --- a/test/diff/diff_nf-8.sh +++ b/test/diff/diff_nf-8.sh @@ -16,3 +16,5 @@ if [ $? -gt 0 ]; then fi rm test/diff/$file.1.res + +normal_exit diff --git a/test/diff/diff_nf-lm-bug.sh b/test/diff/diff_nf-lm-bug.sh index a9b2a213..c54cec6d 100755 --- a/test/diff/diff_nf-lm-bug.sh +++ b/test/diff/diff_nf-lm-bug.sh @@ -16,3 +16,5 @@ if [ $? -gt 0 ]; then fi rm test/diff/$file.1.res + +normal_exit diff --git a/test/diff/diff_nonradical-radicalshape-no-square-31.sh b/test/diff/diff_nonradical-radicalshape-no-square-31.sh index 243368a2..82169572 100755 --- a/test/diff/diff_nonradical-radicalshape-no-square-31.sh +++ b/test/diff/diff_nonradical-radicalshape-no-square-31.sh @@ -55,3 +55,5 @@ if [ $? -gt 0 ]; then fi rm test/diff/$file.63.res + +normal_exit diff --git a/test/diff/diff_nonradical-radicalshape-no-square-qq.sh b/test/diff/diff_nonradical-radicalshape-no-square-qq.sh index 659c35ba..de3e8d6c 100755 --- a/test/diff/diff_nonradical-radicalshape-no-square-qq.sh +++ b/test/diff/diff_nonradical-radicalshape-no-square-qq.sh @@ -5,3 +5,5 @@ file=nonradical-radicalshape-no-square-qq source test/diff/diff_source.sh source test/diff/diff_source-real-param-nonf.sh + +normal_exit diff --git a/test/diff/diff_nonradical-radicalshape-qq.sh b/test/diff/diff_nonradical-radicalshape-qq.sh index 372c8ef1..b8e22f67 100755 --- a/test/diff/diff_nonradical-radicalshape-qq.sh +++ b/test/diff/diff_nonradical-radicalshape-qq.sh @@ -5,3 +5,5 @@ file=nonradical-radicalshape-qq source test/diff/diff_source.sh source test/diff/diff_source-real-param-nonf.sh + +normal_exit diff --git a/test/diff/diff_nonradical-shape-31.sh b/test/diff/diff_nonradical-shape-31.sh index d81c47ce..a463500b 100755 --- a/test/diff/diff_nonradical-shape-31.sh +++ b/test/diff/diff_nonradical-shape-31.sh @@ -3,3 +3,5 @@ file=nonradical-shape-31 source test/diff/diff_source.sh + +normal_exit diff --git a/test/diff/diff_nonradical-shape-qq.sh b/test/diff/diff_nonradical-shape-qq.sh index c823c9f0..bc2517ec 100755 --- a/test/diff/diff_nonradical-shape-qq.sh +++ b/test/diff/diff_nonradical-shape-qq.sh @@ -5,3 +5,5 @@ file=nonradical-shape-qq source test/diff/diff_source.sh source test/diff/diff_source-real-param-nonf.sh + +normal_exit diff --git a/test/diff/diff_nonradical_radicalshape-31.sh b/test/diff/diff_nonradical_radicalshape-31.sh index 5a5cf6e0..08c98e88 100755 --- a/test/diff/diff_nonradical_radicalshape-31.sh +++ b/test/diff/diff_nonradical_radicalshape-31.sh @@ -3,3 +3,5 @@ file=nonradical-radicalshape-31 source test/diff/diff_source.sh + +normal_exit diff --git a/test/diff/diff_one-16.sh b/test/diff/diff_one-16.sh index 16f643df..dbc0193b 100755 --- a/test/diff/diff_one-16.sh +++ b/test/diff/diff_one-16.sh @@ -6,4 +6,4 @@ source test/diff/diff_source.sh source test/diff/diff_source-noarg.sh - +normal_exit diff --git a/test/diff/diff_one-31.sh b/test/diff/diff_one-31.sh index 5759e6cd..d7dabd03 100755 --- a/test/diff/diff_one-31.sh +++ b/test/diff/diff_one-31.sh @@ -8,3 +8,4 @@ source test/diff/diff_source-noarg.sh source test/diff/diff_source-gb-lm.sh +normal_exit diff --git a/test/diff/diff_one-qq.sh b/test/diff/diff_one-qq.sh index a595bf12..29c829eb 100755 --- a/test/diff/diff_one-qq.sh +++ b/test/diff/diff_one-qq.sh @@ -8,3 +8,4 @@ source test/diff/diff_source-noarg.sh source test/diff/diff_source-gb-red.sh +normal_exit diff --git a/test/diff/diff_radical-shape-31.sh b/test/diff/diff_radical-shape-31.sh index f0c69969..7bff67bf 100755 --- a/test/diff/diff_radical-shape-31.sh +++ b/test/diff/diff_radical-shape-31.sh @@ -5,3 +5,5 @@ file=radical-shape-31 source test/diff/diff_source.sh source test/diff/diff_source-param-nonf.sh + +normal_exit diff --git a/test/diff/diff_radical-shape-qq.sh b/test/diff/diff_radical-shape-qq.sh index d51308be..30e5c50e 100755 --- a/test/diff/diff_radical-shape-qq.sh +++ b/test/diff/diff_radical-shape-qq.sh @@ -7,3 +7,5 @@ source test/diff/diff_source.sh source test/diff/diff_source-param-nonf.sh source test/diff/diff_source-param-nonf-qq.sh + +normal_exit diff --git a/test/diff/diff_realroot-extraction-exact-root.sh b/test/diff/diff_realroot-extraction-exact-root.sh index 27007746..10b227dc 100755 --- a/test/diff/diff_realroot-extraction-exact-root.sh +++ b/test/diff/diff_realroot-extraction-exact-root.sh @@ -5,3 +5,5 @@ file=realroot-extraction-exact-root source test/diff/diff_source.sh source test/diff/diff_source-real.sh + +normal_exit diff --git a/test/diff/diff_realroot1.sh b/test/diff/diff_realroot1.sh index 0fd682f4..54f934f5 100755 --- a/test/diff/diff_realroot1.sh +++ b/test/diff/diff_realroot1.sh @@ -9,3 +9,5 @@ file=realroot1 source test/diff/diff_source.sh source test/diff/diff_source-real.sh + +normal_exit diff --git a/test/diff/diff_reals-dim0-chgvar.sh b/test/diff/diff_reals-dim0-chgvar.sh index 68844184..ad136fe7 100755 --- a/test/diff/diff_reals-dim0-chgvar.sh +++ b/test/diff/diff_reals-dim0-chgvar.sh @@ -6,3 +6,4 @@ source test/diff/diff_source.sh source test/diff/diff_source-real.sh +normal_exit diff --git a/test/diff/diff_reals-dim0-extract.sh b/test/diff/diff_reals-dim0-extract.sh index e3ff1a76..93868796 100755 --- a/test/diff/diff_reals-dim0-extract.sh +++ b/test/diff/diff_reals-dim0-extract.sh @@ -5,3 +5,5 @@ file=reals-dim0-extract source test/diff/diff_source.sh source test/diff/diff_source-real.sh + +normal_exit diff --git a/test/diff/diff_reals-dim0-swapvar.sh b/test/diff/diff_reals-dim0-swapvar.sh index de69024e..f09333eb 100755 --- a/test/diff/diff_reals-dim0-swapvar.sh +++ b/test/diff/diff_reals-dim0-swapvar.sh @@ -5,3 +5,5 @@ file=reals-dim0-swapvar source test/diff/diff_source.sh source test/diff/diff_source-real.sh + +normal_exit diff --git a/test/diff/diff_reals-dim0.sh b/test/diff/diff_reals-dim0.sh index 596f7122..30501581 100755 --- a/test/diff/diff_reals-dim0.sh +++ b/test/diff/diff_reals-dim0.sh @@ -5,3 +5,5 @@ file=reals-dim0 source test/diff/diff_source.sh source test/diff/diff_source-real.sh + +normal_exit diff --git a/test/diff/diff_source-gb-elim-red.sh b/test/diff/diff_source-gb-elim-red.sh index 38edc056..ed446de9 100644 --- a/test/diff/diff_source-gb-elim-red.sh +++ b/test/diff/diff_source-gb-elim-red.sh @@ -109,5 +109,3 @@ if [ $? -gt 0 ]; then fi rm test/diff/$file.67.res - - diff --git a/test/diff/diff_source.sh b/test/diff/diff_source.sh index cd5139cb..6e4a18c3 100755 --- a/test/diff/diff_source.sh +++ b/test/diff/diff_source.sh @@ -1,36 +1,59 @@ seed=${SEED:-$EPOCHSECONDS} -isatty=false -[ -t 1 ] && isatty=true -[ -t 2 ] && isatty=true +setup_output() { + # already initialized? -> do nothing + [ -n "${_msolve_test_output:-}" ] && return + _msolve_test_output=1 -if $isatty; then - # colseed='\033[0;96m' # High Intensity Light blue. - colseed=$(tput setaf 14) # High Intensity Light blue. - # colexit='\033[0;93m' # High Intensity Yellow. - colexit=$(tput setaf 11) # High Intensity Yellow. - # std='\033[0m' - std=$(tput sgr0) -else - colseed= - colexit= - std= -fi + # defaults (safe for logs / CI / pipes) + isatty=0 + use_color=0 + use_cr=0 + + # No colored output (default) + colseed="" + colexit="" + std="" + + # Last character after normal exit + lastcharexit="\n" + + # Detect terminal on stderr (diagnostics channel) + if [ -t 2 ] && [ -n "$TERM" ] && [ "$TERM" != dumb ]; then + isatty=1 + use_color=1 + use_cr=1 + fi + + # Colored output + if [ "$use_color" -eq 1 ]; then + # colseed='\033[0;96m' # High Intensity Light blue. + colseed=$(tput setaf 14) # High Intensity Light blue. + # colexit='\033[0;93m' # High Intensity Yellow. + colexit=$(tput setaf 11) # High Intensity Yellow. + # std='\033[0m' + std=$(tput sgr0) + fi + + # Carriage return afer normal exit + if [ "$use_cr" -eq 1 ]; then + lastcharexit="\r" + fi +} # print the seed in color -# carriage return if tty to prevent too many lines -# when the test is successful print_seed() { - if $isatty; then - # interactive terminal -> overwrite line - printf "\r" - fi - printf "${colseed}SEED${std}: %-10d " $seed >&2 + setup_output + printf "${beforeseed}${colseed}SEED${std}: %-10d " $seed >&2 } print_seed +normal_exit() { + printf "$lastcharexit" >&2 +} + # print the exit code in color print_exit() { local excode=$1 diff --git a/test/diff/diff_test-lifting2.sh b/test/diff/diff_test-lifting2.sh index 69dfc90b..8a18d8b4 100755 --- a/test/diff/diff_test-lifting2.sh +++ b/test/diff/diff_test-lifting2.sh @@ -8,3 +8,5 @@ source test/diff/diff_source-param-nonf.sh source test/diff/diff_source-param-nonf-qq.sh +normal_exit + diff --git a/test/diff/diff_xy-qq.sh b/test/diff/diff_xy-qq.sh index 47e76cb3..020c0166 100755 --- a/test/diff/diff_xy-qq.sh +++ b/test/diff/diff_xy-qq.sh @@ -7,3 +7,5 @@ source test/diff/diff_source.sh source test/diff/diff_source-param-nonf.sh source test/diff/diff_source-param-nonf-qq.sh + +normal_exit From 64e588dc8c88f30b2226032ad86c4a488f0984ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Berthomieu?= Date: Thu, 12 Feb 2026 01:10:55 +0100 Subject: [PATCH 14/15] fix rebase issue --- src/msolve/main.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/msolve/main.c b/src/msolve/main.c index 24d36333..dfdb2e6d 100644 --- a/src/msolve/main.c +++ b/src/msolve/main.c @@ -30,11 +30,7 @@ static inline void display_option_help(char short_opt, char *long_opt, char *arg_opt, char* str) { int long_opt_non_empty= strcmp (long_opt, ""); -<<<<<<< HEAD -======= - ->>>>>>> 7ec0ae3 (some files in make check where not sourcing the template files) if (short_opt == 0) { fprintf (stdout, " "); } else { @@ -175,11 +171,7 @@ static inline void display_help(char *str){ display_option_help('q', "", "Q", "Uses signature-based algorithms.\n"); display_option_help_noopt("0 - no (default).\n"); display_option_help_noopt("1 - yes.\n"); -<<<<<<< HEAD display_option_help(0, "random-seed", "SEED", "Random seed to initialize the pseudo\n"); -======= - display_option_help(0, "random_seed", "SEED", "Random seed to initialize the pseudo\n"); ->>>>>>> 7ec0ae3 (some files in make check where not sourcing the template files) display_option_help_noopt("random generator\n"); display_option_help_noopt("-1 - time(0) will be used (default)\n"); display_option_help_noopt("SEED ≥ 0 - use at your own risks;\n"); @@ -248,13 +240,9 @@ static void getoptions( see https://cgit.git.savannah.gnu.org/cgit/coreutils.git/tree/src/ls.c */ enum { RANDOM_SEED_OPTION = CHAR_MAX + 1, -<<<<<<< HEAD /* Below is the template for the next long option with * no equivalent short option */ /* NEXT_OPTION */ -======= - /* MUL_MAT_OPION */ ->>>>>>> 7ec0ae3 (some files in make check where not sourcing the template files) }; struct option long_options[] = { {"elimination", required_argument, NULL, 'e'}, From e129fe00972c640e01c5e6a12b360b78b40c951e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Berthomieu?= Date: Mon, 16 Feb 2026 15:59:51 +0100 Subject: [PATCH 15/15] revert some changes: messages to stderr for legacy code --- src/msolve/hilbert.c | 26 +++++++++++++------------- src/msolve/main.c | 6 ------ 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/src/msolve/hilbert.c b/src/msolve/hilbert.c index f05bfdbe..b697ae67 100644 --- a/src/msolve/hilbert.c +++ b/src/msolve/hilbert.c @@ -1548,10 +1548,10 @@ static inline sp_matfglm_t * build_matrixn(int32_t *lmb, long dquot, int32_t bld } } else{ - fprintf(stdout, "\nStaircase is not generic\n"); - fprintf(stdout, "Multiplication by "); - display_monomial_full(stdout, nv, NULL, 0, exp); - fprintf(stdout, " gets outside the staircase\n"); + fprintf(stderr, "\nStaircase is not generic\n"); + fprintf(stderr, "Multiplication by "); + display_monomial_full(stderr, nv, NULL, 0, exp); + fprintf(stderr, " gets outside the staircase\n"); free(matrix->dense_mat); free(matrix->dense_idx); free(matrix->triv_idx); @@ -2607,10 +2607,10 @@ static inline sp_matfglm_t * build_matrixn_trace(int32_t **bdiv_xn, } } else{ - fprintf(stdout, "Staircase is not generic\n"); - fprintf(stdout, "Multiplication by "); + fprintf(stderr, "Staircase is not generic\n"); + fprintf(stderr, "Multiplication by "); display_monomial_full(stderr, nv, NULL, 0, exp); - fprintf(stdout, " gets outside the staircase\n"); + fprintf(stderr, " gets outside the staircase\n"); free(matrix->dense_mat); free(matrix->dense_idx); free(matrix->triv_idx); @@ -2997,10 +2997,10 @@ static inline void build_matrixn_from_bs_trace_application(sp_matfglm_t *matrix, } } else{ - fprintf(stdout, "Staircase is not generic\n"); - fprintf(stdout, "Multiplication by "); + fprintf(stderr, "Staircase is not generic\n"); + fprintf(stderr, "Multiplication by "); display_monomial_full(stderr, nv, NULL, 0, exp); - fprintf(stdout, " gets outside the staircase\n"); + fprintf(stderr, " gets outside the staircase\n"); free(matrix->dense_mat); free(matrix->dense_idx); free(matrix->triv_idx); @@ -3206,10 +3206,10 @@ static inline void build_matrixn_unstable_from_bs_trace_application(sp_matfglm_t } } else{ /* should not arrive here */ - fprintf(stdout, "Staircase is not generic\n"); - fprintf(stdout, "Multiplication by "); + fprintf(stderr, "Staircase is not generic\n"); + fprintf(stderr, "Multiplication by "); display_monomial_full(stderr, nv, NULL, 0, exp); - fprintf(stdout, " gets outside the staircase\n"); + fprintf(stderr, " gets outside the staircase\n"); free(matrix->dense_mat); free(matrix->dense_idx); free(matrix->triv_idx); diff --git a/src/msolve/main.c b/src/msolve/main.c index dfdb2e6d..21feaa89 100644 --- a/src/msolve/main.c +++ b/src/msolve/main.c @@ -163,11 +163,6 @@ static inline void display_help(char *str){ display_option_help_noopt("0 - no lifting (default). \n"); display_option_help_noopt("1 - matrices are lifted.\n"); display_option_help_noopt("Warning: when activated, this option may cause higher memory consumption.\n"); - /* display_option_help(0, "mul-mat", "MAT", "Compute multiplication matrices."); */ - /* display_option_help_noopt("MAT has to be a number between 1 and #variables,\n"); */ - /* display_option_help_noopt("and gives the number of multiplication matrices, starting\n"); */ - /* display_option_help_noopt("from the last one.\n"); */ - /* display_option_help_noopt("not yet implemented.\n"); */ display_option_help('q', "", "Q", "Uses signature-based algorithms.\n"); display_option_help_noopt("0 - no (default).\n"); display_option_help_noopt("1 - yes.\n"); @@ -252,7 +247,6 @@ static void getoptions( {"isolate", required_argument, NULL, 'I'}, {"linear-algebra", required_argument, NULL, 'l'}, {"lifting-mulmat", required_argument, NULL, 'L'}, - /* {"mul-mat", required_argument, NULL, MUL_MAT_OPION}, */ {"normal-form", required_argument, NULL, 'n'}, {"output-file", required_argument, NULL, 'o'}, {"precision", required_argument, NULL, 'p'},