aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/cm/cm.c8
-rw-r--r--src/cm/custom.c12
-rw-r--r--src/cm/custom.h6
-rw-r--r--src/cm/p1363.c87
-rw-r--r--src/cm/p1363.h4
-rw-r--r--test/src/cm/test_custom.c8
-rw-r--r--test/src/cm/test_p1363.c25
7 files changed, 75 insertions, 75 deletions
diff --git a/src/cm/cm.c b/src/cm/cm.c
index 3d684d9..48a9c5f 100644
--- a/src/cm/cm.c
+++ b/src/cm/cm.c
@@ -3,8 +3,8 @@
* Copyright (C) 2017-2018 J08nY
*/
#include "cm.h"
-#include "io/output.h"
#include "custom.h"
+#include "io/output.h"
#include "p1363.h"
int cm_do() {
@@ -15,11 +15,9 @@ int cm_do() {
GEN D = stoi(71);
p1363_form_t **forms;
size_t nforms = p1363_forms(D, &forms);
- for (size_t i = 0; i < nforms; ++i) {
- p1363_invariant(D, forms[i]);
- }
+ GEN WD = p1363_poly(D, forms, nforms);
+ pari_printf("%Ps\n", WD);
p1363_free(&forms, nforms);
- custom_curve();
debug_log_start("Finished Complex Multiplication method");
return 0;
diff --git a/src/cm/custom.c b/src/cm/custom.c
index fc403e5..9309ed9 100644
--- a/src/cm/custom.c
+++ b/src/cm/custom.c
@@ -8,13 +8,9 @@
static bool custom_is_disc(GEN test) {
bool result = true;
long md4;
- pari_CATCH(e_DOMAIN)
- {
- result = false;
- }
- pari_TRY{ check_quaddisc_imag(test, &md4, ""); };
- pari_ENDCATCH
- return result;
+ pari_CATCH(e_DOMAIN) { result = false; }
+ pari_TRY { check_quaddisc_imag(test, &md4, ""); };
+ pari_ENDCATCH return result;
}
static GEN custom_disc(GEN order, GEN prime) {
@@ -93,7 +89,7 @@ static custom_quadr_t custom_prime_random(GEN order) {
GEN v = gen_0;
GEN D;
long i = 2;
- //TODO: this is wrong, order = p + 1 +- t is not kept.
+ // TODO: this is wrong, order = p + 1 +- t is not kept.
while (gequal0(t)) {
D = stoi(-4 * (i / 2) + (i % 2));
for (long j = 0; j < 100; ++j) {
diff --git a/src/cm/custom.h b/src/cm/custom.h
index ed6f3d3..da5007a 100644
--- a/src/cm/custom.h
+++ b/src/cm/custom.h
@@ -5,8 +5,8 @@
#ifndef ECGEN_CUSTOM_H
#define ECGEN_CUSTOM_H
-#include "misc/types.h"
#include "misc/config.h"
+#include "misc/types.h"
typedef struct {
GEN p;
@@ -19,6 +19,6 @@ typedef struct {
* @brief
* @return
*/
-curve_t * custom_curve();
+curve_t* custom_curve();
-#endif //ECGEN_CUSTOM_H
+#endif // ECGEN_CUSTOM_H
diff --git a/src/cm/p1363.c b/src/cm/p1363.c
index 119b0cb..5ead675 100644
--- a/src/cm/p1363.c
+++ b/src/cm/p1363.c
@@ -79,15 +79,15 @@ void p1363_free(p1363_form_t ***forms, size_t nforms) {
}
}
-static GEN p1363_func_F(GEN z) {
+static GEN p1363_func_F(GEN z, long precision) {
pari_sp ltop = avma;
if (gequal0(z)) {
return gcopy(gen_1);
}
- GEN sum = cgetc(BIGDEFAULTPREC * 5);
- gel(sum, 1) = real_1(BIGDEFAULTPREC * 5);
- gel(sum, 2) = real_0(BIGDEFAULTPREC * 5);
+ GEN sum = cgetc(precision * 2);
+ gel(sum, 1) = real_1(precision);
+ gel(sum, 2) = real_0(precision);
pari_printf("initial sum = %Ps\n", sum);
GEN last;
@@ -99,8 +99,7 @@ static GEN p1363_func_F(GEN z) {
GEN quota = divis(subii(j3, j), 2);
GEN quotb = divis(addii(j3, j), 2);
- GEN term = gadd(gpow(z, quota, BIGDEFAULTPREC),
- gpow(z, quotb, BIGDEFAULTPREC));
+ GEN term = gadd(gpow(z, quota, precision), gpow(z, quotb, precision));
pari_printf("%Ps %Ps \n", sum, term);
if (mod2(j) == 0) {
sum = gadd(sum, term);
@@ -117,37 +116,37 @@ static GEN p1363_func_F(GEN z) {
return gerepilecopy(ltop, sum);
}
-static GEN p1363_func_fzero(GEN D, p1363_form_t *form) {
+static GEN p1363_func_fzero(GEN D, p1363_form_t *form, long precision) {
pari_sp ltop = avma;
- GEN upper = p1363_func_F(gneg(form->theta));
- GEN lower = p1363_func_F(gsqr(form->theta));
- GEN front = gpow(form->theta, gdivgs(gen_m1, 24), BIGDEFAULTPREC * 5);
+ GEN upper = p1363_func_F(gneg(form->theta), precision);
+ GEN lower = p1363_func_F(gsqr(form->theta), precision);
+ GEN front = gpow(form->theta, gdivgs(gen_m1, 24), precision);
GEN result = gmul(gdiv(upper, lower), front);
return gerepilecopy(ltop, result);
}
-static GEN p1363_func_fone(GEN D, p1363_form_t *form) {
+static GEN p1363_func_fone(GEN D, p1363_form_t *form, long precision) {
pari_sp ltop = avma;
- GEN upper = p1363_func_F(form->theta);
- GEN lower = p1363_func_F(gsqr(form->theta));
- GEN front = gpow(form->theta, gdivgs(gen_m1, 24), BIGDEFAULTPREC * 5);
+ GEN upper = p1363_func_F(form->theta, precision);
+ GEN lower = p1363_func_F(gsqr(form->theta), precision);
+ GEN front = gpow(form->theta, gdivgs(gen_m1, 24), precision);
GEN result = gmul(gdiv(upper, lower), front);
return gerepilecopy(ltop, result);
}
-static GEN p1363_func_ftwo(GEN D, p1363_form_t *form) {
+static GEN p1363_func_ftwo(GEN D, p1363_form_t *form, long precision) {
pari_sp ltop = avma;
- GEN upper = p1363_func_F(gpowgs(form->theta, 4));
- GEN lower = p1363_func_F(gsqr(form->theta));
- GEN front = gmul(sqrti(gen_2),
- gpow(form->theta, gdivgs(gen_1, 12), BIGDEFAULTPREC * 5));
+ GEN upper = p1363_func_F(gpowgs(form->theta, 4), precision);
+ GEN lower = p1363_func_F(gsqr(form->theta), precision);
+ GEN front =
+ gmul(sqrti(gen_2), gpow(form->theta, gdivgs(gen_1, 12), precision));
GEN result = gmul(gdiv(upper, lower), front);
@@ -287,20 +286,20 @@ static void p1363_N(GEN D, p1363_form_t *form) {
form->N = gerepileupto(ltop, form->N);
}
-static void p1363_lambda(GEN D, p1363_form_t *form) {
+static void p1363_lambda(GEN D, p1363_form_t *form, long precision) {
pari_sp ltop = avma;
- GEN pik = mulri(mppi(BIGDEFAULTPREC), stoi(form->K));
+ GEN pik = mulri(mppi(precision), stoi(form->K));
GEN quot = divrs(pik, 24);
form->lambda = gerepileupto(ltop, expIr(quot));
}
-static void p1363_theta(GEN D, p1363_form_t *form) {
+static void p1363_theta(GEN D, p1363_form_t *form, long precision) {
pari_sp ltop = avma;
- GEN upper = gadd(gneg(gsqrt(D, BIGDEFAULTPREC)), gmul(form->B, gen_I()));
- GEN quot = gmul(gdiv(upper, form->A), mppi(BIGDEFAULTPREC));
+ GEN upper = gadd(gneg(gsqrt(D, precision)), gmul(form->B, gen_I()));
+ GEN quot = gmul(gdiv(upper, form->A), mppi(precision));
- form->theta = gerepileupto(ltop, gexp(quot, BIGDEFAULTPREC));
+ form->theta = gerepileupto(ltop, gexp(quot, precision));
}
/**
@@ -310,22 +309,23 @@ static void p1363_theta(GEN D, p1363_form_t *form) {
* @param D
* @param forms
* @param nforms
- * @return
+ * @return The pari precision required for W_D.
*/
-static long p1363_bit_precision(GEN D, p1363_form_t **forms, size_t nforms) {
+long p1363_bit_precision(GEN D, p1363_form_t **forms, size_t nforms) {
pari_sp ltop = avma;
long v0 = 32;
- GEN mul = divrr(mulrr(mppi(BIGDEFAULTPREC), sqrti(D)), mplog2(BIGDEFAULTPREC));
+ GEN mul =
+ divrr(mulrr(mppi(BIGDEFAULTPREC), sqrti(D)), mplog2(BIGDEFAULTPREC));
GEN sum = gen_0;
for (size_t i = 0; i < nforms; ++i) {
sum = gadd(sum, ginv(forms[i]->A));
}
- long result = v0 + itos(mpceil(mulrr(mul, sum)));
+ long result = v0 + itos(gceil(gmul(mul, sum)));
avma = ltop;
- return result;
+ return nbits2prec(result);
}
-GEN p1363_invariant(GEN D, p1363_form_t *form) {
+GEN p1363_invariant(GEN D, p1363_form_t *form, long precision) {
pari_printf("[A,B,C] = %Pi %Pi %Pi\n", form->A, form->B, form->C);
pari_sp ltop = avma;
@@ -342,9 +342,9 @@ GEN p1363_invariant(GEN D, p1363_form_t *form) {
pari_printf("M = %Pi\n", form->M);
p1363_N(D, form);
pari_printf("N = %Pi\n", form->N);
- p1363_lambda(D, form);
+ p1363_lambda(D, form, precision);
pari_printf("lambda = %Ps\n", form->lambda);
- p1363_theta(D, form);
+ p1363_theta(D, form, precision);
pari_printf("theta = %Ps\n", form->theta);
GEN G = gcdii(D, stoi(3));
@@ -352,23 +352,23 @@ GEN p1363_invariant(GEN D, p1363_form_t *form) {
GEN bl = mulii(form->B, form->L);
- GEN lmbl = gpow(form->lambda, negi(bl), BIGDEFAULTPREC);
+ GEN lmbl = gpow(form->lambda, negi(bl), precision);
pari_printf("lmbl = %Ps\n", lmbl);
GEN mi6 = gneg(gdiv(stoi(form->I), stoi(6)));
- GEN powmi6 = gpow(gen_2, mi6, BIGDEFAULTPREC);
+ GEN powmi6 = gpow(gen_2, mi6, precision);
pari_printf("powmi6 = %Ps\n", powmi6);
GEN f = gen_0;
switch (form->J) {
case 0:
- f = p1363_func_fzero(D, form);
+ f = p1363_func_fzero(D, form, precision);
break;
case 1:
- f = p1363_func_fone(D, form);
+ f = p1363_func_fone(D, form, precision);
break;
case 2:
- f = p1363_func_ftwo(D, form);
+ f = p1363_func_ftwo(D, form, precision);
break;
default:
pari_err_DOMAIN("p1363_invariant", "J", ">", stoi(2),
@@ -377,14 +377,14 @@ GEN p1363_invariant(GEN D, p1363_form_t *form) {
pari_printf("f = %Ps\n", f);
- GEN fK = gpow(f, stoi(form->K), BIGDEFAULTPREC);
+ GEN fK = gpow(f, stoi(form->K), precision);
pari_printf("fK = %Ps\n", fK);
GEN in = gmul(lmbl, powmi6);
pari_printf("in = %Ps\n", in);
GEN inner = gmul(gmul(form->N, in), fK);
pari_printf("inner = %Ps\n", inner);
- GEN result = gpow(inner, G, BIGDEFAULTPREC);
+ GEN result = gpow(inner, G, precision);
pari_printf("result = %Ps\n", result);
return gerepilecopy(ltop, result);
@@ -395,14 +395,17 @@ GEN p1363_poly(GEN D, p1363_form_t **forms, size_t nforms) {
long v = fetch_var();
name_var(v, "t");
+ long precision = p1363_bit_precision(D, forms, nforms);
+
GEN terms = gtovec0(gen_0, nforms);
for (size_t i = 0; i < nforms; ++i) {
- gel(terms, i + 1) = gsub(pol_x(v), p1363_invariant(D, forms[i]));
+ gel(terms, i + 1) =
+ gsub(pol_x(v), p1363_invariant(D, forms[i], precision));
}
GEN result = gen_1;
for (size_t i = 0; i < nforms; ++i) {
- gmulz(result, gel(terms, i + 1), result);
+ result = gmul(result, gel(terms, i + 1));
}
return gerepilecopy(ltop, result);
}
diff --git a/src/cm/p1363.h b/src/cm/p1363.h
index ef6f7a2..7201d80 100644
--- a/src/cm/p1363.h
+++ b/src/cm/p1363.h
@@ -32,7 +32,9 @@ size_t p1363_forms(GEN D, p1363_form_t ***forms);
void p1363_free(p1363_form_t ***forms, size_t nforms);
-GEN p1363_invariant(GEN D, p1363_form_t *form);
+GEN p1363_invariant(GEN D, p1363_form_t *form, long precision);
+
+long p1363_bit_precision(GEN D, p1363_form_t **forms, size_t nforms);
GEN p1363_poly(GEN D, p1363_form_t **forms, size_t nforms);
diff --git a/test/src/cm/test_custom.c b/test/src/cm/test_custom.c
index 3309de7..dd331e6 100644
--- a/test/src/cm/test_custom.c
+++ b/test/src/cm/test_custom.c
@@ -4,11 +4,11 @@
*/
#include <criterion/criterion.h>
+#include "cm/custom.h"
#include "misc/config.h"
-#include "util/random.h"
#include "test/default.h"
#include "test/input.h"
-#include "cm/custom.h"
+#include "util/random.h"
void custom_setup() {
default_setup();
@@ -16,9 +16,7 @@ void custom_setup() {
random_init();
}
-void custom_teardown() {
- input_teardown();
-}
+void custom_teardown() { input_teardown(); }
TestSuite(custom, .init = custom_setup, .fini = custom_teardown);
diff --git a/test/src/cm/test_p1363.c b/test/src/cm/test_p1363.c
index fdc1823..7bdc6be 100644
--- a/test/src/cm/test_p1363.c
+++ b/test/src/cm/test_p1363.c
@@ -4,9 +4,8 @@
*/
#include <criterion/criterion.h>
-#include "test/default.h"
#include "cm/p1363.h"
-
+#include "test/default.h"
TestSuite(p1363, .init = default_setup, .fini = default_teardown);
@@ -16,18 +15,22 @@ Test(p1363, test_p1363_forms) {
size_t nforms = p1363_forms(D, &forms);
p1363_form_t expected[7] = {
- {gen_1, gen_0, stoi(71)},
- {stoi(3), gen_1, stoi(24)},
- {stoi(3), gen_m1, stoi(24)},
- {stoi(8), gen_1, stoi(9)},
- {stoi(8), gen_m1, stoi(9)},
- {stoi(5), stoi(2), stoi(15)},
- {stoi(5), stoi(-2), stoi(15)}
- };
- cr_assert_eq(nforms, 7,);
+ {gen_1, gen_0, stoi(71)}, {stoi(3), gen_1, stoi(24)},
+ {stoi(3), gen_m1, stoi(24)}, {stoi(8), gen_1, stoi(9)},
+ {stoi(8), gen_m1, stoi(9)}, {stoi(5), stoi(2), stoi(15)},
+ {stoi(5), stoi(-2), stoi(15)}};
+ cr_assert_eq(nforms, 7, );
for (size_t i = 0; i < nforms; ++i) {
cr_assert(equalii(forms[i]->A, expected[i].A), );
cr_assert(equalii(forms[i]->B, expected[i].B), );
cr_assert(equalii(forms[i]->C, expected[i].C), );
}
+}
+
+Test(p1363, test_p1363_poly) {
+ GEN D = stoi(71);
+ p1363_form_t **forms;
+ size_t nforms = p1363_forms(D, &forms);
+ GEN WD = p1363_poly(D, forms, nforms);
+ pari_printf("%Ps\n", WD);
} \ No newline at end of file
generated by cgit v1.2.3-70-g09d2 (git 2.51.2) at 2025-11-08 11:00:15 +0000