cleanup

1 files changed, 62 insertions, 62 deletions

diff --git a/src/input/marcbench.input.pamphlet b/src/input/marcbench.input.pamphlet
index 4cdc0249..5940fa55 100644
--- a/src/input/marcbench.input.pamphlet
+++ b/src/input/marcbench.input.pamphlet
@@ -23,10 +23,10 @@ output(" Ex. 1: 4-body ")$OutputPackage
 -----------------------------------------------------------------------------
 
 )clear all
-ls : List Symbol := [p,s,phi];
-V := OVAR(ls);
-R := Integer;
-E := IndexedExponents V;
+ls : List Symbol := [p,s,phi]
+V := OVAR(ls)
+R := Integer
+E := IndexedExponents V
 P := NSMP(R, V);
 LP := List(P);
 
@@ -61,31 +61,31 @@ ls : List Symbol := [x,y,z,t,u];
 V := OVAR(ls);
 R := Integer;
 E := IndexedExponents V;
-P := NSMP(R, V);
-LP := List(P);
+P := NSMP(R, V)
+LP := List(P)
 
 -----------------------------------------------------------------------------
 --% Initialisations
 -----------------------------------------------------------------------------
 
-x: P := 'x;
-y: P := 'y;
-z: P := 'z;
-t: P := 't;
-u: P := 'u;
-f0 := u-2;
-f1:= 2*(u-1)^2+2*(x-z*x+z^2)+y^2*(x-1)^2-2*u*x+2*y*t*(1-x)*(x-z)+2*u*z*t*(t-y)+u^2*t^2*(1-2*z)+2*u*t^2*(z-x)+2*u*t*y*(z-1)+2*u*z*x*(y+1)+(u^2-2*u)*z^2*t^2+2*u^2*z^2+4*u*(1-u)*z+t^2*(z-x)^2;
-f2:= t*(2*z+1)*(x-z)+y*(z+2)*(1-x)+u*(u-2)*t+u*(1-2*u)*z*t+u*y*(x+u-z*x-1)+u*(u+1)*z^2*t;
-f3:= -u^2*(z-1)^2+2*z*(z-x)-2*(x-1);
-f4:= u^2+4*(z-x^2)+3*y^2*(x-1)^2-3*t^2*(z-x)^2 +3*u^2*t^2*(z-1)^2+u^2*z*(z-2)+6*u*t*y*(z+x+z*x-1);
-lp :=[f0,f1,f2,f3,f4];
+x: P := 'x
+y: P := 'y
+z: P := 'z
+t: P := 't
+u: P := 'u
+f0 := u-2
+f1:= 2*(u-1)^2+2*(x-z*x+z^2)+y^2*(x-1)^2-2*u*x+2*y*t*(1-x)*(x-z)+2*u*z*t*(t-y)+u^2*t^2*(1-2*z)+2*u*t^2*(z-x)+2*u*t*y*(z-1)+2*u*z*x*(y+1)+(u^2-2*u)*z^2*t^2+2*u^2*z^2+4*u*(1-u)*z+t^2*(z-x)^2
+f2:= t*(2*z+1)*(x-z)+y*(z+2)*(1-x)+u*(u-2)*t+u*(1-2*u)*z*t+u*y*(x+u-z*x-1)+u*(u+1)*z^2*t
+f3:= -u^2*(z-1)^2+2*z*(z-x)-2*(x-1)
+f4:= u^2+4*(z-x^2)+3*y^2*(x-1)^2-3*t^2*(z-x)^2 +3*u^2*t^2*(z-1)^2+u^2*z*(z-2)+6*u*t*y*(z+x+z*x-1)
+lp :=[f0,f1,f2,f3,f4]
 
 
-T := REGSET(R,E,V,P);
+T := REGSET(R,E,V,P)
 )set message time off
-zeroSetSplit(lp)$T;
+zeroSetSplit(lp)$T
 )set message time on
-zeroSetSplit(lp)$T;
+zeroSetSplit(lp)$T
 )set message time off
 
 output(" Ex. 3: Rose ")$OutputPackage
@@ -95,12 +95,12 @@ output(" Ex. 3: Rose ")$OutputPackage
 -----------------------------------------------------------------------------
 
 )clear all
-ls : List Symbol := [z,y,x];
-V := OVAR(ls);
-R := Integer;
-E := IndexedExponents V;
-P := NSMP(R, V);
-LP := List(P);
+ls : List Symbol := [z,y,x]
+V := OVAR(ls)
+R := Integer
+E := IndexedExponents V
+P := NSMP(R, V)
+LP := List(P)
 
 -----------------------------------------------------------------------------
 --% Initialisations
@@ -109,17 +109,17 @@ LP := List(P);
 x: P := 'x;
 y: P := 'y;
 z: P := 'z;
-f1 := 7*y**4 - 20*x**2 ;
-f2:=  (2160*x**2 + 1512*x +315)*z**4-4000*x**2-2800*x-490 ;
-f3 :=  (67200000*x**5 + 94080000*x**4 + 40924800*x**3 + 2634240*x**2-2300844*x-432180)*y**3 + ((40320000*x**6 + 28800000*x**5 + 21168000*x**3 + 4939200*x**2 + 347508*x)*z)*y**2 + ((-23520000*x**4-41395200*x**3-26726560*x**2-7727104*x-852355)*z**2)*y + (-10080000*x**4-28224000*x**3-15288000*x**2-1978032*x-180075)*z**3 ;
-lp := [f1,f2,f3];
+f1 := 7*y**4 - 20*x**2 
+f2:=  (2160*x**2 + 1512*x +315)*z**4-4000*x**2-2800*x-490 
+f3 :=  (67200000*x**5 + 94080000*x**4 + 40924800*x**3 + 2634240*x**2-2300844*x-432180)*y**3 + ((40320000*x**6 + 28800000*x**5 + 21168000*x**3 + 4939200*x**2 + 347508*x)*z)*y**2 + ((-23520000*x**4-41395200*x**3-26726560*x**2-7727104*x-852355)*z**2)*y + (-10080000*x**4-28224000*x**3-15288000*x**2-1978032*x-180075)*z**3 
+lp := [f1,f2,f3]
 
 
-T := REGSET(R,E,V,P);
+T := REGSET(R,E,V,P)
 )set message time off
-zeroSetSplit(lp)$T;
+zeroSetSplit(lp)$T
 )set message time on
-zeroSetSplit(lp)$T;
+zeroSetSplit(lp)$T
 )set message time off
 
 output(" Ex. 4: L-3 ")$OutputPackage
@@ -150,11 +150,11 @@ p3 := x + y + z^3 + t-1;
 p4 := x + y + z + t^3 -1;
 lp := [p1,p2,p3,p4];
 
-T := REGSET(R,E,V,P);
+T := REGSET(R,E,V,P)
 )set message time off
-zeroSetSplit(lp)$T;
+zeroSetSplit(lp)$T
 )set message time on
-zeroSetSplit(lp)$T;
+zeroSetSplit(lp)$T
 )set message time off
 
 output(" Ex. 5:Butcher ")$OutputPackage
@@ -183,21 +183,21 @@ t: P := 't;
 u: P := 'u;
 v: P := 'v;
 w: P := 'w;
-f0 := b1 + y + z - t - w;
-f1 := 2*z*u + 2*y*v + 2*t*w - 2*w**2 - w - 1 ;
-f2 := 3*z*u**2 + 3*y*v**2 - 3*t*w**2 + 3*w**3 + 3*w**2 - t + 4*w  ;
-f3 := 6*x*z*v - 6*t*w**2 + 6*w**3 - 3*t*w + 6*w**2 - t + 4*w  ;
-f4 := 4*z*u**3+ 4*y*v**3+ 4*t*w**3- 4*w**4 - 6*w**3+ 4*t*w- 10*w**2- w- 1  ;
-f5 := 8*x*z*u*v +8*t*w**3 -8*w**4 +4*t*w**2 -12*w**3 +4*t*w -14*w**2 -3*w -1  ;
-f6 := 12*x*z*v**2+12*t*w**3 -12*w**4 +12*t*w**2 -18*w**3 +8*t*w -14*w**2 -w -1;
-f7 := -24*t*w**3 + 24*w**4 - 24*t*w**2 + 36*w**3 - 8*t*w + 26*w**2 + 7*w + 1 ;
-
-lp := [f0,f1,f2,f3,f4,f5,f6,f7];
-T := REGSET(R,E,V,P);
+f0 := b1 + y + z - t - w
+f1 := 2*z*u + 2*y*v + 2*t*w - 2*w**2 - w - 1 
+f2 := 3*z*u**2 + 3*y*v**2 - 3*t*w**2 + 3*w**3 + 3*w**2 - t + 4*w  
+f3 := 6*x*z*v - 6*t*w**2 + 6*w**3 - 3*t*w + 6*w**2 - t + 4*w  
+f4 := 4*z*u**3+ 4*y*v**3+ 4*t*w**3- 4*w**4 - 6*w**3+ 4*t*w- 10*w**2- w- 1  
+f5 := 8*x*z*u*v +8*t*w**3 -8*w**4 +4*t*w**2 -12*w**3 +4*t*w -14*w**2 -3*w -1  
+f6 := 12*x*z*v**2+12*t*w**3 -12*w**4 +12*t*w**2 -18*w**3 +8*t*w -14*w**2 -w -1
+f7 := -24*t*w**3 + 24*w**4 - 24*t*w**2 + 36*w**3 - 8*t*w + 26*w**2 + 7*w + 1 
+
+lp := [f0,f1,f2,f3,f4,f5,f6,f7]
+T := REGSET(R,E,V,P)
 )set message time off
-zeroSetSplit(lp)$T;
+zeroSetSplit(lp)$T
 )set message time on
-zeroSetSplit(lp)$T;
+zeroSetSplit(lp)$T
 )set message time off
 
 output(" Ex. 6 : Hairer-2 ")$OutputPackage
@@ -247,9 +247,9 @@ lp := [f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f11];
 
 T := REGSET(R,E,V,P);
 )set message time off
-zeroSetSplit(lp)$T;
+zeroSetSplit(lp)$T
 )set message time on
-zeroSetSplit(lp)$T;
+zeroSetSplit(lp)$T
 )set message time off
 
 output(" Ex. 7 : Lichtblau ")$OutputPackage
@@ -279,9 +279,9 @@ lp := [p1, p2];
 
 T := REGSET(R,E,V,P);
 )set message time off
-zeroSetSplit(lp)$T;
+zeroSetSplit(lp)$T
 )set message time on
-zeroSetSplit(lp)$T;
+zeroSetSplit(lp)$T
 )set message time off
 
 output(" Ex. 8: Liu original ")$OutputPackage
@@ -316,9 +316,9 @@ lp := [p1,p2,p3,p4] ;
 
 T := REGSET(R,E,V,P);
 )set message time off
-zeroSetSplit(lp)$T;
+zeroSetSplit(lp)$T
 )set message time on
-zeroSetSplit(lp)$T;
+zeroSetSplit(lp)$T
 )set message time off
 
 output(" Ex. 9: Liu homog. ")$OutputPackage
@@ -354,9 +354,9 @@ lp := [p1,p2,p3,p4] ;
 
 T := REGSET(R,E,V,P);
 )set message time off
-zeroSetSplit(lp)$T;
+zeroSetSplit(lp)$T
 )set message time on
-zeroSetSplit(lp)$T;
+zeroSetSplit(lp)$T
 )set message time off
 
 output(" Ex. 10: Vermeer ")$OutputPackage
@@ -405,7 +405,7 @@ output(" Ex. 11: Wu-Wang-2" )
 -----------------------------------------------------------------------------
 
 )clear all
-ls : List Symbol := reverse [x10,x11,x12,x13,x21,x22,x23,x30,x101,x102,x103,x104,x105];
+ls : List Symbol := reverse [x10,x11,x12,x13,x21,x22,x23,x30,x101,x102,x103,x104,x105]
 V := OVAR(ls);
 R := Integer;
 E := IndexedExponents V;
@@ -450,9 +450,9 @@ lp:=[f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f11,f12,f13,f14,f15,f16];
 
 T := REGSET(R,E,V,P);
 )set message time off
-zeroSetSplit(lp)$T;
+zeroSetSplit(lp)$T
 )set message time on
-zeroSetSplit(lp)$T;
+zeroSetSplit(lp)$T
 )set message time off
 
 output(" Ex. 12: f-633 ")$OutputPackage
@@ -498,9 +498,9 @@ lp := [p1,p2,p3,p4,p6,p7,p8,p9,p10];
 
 T := REGSET(R,E,V,P);
 )set message time off
-zeroSetSplit(lp)$T;
+zeroSetSplit(lp)$T
 )set message time on
-zeroSetSplit(lp)$T;
+zeroSetSplit(lp)$T
 )set message time off
 
 @