diff options
Diffstat (limited to 'src/algebra/intef.spad.pamphlet')
| -rw-r--r-- | src/algebra/intef.spad.pamphlet | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/algebra/intef.spad.pamphlet b/src/algebra/intef.spad.pamphlet index 7e96e6f2..ab6821ba 100644 --- a/src/algebra/intef.spad.pamphlet +++ b/src/algebra/intef.spad.pamphlet @@ -99,7 +99,7 @@ ElementaryIntegration(R, F): Exports == Implementation where tryChangeVar: (F, K, SE) -> Union(IR, "failed") droponex : (F, F, K, F) -> Union(F, "failed") - prim?(k, x) == is?(k, "log"::SE) or has?(operator k, 'prim) + prim?(k, x) == is?(k, 'log) or has?(operator k, 'prim) tanint(f, x, k) == eta' := differentiate(eta := first argument k, x) @@ -147,7 +147,7 @@ ElementaryIntegration(R, F): Exports == Implementation where alglfint(f, k, l, x) == xf := x::F symbolIfCan(kx := ksec(k,l,x)) case SE => addx(palgint(f, kx, k), xf) - is?(kx, "exp"::SE) => addx(algexpint(f, kx, k, x), xf) + is?(kx, 'exp) => addx(algexpint(f, kx, k, x), xf) prim?(kx, x) => addx(algprimint(f, kx, k, x), xf) has?(operator kx, ALGOP) => rec := primitiveElement(kx::F, k::F) @@ -167,7 +167,7 @@ ElementaryIntegration(R, F): Exports == Implementation where ky := retract(y)@K r := u::Record(ratpart:F, coeff:F) [eval(r.ratpart,ky,rec.primelt), eval(r.coeff,ky,rec.primelt)] - is?(kx, "exp"::SE) or is?(kx, "log"::SE) => FAIL + is?(kx, 'exp) or is?(kx, 'log) => FAIL unkextint(f, x, g) alglflimint(f, k, l, x, lu) == @@ -183,7 +183,7 @@ ElementaryIntegration(R, F): Exports == Implementation where [eval(r.mainpart, ky, rec.primelt), [[eval(rc.coeff, ky, rec.primelt), eval(rc.logand,ky, rec.primelt)] for rc in r.limitedlogs]] - is?(kx, "exp"::SE) or is?(kx, "log"::SE) => FAIL + is?(kx, 'exp) or is?(kx, 'log) => FAIL unklimint(f, x, lu) if R has Join(ConvertibleTo Pattern Integer, PatternMatchable Integer) @@ -199,8 +199,8 @@ ElementaryIntegration(R, F): Exports == Implementation where empty?(l := varselect(kernels f, x)) => (xf * f)::IR symbolIfCan(k := kmax l) case SE => map(multivariate(#1, k), integrate univariate(f, k)) - is?(k, "tan"::SE) => addx(tanint(f, x, k), xf) - is?(k, "exp"::SE) => addx(expint(f, x, k), xf) + is?(k, 'tan) => addx(tanint(f, x, k), xf) + is?(k, 'exp) => addx(expint(f, x, k), xf) prim?(k, x) => addx(primint(f, x, k), xf) has?(operator k, ALGOP) => alglfint(f, k, l, x) unknownint(f, x) @@ -233,7 +233,7 @@ ElementaryIntegration(R, F): Exports == Implementation where case SE => map(multivariate(#1, k), extendedint(univariate(f, k), univariate(g, k))) - is?(k, "exp"::SE) => expextint(f, x, k, g) + is?(k, 'exp) => expextint(f, x, k, g) prim?(k, x) => primextint(f, x, k, g) has?(operator k, ALGOP) => alglfextint(f, k, l, x, g) unkextint(f, x, g) @@ -243,7 +243,7 @@ ElementaryIntegration(R, F): Exports == Implementation where symbolIfCan(k := kmax(l)) case SE => map(multivariate(#1, k), limitedint(univariate(f, k), [univariate(u, k) for u in lu])) - is?(k, "exp"::SE) => explimint(f, x, k, lu) + is?(k, 'exp) => explimint(f, x, k, lu) prim?(k, x) => primlimint(f, x, k, lu) has?(operator k, ALGOP) => alglflimint(f, k, l, x, lu) unklimint(f, x, lu) @@ -254,7 +254,7 @@ ElementaryIntegration(R, F): Exports == Implementation where primextint(f, x, k, g) == lk := varselect([a for a in tower f - | k ~= a and is?(a, "log"::SE)], x) + | k ~= a and is?(a, 'log)], x) (u1 := primextendedint(univariate(f, k), differentiate(#1, differentiate(#1, x), differentiate(k::F, x)::UP), lfextlimint(#1, x, k, lk), univariate(g, k))) case "failed" @@ -278,7 +278,7 @@ ElementaryIntegration(R, F): Exports == Implementation where primint(f, x, k) == lk := varselect([a for a in tower f - | k ~= a and is?(a, "log"::SE)], x) + | k ~= a and is?(a, 'log)], x) r1 := primintegrate(univariate(f, k), differentiate(#1, differentiate(#1, x), differentiate(k::F, x)::UP), lfextlimint(#1, x, k, lk)) @@ -289,7 +289,7 @@ ElementaryIntegration(R, F): Exports == Implementation where case "failed") => u1 twr := tower f empty?(lg := [kk for kk in lk | not member?(kk, twr)]) => "failed" - is?(k, "log"::SE) => + is?(k, 'log) => (u2 := lflimitedint(f, x, [first argument u for u in union(lg, [k])])) case "failed" => "failed" @@ -313,7 +313,7 @@ ElementaryIntegration(R, F): Exports == Implementation where primlimint(f, x, k, lu) == lk := varselect([a for a in tower f - | k ~= a and is?(a, "log"::SE)], x) + | k ~= a and is?(a, 'log)], x) (u1 := primlimitedint(univariate(f, k), differentiate(#1, differentiate(#1, x), differentiate(k::F, x)::UP), lfextlimint(#1, x, k, lk), [univariate(u, k) for u in lu])) |