Skip to content

Use par=1 EndSorts in ArgFactorize #565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jodavies merged 1 commit into from
Nov 11, 2024
Merged

Use par=1 EndSorts in ArgFactorize #565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions check/fixes.frm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2827,3 +2827,25 @@ print;
assert succeeded?
assert result("F") =~ expr("5000")
*--#] Issue508 :
*--#[ Issue563 :
#: SubTermsInSmall 50

CFunction f,g;
Symbol a;

* Generate a function arg with more than SubTermsInSmall terms:
* Make sure one of the factors has more than SubTermsInSmall itself.
* Use functions to trigger LocalConvertToPoly and the EndSort there.
Local F = f((g(1)+g(2)) * (<g(1)>+...+<g(65)>)) - g(1+2, 1+...+65);

FactArg f;
Argument f;
Identify g(a?) = a;
EndArgument;
Identify g(?a) = f(?a);

Print F;
.end
assert succeeded?
assert result("F") =~ expr("0")
*--#] Issue563 :
113 changes: 59 additions & 54 deletions sources/argument.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2094,7 +2094,8 @@ int ArgFactorize(PHEAD WORD *argin, WORD *argout)
StoreTerm(BHEAD t);
t = tstop;
}
EndSort(BHEAD argin+ARGHEAD,0);
/* par = 1, in case the arg has more than SubTermsInSmall terms */
EndSort(BHEAD argin+ARGHEAD,1);
argin[*argin] = oldword;
}
/*
Expand Down Expand Up @@ -2155,7 +2156,8 @@ int ArgFactorize(PHEAD WORD *argin, WORD *argout)
StoreTerm(BHEAD t);
t = tstop;
}
EndSort(BHEAD argfree+ARGHEAD,0);
/* par = 1, in case the arg has more than SubTermsInSmall terms */
EndSort(BHEAD argfree+ARGHEAD,1);
t = argfree+ARGHEAD;
while ( *t ) t += *t;
*argfree = t - argfree;
Expand Down Expand Up @@ -2247,7 +2249,8 @@ int ArgFactorize(PHEAD WORD *argin, WORD *argout)
StoreTerm(BHEAD argextra);
t += *t; argextra += *argextra;
}
if ( EndSort(BHEAD argfree+ARGHEAD,0) ) { error = -2; goto getout; }
/* par = 1, in case the arg has more than SubTermsInSmall terms */
if ( EndSort(BHEAD argfree+ARGHEAD,1) ) { error = -2; goto getout; }
t = argfree + ARGHEAD;
while ( *t > 0 ) t += *t;
*argfree = t - argfree;
Expand All @@ -2270,63 +2273,64 @@ int ArgFactorize(PHEAD WORD *argin, WORD *argout)
Be careful: there should be more than one argument now.
*/
if ( error == 0 && action ) {
a1 = a; NEXTARG(a1);
if ( *a1 != 0 ) {
CBUF *C = cbuf+AC.cbufnum;
CBUF *CC = cbuf+AT.ebufnum;
WORD *oldworkpointer = AT.WorkPointer;
WORD *argcopy2 = TermMalloc("argcopy2"), *a1, *a2;
a1 = a; a2 = argcopy2;
while ( *a1 ) {
if ( *a1 < 0 ) {
if ( *a1 > -FUNCTION ) *a2++ = *a1++;
*a2++ = *a1++; *a2 = 0;
continue;
}
t = a1 + ARGHEAD;
tstop = a1 + *a1;
argextra = AT.WorkPointer;
NewSort(BHEAD0);
while ( t < tstop ) {
if ( ConvertFromPoly(BHEAD t,argextra,numxsymbol,CC->numrhs-startebuf+numxsymbol
,startebuf-numxsymbol,1) <= 0 ) {
TermFree(argcopy2,"argcopy2");
LowerSortLevel();
error = -3;
goto getout;
a1 = a; NEXTARG(a1);
if ( *a1 != 0 ) {
CBUF *C = cbuf+AC.cbufnum;
CBUF *CC = cbuf+AT.ebufnum;
WORD *oldworkpointer = AT.WorkPointer;
WORD *argcopy2 = TermMalloc("argcopy2"), *a1, *a2;
a1 = a; a2 = argcopy2;
while ( *a1 ) {
if ( *a1 < 0 ) {
if ( *a1 > -FUNCTION ) *a2++ = *a1++;
*a2++ = *a1++; *a2 = 0;
continue;
}
t += *t;
AT.WorkPointer = argextra + *argextra;
t = a1 + ARGHEAD;
tstop = a1 + *a1;
argextra = AT.WorkPointer;
NewSort(BHEAD0);
while ( t < tstop ) {
if ( ConvertFromPoly(BHEAD t,argextra,numxsymbol,CC->numrhs-startebuf+numxsymbol
,startebuf-numxsymbol,1) <= 0 ) {
TermFree(argcopy2,"argcopy2");
LowerSortLevel();
error = -3;
goto getout;
}
t += *t;
AT.WorkPointer = argextra + *argextra;
/*
ConvertFromPoly leaves terms with subexpressions. Hence:
ConvertFromPoly leaves terms with subexpressions. Hence:
*/
if ( Generator(BHEAD argextra,C->numlhs) ) {
TermFree(argcopy2,"argcopy2");
LowerSortLevel();
error = -4;
goto getout;
if ( Generator(BHEAD argextra,C->numlhs) ) {
TermFree(argcopy2,"argcopy2");
LowerSortLevel();
error = -4;
goto getout;
}
}
AT.WorkPointer = oldworkpointer;
/* par = 1, in case the factor has more than SubTermsInSmall terms */
if ( EndSort(BHEAD a2+ARGHEAD,1) ) { error = -5; goto getout; }
t = a2+ARGHEAD; while ( *t ) t += *t;
*a2 = t - a2; a2[1] = 0; ZEROARG(a2);
ToFast(a2,a2); NEXTARG(a2);
a1 = tstop;
}
AT.WorkPointer = oldworkpointer;
if ( EndSort(BHEAD a2+ARGHEAD,0) ) { error = -5; goto getout; }
t = a2+ARGHEAD; while ( *t ) t += *t;
*a2 = t - a2; a2[1] = 0; ZEROARG(a2);
ToFast(a2,a2); NEXTARG(a2);
a1 = tstop;
}
i = a2 - argcopy2;
a2 = argcopy2; a1 = a;
NCOPY(a1,a2,i);
*a1 = 0;
TermFree(argcopy2,"argcopy2");
i = a2 - argcopy2;
a2 = argcopy2; a1 = a;
NCOPY(a1,a2,i);
*a1 = 0;
TermFree(argcopy2,"argcopy2");
/*
Erase the entries we made temporarily in cbuf[AT.ebufnum]
Erase the entries we made temporarily in cbuf[AT.ebufnum]
*/
CC->numrhs = startebuf;
}
else { /* no factorization. recover the argument from before step 3. */
for ( i = 0; i <= *argcopy; i++ ) a[i] = argcopy[i];
}
CC->numrhs = startebuf;
}
else { /* no factorization. recover the argument from before step 3. */
for ( i = 0; i <= *argcopy; i++ ) a[i] = argcopy[i];
}
}
/*
#] step 6 :
Expand Down Expand Up @@ -2400,7 +2404,8 @@ int ArgFactorize(PHEAD WORD *argin, WORD *argout)
StoreTerm(BHEAD t);
t = tstop;
}
EndSort(BHEAD a+ARGHEAD,0);
/* par = 1, in case the factor has more than SubTermsInSmall terms */
EndSort(BHEAD a+ARGHEAD,1);
a[*a] = oldword;
a += *a;
}
Expand Down