Use sum_jet_all in t-sum_jet_00

j-kieffer · Sep 4, 2024 · 77b4f2f · 77b4f2f
1 parent 98d8d86
commit 77b4f2f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/src/acb_theta/test/main.c b/src/acb_theta/test/main.c
@@ -54,7 +54,6 @@
 #include "t-g2_transvectant.c"
 #include "t-g2_transvectant_lead.c"
 #include "t-jet_00.c"
-#include "t-jet_00_notransform.c"
 #include "t-jet_all.c"
 #include "t-jet_all_notransform.c"
 #include "t-jet_one_notransform.c"
@@ -147,7 +146,6 @@ test_struct tests[] =
     TEST_FUNCTION(acb_theta_g2_transvectant),
     TEST_FUNCTION(acb_theta_g2_transvectant_lead),
     TEST_FUNCTION(acb_theta_jet_00),
-    TEST_FUNCTION(acb_theta_jet_00_notransform),
     TEST_FUNCTION(acb_theta_jet_all),
     TEST_FUNCTION(acb_theta_jet_all_notransform),
     TEST_FUNCTION(acb_theta_jet_one_notransform),

diff --git a/src/acb_theta/test/t-sum_jet_00.c b/src/acb_theta/test/t-sum_jet_00.c
@@ -18,11 +18,13 @@ TEST_FUNCTION_START(acb_theta_sum_jet_00, state)
 {
     slong iter;
 
-    /* Test: matches jet_naive_00 */
+    /* Test: matches sum_jet_all */
     for (iter = 0; iter < 50 * flint_test_multiplier(); iter++)
     {
-        slong g = 1 + n_randint(state, 3);
-        slong prec = 100 + n_randint(state, 100);
+        slong g = 1 + n_randint(state, 2);
+        slong n2 = 1 << (2 * g);
+        slong mprec = 50 + n_randint(state, 100);
+        slong prec = mprec + 50;
         slong ord = n_randint(state, 4);
         slong mag_bits = n_randint(state, 4);
         slong nbz = 1 + n_randint(state, 4);
@@ -39,27 +41,29 @@ TEST_FUNCTION_START(acb_theta_sum_jet_00, state)
         acb_theta_ctx_tau_init(ctx_tau, g);
         vec = acb_theta_ctx_z_vec_init(nbz, g);
         th1 = _acb_vec_init(nbz * nbth);
-        th2 = _acb_vec_init(nbz * nbth);
+        th2 = _acb_vec_init(nbz * nbth * n2);
 
         acb_siegel_randtest_reduced(tau, state, prec, mag_bits);
-        acb_siegel_randtest_vec(zs, state, nbz * g, prec);
-
         acb_theta_ctx_tau_set(ctx_tau, tau, prec);
         for (j = 0; j < nbz; j++)
         {
+            acb_siegel_randtest_vec_reduced(zs + j * g, state, tau, 0, prec);
             acb_theta_ctx_z_set(&vec[j], zs + j * g, ctx_tau, prec);
         }
 
-        acb_theta_sum_jet_00(th1, vec, nbz, ctx_tau, ord, prec);
+        /* Call sum_jet_00 at precision mprec, test against sum_jet_all */
+        acb_theta_sum_jet_00(th1, vec, nbz, ctx_tau, ord, mprec);
+        acb_theta_sum_jet_all(th2, vec, nbz, ctx_tau, ord, prec);
         for (j = 0; j < nbz; j++)
         {
-            acb_theta_jet_naive_00(th2 + j * nbth, zs + j * g, tau, ord, prec);
+            _acb_vec_set(th2 + j * nbth, th2 + j * n2 * nbth, nbth);
         }
 
         if (!_acb_vec_overlaps(th1, th2, nbz * nbth))
         {
             flint_printf("FAIL\n");
-            flint_printf("\n\ng=%wd, ord=%wd\n", g, ord);
+            flint_printf("g = %wd, nbz = %wd, ord = %wd, mprec = %wd, prec = %wd\n",
+                g, nbz, ord, mprec, prec);
             acb_mat_printd(tau, 5);
             _acb_vec_printd(zs, nbz * g, 5);
             flint_printf("th1 : ");
@@ -78,7 +82,7 @@ TEST_FUNCTION_START(acb_theta_sum_jet_00, state)
         acb_theta_ctx_tau_clear(ctx_tau);
         acb_theta_ctx_z_vec_clear(vec, nbz);
         _acb_vec_clear(th1, nbz * nbth);
-        _acb_vec_clear(th2, nbz * nbth);
+        _acb_vec_clear(th2, nbz * nbth * n2);
     }
 
     TEST_FUNCTION_END(state);