Skip to content

Commit 6c16c18

Browse files
lorenzogentile404lorenzogentile404
authoredMar 25, 2025··
Revert "46 fixecdata calltoc1membershipwcp (#47)" (#131)
This reverts commit 0649956.
·
beta-v2Paris
1 parent 0649956 commit 6c16c18

File tree

5 files changed

+52
-180
lines changed

5 files changed

+52
-180
lines changed
 

‎pkg/precompiles.sty

+30-91
Original file line numberDiff line numberDiff line change
@@ -126,120 +126,59 @@
126126
\newcol{\csEcmul} {CS\_ECMUL}{CIRCUIT\_SELECTOR\_ECMUL}
127127
\newcol{\csEcpairing} {CS\_ECPAIRING}{CIRCUIT\_SELECTOR\_ECPAIRING}
128128
\newcol{\csGTwo} {CS\_G2\_MEMBERSHIP}{CIRCUIT\_SELECTOR\_G2\_MEMBERSHIP}
129-
\newcol{\trivialPairing} {TRIVIAL\_PAIRING}{OVERALL\_TRIVIAL\_PAIRING}
129+
\newcol{\trivialPairing} {TRIVIAL\_PAIRING}{OVERALL\_TRIVIAL\_PAIRING}
130130

131131
% System of constraints
132-
\define@cmdkey [ECDATA] {var} {anchorRow} {}
133-
\define@cmdkey [ECDATA] {var} {relOffset} {}
134-
\define@cmdkey [ECDATA] {var} {xHi} {}
135-
\define@cmdkey [ECDATA] {var} {xLo} {}
136-
\define@cmdkey [ECDATA] {var} {yHi} {}
137-
\define@cmdkey [ECDATA] {var} {yLo} {}
138-
\define@cmdkey [ECDATA] {var} {xSquareHi} {}
139-
\define@cmdkey [ECDATA] {var} {xSquareLo} {}
140-
\define@cmdkey [ECDATA] {var} {ySquareHi} {}
141-
\define@cmdkey [ECDATA] {var} {ySquareLo} {}
142-
\define@cmdkey [ECDATA] {var} {xCubeHi} {}
143-
\define@cmdkey [ECDATA] {var} {xCubeLo} {}
144-
\define@cmdkey [ECDATA] {var} {xCubePlusThreeHi} {}
145-
\define@cmdkey [ECDATA] {var} {xCubePlusThreeLo} {}
146-
\define@cmdkey [ECDATA] {var} {xImHi} {}
147-
\define@cmdkey [ECDATA] {var} {xImLo} {}
148-
\define@cmdkey [ECDATA] {var} {xReHi} {}
149-
\define@cmdkey [ECDATA] {var} {xReLo} {}
150-
\define@cmdkey [ECDATA] {var} {yImHi} {}
151-
\define@cmdkey [ECDATA] {var} {yImLo} {}
152-
\define@cmdkey [ECDATA] {var} {yReHi} {}
153-
\define@cmdkey [ECDATA] {var} {yReLo} {}
154-
155-
\presetkeys [ECDATA] {var} {
156-
anchorRow = \missingParameter ,
157-
relOffset = \missingParameter ,
158-
xHi = \missingParameter ,
159-
xLo = \missingParameter ,
160-
yHi = \missingParameter ,
161-
yLo = \missingParameter ,
162-
xSquareHi = \missingParameter ,
163-
xSquareLo = \missingParameter ,
164-
ySquareHi = \missingParameter ,
165-
ySquareLo = \missingParameter ,
166-
xCubeHi = \missingParameter ,
167-
xCubeLo = \missingParameter ,
168-
xCubePlusThreeHi = \missingParameter,
169-
xCubePlusThreeLo = \missingParameter,
170-
xImHi = \missingParameter ,
171-
xImLo = \missingParameter ,
172-
xReHi = \missingParameter ,
173-
xReLo = \missingParameter ,
174-
yImHi = \missingParameter ,
175-
yImLo = \missingParameter ,
176-
yReHi = \missingParameter ,
177-
yReLo = \missingParameter
178-
}{}
179-
180-
181132
\newcommand{\callCOneMembership} {\texttt{callToC1Membership}}
182133

183134
\newcommand{\callToCOneMembership}[6]{
184135
\callCOneMembership_{#1}
185136
\left[ \begin{array}{ll}
186137
\utt{Rel. row offset:} & #2 \\
187-
\utt{x coord. hi:} & #3 \\
188-
\utt{x coord. lo:} & #4 \\
189-
\utt{y coord. hi:} & #5 \\
190-
\utt{y coord. lo:} & #6 \\
138+
\utt{First argument (high):} & \col{#3} \\
139+
\utt{First argument (low):} & \col{#4} \\
140+
\utt{Second argument (high):} & \col{#5} \\
141+
\utt{Second argument (low):} & \col{#6} \\
191142
\end{array} \right]}
192143

193144
\newcommand{\callCOneMembershipWCP} {\texttt{callToC1MembershipWCP}}
194145

195-
\newcommand{\callToCOneMembershipWCP}[1]{
196-
\setkeys[ECDATA]{var}{#1}
197-
\callCOneMembershipWCP_{\cmdECDATA@var@anchorRow}
146+
\newcommand{\callToCOneMembershipWCP}[6]{
147+
\callCOneMembershipWCP_{#1}
198148
\left[ \begin{array}{ll}
199-
\utt{Rel. row offset:} & \cmdECDATA@var@relOffset \\
200-
\utt{x coord. hi:} & \cmdECDATA@var@xHi \\
201-
\utt{x coord. lo:} & \cmdECDATA@var@xLo \\
202-
\utt{y coord. hi:} & \cmdECDATA@var@yHi \\
203-
\utt{y coord. lo:} & \cmdECDATA@var@yLo \\
204-
\utt{LHS of (E) hi:} & \cmdECDATA@var@ySquareHi \\
205-
\utt{LHS of (E) lo:} & \cmdECDATA@var@ySquareLo \\
206-
\utt{RHS of (E) hi:} & \cmdECDATA@var@xCubePlusThreeHi \\
207-
\utt{RHS of (E) lo:} & \cmdECDATA@var@xCubePlusThreeLo \\
208-
\utt{Where (E) is:} & y^2 = x^3 + 3
149+
\utt{Rel. row offset:} & #2 \\
150+
\utt{First argument (high):} & \col{#3} \\
151+
\utt{First argument (low):} & \col{#4} \\
152+
\utt{Second argument (high):} & \col{#5} \\
153+
\utt{Second argument (low):} & \col{#6} \\
209154
\end{array} \right]}
210155

211156
\newcommand{\callCOneMembershipEXT} {\texttt{callToC1MembershipEXT}}
212157

213-
\newcommand{\callToCOneMembershipEXT}[1]{
214-
\setkeys[ECDATA]{var}{#1}
215-
\callCOneMembershipEXT_{\cmdECDATA@var@anchorRow}
158+
\newcommand{\callToCOneMembershipEXT}[6]{
159+
\callCOneMembershipEXT_{#1}
216160
\left[ \begin{array}{ll}
217-
\utt{Rel. row offset:} & \cmdECDATA@var@relOffset \\
218-
\utt{x coord. hi:} & \cmdECDATA@var@xHi \\
219-
\utt{x coord. lo:} & \cmdECDATA@var@xLo \\
220-
\utt{y coord. hi:} & \cmdECDATA@var@yHi \\
221-
\utt{y coord. lo:} & \cmdECDATA@var@yLo \\
222-
\utt{square of x coord. hi:} & \cmdECDATA@var@xSquareHi \\
223-
\utt{square of x coord. lo:} & \cmdECDATA@var@xSquareLo \\
224-
\utt{cube of x coord. hi:} & \cmdECDATA@var@xCubeHi \\
225-
\utt{cube of x coord. lo:} & \cmdECDATA@var@xCubeLo \\
161+
\utt{Rel. row offset:} & #2 \\
162+
\utt{First argument (high):} & \col{#3} \\
163+
\utt{First argument (low):} & \col{#4} \\
164+
\utt{Second argument (high):} & \col{#5} \\
165+
\utt{Second argument (low):} & \col{#6} \\
226166
\end{array} \right]}
227167

228168
\newcommand{\callWellFormedCoordinates} {\texttt{callToWellFormedCoordinates}}
229169

230-
\newcommand{\callToWellFormedCoordinates}[1]{
231-
\setkeys[ECDATA]{var}{#1}
232-
\callWellFormedCoordinates_{\cmdECDATA@var@anchorRow}
170+
\newcommand{\callToWellFormedCoordinates}[9]{ % TODO: a standard macro cannot have more than 9 arguments, thus here 'i' is hardcoded: use xkeyval
171+
\callWellFormedCoordinates_{i}
233172
\left[ \begin{array}{ll}
234-
\utt{Rel. row offset:} & \cmdECDATA@var@relOffset \\
235-
\utt{x coord. imaginary hi:} & \cmdECDATA@var@xImHi \\
236-
\utt{x coord. imaginary lo:} & \cmdECDATA@var@xImLo \\
237-
\utt{x coord. real hi:} & \cmdECDATA@var@xReHi \\
238-
\utt{x coord. real lo:} & \cmdECDATA@var@xReLo \\
239-
\utt{y coord. imaginary hi:} & \cmdECDATA@var@yImHi \\
240-
\utt{y coord. imaginary lo:} & \cmdECDATA@var@yImLo \\
241-
\utt{y coord. real hi:} & \cmdECDATA@var@yReHi \\
242-
\utt{y coord. real lo:} & \cmdECDATA@var@yReLo \\
173+
\utt{Rel. row offset:} & #1 \\
174+
\utt{First argument (high):} & \col{#2} \\
175+
\utt{First argument (low):} & \col{#3} \\
176+
\utt{Second argument (high):} & \col{#4} \\
177+
\utt{Second argument (low):} & \col{#5} \\
178+
\utt{Third argument (high):} & \col{#6} \\
179+
\utt{Third argument (low):} & \col{#7} \\
180+
\utt{Fourth argument (high):} & \col{#8} \\
181+
\utt{Fourth argument (low):} & \col{#9} \\
243182
\end{array} \right]}
244183

245184
% base 10 : 21888242871839275222246405745257275088696311157297823662689037894645226208583

‎pkg/xkeyval_macros/ext_calls.sty

+14-14
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@
2929
\setkeys[EXT]{var}{#1}
3030
\extCallToAddModName _{\cmdEXT@var@anchorRow}
3131
\left[ \begin{array}{ll}
32-
\utt{Rel. row offset:} & \cmdEXT@var@relOffset \\
33-
\utt{First argument hi:} & \cmdEXT@var@argOneHi \\
34-
\utt{First argument lo:} & \cmdEXT@var@argOneLo \\
35-
\utt{Second argument hi:} & \cmdEXT@var@argTwoHi \\
36-
\utt{Second argument lo:} & \cmdEXT@var@argTwoLo \\
37-
\utt{Third argument hi:} & \cmdEXT@var@argThreeHi \\
38-
\utt{Third argument lo:} & \cmdEXT@var@argThreeLo \\
32+
\utt{Rel. row offset:} & \cmdEXT@var@relOffset \\
33+
\utt{First argument (high):} & \cmdEXT@var@argOneHi \\
34+
\utt{First argument (low):} & \cmdEXT@var@argOneLo \\
35+
\utt{Second argument (high):} & \cmdEXT@var@argTwoHi \\
36+
\utt{Second argument (low):} & \cmdEXT@var@argTwoLo \\
37+
\utt{Third argument (high):} & \cmdEXT@var@argThreeHi \\
38+
\utt{Third argument (low):} & \cmdEXT@var@argThreeLo \\
3939
\end{array} \right]
4040
}
4141

@@ -45,13 +45,13 @@
4545
\setkeys[EXT]{var}{#1}
4646
\extCallToMulModName _{\cmdEXT@var@anchorRow}
4747
\left[ \begin{array}{ll}
48-
\utt{Rel. row offset:} & \cmdEXT@var@relOffset \\
49-
\utt{First argument hi:} & \cmdEXT@var@argOneHi \\
50-
\utt{First argument lo:} & \cmdEXT@var@argOneLo \\
51-
\utt{Second argument hi:} & \cmdEXT@var@argTwoHi \\
52-
\utt{Second argument lo:} & \cmdEXT@var@argTwoLo \\
53-
\utt{Third argument hi:} & \cmdEXT@var@argThreeHi \\
54-
\utt{Third argument lo:} & \cmdEXT@var@argThreeLo \\
48+
\utt{Rel. row offset:} & \cmdEXT@var@relOffset \\
49+
\utt{First argument (high):} & \cmdEXT@var@argOneHi \\
50+
\utt{First argument (low):} & \cmdEXT@var@argOneLo \\
51+
\utt{Second argument (high):} & \cmdEXT@var@argTwoHi \\
52+
\utt{Second argument (low):} & \cmdEXT@var@argTwoLo \\
53+
\utt{Third argument (high):} & \cmdEXT@var@argThreeHi \\
54+
\utt{Third argument (low):} & \cmdEXT@var@argThreeLo \\
5555
\end{array} \right]
5656
}
5757

‎prc/ecdata/specialized/ecpairing.tex

+1-12
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,7 @@
4242
\begin{description}
4343
\item[\underline{Row $n^°(i+4)$:}]
4444
\[
45-
\callToWellFormedCoordinates {
46-
anchorRow = i ,
47-
relOffset = 4 ,
48-
xImHi = \locBXImHi ,
49-
xImLo = \locBXImLo ,
50-
xReHi = \locBXReHi ,
51-
xReLo = \locBXReLo ,
52-
yImHi = \locBYImHi ,
53-
yImLo = \locBYImLo ,
54-
yReHi = \locBYReHi ,
55-
yReLo = \locBYReLo ,
56-
}
45+
\callToWellFormedCoordinates{4}{\locBXImHi}{\locBXImLo}{\locBXReHi}{\locBXReLo}{\locBYImHi}{\locBYImLo}{\locBYReHi}{\locBYReLo}
5746
\]
5847

5948
\[

‎prc/ecdata/utils/c1_membership.tex

+6-51
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,16 @@
22
\left\{ \begin{array}{l}
33
\callToCOneMembership
44
{i}{\relof}
5-
{\locPXHi}{\locPXLo}{\locPYHi}{\locPYLo} \vspace{4mm} \\
5+
{\locPXHi}{\locPXLo }{\locPYHi }{\locPYLo} \vspace{4mm} \\
66
\qquad \qquad \iff
77
\left\{ \begin{array}{l}
8-
\callToCOneMembershipWCP {
9-
anchorRow = i ,
10-
relOffset = \relof ,
11-
xHi = \locPXHi ,
12-
xLo = \locPXLo ,
13-
yHi = \locPYHi ,
14-
yLo = \locPYLo ,
15-
ySquareHi = \locPYSquareHi ,
16-
ySquareLo = \locPYSquareLo ,
17-
xCubePlusThreeHi = \locPXCubePlusThreeHi ,
18-
xCubePlusThreeLo = \locPXCubePlusThreeLo ,
19-
} \\
8+
\callToCOneMembershipWCP{i}{\relof}{\locPXHi}{\locPXLo}{\locPYHi}{\locPYLo} \\
209
\locPXIsInRange \define \wcpRes_{i+\relof} \\
2110
\locPYIsInRange \define \wcpRes_{i+\relof+1} \\
2211
\locPSatisfiesCubic \define \wcpRes_{i+\relof+2} \\
2312
\vspace{1mm} \\
24-
%
25-
\callToCOneMembershipEXT {
26-
anchorRow = i ,
27-
relOffset = \relof ,
28-
xHi = \locPXHi ,
29-
xLo = \locPXLo ,
30-
yHi = \locPYHi ,
31-
yLo = \locPYLo ,
32-
xSquareHi = \locPXSquareHi ,
33-
xSquareLo = \locPXSquareLo ,
34-
xCubeHi = \locPXCube ,
35-
xCubeLo = \locPXCube ,
36-
}
37-
\\
13+
%
14+
\callToCOneMembershipEXT{i}{\relof}{\locPXHi}{\locPXLo}{\locPYHi}{\locPYLo} \\
3815
\locPYSquareHi \define \extResHi_{i+\relof} \\
3916
\locPYSquareLo \define \extResLo_{i+\relof} \\
4017
\locPXSquareHi \define \extResHi_{i+\relof+1} \\
@@ -70,18 +47,7 @@
7047

7148
\[
7249
\left\{ \begin{array}{l}
73-
\callToCOneMembershipWCP {
74-
anchorRow = i ,
75-
relOffset = \relof ,
76-
xHi = \locPXHi ,
77-
xLo = \locPXLo ,
78-
yHi = \locPYHi ,
79-
yLo = \locPYLo ,
80-
ySquareHi = \locPYSquareHi ,
81-
ySquareLo = \locPYSquareLo ,
82-
xCubePlusThreeHi = \locPXCubePlusThreeHi ,
83-
xCubePlusThreeLo = \locPXCubePlusThreeLo ,
84-
} \vspace{4mm} \\
50+
\callToCOneMembershipWCP{i}{\relof}{\locPXHi}{\locPXLo}{\locPYHi}{\locPYLo} \vspace{4mm} \\
8551
\qquad \qquad \iff
8652
\left\{ \begin{array}{lcl}
8753
% \callToLt
@@ -133,18 +99,7 @@
13399

134100
\[
135101
\left\{ \begin{array}{l}
136-
\callToCOneMembershipEXT {
137-
anchorRow = i ,
138-
relOffset = \relof ,
139-
xHi = \locPXHi ,
140-
xLo = \locPXLo ,
141-
yHi = \locPYHi ,
142-
yLo = \locPYLo ,
143-
xSquareHi = \locPXSquareHi ,
144-
xSquareLo = \locPXSquareLo ,
145-
xCubeHi = \locPXCube ,
146-
xCubeLo = \locPXCube ,
147-
} \vspace{4mm} \\
102+
\callToCOneMembershipEXT{i}{\relof}{\locPXHi}{\locPXLo }{\locPYHi }{\locPYLo} \vspace{4mm} \\
148103
\qquad \qquad \iff
149104
\left\{ \begin{array}{lcl}
150105
% \callToMulMod{i+\relof}{$\locPYHi$}{$\locPYLo$}{$\locPYHi$}{$\locPYLo$}{$\bnOuterPrimeHi$}{$\bnOuterPrimeLo$}

‎prc/ecdata/utils/well_formed_coordinates.tex

+1-12
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
11
\[
22
\left\{ \begin{array}{l}
3-
\callToWellFormedCoordinates {
4-
anchorRow = i ,
5-
relOffset = \relof ,
6-
xImHi = \locBXImHi ,
7-
xImLo = \locBXImLo ,
8-
xReHi = \locBXReHi ,
9-
xReLo = \locBXReLo ,
10-
yImHi = \locBYImHi ,
11-
yImLo = \locBYImLo ,
12-
yReHi = \locBYReHi ,
13-
yReLo = \locBYReLo ,
14-
} \vspace{4mm} \\
3+
\callToWellFormedCoordinates{\relof}{\locBXImHi}{\locBXImLo}{\locBXReHi}{\locBXReLo}{\locBYImHi}{\locBYImLo}{\locBYReHi}{\locBYReLo} \vspace{4mm} \\
154
\qquad \qquad \iff
165
\left\{ \begin{array}{l}
176
% \callToLt

0 commit comments

Comments
 (0)
Please sign in to comment.