diff options
| author | dos-reis <gdr@axiomatics.org> | 2009-05-25 05:29:46 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2009-05-25 05:29:46 +0000 |
| commit | 785f36fcc98e8cbbd206342a73b274bc361508d6 (patch) | |
| tree | 2cb0c951f79e8fd7a3c77832b9c9098c608d8eb5 /src/algebra/intpm.spad.pamphlet | |
| parent | 67eb28e8fcfd246d7f149c00bdd3089e2f606676 (diff) | |
| download | open-axiom-785f36fcc98e8cbbd206342a73b274bc361508d6.tar.gz | |
Partial fix for AW/193 and AW/334.
* algebra/algfunc.spad.pamphlet: Remove OrderedSet requirements.
* algebra/combfunc.spad.pamphlet: Likewise.
* algebra/defintef.spad.pamphlet: Likewise.
* algebra/defintrf.spad.pamphlet: Likewise.
* algebra/degred.spad.pamphlet: Likewise.
* algebra/efstruc.spad.pamphlet: Likewise.
* algebra/elemntry.spad.pamphlet: Likewise.
* algebra/expexpan.spad.pamphlet: Likewise.
* algebra/expr.spad.pamphlet: Likewise.
* algebra/expr2ups.spad.pamphlet: Likewise.
* algebra/exprode.spad.pamphlet: Likewise.
* algebra/fortran.spad.pamphlet: Likewise.
* algebra/fr.spad.pamphlet: Likewise.
* algebra/fraction.spad.pamphlet: Likewise.
* algebra/fs2expxp.spad.pamphlet: Likewise.
* algebra/fspace.spad.pamphlet: Likewise.
* algebra/funcpkgs.spad.pamphlet: Likewise.
* algebra/gaussian.spad.pamphlet: Likewise.
* algebra/genups.spad.pamphlet: Likewise.
* algebra/intalg.spad.pamphlet: Likewise.
* algebra/intef.spad.pamphlet: Likewise.
* algebra/integrat.spad.pamphlet: Likewise.
* algebra/intpm.spad.pamphlet: Likewise.
* algebra/irexpand.spad.pamphlet: Likewise.
* algebra/kl.spad.pamphlet: Likewise.
* algebra/laplace.spad.pamphlet: Likewise.
* algebra/limitps.spad.pamphlet: Likewise.
* algebra/liouv.spad.pamphlet: Likewise.
* algebra/manip.spad.pamphlet: Likewise.
* algebra/nlode.spad.pamphlet: Likewise.
* algebra/odeef.spad.pamphlet: Likewise.
* algebra/oderf.spad.pamphlet: Likewise.
* algebra/openmath.spad.pamphlet: Likewise.
* algebra/patmatch1.spad.pamphlet: Likewise.
* algebra/patmatch2.spad.pamphlet: Likewise.
* algebra/pfo.spad.pamphlet: Likewise.
* algebra/polycat.spad.pamphlet: Likewise.
* algebra/primelt.spad.pamphlet: Likewise.
* algebra/rdeef.spad.pamphlet: Likewise.
* algebra/rdesys.spad.pamphlet: Likewise.
* algebra/rule.spad.pamphlet: Likewise.
* algebra/solverad.spad.pamphlet: Likewise.
* algebra/sum.spad.pamphlet: Likewise.
* algebra/transsolve.spad.pamphlet: Likewise.
* testsuite/interpreter/aw-193.input: New.
* testsuite/interpreter/aw-334.input: Likewise.
Diffstat (limited to 'src/algebra/intpm.spad.pamphlet')
| -rw-r--r-- | src/algebra/intpm.spad.pamphlet | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/algebra/intpm.spad.pamphlet b/src/algebra/intpm.spad.pamphlet index aca1a275..3ac33ab1 100644 --- a/src/algebra/intpm.spad.pamphlet +++ b/src/algebra/intpm.spad.pamphlet @@ -20,7 +20,7 @@ ++ the pattern matcher to find some indefinite and definite integrals ++ involving special functions and found in the litterature. PatternMatchIntegration(R, F): Exports == Implementation where - R : Join(OrderedSet, RetractableTo Integer, GcdDomain, + R : Join(RetractableTo Integer, GcdDomain, LinearlyExplicitRingOver Integer) F : Join(AlgebraicallyClosedField, TranscendentalFunctionCategory, FunctionSpace R) @@ -87,7 +87,7 @@ PatternMatchIntegration(R, F): Exports == Implementation where w := suchThat(optional(pmw::F), empty? variables #1) s := suchThat(optional(pms::F), empty? variables #1 and real? #1) m := suchThat(optional(pmm::F), - (retractIfCan(#1)@Union(Z,"failed") case Z) and #1 >= 0) + (retractIfCan(#1)@Union(Z,"failed") case Z) and not before?(#1,0)) spi := sqrt(pi()$F) @@ -125,7 +125,6 @@ PatternMatchIntegration(R, F): Exports == Implementation where if R has ConvertibleTo Pattern Integer and R has PatternMatchable Integer then if F has LiouvillianFunctionCategory then - import ElementaryFunctionSign(R, F) insqrt : F -> F matchei : (F, SY) -> REC |