diff options
Diffstat (limited to 'src/algebra/integrat.spad.pamphlet')
| -rw-r--r-- | src/algebra/integrat.spad.pamphlet | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/algebra/integrat.spad.pamphlet b/src/algebra/integrat.spad.pamphlet index 9fce6205..fb83e7f3 100644 --- a/src/algebra/integrat.spad.pamphlet +++ b/src/algebra/integrat.spad.pamphlet @@ -76,7 +76,7 @@ FunctionSpaceComplexIntegration(R, F): Exports == Implementation where [k for k in tower(g := realElementary(f, x)) | member?(x, variables(k::F))]$List(Kernel F))$List(Kernel F) => h := trigs2explogs(F2FG g, [K2KG k for k in tower f - | is?(k, "tan"::SE) or is?(k, "cot"::SE)], [x]) + | is?(k, 'tan) or is?(k, 'cot)], [x]) real?(g := FG2F h) => internalIntegrate0(rootSimp(rischNormalize(g, x).func), x) real?(g := FG2F(h := rootSimp(rischNormalize(h, x).func))) => @@ -149,7 +149,7 @@ FunctionSpaceIntegration(R, F): Exports == Implementation where tan2temp k == kernel(optemp, argument k, height k)$K trans? f == - any?(is?(#1,"log"::SE) or is?(#1,"exp"::SE) or is?(#1,"atan"::SE), + any?(is?(#1,'log) or is?(#1,'exp) or is?(#1,'atan), operators f)$List(BasicOperator) mkPrimh(f, x, h, comp) == @@ -198,19 +198,19 @@ FunctionSpaceIntegration(R, F): Exports == Implementation where R has complex or not real? f => complexIntegrate(f, x) f := distribute(f, x::F) tf := [k for k in tower f | member?(x, variables(k::F)@List(SE))]$List(K) - ltf := select(is?(operator #1, "tan"::SE), tf) + ltf := select(is?(operator #1, 'tan), tf) ht := any?(has?(operator #1, 'htrig), tf) rec := rischNormalize(realElementary(f, x), x) g := rootSimp(rec.func) tg := [k for k in tower g | member?(x, variables(k::F))]$List(K) - ltg := select(is?(operator #1, "tan"::SE), tg) + ltg := select(is?(operator #1, 'tan), tg) rtg := any?(has?(operator #1, 'rtrig), tg) el := any?(has?(operator #1, 'elem), tg) i:IR if (comp := goComplex?(rtg, tg, ltg)) then i := map(FG2F, lfintegrate(trigs2explogs(F2FG g, - [K2KG k for k in tf | is?(k, "tan"::SE) or - is?(k, "cot"::SE)], [x]), x)) + [K2KG k for k in tf | is?(k, 'tan) or + is?(k, 'cot)], [x]), x)) else i := lfintegrate(g, x) ltg := setDifference(ltg, ltf) -- tan's added by normalization (u := rinteg(i, f, x, el and ht, comp)) case F => |