aboutsummaryrefslogtreecommitdiff
path: root/src/algebra/intaux.spad.pamphlet
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2009-02-04 11:43:05 +0000
committerdos-reis <gdr@axiomatics.org>2009-02-04 11:43:05 +0000
commitc76dce6ee2f6b6830f1087f83bf452974ce3bf09 (patch)
tree40e02b9b2ed5af7e36ebf581f5d58d4557ef94bf /src/algebra/intaux.spad.pamphlet
parent65045e7285ed629a68ae63529fae61bbcf7bf890 (diff)
downloadopen-axiom-c76dce6ee2f6b6830f1087f83bf452974ce3bf09.tar.gz
* algebra/algfunc.spad.pamphlet: Quote symbols.
* algebra/combfunc.spad.pamphlet: Likewise. * algebra/drawopt.spad.pamphlet: Likewise. * algebra/efstruc.spad.pamphlet: Likewise. * algebra/elemntry.spad.pamphlet: Likewise. * algebra/expr.spad.pamphlet: Likewise. * algebra/exprode.spad.pamphlet: Likewise. * algebra/float.spad.pamphlet: Likewise. * algebra/gaussian.spad.pamphlet: Likewise. * algebra/intaux.spad.pamphlet: Likewise. * algebra/irexpand.spad.pamphlet: Likewise. * algebra/laplace.spad.pamphlet: Likewise. * algebra/limitps.spad.pamphlet: Likewise. * algebra/liouv.spad.pamphlet: Likewise. * algebra/list.spad.pamphlet: Likewise. * algebra/lmdict.spad.pamphlet: Likewise. * algebra/manip.spad.pamphlet: Likewise. * algebra/matcat.spad.pamphlet: Likewise. * algebra/matrix.spad.pamphlet: Likewise. * algebra/mkfunc.spad.pamphlet: Likewise. * algebra/mset.spad.pamphlet: Likewise. * algebra/oct.spad.pamphlet: Likewise. * algebra/op.spad.pamphlet: Likewise. * algebra/patmatch1.spad.pamphlet: Likewise. * algebra/pattern.spad.pamphlet: Likewise. * algebra/quat.spad.pamphlet: Likewise. * algebra/sets.spad.pamphlet: Likewise. * algebra/transsolve.spad.pamphlet: Likewise. * algebra/vector.spad.pamphlet: Likewise.
Diffstat (limited to 'src/algebra/intaux.spad.pamphlet')
-rw-r--r--src/algebra/intaux.spad.pamphlet9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/algebra/intaux.spad.pamphlet b/src/algebra/intaux.spad.pamphlet
index d2452f79..d7b72256 100644
--- a/src/algebra/intaux.spad.pamphlet
+++ b/src/algebra/intaux.spad.pamphlet
@@ -99,13 +99,12 @@ IntegrationResult(F:Field): Exports == Implementation where
-- deg 1 minimal poly doesn't get sigma
lastc := - coefficient(rec.coeff, 0) / coefficient(rec.coeff, 1)
lg := (rec.logand) lastc
- logandp := prefix("log"::Symbol::O, [lg::O])
+ logandp := prefix('log::O, [lg::O])
(cc := Q2F(rec.scalar) * lastc) = 1 => logandp
cc = -1 => - logandp
cc::O * logandp
coeffp:O := (outputForm(rec.coeff, alpha) = 0::Z::O)@O
- logandp :=
- alpha * prefix("log"::Symbol::O, [outputForm(rec.logand, alpha)])
+ logandp := alpha * prefix('log::O, [outputForm(rec.logand, alpha)])
if (cc := Q2F(rec.scalar)) ~= 1 then
logandp := cc::O * logandp
sum(logandp, coeffp)
@@ -179,7 +178,7 @@ IntegrationResult(F:Field): Exports == Implementation where
reduce("+", l)
NE2O ne ==
- int((ne.integrand)::O * hconcat ["d"::Symbol::O, (ne.intvar)::O])
+ int((ne.integrand)::O * hconcat ['d::O, (ne.intvar)::O])
@
\section{package IR2 IntegrationResultFunctions2}
@@ -252,6 +251,8 @@ IntegrationResultFunctions2(E, F): Exports == Implementation where
<<license>>=
--Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
--All rights reserved.
+--Copyright (C) 2007-2009, Gabriel Dos Reis.
+--All rights reserved.
--
--Redistribution and use in source and binary forms, with or without
--modification, are permitted provided that the following conditions are