diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-06-21 03:16:39 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-06-21 03:16:39 +0000 |
| commit | afaaaac2b55741bfe43099f819fd4a9592b1c022 (patch) | |
| tree | 7a5bbd28009759b1c787d3df4c4ba5960cd11280 /src/algebra/d01routine.spad.pamphlet | |
| parent | 640d839b4de4d0daf0dde00ba08eab6d264160ad (diff) | |
| download | open-axiom-afaaaac2b55741bfe43099f819fd4a9592b1c022.tar.gz | |
Revert previous erroneous commit
Diffstat (limited to 'src/algebra/d01routine.spad.pamphlet')
| -rw-r--r-- | src/algebra/d01routine.spad.pamphlet | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/algebra/d01routine.spad.pamphlet b/src/algebra/d01routine.spad.pamphlet index 66dbccf8..ee7b45fa 100644 --- a/src/algebra/d01routine.spad.pamphlet +++ b/src/algebra/d01routine.spad.pamphlet @@ -456,6 +456,8 @@ d01anfAnnaType(): NumericalIntegrationCategory == Result add ext:Result := empty()$Result weight:Union(Record(op:BOP,w:DF),"failed") := exprHasWeightCosWXorSinWX(args) + weight case "failed" => + [0.0,"d01anf: A suitable weight has not been found", ext] weight case Record(op:BOP,w:DF) => wany := coerce(weight)$AnyFunctions1(Record(op:BOP,w:DF)) ex:Record(key:S,entry:Any) := [d01anfextra@S,wany] @@ -464,7 +466,6 @@ d01anfAnnaType(): NumericalIntegrationCategory == Result add string(args.var)$S ")" [getMeasure(R,d01anf@S)$RT, "d01anf: The expression has a suitable weight:- " ws, ext] - [0.0,"d01anf: A suitable weight has not been found", ext] numericalIntegration(args:NIA,hints:Result) == a:INT @@ -528,6 +529,8 @@ d01asfAnnaType(): NumericalIntegrationCategory == Result add [0.0,"d01asf is not a suitable routine for infinite integrals",ext] weight: Union(Record(op:BOP,w:DF),"failed") := exprHasWeightCosWXorSinWX(args) + weight case "failed" => + [0.0,"d01asf: A suitable weight has not been found", ext] weight case Record(op:BOP,w:DF) => wany := coerce(weight)$AnyFunctions1(Record(op:BOP,w:DF)) ex:Record(key:S,entry:Any) := [d01asfextra@S,wany] @@ -536,7 +539,6 @@ d01asfAnnaType(): NumericalIntegrationCategory == Result add string(args.var)$S ")" [getMeasure(R,d01asf@S)$RT, "d01asf: A suitable weight has been found:- " ws, ext] - [0.0,"d01asf: A suitable weight has not been found", ext] numericalIntegration(args:NIA,hints:Result) == i:INT |