Commit 94cb1e09 authored by Peter Bruin's avatar Peter Bruin

move print statement to gp_eval_args

parent d560178f
......@@ -22,7 +22,7 @@ gp_eval_raw = echo $(1) | $(GP) $(2) > $(3)
gp_catch = "iferr(" $(1) ",e,write(\"/dev/stderr\",e);quit(1))"
# Evaluate $(1) in GP with arguments $(2), catching errors and writing
# the result to $(3).
gp_eval_args = $(call gp_eval_raw,$(call gp_catch,$(1)),$(2),$(3))
gp_eval_args = $(call gp_eval_raw,"print(" $(call gp_catch,$(1)) ");",$(2),$(3))
# Evaluate $(1) in GP, catching errors and writing the result to $(2).
gp_eval = $(call gp_eval_args,$(1),@pkgdatadir@/functions.gp,$(2))
# Evaluate $(1) in GP with arguments $(2), catching errors and writing
......
......@@ -284,15 +284,15 @@ pairing(p) =
W = matrix(m^2, m^2, i, j,
polcoeff(polcoeff(Wpol, i - 1, x), j - 1, y));
/* Return the matrix of the dual pairing (this has smaller height). */
print(W~^-1);
W~^-1;
}
pairing_red(p) =
{
my(T = Mod(read(filename("pairing", p)), p),
P = Mod(readvec("reduced_bases.gp"), p));
print(liftint(if(#P == 1, P[1]~ * T * P[1],
P[1]~ * T * P[2])));
liftint(if(#P == 1, P[1]~ * T * P[1],
P[1]~ * T * P[2]));
}
/*
......@@ -655,7 +655,7 @@ reconstruct_pairing() =
W = bestappr(W);
if(W == [],
error("cannot reconstruct pairing matrix"));
print(W);
W;
}
reconstruct_reduced_pairing() =
......@@ -665,7 +665,7 @@ reconstruct_reduced_pairing() =
W = bestappr(W);
if(W == [],
error("cannot reconstruct reduced pairing matrix"));
print(W);
W;
}
reduced_dual_pair() =
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment