From fd044738c5b081308b39c142488163350d8c1023 Mon Sep 17 00:00:00 2001 From: Martin Wagner Date: Tue, 24 Sep 2024 17:30:33 +0200 Subject: [PATCH] Fixed renaming issue (#190) --- data/Tables/2A2/PGU3.2.jl | 2 +- data/Tables/2F4/2F4.1.jl | 16 ++++++++-------- data/Tables/2F4/2F4.2.jl | 16 ++++++++-------- data/Tables/3D4/3D4.0.jl | 20 ++++++++++---------- data/Tables/3D4/3D4.11.jl | 36 ++++++++++++++++++------------------ data/Tables/3D4/3D4.13.jl | 36 ++++++++++++++++++------------------ data/Tables/A2/PGL3.1.jl | 2 +- data/Tables/G2/G2.01.jl | 6 +++--- data/Tables/G2/G2.02.jl | 6 +++--- data/Tables/G2/G2.101.jl | 16 ++++++++-------- data/Tables/G2/G2.103.jl | 16 ++++++++-------- data/Tables/G2/G2.111.jl | 24 ++++++++++++------------ data/Tables/G2/G2.113.jl | 24 ++++++++++++------------ data/Tables/G2/G2.121.jl | 24 ++++++++++++------------ data/Tables/G2/G2.123.jl | 24 ++++++++++++------------ 15 files changed, 134 insertions(+), 134 deletions(-) diff --git a/data/Tables/2A2/PGU3.2.jl b/data/Tables/2A2/PGU3.2.jl index d08d8255..b39ab61a 100644 --- a/data/Tables/2A2/PGU3.2.jl +++ b/data/Tables/2A2/PGU3.2.jl @@ -148,7 +148,7 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) ss5=nesum(ss5a, l, 1, q) tt1=eesubs(tt, [l], [k]) ss6=nesum(tt1, k, 1, q) - ss7=eesubs(tt, [k,l], S.([(q+1)*1//3,2*(q+1)*1//3])) + ss7=eesubs(tt, [k,l], R.([(q+1)*1//3,2*(q+1)*1//3])) 1//6*ss5-1//6*ss6-1//3*ss7 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) diff --git a/data/Tables/2F4/2F4.1.jl b/data/Tables/2F4/2F4.1.jl index 868cb97b..5935dd1d 100644 --- a/data/Tables/2F4/2F4.1.jl +++ b/data/Tables/2F4/2F4.1.jl @@ -2507,10 +2507,10 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s11=nesum(tt1, a, 1, 2*q0^2) tt1=eesubs(tt, [b], [-(2*q0+1)*a]) s12=nesum(tt1, a, 1, 2*q0^2) - s13=eesubs(tt, [a,b], S.([b,(2*q0^2+1)*1//3])) - s14=eesubs(tt, [a,b], S.([-b,(2*q0^2+1)*1//3])) - s15=eesubs(tt, [a,b], S.([b,2*(2*q0^2+1)*1//3])) - s16=eesubs(tt, [a,b], S.([-b,2*(2*q0^2+1)*1//3])) + s13=eesubs(tt, [a,b], R.([b,(2*q0^2+1)*1//3])) + s14=eesubs(tt, [a,b], R.([-b,(2*q0^2+1)*1//3])) + s15=eesubs(tt, [a,b], R.([b,2*(2*q0^2+1)*1//3])) + s16=eesubs(tt, [a,b], R.([-b,2*(2*q0^2+1)*1//3])) 1//48*s2-1//48*s3-1//48*s4-1//48*s5-1//48*s6-1//48*s7-1//48*s8-1//48*s9-1//48*s10-1//48*s11-1//48*s12+1//12*s13+1//12*s14+1//12*s15+1//12*s16 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) @@ -2707,10 +2707,10 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s11=nesum(tt1, k, 1, 2*q0^2) tt1=eesubs(tt, [l], [-(2*q0+1)*k]) s12=nesum(tt1, k, 1, 2*q0^2) - s13=eesubs(tt, [k,l], S.([l,(2*q0^2+1)*1//3])) - s14=eesubs(tt, [k,l], S.([-l,(2*q0^2+1)*1//3])) - s15=eesubs(tt, [k,l], S.([l,2*(2*q0^2+1)*1//3])) - s16=eesubs(tt, [k,l], S.([-l,2*(2*q0^2+1)*1//3])) + s13=eesubs(tt, [k,l], R.([l,(2*q0^2+1)*1//3])) + s14=eesubs(tt, [k,l], R.([-l,(2*q0^2+1)*1//3])) + s15=eesubs(tt, [k,l], R.([l,2*(2*q0^2+1)*1//3])) + s16=eesubs(tt, [k,l], R.([-l,2*(2*q0^2+1)*1//3])) 1//48*s2-1//48*s3-1//48*s4-1//48*s5-1//48*s6-1//48*s7-1//48*s8-1//48*s9-1//48*s10-1//48*s11-1//48*s12+1//12*s13+1//12*s14+1//12*s15+1//12*s16 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) diff --git a/data/Tables/2F4/2F4.2.jl b/data/Tables/2F4/2F4.2.jl index bfc02f3a..040940a8 100644 --- a/data/Tables/2F4/2F4.2.jl +++ b/data/Tables/2F4/2F4.2.jl @@ -2507,10 +2507,10 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s11=nesum(tt1, a, 1, 2*q0^2) tt1=eesubs(tt, [b], [-(2*q0+1)*a]) s12=nesum(tt1, a, 1, 2*q0^2) - s13=eesubs(tt, [a,b], S.([b,(2*q0^2+1)*1//3])) - s14=eesubs(tt, [a,b], S.([-b,(2*q0^2+1)*1//3])) - s15=eesubs(tt, [a,b], S.([b,2*(2*q0^2+1)*1//3])) - s16=eesubs(tt, [a,b], S.([-b,2*(2*q0^2+1)*1//3])) + s13=eesubs(tt, [a,b], R.([b,(2*q0^2+1)*1//3])) + s14=eesubs(tt, [a,b], R.([-b,(2*q0^2+1)*1//3])) + s15=eesubs(tt, [a,b], R.([b,2*(2*q0^2+1)*1//3])) + s16=eesubs(tt, [a,b], R.([-b,2*(2*q0^2+1)*1//3])) 1//48*s2-1//48*s3-1//48*s4-1//48*s5-1//48*s6-1//48*s7-1//48*s8-1//48*s9-1//48*s10-1//48*s11-1//48*s12+1//12*s13+1//12*s14+1//12*s15+1//12*s16 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) @@ -2707,10 +2707,10 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s11=nesum(tt1, k, 1, 2*q0^2) tt1=eesubs(tt, [l], [-(2*q0+1)*k]) s12=nesum(tt1, k, 1, 2*q0^2) - s13=eesubs(tt, [k,l], S.([l,(2*q0^2+1)*1//3])) - s14=eesubs(tt, [k,l], S.([-l,(2*q0^2+1)*1//3])) - s15=eesubs(tt, [k,l], S.([l,2*(2*q0^2+1)*1//3])) - s16=eesubs(tt, [k,l], S.([-l,2*(2*q0^2+1)*1//3])) + s13=eesubs(tt, [k,l], R.([l,(2*q0^2+1)*1//3])) + s14=eesubs(tt, [k,l], R.([-l,(2*q0^2+1)*1//3])) + s15=eesubs(tt, [k,l], R.([l,2*(2*q0^2+1)*1//3])) + s16=eesubs(tt, [k,l], R.([-l,2*(2*q0^2+1)*1//3])) 1//48*s2-1//48*s3-1//48*s4-1//48*s5-1//48*s6-1//48*s7-1//48*s8-1//48*s9-1//48*s10-1//48*s11-1//48*s12+1//12*s13+1//12*s14+1//12*s15+1//12*s16 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) diff --git a/data/Tables/3D4/3D4.0.jl b/data/Tables/3D4/3D4.0.jl index f71ab621..d9d250ac 100644 --- a/data/Tables/3D4/3D4.0.jl +++ b/data/Tables/3D4/3D4.0.jl @@ -1032,7 +1032,7 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s2=nesum(s1, b, 0, q-2) tt1=eesubs(tt, [b], [0]) s3=nesum(tt1, a, 0, q^3-2) - tt1=eesubs(tt, [a,b], S.([(q-1)*a,0])) + tt1=eesubs(tt, [a,b], R.([(q-1)*a,0])) s4=nesum(tt1, a, 0, q^2+q) tt1=eesubs(tt, [a], [0]) s5=nesum(tt1, b, 1, q-2) @@ -1093,7 +1093,7 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s2=nesum(s1, b, 0, q^2+q) tt1=eesubs(tt, [b], [a]) s3=nesum(tt1, a, 0, q^2+q) - tt1=eesubs(tt, [a,b], S.([0,0])) + tt1=eesubs(tt, [a,b], R.([0,0])) 1//24*s2-1//6*s3+1//8*tt1 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) @@ -1101,7 +1101,7 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s2=nesum(s1, b, 0, q^2-q) tt1=eesubs(tt, [b], [a]) s3=nesum(tt1, a, 0, q^2-q) - tt1=eesubs(tt, [a,b], S.([0,0])) + tt1=eesubs(tt, [a,b], R.([0,0])) 1//24*s2-1//6*s3+1//8*tt1 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) @@ -1111,15 +1111,15 @@ end, function (tt::Union{GenericCyclo, GenericCycloFrac}) s1=nesum(tt, a, 0, q^3) s2=nesum(s1, b, 1, q) - tt1=eesubs(tt, [a,b], S.([(q^2-q+1)*a,2*a])) + tt1=eesubs(tt, [a,b], R.([(q^2-q+1)*a,2*a])) s3=nesum(tt1, a, 0, q) - tt1=eesubs(tt, [a,b], S.([2*a,a])) + tt1=eesubs(tt, [a,b], R.([2*a,a])) s4=nesum(tt1, a, 0, q^3) tt1=eesubs(tt, [b], [a]) s5=nesum(tt1, a, 0, q^3) - tt1=eesubs(tt, [a,b], S.([(q+1)*a,0])) + tt1=eesubs(tt, [a,b], R.([(q+1)*a,0])) s6=nesum(tt1, a, 0, q^2-q) - tt1=eesubs(tt, [a,b], S.([(q^3+1),0])) + tt1=eesubs(tt, [a,b], R.([(q^3+1),0])) 1//12*s2-1//4*s3-1//12*s4-1//12*s5+1//6*s6+1//4*tt1 end ] @@ -1186,7 +1186,7 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s2=nesum(s1, l, 0, q-2) tt1=eesubs(tt, [l], [0]) s3=nesum(tt1, k, 0, q^3-2) - tt1=eesubs(tt, [k,l], S.([(q-1)*k,0])) + tt1=eesubs(tt, [k,l], R.([(q-1)*k,0])) s4=nesum(tt1, k, 0, q^2+q) tt1=eesubs(tt, [k], [0]) s5=nesum(tt1, l, 1, q-2) @@ -1252,7 +1252,7 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s2=nesum(s1, l, 0, q^2-q) tt1=eesubs(tt, [l], [0]) s3=nesum(tt1, k, 0, q^2-q) - tt1=eesubs(tt, [k,l], S.([0,0])) + tt1=eesubs(tt, [k,l], R.([0,0])) 1//24*s2-1//6*s3+1//8*tt1 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) @@ -1264,7 +1264,7 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s2=nesum(s1, l, 1, q) tt1=eesubs(tt, [l], [0]) s3=nesum(tt1, k, 1, q^3) - tt1=eesubs(tt, [k,l], S.([(q+1)*k,0])) + tt1=eesubs(tt, [k,l], R.([(q+1)*k,0])) s4=nesum(tt1, k, 1, q^2-q) tt1=eesubs(tt, [k], [0]) s5=nesum(tt1, l, 1, q) diff --git a/data/Tables/3D4/3D4.11.jl b/data/Tables/3D4/3D4.11.jl index 9c83bd3c..3d664b07 100644 --- a/data/Tables/3D4/3D4.11.jl +++ b/data/Tables/3D4/3D4.11.jl @@ -1310,16 +1310,16 @@ end, function (tt::Union{GenericCyclo, GenericCycloFrac}) s1=nesum(tt, a, 0, q^3-2) s2=nesum(s1, b, 1, q-2) - tt1=eesubs(tt, [a,b], S.([(q^2+q+1)*a,2*a])) + tt1=eesubs(tt, [a,b], R.([(q^2+q+1)*a,2*a])) s3=nesum(tt1, a, 0, q-2) - tt1=eesubs(tt, [a,b], S.([2*a,a])) + tt1=eesubs(tt, [a,b], R.([2*a,a])) s4=nesum(tt1, a, 0, q^3-2) tt1=eesubs(tt, [b], [a]) s5=nesum(tt1, a, 0, q^3-2) - tt1=eesubs(tt, [a,b], S.([(q-1)*a,0])) + tt1=eesubs(tt, [a,b], R.([(q-1)*a,0])) s6=nesum(tt1, a, 0, q^2+q) - tt1=eesubs(tt, [a,b], S.([(q^3-1)*1//2,0])) - tt2=eesubs(tt, [a,b], S.([(q^3-1),0])) + tt1=eesubs(tt, [a,b], R.([(q^3-1)*1//2,0])) + tt2=eesubs(tt, [a,b], R.([(q^3-1),0])) 1//12*s2-1//4*s3-1//12*s4-1//12*s5+1//6*s6+1//4*tt1+1//4*tt2 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) @@ -1383,7 +1383,7 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s2=nesum(s1, b, 0, q^2+q) tt1=eesubs(tt, [b], [a]) s3=nesum(tt1, a, 0, q^2+q) - tt1=eesubs(tt, [a,b], S.([0,0])) + tt1=eesubs(tt, [a,b], R.([0,0])) 1//24*s2-1//6*s3+1//8*tt1 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) @@ -1391,7 +1391,7 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s2=nesum(s1, b, 0, q^2-q) tt1=eesubs(tt, [b], [a]) s3=nesum(tt1, a, 0, q^2-q) - tt1=eesubs(tt, [a,b], S.([0,0])) + tt1=eesubs(tt, [a,b], R.([0,0])) 1//24*s2-1//6*s3+1//8*tt1 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) @@ -1401,16 +1401,16 @@ end, function (tt::Union{GenericCyclo, GenericCycloFrac}) s1=nesum(tt, a, 0, q^3) s2=nesum(s1, b, 1, q) - tt1=eesubs(tt, [a,b], S.([(q^2-q+1)*a,2*a])) + tt1=eesubs(tt, [a,b], R.([(q^2-q+1)*a,2*a])) s3=nesum(tt1, a, 0, q) - tt1=eesubs(tt, [a,b], S.([2*a,a])) + tt1=eesubs(tt, [a,b], R.([2*a,a])) s4=nesum(tt1, a, 0, q^3) tt1=eesubs(tt, [b], [a]) s5=nesum(tt1, a, 0, q^3) - tt1=eesubs(tt, [a,b], S.([(q+1)*a,0])) + tt1=eesubs(tt, [a,b], R.([(q+1)*a,0])) s6=nesum(tt1, a, 0, q^2-q) - tt1=eesubs(tt, [a,b], S.([(q^3+1)*1//2,0])) - tt2=eesubs(tt, [a,b], S.([(q^3+1),0])) + tt1=eesubs(tt, [a,b], R.([(q^3+1)*1//2,0])) + tt2=eesubs(tt, [a,b], R.([(q^3+1),0])) 1//12*s2-1//4*s3-1//12*s4-1//12*s5+1//6*s6+1//4*tt1+1//4*tt2 end ] @@ -1493,11 +1493,11 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s2=nesum(s1, l, 0, q-2) tt1=eesubs(tt, [l], [0]) s3=nesum(tt1, k, 0, q^3-2) - tt1=eesubs(tt, [k,l], S.([(q-1)*k,0])) + tt1=eesubs(tt, [k,l], R.([(q-1)*k,0])) s4=nesum(tt1, k, 0, q^2+q) tt1=eesubs(tt, [k], [0]) s5=nesum(tt1, l, 1, q-2) - tt1=eesubs(tt, [k,l], S.([(q^3-1)*1//2,0])) + tt1=eesubs(tt, [k,l], R.([(q^3-1)*1//2,0])) 1//12*s2-1//4*s3+1//6*s4-1//4*s5+1//4*tt1 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) @@ -1561,7 +1561,7 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s2=nesum(s1, l, 0, q^2+q) tt1=eesubs(tt, [l], [0]) s3=nesum(tt1, k, 0, q^2+q) - tt1=eesubs(tt, [k,l], S.([0,0])) + tt1=eesubs(tt, [k,l], R.([0,0])) 1//24*s2-1//6*s3+1//8*tt1 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) @@ -1569,7 +1569,7 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s2=nesum(s1, l, 0, q^2-q) tt1=eesubs(tt, [l], [0]) s3=nesum(tt1, k, 0, q^2-q) - tt1=eesubs(tt, [k,l], S.([0,0])) + tt1=eesubs(tt, [k,l], R.([0,0])) 1//24*s2-1//6*s3+1//8*tt1 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) @@ -1581,11 +1581,11 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s2=nesum(s1, l, 1, q) tt1=eesubs(tt, [l], [0]) s3=nesum(tt1, k, 1, q^3) - tt1=eesubs(tt, [k,l], S.([(q+1)*k,0])) + tt1=eesubs(tt, [k,l], R.([(q+1)*k,0])) s4=nesum(tt1, k, 1, q^2-q) tt1=eesubs(tt, [k], [0]) s5=nesum(tt1, l, 1, q) - tt1=eesubs(tt, [k,l], S.([(q^3+1)*1//2,0])) + tt1=eesubs(tt, [k,l], R.([(q^3+1)*1//2,0])) 1//12*s2-1//6*s3+1//6*s4-1//6*s5+1//4*tt1 end ] diff --git a/data/Tables/3D4/3D4.13.jl b/data/Tables/3D4/3D4.13.jl index 952db2a8..eae8b252 100644 --- a/data/Tables/3D4/3D4.13.jl +++ b/data/Tables/3D4/3D4.13.jl @@ -1310,16 +1310,16 @@ end, function (tt::Union{GenericCyclo, GenericCycloFrac}) s1=nesum(tt, a, 0, q^3-2) s2=nesum(s1, b, 1, q-2) - tt1=eesubs(tt, [a,b], S.([(q^2+q+1)*a,2*a])) + tt1=eesubs(tt, [a,b], R.([(q^2+q+1)*a,2*a])) s3=nesum(tt1, a, 0, q-2) - tt1=eesubs(tt, [a,b], S.([2*a,a])) + tt1=eesubs(tt, [a,b], R.([2*a,a])) s4=nesum(tt1, a, 0, q^3-2) tt1=eesubs(tt, [b], [a]) s5=nesum(tt1, a, 0, q^3-2) - tt1=eesubs(tt, [a,b], S.([(q-1)*a,0])) + tt1=eesubs(tt, [a,b], R.([(q-1)*a,0])) s6=nesum(tt1, a, 0, q^2+q) - tt1=eesubs(tt, [a,b], S.([(q^3-1)*1//2,0])) - tt2=eesubs(tt, [a,b], S.([(q^3-1),0])) + tt1=eesubs(tt, [a,b], R.([(q^3-1)*1//2,0])) + tt2=eesubs(tt, [a,b], R.([(q^3-1),0])) 1//12*s2-1//4*s3-1//12*s4-1//12*s5+1//6*s6+1//4*tt1+1//4*tt2 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) @@ -1383,7 +1383,7 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s2=nesum(s1, b, 0, q^2+q) tt1=eesubs(tt, [b], [a]) s3=nesum(tt1, a, 0, q^2+q) - tt1=eesubs(tt, [a,b], S.([0,0])) + tt1=eesubs(tt, [a,b], R.([0,0])) 1//24*s2-1//6*s3+1//8*tt1 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) @@ -1391,7 +1391,7 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s2=nesum(s1, b, 0, q^2-q) tt1=eesubs(tt, [b], [a]) s3=nesum(tt1, a, 0, q^2-q) - tt1=eesubs(tt, [a,b], S.([0,0])) + tt1=eesubs(tt, [a,b], R.([0,0])) 1//24*s2-1//6*s3+1//8*tt1 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) @@ -1401,16 +1401,16 @@ end, function (tt::Union{GenericCyclo, GenericCycloFrac}) s1=nesum(tt, a, 0, q^3) s2=nesum(s1, b, 1, q) - tt1=eesubs(tt, [a,b], S.([(q^2-q+1)*a,2*a])) + tt1=eesubs(tt, [a,b], R.([(q^2-q+1)*a,2*a])) s3=nesum(tt1, a, 0, q) - tt1=eesubs(tt, [a,b], S.([2*a,a])) + tt1=eesubs(tt, [a,b], R.([2*a,a])) s4=nesum(tt1, a, 0, q^3) tt1=eesubs(tt, [b], [a]) s5=nesum(tt1, a, 0, q^3) - tt1=eesubs(tt, [a,b], S.([(q+1)*a,0])) + tt1=eesubs(tt, [a,b], R.([(q+1)*a,0])) s6=nesum(tt1, a, 0, q^2-q) - tt1=eesubs(tt, [a,b], S.([(q^3+1)*1//2,0])) - tt2=eesubs(tt, [a,b], S.([(q^3+1),0])) + tt1=eesubs(tt, [a,b], R.([(q^3+1)*1//2,0])) + tt2=eesubs(tt, [a,b], R.([(q^3+1),0])) 1//12*s2-1//4*s3-1//12*s4-1//12*s5+1//6*s6+1//4*tt1+1//4*tt2 end ] @@ -1493,11 +1493,11 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s2=nesum(s1, l, 0, q-2) tt1=eesubs(tt, [l], [0]) s3=nesum(tt1, k, 0, q^3-2) - tt1=eesubs(tt, [k,l], S.([(q-1)*k,0])) + tt1=eesubs(tt, [k,l], R.([(q-1)*k,0])) s4=nesum(tt1, k, 0, q^2+q) tt1=eesubs(tt, [k], [0]) s5=nesum(tt1, l, 1, q-2) - tt1=eesubs(tt, [k,l], S.([(q^3-1)*1//2,0])) + tt1=eesubs(tt, [k,l], R.([(q^3-1)*1//2,0])) 1//12*s2-1//4*s3+1//6*s4-1//4*s5+1//4*tt1 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) @@ -1561,7 +1561,7 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s2=nesum(s1, l, 0, q^2+q) tt1=eesubs(tt, [l], [0]) s3=nesum(tt1, k, 0, q^2+q) - tt1=eesubs(tt, [k,l], S.([0,0])) + tt1=eesubs(tt, [k,l], R.([0,0])) 1//24*s2-1//6*s3+1//8*tt1 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) @@ -1569,7 +1569,7 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s2=nesum(s1, l, 0, q^2-q) tt1=eesubs(tt, [l], [0]) s3=nesum(tt1, k, 0, q^2-q) - tt1=eesubs(tt, [k,l], S.([0,0])) + tt1=eesubs(tt, [k,l], R.([0,0])) 1//24*s2-1//6*s3+1//8*tt1 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) @@ -1581,11 +1581,11 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s2=nesum(s1, l, 1, q) tt1=eesubs(tt, [l], [0]) s3=nesum(tt1, k, 1, q^3) - tt1=eesubs(tt, [k,l], S.([(q+1)*k,0])) + tt1=eesubs(tt, [k,l], R.([(q+1)*k,0])) s4=nesum(tt1, k, 1, q^2-q) tt1=eesubs(tt, [k], [0]) s5=nesum(tt1, l, 1, q) - tt1=eesubs(tt, [k,l], S.([(q^3+1)*1//2,0])) + tt1=eesubs(tt, [k,l], R.([(q^3+1)*1//2,0])) 1//12*s2-1//6*s3+1//6*s4-1//6*s5+1//4*tt1 end ] diff --git a/data/Tables/A2/PGL3.1.jl b/data/Tables/A2/PGL3.1.jl index 6a480746..1720d919 100644 --- a/data/Tables/A2/PGL3.1.jl +++ b/data/Tables/A2/PGL3.1.jl @@ -145,7 +145,7 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) ss5=nesum(ss5a, b, 1, q-2) tt1=eesubs(tt, [b], [a]) ss6=nesum(tt1, a, 1, q-2) - ss7=eesubs(tt, [a,b], S.([(q-1)*1//3,2*(q-1)*1//3])) + ss7=eesubs(tt, [a,b], R.([(q-1)*1//3,2*(q-1)*1//3])) 1//6*ss5-1//6*ss6-1//3*ss7 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) diff --git a/data/Tables/G2/G2.01.jl b/data/Tables/G2/G2.01.jl index 2c89f1c9..58702920 100644 --- a/data/Tables/G2/G2.01.jl +++ b/data/Tables/G2/G2.01.jl @@ -917,7 +917,7 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s4=nesum(tt1, i, 1, q-2) tt1=eesubs(tt, [i], [-j]) s5=nesum(tt1, j, 1, q-2) - s7=eesubs(tt, [j,i], S.([i,(q-1)*1//3])) + s7=eesubs(tt, [j,i], R.([i,(q-1)*1//3])) 1//12*s2-1//12*s3-1//6*s4-1//12*s5+1//3*s7 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) @@ -1057,8 +1057,8 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s4=nesum(tt1, k, 1, q-2) tt1=eesubs(tt, [k], [-l]) s5=nesum(tt1, l, 1, q-2) - s7=eesubs(tt, [k,l], S.([(q-1)*1//3,2*(q-1)*1//3])) - s8=eesubs(tt, [k,l], S.([2*(q-1)*1//3,(q-1)*1//3])) + s7=eesubs(tt, [k,l], R.([(q-1)*1//3,2*(q-1)*1//3])) + s8=eesubs(tt, [k,l], R.([2*(q-1)*1//3,(q-1)*1//3])) 1//12*s2-1//12*s3-1//6*s4-1//12*s5+1//6*s7+1//6*s8 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) diff --git a/data/Tables/G2/G2.02.jl b/data/Tables/G2/G2.02.jl index 7811d914..3532267f 100644 --- a/data/Tables/G2/G2.02.jl +++ b/data/Tables/G2/G2.02.jl @@ -942,7 +942,7 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s4=nesum(tt1, i, 1, q) tt1=eesubs(tt, [i], [-j]) s5=nesum(tt1, j, 1, q) - s7=eesubs(tt, [j,i], S.([i,(q+1)*1//3])) + s7=eesubs(tt, [j,i], R.([i,(q+1)*1//3])) 1//12*s2-1//12*s3-1//6*s4-1//12*s5+1//3*s7 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) @@ -1066,8 +1066,8 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s4=nesum(tt1, k, 1, q) tt1=eesubs(tt, [k], [-l]) s5=nesum(tt1, l, 1, q) - s7=eesubs(tt, [k,l], S.([2*(q+1)*1//3,(q+1)*1//3])) - s8=eesubs(tt, [k,l], S.([(q+1)*1//3,2*(q+1)*1//3])) + s7=eesubs(tt, [k,l], R.([2*(q+1)*1//3,(q+1)*1//3])) + s8=eesubs(tt, [k,l], R.([(q+1)*1//3,2*(q+1)*1//3])) 1//12*s2-1//12*s3-1//6*s4-1//12*s5+1//6*s7+1//6*s8 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) diff --git a/data/Tables/G2/G2.101.jl b/data/Tables/G2/G2.101.jl index d360a8c6..0d309e14 100644 --- a/data/Tables/G2/G2.101.jl +++ b/data/Tables/G2/G2.101.jl @@ -1001,8 +1001,8 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s4=nesum(tt1, i, 1, q-2) tt1=eesubs(tt, [i], [-j]) s5=nesum(tt1, j, 1, q-2) - s6=eesubs(tt, [i,j], S.([(q-1)*1//2,(q-1)*1//2])) - s7=eesubs(tt, [i,j], S.([(q-1)*1//2,0])) + s6=eesubs(tt, [i,j], R.([(q-1)*1//2,(q-1)*1//2])) + s7=eesubs(tt, [i,j], R.([(q-1)*1//2,0])) 1//12*s2-1//12*s3-1//6*s4-1//12*s5+1//12*s6+1//6*s7 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) @@ -1034,8 +1034,8 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s4=nesum(tt1, i, 1, q) tt1=eesubs(tt, [i], [-j]) s5=nesum(tt1, j, 1, q) - s6=eesubs(tt, [i,j], S.([(q+1)*1//2,(q+1)*1//2])) - s7=eesubs(tt, [i,j], S.([(q+1)*1//2,0])) + s6=eesubs(tt, [i,j], R.([(q+1)*1//2,(q+1)*1//2])) + s7=eesubs(tt, [i,j], R.([(q+1)*1//2,0])) 1//12*s2-1//12*s3-1//6*s4-1//12*s5+1//12*s6+1//6*s7 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) @@ -1140,8 +1140,8 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s4=nesum(tt1, k, 1, q-2) tt1=eesubs(tt, [k], [-l]) s5=nesum(tt1, l, 1, q-2) - s6=eesubs(tt, [k,l], S.([(q-1)*1//2,(q-1)*1//2])) - s7=eesubs(tt, [k,l], S.([(q-1)*1//2,0])) + s6=eesubs(tt, [k,l], R.([(q-1)*1//2,(q-1)*1//2])) + s7=eesubs(tt, [k,l], R.([(q-1)*1//2,0])) 1//12*s2-1//12*s3-1//6*s4-1//12*s5+1//12*s6+1//6*s7 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) @@ -1153,8 +1153,8 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s4=nesum(tt1, k, 1, q) tt1=eesubs(tt, [k], [-l]) s5=nesum(tt1, l, 1, q) - s6=eesubs(tt, [k,l], S.([(q+1)*1//2,(q+1)*1//2])) - s7=eesubs(tt, [k,l], S.([(q+1)*1//2,0])) + s6=eesubs(tt, [k,l], R.([(q+1)*1//2,(q+1)*1//2])) + s7=eesubs(tt, [k,l], R.([(q+1)*1//2,0])) 1//12*s2-1//12*s3-1//6*s4-1//12*s5+1//12*s6+1//6*s7 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) diff --git a/data/Tables/G2/G2.103.jl b/data/Tables/G2/G2.103.jl index 1f0da028..642f5ba3 100644 --- a/data/Tables/G2/G2.103.jl +++ b/data/Tables/G2/G2.103.jl @@ -1001,8 +1001,8 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s4=nesum(tt1, i, 1, q-2) tt1=eesubs(tt, [i], [-j]) s5=nesum(tt1, j, 1, q-2) - s6=eesubs(tt, [i,j], S.([(q-1)*1//2,(q-1)*1//2])) - s7=eesubs(tt, [i,j], S.([(q-1)*1//2,0])) + s6=eesubs(tt, [i,j], R.([(q-1)*1//2,(q-1)*1//2])) + s7=eesubs(tt, [i,j], R.([(q-1)*1//2,0])) 1//12*s2-1//12*s3-1//6*s4-1//12*s5+1//12*s6+1//6*s7 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) @@ -1034,8 +1034,8 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s4=nesum(tt1, i, 1, q) tt1=eesubs(tt, [i], [-j]) s5=nesum(tt1, j, 1, q) - s6=eesubs(tt, [i,j], S.([(q+1)*1//2,(q+1)*1//2])) - s7=eesubs(tt, [i,j], S.([(q+1)*1//2,0])) + s6=eesubs(tt, [i,j], R.([(q+1)*1//2,(q+1)*1//2])) + s7=eesubs(tt, [i,j], R.([(q+1)*1//2,0])) 1//12*s2-1//12*s3-1//6*s4-1//12*s5+1//12*s6+1//6*s7 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) @@ -1140,8 +1140,8 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s4=nesum(tt1, k, 1, q-2) tt1=eesubs(tt, [k], [-l]) s5=nesum(tt1, l, 1, q-2) - s6=eesubs(tt, [k,l], S.([(q-1)*1//2,(q-1)*1//2])) - s7=eesubs(tt, [k,l], S.([(q-1)*1//2,0])) + s6=eesubs(tt, [k,l], R.([(q-1)*1//2,(q-1)*1//2])) + s7=eesubs(tt, [k,l], R.([(q-1)*1//2,0])) 1//12*s2-1//12*s3-1//6*s4-1//12*s5+1//12*s6+1//6*s7 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) @@ -1153,8 +1153,8 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s4=nesum(tt1, k, 1, q) tt1=eesubs(tt, [k], [-l]) s5=nesum(tt1, l, 1, q) - s6=eesubs(tt, [k,l], S.([(q+1)*1//2,(q+1)*1//2])) - s7=eesubs(tt, [k,l], S.([(q+1)*1//2,0])) + s6=eesubs(tt, [k,l], R.([(q+1)*1//2,(q+1)*1//2])) + s7=eesubs(tt, [k,l], R.([(q+1)*1//2,0])) 1//12*s2-1//12*s3-1//6*s4-1//12*s5+1//12*s6+1//6*s7 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) diff --git a/data/Tables/G2/G2.111.jl b/data/Tables/G2/G2.111.jl index 324e08ba..12f2c6d9 100644 --- a/data/Tables/G2/G2.111.jl +++ b/data/Tables/G2/G2.111.jl @@ -1201,10 +1201,10 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s4=nesum(tt1, i, 1, q-2) tt1=eesubs(tt, [i], [-j]) s5=nesum(tt1, j, 1, q-2) - s6=eesubs(tt, [i,j], S.([(q-1)*1//2,(q-1)*1//2])) - s7=eesubs(tt, [i,j], S.([(q-1)*1//2,0])) - s8=eesubs(tt, [i,j], S.([(q-1)*1//3,(q-1)*1//3])) - s9=eesubs(tt, [i,j], S.([2*(q-1)*1//3,2*(q-1)*1//3])) + s6=eesubs(tt, [i,j], R.([(q-1)*1//2,(q-1)*1//2])) + s7=eesubs(tt, [i,j], R.([(q-1)*1//2,0])) + s8=eesubs(tt, [i,j], R.([(q-1)*1//3,(q-1)*1//3])) + s9=eesubs(tt, [i,j], R.([2*(q-1)*1//3,2*(q-1)*1//3])) 1//12*s2-1//12*s3-1//6*s4-1//12*s5+1//12*s6+1//6*s7+1//6*s8+1//6*s9 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) @@ -1216,8 +1216,8 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s4=nesum(tt1, i, 1, q) tt1=eesubs(tt, [i], [-j]) s5=nesum(tt1, j, 1, q) - s6=eesubs(tt, [i,j], S.([(q+1)*1//2,(q+1)*1//2])) - s7=eesubs(tt, [i,j], S.([(q+1)*1//2,0])) + s6=eesubs(tt, [i,j], R.([(q+1)*1//2,(q+1)*1//2])) + s7=eesubs(tt, [i,j], R.([(q+1)*1//2,0])) 1//12*s2-1//12*s3-1//6*s4-1//12*s5+1//12*s6+1//6*s7 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) @@ -1354,10 +1354,10 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s4=nesum(tt1, k, 1, q-2) tt1=eesubs(tt, [k], [-l]) s5=nesum(tt1, l, 1, q-2) - s6=eesubs(tt, [k,l], S.([(q-1)*1//2,(q-1)*1//2])) - s7=eesubs(tt, [k,l], S.([(q-1)*1//2,0])) - s8=eesubs(tt, [k,l], S.([(q-1)*1//3,2*(q-1)*1//3])) - s9=eesubs(tt, [k,l], S.([2*(q-1)*1//3,(q-1)*1//3])) + s6=eesubs(tt, [k,l], R.([(q-1)*1//2,(q-1)*1//2])) + s7=eesubs(tt, [k,l], R.([(q-1)*1//2,0])) + s8=eesubs(tt, [k,l], R.([(q-1)*1//3,2*(q-1)*1//3])) + s9=eesubs(tt, [k,l], R.([2*(q-1)*1//3,(q-1)*1//3])) 1//12*s2-1//12*s3-1//6*s4-1//12*s5+1//12*s6+1//6*s7+1//6*s8+1//6*s9 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) @@ -1369,8 +1369,8 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s4=nesum(tt1, k, 1, q) tt1=eesubs(tt, [k], [-l]) s5=nesum(tt1, l, 1, q) - s6=eesubs(tt, [k,l], S.([(q+1)*1//2,(q+1)*1//2])) - s7=eesubs(tt, [k,l], S.([(q+1)*1//2,0])) + s6=eesubs(tt, [k,l], R.([(q+1)*1//2,(q+1)*1//2])) + s7=eesubs(tt, [k,l], R.([(q+1)*1//2,0])) 1//12*s2-1//12*s3-1//6*s4-1//12*s5+1//12*s6+1//6*s7 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) diff --git a/data/Tables/G2/G2.113.jl b/data/Tables/G2/G2.113.jl index 9a523e76..4be1e60f 100644 --- a/data/Tables/G2/G2.113.jl +++ b/data/Tables/G2/G2.113.jl @@ -1201,10 +1201,10 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s4=nesum(tt1, i, 1, q-2) tt1=eesubs(tt, [i], [-j]) s5=nesum(tt1, j, 1, q-2) - s6=eesubs(tt, [i,j], S.([(q-1)*1//2,(q-1)*1//2])) - s7=eesubs(tt, [i,j], S.([(q-1)*1//2,0])) - s8=eesubs(tt, [i,j], S.([(q-1)*1//3,(q-1)*1//3])) - s9=eesubs(tt, [i,j], S.([2*(q-1)*1//3,2*(q-1)*1//3])) + s6=eesubs(tt, [i,j], R.([(q-1)*1//2,(q-1)*1//2])) + s7=eesubs(tt, [i,j], R.([(q-1)*1//2,0])) + s8=eesubs(tt, [i,j], R.([(q-1)*1//3,(q-1)*1//3])) + s9=eesubs(tt, [i,j], R.([2*(q-1)*1//3,2*(q-1)*1//3])) 1//12*s2-1//12*s3-1//6*s4-1//12*s5+1//12*s6+1//6*s7+1//6*s8+1//6*s9 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) @@ -1216,8 +1216,8 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s4=nesum(tt1, i, 1, q) tt1=eesubs(tt, [i], [-j]) s5=nesum(tt1, j, 1, q) - s6=eesubs(tt, [i,j], S.([(q+1)*1//2,(q+1)*1//2])) - s7=eesubs(tt, [i,j], S.([(q+1)*1//2,0])) + s6=eesubs(tt, [i,j], R.([(q+1)*1//2,(q+1)*1//2])) + s7=eesubs(tt, [i,j], R.([(q+1)*1//2,0])) 1//12*s2-1//12*s3-1//6*s4-1//12*s5+1//12*s6+1//6*s7 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) @@ -1354,10 +1354,10 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s4=nesum(tt1, k, 1, q-2) tt1=eesubs(tt, [k], [-l]) s5=nesum(tt1, l, 1, q-2) - s6=eesubs(tt, [k,l], S.([(q-1)*1//2,(q-1)*1//2])) - s7=eesubs(tt, [k,l], S.([(q-1)*1//2,0])) - s8=eesubs(tt, [k,l], S.([(q-1)*1//3,2*(q-1)*1//3])) - s9=eesubs(tt, [k,l], S.([2*(q-1)*1//3,(q-1)*1//3])) + s6=eesubs(tt, [k,l], R.([(q-1)*1//2,(q-1)*1//2])) + s7=eesubs(tt, [k,l], R.([(q-1)*1//2,0])) + s8=eesubs(tt, [k,l], R.([(q-1)*1//3,2*(q-1)*1//3])) + s9=eesubs(tt, [k,l], R.([2*(q-1)*1//3,(q-1)*1//3])) 1//12*s2-1//12*s3-1//6*s4-1//12*s5+1//12*s6+1//6*s7+1//6*s8+1//6*s9 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) @@ -1369,8 +1369,8 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s4=nesum(tt1, k, 1, q) tt1=eesubs(tt, [k], [-l]) s5=nesum(tt1, l, 1, q) - s6=eesubs(tt, [k,l], S.([(q+1)*1//2,(q+1)*1//2])) - s7=eesubs(tt, [k,l], S.([(q+1)*1//2,0])) + s6=eesubs(tt, [k,l], R.([(q+1)*1//2,(q+1)*1//2])) + s7=eesubs(tt, [k,l], R.([(q+1)*1//2,0])) 1//12*s2-1//12*s3-1//6*s4-1//12*s5+1//12*s6+1//6*s7 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) diff --git a/data/Tables/G2/G2.121.jl b/data/Tables/G2/G2.121.jl index baf8ebaf..457acb2e 100644 --- a/data/Tables/G2/G2.121.jl +++ b/data/Tables/G2/G2.121.jl @@ -1201,8 +1201,8 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s4=nesum(tt1, i, 1, q-2) tt1=eesubs(tt, [i], [-j]) s5=nesum(tt1, j, 1, q-2) - s6=eesubs(tt, [i,j], S.([(q-1)*1//2,(q-1)*1//2])) - s7=eesubs(tt, [i,j], S.([(q-1)*1//2,0])) + s6=eesubs(tt, [i,j], R.([(q-1)*1//2,(q-1)*1//2])) + s7=eesubs(tt, [i,j], R.([(q-1)*1//2,0])) 1//12*s2-1//12*s3-1//6*s4-1//12*s5+1//12*s6+1//6*s7 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) @@ -1214,10 +1214,10 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s4=nesum(tt1, i, 1, q) tt1=eesubs(tt, [i], [-j]) s5=nesum(tt1, j, 1, q) - s6=eesubs(tt, [i,j], S.([(q+1)*1//2,(q+1)*1//2])) - s7=eesubs(tt, [i,j], S.([(q+1)*1//2,0])) - s8=eesubs(tt, [i,j], S.([(q+1)*1//3,(q+1)*1//3])) - s9=eesubs(tt, [i,j], S.([2*(q+1)*1//3,2*(q+1)*1//3])) + s6=eesubs(tt, [i,j], R.([(q+1)*1//2,(q+1)*1//2])) + s7=eesubs(tt, [i,j], R.([(q+1)*1//2,0])) + s8=eesubs(tt, [i,j], R.([(q+1)*1//3,(q+1)*1//3])) + s9=eesubs(tt, [i,j], R.([2*(q+1)*1//3,2*(q+1)*1//3])) 1//12*s2-1//12*s3-1//6*s4-1//12*s5+1//12*s6+1//6*s7+1//6*s8+1//6*s9 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) @@ -1354,8 +1354,8 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s4=nesum(tt1, k, 1, q-2) tt1=eesubs(tt, [k], [-l]) s5=nesum(tt1, l, 1, q-2) - s6=eesubs(tt, [k,l], S.([(q-1)*1//2,(q-1)*1//2])) - s7=eesubs(tt, [k,l], S.([(q-1)*1//2,0])) + s6=eesubs(tt, [k,l], R.([(q-1)*1//2,(q-1)*1//2])) + s7=eesubs(tt, [k,l], R.([(q-1)*1//2,0])) 1//12*s2-1//12*s3-1//6*s4-1//12*s5+1//12*s6+1//6*s7 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) @@ -1367,10 +1367,10 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s4=nesum(tt1, k, 1, q) tt1=eesubs(tt, [k], [-l]) s5=nesum(tt1, l, 1, q) - s6=eesubs(tt, [k,l], S.([(q+1)*1//2,(q+1)*1//2])) - s7=eesubs(tt, [k,l], S.([(q+1)*1//2,0])) - s8=eesubs(tt, [k,l], S.([(q+1)*1//3,2*(q+1)*1//3])) - s9=eesubs(tt, [k,l], S.([2*(q+1)*1//3,(q+1)*1//3])) + s6=eesubs(tt, [k,l], R.([(q+1)*1//2,(q+1)*1//2])) + s7=eesubs(tt, [k,l], R.([(q+1)*1//2,0])) + s8=eesubs(tt, [k,l], R.([(q+1)*1//3,2*(q+1)*1//3])) + s9=eesubs(tt, [k,l], R.([2*(q+1)*1//3,(q+1)*1//3])) 1//12*s2-1//12*s3-1//6*s4-1//12*s5+1//12*s6+1//6*s7+1//6*s8+1//6*s9 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) diff --git a/data/Tables/G2/G2.123.jl b/data/Tables/G2/G2.123.jl index e85f6665..18655dc0 100644 --- a/data/Tables/G2/G2.123.jl +++ b/data/Tables/G2/G2.123.jl @@ -1201,8 +1201,8 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s4=nesum(tt1, i, 1, q-2) tt1=eesubs(tt, [i], [-j]) s5=nesum(tt1, j, 1, q-2) - s6=eesubs(tt, [i,j], S.([(q-1)*1//2,(q-1)*1//2])) - s7=eesubs(tt, [i,j], S.([(q-1)*1//2,0])) + s6=eesubs(tt, [i,j], R.([(q-1)*1//2,(q-1)*1//2])) + s7=eesubs(tt, [i,j], R.([(q-1)*1//2,0])) 1//12*s2-1//12*s3-1//6*s4-1//12*s5+1//12*s6+1//6*s7 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) @@ -1214,10 +1214,10 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s4=nesum(tt1, i, 1, q) tt1=eesubs(tt, [i], [-j]) s5=nesum(tt1, j, 1, q) - s6=eesubs(tt, [i,j], S.([(q+1)*1//2,(q+1)*1//2])) - s7=eesubs(tt, [i,j], S.([(q+1)*1//2,0])) - s8=eesubs(tt, [i,j], S.([(q+1)*1//3,(q+1)*1//3])) - s9=eesubs(tt, [i,j], S.([2*(q+1)*1//3,2*(q+1)*1//3])) + s6=eesubs(tt, [i,j], R.([(q+1)*1//2,(q+1)*1//2])) + s7=eesubs(tt, [i,j], R.([(q+1)*1//2,0])) + s8=eesubs(tt, [i,j], R.([(q+1)*1//3,(q+1)*1//3])) + s9=eesubs(tt, [i,j], R.([2*(q+1)*1//3,2*(q+1)*1//3])) 1//12*s2-1//12*s3-1//6*s4-1//12*s5+1//12*s6+1//6*s7+1//6*s8+1//6*s9 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) @@ -1354,8 +1354,8 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s4=nesum(tt1, k, 1, q-2) tt1=eesubs(tt, [k], [-l]) s5=nesum(tt1, l, 1, q-2) - s6=eesubs(tt, [k,l], S.([(q-1)*1//2,(q-1)*1//2])) - s7=eesubs(tt, [k,l], S.([(q-1)*1//2,0])) + s6=eesubs(tt, [k,l], R.([(q-1)*1//2,(q-1)*1//2])) + s7=eesubs(tt, [k,l], R.([(q-1)*1//2,0])) 1//12*s2-1//12*s3-1//6*s4-1//12*s5+1//12*s6+1//6*s7 end, function (tt::Union{GenericCyclo, GenericCycloFrac}) @@ -1367,10 +1367,10 @@ function (tt::Union{GenericCyclo, GenericCycloFrac}) s4=nesum(tt1, k, 1, q) tt1=eesubs(tt, [k], [-l]) s5=nesum(tt1, l, 1, q) - s6=eesubs(tt, [k,l], S.([(q+1)*1//2,(q+1)*1//2])) - s7=eesubs(tt, [k,l], S.([(q+1)*1//2,0])) - s8=eesubs(tt, [k,l], S.([(q+1)*1//3,2*(q+1)*1//3])) - s9=eesubs(tt, [k,l], S.([2*(q+1)*1//3,(q+1)*1//3])) + s6=eesubs(tt, [k,l], R.([(q+1)*1//2,(q+1)*1//2])) + s7=eesubs(tt, [k,l], R.([(q+1)*1//2,0])) + s8=eesubs(tt, [k,l], R.([(q+1)*1//3,2*(q+1)*1//3])) + s9=eesubs(tt, [k,l], R.([2*(q+1)*1//3,(q+1)*1//3])) 1//12*s2-1//12*s3-1//6*s4-1//12*s5+1//12*s6+1//6*s7+1//6*s8+1//6*s9 end, function (tt::Union{GenericCyclo, GenericCycloFrac})