Skip to content

Commit

Permalink
Uploaded the sources for version 5.0beta
Browse files Browse the repository at this point in the history
  • Loading branch information
vermaseren committed Apr 4, 2023
1 parent 3626a4a commit 1d4b775
Show file tree
Hide file tree
Showing 79 changed files with 4,846 additions and 953 deletions.
361 changes: 325 additions & 36 deletions doc/manual/diagrams.tex

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions doc/manual/man.tex
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@
\input{external}
\input{spectators}
\input{diagrams}
\input{float.tex}
%
\printindex

Expand Down
29 changes: 26 additions & 3 deletions sources/argument.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

/* #[ License : */
/*
* Copyright (C) 1984-2022 J.A.M. Vermaseren
* Copyright (C) 1984-2017 J.A.M. Vermaseren
* When using this file you are requested to refer to the publication
* J.A.M.Vermaseren "New features of FORM" math-ph/0010025
* This is considered a matter of courtesy as the development was paid
Expand Down Expand Up @@ -158,10 +158,15 @@ WORD execarg(PHEAD WORD *term, WORD level)
}
RightNum:
if ( m[1] == 2 ) {
#ifdef WITHFLOAT
if ( *t != FLOATFUN || AT.aux_ == 0 || TestFloat(t) == 0 )
#endif
{
m += 2;
m += *m;
goto HaveTodo;
}
}
else {
r = m + m[1];
m += 2;
Expand Down Expand Up @@ -525,7 +530,7 @@ ScaledVariety:;
}
/*
We generate a statement for adapting all terms in the
argument successively
argument sucessively
*/
r4 = AddRHS(AT.ebufnum,1);
while ( (r4+j+12) > CC->Top ) r4 = DoubleCbuffer(AT.ebufnum,r4,3);
Expand Down Expand Up @@ -1165,7 +1170,7 @@ ScaledVariety:;
t += *t;
}
/*
if ( ngcd != 3 || EAscrat[0] != 1 || EAscrat[1] != 1 ) {
if ( ngcd != 3 || EAscrat[0] != 1 || EAscrat[1] != 1 )
*/
{
if ( pow ) ngcd = -ngcd;
Expand Down Expand Up @@ -1218,6 +1223,23 @@ ScaledVariety:;
}
/*
#] Numerical factor :
else {
onetermnew:;
if ( factor == 0 || *factor > 2 ) {
if ( pow > 0 ) {
*r1++ = -SNUMBER; *r1++ = -1;
t = r5;
while ( t < r3 ) {
t += *t; t[-1] = -t[-1];
}
}
t = rr; *r1++ = *t++; *r1++ = 1; t++;
COPYARG(r1,t);
while ( t < m ) *r1++ = *t++;
}
}
onetermnew:;
*/
}
TermFree(EAscrat,"execarg");
Expand Down Expand Up @@ -1689,6 +1711,7 @@ oneterm:;
}
} /* AC.OldFactArgFlag */
}
/* r1 is fout in ons voorbeeld. */
r2[1] = r1 - r2;
action = 1;
v[2] = DIRTYFLAG;
Expand Down
2 changes: 1 addition & 1 deletion sources/bugtool.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

/* #[ License : */
/*
* Copyright (C) 1984-2022 J.A.M. Vermaseren
* Copyright (C) 1984-2017 J.A.M. Vermaseren
* When using this file you are requested to refer to the publication
* J.A.M.Vermaseren "New features of FORM" math-ph/0010025
* This is considered a matter of courtesy as the development was paid
Expand Down
14 changes: 7 additions & 7 deletions sources/checkpoint.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
#] Explanations :
#[ License :
*
* Copyright (C) 1984-2022 J.A.M. Vermaseren
* Copyright (C) 1984-2017 J.A.M. Vermaseren
* When using this file you are requested to refer to the publication
* J.A.M.Vermaseren "New features of FORM" math-ph/0010025
* This is considered a matter of courtesy as the development was paid
Expand Down Expand Up @@ -275,7 +275,7 @@ static int PF_CheckRecoveryFile()
}
#endif

int CheckRecoveryFile()
int CheckRecoveryFile(VOID)
{
int ret = 0;
#ifdef WITHMPI
Expand Down Expand Up @@ -330,7 +330,7 @@ int CheckRecoveryFile()
* Deletes the recovery files. It is called by CleanUp() in the case of a
* successful completion.
*/
void DeleteRecoveryFile()
void DeleteRecoveryFile(VOID)
{
if ( done_snapshot ) {
remove(recoveryfile);
Expand Down Expand Up @@ -361,7 +361,7 @@ void DeleteRecoveryFile()
/**
* Returns pointer to recovery filename.
*/
char *RecoveryFilename()
char *RecoveryFilename(VOID)
{
return(recoveryfile);
}
Expand Down Expand Up @@ -396,7 +396,7 @@ static char *InitName(char *str, char *ext)
* This functions should only be called once to avoid memory leaks and after
* AM.TempDir has been initialized.
*/
void InitRecovery()
void InitRecovery(VOID)
{
int lenpath = AM.TempDir ? strlen((char*)AM.TempDir)+1 : 0;
#ifdef WITHMPI
Expand Down Expand Up @@ -2343,9 +2343,9 @@ int DoRecovery(int *moduletype)
R_SET(AR.SortType, WORD);
R_SET(AR.ShortSortCount, WORD);

/* this is usually done in Process(), but sometimes FORM does not
/* this is usually done in Process(), but sometimes FORM doesn't
end up executing Process() before it uses the AR.CompressPointer,
so we need to explicitly set it here. */
so we need to explicitely set it here. */
AR.CompressPointer = AR.CompressBuffer;

#ifdef WITHPTHREADS
Expand Down
Loading

0 comments on commit 1d4b775

Please sign in to comment.